lkml.org 
[lkml]   [2015]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the y2038 tree with the staging tree
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).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au


\
 
 \ /
  Last update: 2015-11-01 16:01    [W:0.040 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site