* linux-next: manual merge of the block tree with the uml tree
@ 2015-06-01 4:45 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-06-01 4:45 UTC (permalink / raw)
To: Jens Axboe, Richard Weinberger
Cc: linux-next, linux-kernel, Nicolas Iooss, Christoph Hellwig
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-01 4:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-01 4:45 linux-next: manual merge of the block tree with the uml tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox