linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Russell King <linux@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Arnd Bergmann <arnd@arndb.de>,
	Daniel Cashman <dcashman@google.com>
Subject: linux-next: manual merge of the akpm-current tree with the arm tree
Date: Mon, 7 Dec 2015 19:00:28 +1100	[thread overview]
Message-ID: <20151207190028.390223f2@canb.auug.org.au> (raw)

Hi Andrew,

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

  arch/arm/Kconfig

between commit:

  437682eeab45 ("ARM: 8456/1: code patching only works on MMU")

from the arm tree and commits:

  47fb802e4fcd ("arm: mm: support ARCH_MMAP_RND_BITS")
  8100fa068b27 ("ARM: avoid ARCH_MMAP_RND_BITS for NOMMU")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/Kconfig
index 752775aab3ae,536a8e477a96..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -33,8 -33,9 +33,9 @@@ config AR
  	select HARDIRQS_SW_RESEND
  	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
  	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
 -	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32
 -	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32
 +	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
 +	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
+ 	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_BPF_JIT

             reply	other threads:[~2015-12-07  8:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-07  8:00 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-24  9:10 linux-next: manual merge of the akpm-current tree with the arm tree Stephen Rothwell
2021-09-06  4:46 ` Stephen Rothwell
2016-07-15  8:38 Stephen Rothwell
2015-07-16  4:50 Stephen Rothwell
2014-06-02  8:42 Stephen Rothwell
2014-04-24  5:25 Stephen Rothwell
2014-04-24 14:27 ` Mark Salter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151207190028.390223f2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=dcashman@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).