linux-next: manual merge of the mips tree with the kbuild tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]

Hi all,

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

  arch/mips/Kconfig

between commit:

  2ff2b7ec65dc ("kbuild: add CONFIG_ASM_MODVERSIONS")

from the kbuild tree and commit:

  45e03e62724f ("MIPS: Decouple CPU_SUPPORTS_HUGEPAGES from 64BIT")

from the mips 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/mips/Kconfig
index 3db919b5c93a,31c7044e34e6..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -43,8 -44,7 +44,8 @@@ config MIP
  	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
  	select HAVE_ARCH_SECCOMP_FILTER
  	select HAVE_ARCH_TRACEHOOK
- 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
+ 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
 +	select HAVE_ASM_MODVERSIONS
  	select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
  	select HAVE_CONTEXT_TRACKING
  	select HAVE_COPY_THREAD_TLS

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]