From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Laura Abbott <lauraa@codeaurora.org>,
Mark Brown <broonie@linaro.org>
Subject: linux-next: manual merge of the akpm-current tree with the arm64 tree
Date: Thu, 24 Jul 2014 18:42:19 +1000 [thread overview]
Message-ID: <20140724184219.58c15517@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 903 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/Kconfig between commit affeafbb8477 ("arm64: Remove stray
ARCH_HAS_OPP reference") from the arm64 tree and commit 0941368c8dd9
("lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig") 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/arm64/Kconfig
index 555ad3cf3f0f,7bc7b7445774..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,6 -1,8 +1,7 @@@
config ARM64
def_bool y
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
- select ARCH_HAS_OPP
+ select ARCH_HAS_SG_CHAIN
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_SUPPORTS_ATOMIC_RMW
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-24 8:42 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 8:42 Stephen Rothwell [this message]
2014-09-23 7:23 linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2014-09-23 8:36 ` Catalin Marinas
2015-12-16 5:01 Stephen Rothwell
2015-12-16 10:14 ` Will Deacon
2016-06-22 4:54 Stephen Rothwell
2016-09-27 6:03 Stephen Rothwell
2017-11-06 5:33 Stephen Rothwell
2018-07-27 10:55 Stephen Rothwell
2018-08-16 0:11 ` Stephen Rothwell
2018-09-24 4:38 Stephen Rothwell
2018-09-24 9:32 ` Catalin Marinas
2018-12-11 6:02 Stephen Rothwell
2018-12-11 6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2018-12-11 6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2018-12-11 10:39 ` Will Deacon
2018-12-13 6:01 Stephen Rothwell
2018-12-13 11:12 ` Will Deacon
2019-08-07 6:39 Stephen Rothwell
2020-04-29 6:53 Stephen Rothwell
2020-04-30 6:26 Stephen Rothwell
2020-07-16 8:00 Stephen Rothwell
2020-07-16 8:23 ` Will Deacon
2020-09-21 8:03 Stephen Rothwell
2020-09-21 8:12 ` Catalin Marinas
2020-10-13 7:34 ` Stephen Rothwell
2020-12-03 8:06 Stephen Rothwell
2020-12-03 11:16 ` Catalin Marinas
2021-04-13 8:59 Stephen Rothwell
2021-04-13 9:14 ` Catalin Marinas
2021-10-08 6:04 Stephen Rothwell
2021-10-08 7:37 ` Will Deacon
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=20140724184219.58c15517@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=broonie@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=lauraa@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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).