linux-next: manual merge of the akpm-current tree with the y2038 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/linux/syscalls.h

between commit:

  4ced3933226d ("y2038: syscalls: change remaining timeval to __kernel_old_timeval")

from the y2038 tree and commit:

  01606a699584 ("syscalls: fix references to filenames containing syscall defs")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/syscalls.h
index f90f1c8705fc,1dbefa5e00e5..000000000000
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -731,10 -731,10 +731,10 @@@ asmlinkage long sys_prctl(int option, u
  			unsigned long arg4, unsigned long arg5);
  asmlinkage long sys_getcpu(unsigned __user *cpu, unsigned __user *node, struct getcpu_cache __user *cache);
  
- /* kernel/time.c */
+ /* kernel/time/time.c */
 -asmlinkage long sys_gettimeofday(struct timeval __user *tv,
 +asmlinkage long sys_gettimeofday(struct __kernel_old_timeval __user *tv,
  				struct timezone __user *tz);
 -asmlinkage long sys_settimeofday(struct timeval __user *tv,
 +asmlinkage long sys_settimeofday(struct __kernel_old_timeval __user *tv,
  				struct timezone __user *tz);
  asmlinkage long sys_adjtimex(struct __kernel_timex __user *txc_p);
  asmlinkage long sys_adjtimex_time32(struct old_timex32 __user *txc_p);

Attachment: pgpU81_keKvWz.pgp
Description: OpenPGP digital signature