From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Richard Weinberger <richard@nod•at>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Nicolas Iooss <nicolas.iooss_linux@m4x•org>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the block tree with the uml tree
Date: Mon, 1 Jun 2015 14:45:43 +1000 [thread overview]
Message-ID: <20150601144543.118bbda2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
arch/um/include/asm/Kbuild between commit d5f20be7cab8 ("um: Create
asm/sections.h") from the uml tree and commit c546d5db75b4 ("remove
scatterlist.h generation from arch Kbuild files") from the block 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/um/include/asm/Kbuild
index ea9ec2e34384,b7df3ae9be51..000000000000
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@@ -21,7 -21,7 +21,6 @@@ generic-y += param.
generic-y += pci.h
generic-y += percpu.h
generic-y += preempt.h
- generic-y += scatterlist.h
-generic-y += sections.h
generic-y += switch_to.h
generic-y += topology.h
generic-y += trace_clock.h
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-06-01 4:45 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=20150601144543.118bbda2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolas.iooss_linux@m4x$(echo .)org \
--cc=richard@nod$(echo .)at \
/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