From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jesper Nilsson <jesper.nilsson@axis•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>, Jens Axboe <axboe@fb•com>,
Rabin Vincent <rabin@rab•in>,
Laurent Dufour <ldufour@linux•vnet.ibm.com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the cris tree with Linus' tree
Date: Mon, 20 Jul 2015 10:01:44 +1000 [thread overview]
Message-ID: <20150720100144.7c6d40fa@canb.auug.org.au> (raw)
Hi Jesper,
Today's linux-next merge of the cris tree got a conflict in:
arch/cris/include/asm/Kbuild
between commits:
c546d5db75b4 ("remove scatterlist.h generation from arch Kbuild files")
f2abeef9fd6f ("mm: clean up per architecture MM hook header files")
from Linus' tree and commit:
d0529229a92c ("CRIS: UAPI: use generic headers via Kbuild")
from the cris 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/cris/include/asm/Kbuild
index ad2244f35bca,2fc4331a69ca..000000000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -18,12 -24,23 +24,23 @@@ generic-y += linkage.
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
+ generic-y += mman.h
+generic-y += mm-arch-hooks.h
generic-y += module.h
+ generic-y += msgbuf.h
generic-y += percpu.h
+ generic-y += poll.h
generic-y += preempt.h
+ generic-y += resource.h
-generic-y += scatterlist.h
generic-y += sections.h
+ generic-y += sembuf.h
+ generic-y += shmbuf.h
+ generic-y += siginfo.h
+ generic-y += socket.h
+ generic-y += sockios.h
+ generic-y += statfs.h
generic-y += topology.h
generic-y += trace_clock.h
+ generic-y += types.h
generic-y += vga.h
generic-y += xor.h
reply other threads:[~2015-07-20 0:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150720100144.7c6d40fa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axboe@fb$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=jesper.nilsson@axis$(echo .)com \
--cc=ldufour@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rabin@rab$(echo .)in \
/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