Merge remote-tracking branch 'y2038/y2038'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 05:31:34 +0000 (16:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 05:31:34 +0000 (16:31 +1100)
1  2 
arch/Kconfig
include/uapi/linux/time.h
ipc/mqueue.c
kernel/futex.c
kernel/sched/core.c
kernel/signal.c
kernel/time/hrtimer.c
net/compat.c

diff --cc arch/Kconfig
Simple merge
Simple merge
diff --cc ipc/mqueue.c
Simple merge
diff --cc kernel/futex.c
Simple merge
Simple merge
diff --cc kernel/signal.c
Simple merge
Simple merge
diff --cc net/compat.c
Simple merge