From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbbKASEE (ORCPT ); Sun, 1 Nov 2015 13:04:04 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46440 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbbKASED (ORCPT ); Sun, 1 Nov 2015 13:04:03 -0500 X-Sasl-enc: 7zYB6mppbWLADUrBIuHGsOjPEUMytsbDj+h/QzhOey9O 1446401041 Date: Sun, 1 Nov 2015 10:03:59 -0800 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Deepa Dinamani , Tapasweni Pathak Subject: Re: linux-next: manual merge of the y2038 tree with the staging tree Message-ID: <20151101180359.GA13943@kroah.com> References: <20151102014449.5ae120ab@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151102014449.5ae120ab@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 02, 2015 at 01:44:49AM +1100, Stephen Rothwell wrote: > Hi Arnd, > > Today's linux-next merge of the y2038 tree got conflicts in: > > drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c > drivers/staging/ft1000/ft1000-usb/ft1000_debug.c > drivers/staging/ft1000/ft1000-usb/ft1000_hw.c > drivers/staging/ft1000/ft1000.h > > between commit: > > 6512edec48b2 ("staging: ft1000: remove obsolete driver") > > from the staging tree and commit: > > 8b37bf430656 ("staging: ft1000: Replace timeval and time_t with time64_t") > > from the y2038 tree. > > I fixed it up (the former removed the files) and can carry the fix as > necessary (no action is required). Thanks for the fix, that sounds obviously correct :) greg k-h