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,
Will Deacon <will.deacon@arm•com>,
Laura Abbott <lauraa@codeaurora•org>
Subject: linux-next: manual merge of the akpm-current tree with the arm tree
Date: Mon, 2 Jun 2014 18:42:38 +1000 [thread overview]
Message-ID: <20140602184238.2672e610@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 915 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/include/asm/Kbuild between commit 8a87411b649c ("ARM: 8047/1:
rwsem: use asm-generic rwsem implementation") from the arm tree and
commit bca74b3faf68 ("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/arm/include/asm/Kbuild
index f5a357601983,2d95820276fd..000000000000
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -21,7 -21,7 +21,8 @@@ generic-y += parport.
generic-y += poll.h
generic-y += preempt.h
generic-y += resource.h
+generic-y += rwsem.h
+ generic-y += scatterlist.h
generic-y += sections.h
generic-y += segment.h
generic-y += sembuf.h
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-06-02 8:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 8:42 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-12-07 8:00 Stephen Rothwell
2015-07-16 4:50 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=20140602184238.2672e610@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=lauraa@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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