Hi all,
Today's linux-next merge of the y2038 tree got conflicts in:
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/lustre/lustre/lmv/lmv_obd.c
drivers/staging/lustre/lustre/mdc/mdc_reint.c
Hi all,
Today's linux-next merge of the y2038 tree got conflicts in:
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/lustre/lustre/lmv/lmv_obd.c
drivers/staging/lustre/lustre/mdc/mdc_reint.c
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
>
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
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
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
>
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/media/lirc/lirc_parallel.c between commit 8126e17f8925
("Staging: media: Remove parentheses around right side an assignment")
from the staging tree and commit 77f0cbce579d ("staging: media: lirc:
Replace timeval
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/media/lirc/lirc_parallel.c between commit 8126e17f8925
(Staging: media: Remove parentheses around right side an assignment)
from the staging tree and commit 77f0cbce579d (staging: media: lirc:
Replace timeval
Hi Arnd,
On Thu, 6 Nov 2014 15:48:15 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the y2038 tree got a conflict in
> drivers/staging/ft1000/ft1000-usb/ft1000_debug.c between commit
> ecdd21c7b982 ("staging: ft1000: Whitespace neatening") from the staging
> tree and commit
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c between commit
ecdd21c7b982 ("staging: ft1000: Whitespace neatening") from the staging
tree and commit 4115d2b27a50 ("staging: ft1000: Replace timeval and
time_t with time64_t")
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c between commit
ecdd21c7b982 ("staging: ft1000: Whitespace neatening") from the staging
tree and commit 4115d2b27a50 ("staging: ft1000: Replace timeval and
time_t with time64_t")
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c between commit
ecdd21c7b982 (staging: ft1000: Whitespace neatening) from the staging
tree and commit 4115d2b27a50 (staging: ft1000: Replace timeval and
time_t with time64_t) from
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c between commit
ecdd21c7b982 (staging: ft1000: Whitespace neatening) from the staging
tree and commit 4115d2b27a50 (staging: ft1000: Replace timeval and
time_t with time64_t) from
Hi Arnd,
On Thu, 6 Nov 2014 15:48:15 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c between commit
ecdd21c7b982 (staging: ft1000: Whitespace neatening) from the staging
tree
14 matches
Mail list logo