Merge remote-tracking branch 'y2038/y2038'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 07:09:08 +0000 (18:09 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 07:09:08 +0000 (18:09 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 07:09:08 +0000 (18:09 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 07:09:08 +0000 (18:09 +1100)
diff --cc fs/aio.c
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc include/linux/syscalls.h
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/time/time.c
Simple merge
diff --cc kernel/time/timekeeping.c
Simple merge
diff --cc net/socket.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 07:09:08 +0000 (18:09 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 07:09:08 +0000 (18:09 +1100)
		1	2
fs/aio.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/syscalls.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/time.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/timekeeping.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history