linux-kernel - linux-next: manual merge of the tip tree with the vfs 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20210106111533.2036c1d7@canb.auug.org.au>
Date:   Wed, 6 Jan 2021 11:15:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Al Viro <viro@...iv.linux.org.uk>
Cc:     Borislav Petkov <bp@...e.de>, Brian Gerst <brgerst@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the tip tree with the vfs tree

Hi all,

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

  arch/Kconfig

between commit:

  139d7deeea00 ("[elfcore-compat][amd64] clean PRSTATUS_SIZE/SET_PR_FPVALID up properly")

from the vfs tree and commit:

  2ca408d9c749 ("fanotify: Fix sys_fanotify_mark() on native x86-32")

from the tip 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 arch/Kconfig
index a17ced73b23c,24862d15f3a3..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -1105,9 -1105,12 +1105,15 @@@ config HAVE_ARCH_PFN_VALI
  config ARCH_SUPPORTS_DEBUG_PAGEALLOC
  	bool
  
 +config ARCH_HAS_ELFCORE_COMPAT
 +	bool
 +
+ config ARCH_SPLIT_ARG64
+ 	bool
+ 	help
+ 	   If a 32-bit architecture requires 64-bit arguments to be split into
+ 	   pairs of 32-bit arguments, select this option.
+ 
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"

Content of type "application/pgp-signature" skipped