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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20191114180021.1a41c73b@canb.auug.org.au>
Date:   Thu, 14 Nov 2019 18:00:21 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mohammad Nasirifar <far.nasiri.m@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the y2038
 tree

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);

Content of type "application/pgp-signature" skipped