From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Helge Deller <deller@gmx.de>,
Parisc List <linux-parisc@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vineet Gupta <Vineet.Gupta1@synopsys.com>
Subject: linux-next: manual merge of the akpm-current tree with the parisc-hd tree
Date: Wed, 21 Sep 2016 15:20:06 +1000 [thread overview]
Message-ID: <20160921152006.58c2c81c@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/parisc/Kconfig
between commit:
b5d5cf2b8a68 ("parisc: Drop BROKEN_RODATA config option")
from the parisc-hd tree and commit:
7b4d24d8c01d ("atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE")
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 arch/parisc/Kconfig
index f8dc10dcf292,8a96bdcc3807..000000000000
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@@ -14,7 -14,7 +14,6 @@@ config PARIS
select BUILDTIME_EXTABLE_SORT
select HAVE_PERF_EVENTS
select GENERIC_ATOMIC64 if !64BIT
- select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
- select BROKEN_RODATA
select GENERIC_IRQ_PROBE
select GENERIC_PCI_IOMAP
select ARCH_HAVE_NMI_SAFE_CMPXCHG
next reply other threads:[~2016-09-21 5:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 5:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-09 5:33 linux-next: manual merge of the akpm-current tree with the parisc-hd tree Stephen Rothwell
2017-08-22 6:53 Stephen Rothwell
2017-09-05 0:34 ` Stephen Rothwell
2017-09-05 6:09 ` Helge Deller
2017-09-05 6:58 ` Stephen Rothwell
2015-03-30 9:09 Stephen Rothwell
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=20160921152006.58c2c81c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Vineet.Gupta1@synopsys.com \
--cc=akpm@linux-foundation.org \
--cc=deller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
/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).