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,
Matthew Wilcox <willy@linux.intel.com>,
Dave Anglin <dave.anglin@bell.net>,
Kees Cook <keescook@chromium.org>
Subject: linux-next: manual merge of the akpm-current tree with the parisc-hd tree
Date: Mon, 30 Mar 2015 20:09:28 +1100 [thread overview]
Message-ID: <20150330200928.6dc4773d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 930 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/parisc/include/asm/Kbuild between commit 476840458128 ("parisc:
Eliminate sg_virt_addr() and private scatterlist.h") from the parisc-hd
tree and commit e494f4a463cd ("parisc: switch to using asm-generic for
seccomp.h") 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/parisc/include/asm/Kbuild
index a5f037535aab,12b341d04f88..000000000000
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@@ -20,7 -20,7 +20,8 @@@ generic-y += param.
generic-y += percpu.h
generic-y += poll.h
generic-y += preempt.h
+generic-y += scatterlist.h
+ generic-y += seccomp.h
generic-y += segment.h
generic-y += topology.h
generic-y += trace_clock.h
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-30 9:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 9:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-09-21 5:20 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
2019-05-02 9:11 Stephen Rothwell
2019-05-09 5:33 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=20150330200928.6dc4773d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dave.anglin@bell.net \
--cc=deller@gmx.de \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=willy@linux.intel.com \
/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