linux-kernel - Re: linux-next: manual merge of the y2038 tree with the staging tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20151101180359.GA13943@kroah.com>
Date:	Sun, 1 Nov 2015 10:03:59 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Arnd Bergmann <arnd@...db.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Deepa Dinamani <deepa.kernel@...il.com>,
	Tapasweni Pathak <tapaswenipathak@...il.com>
Subject: Re: linux-next: manual merge of the y2038 tree with the staging tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/