Messages in this thread | | | Date | Mon, 2 Nov 2015 01:44:49 +1100 | From | Stephen Rothwell <> | Subject | linux-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
| |