linux-next: manual merge of the block tree with the uml tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgpFQxbWH2eGE.pgp
Description: OpenPGP digital signature