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

[Stephen Rothwell]

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
arch/cris/include/asm/Kbuild between commit 5527b7d955ac ("CRIS: UAPI:
use generic headers via Kbuild") from the cris 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                    s...@canb.auug.org.au

diff --cc arch/cris/include/asm/Kbuild
index 2fc4331a69ca,d294f6aaff1d..000000000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -24,23 -18,11 +24,22 @@@ generic-y += linkage.
  generic-y += local.h
  generic-y += local64.h
  generic-y += mcs_spinlock.h
 +generic-y += mman.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

pgpPOgZ3oN1pJ.pgp
Description: OpenPGP digital signature