Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 22:22:36 +0000 (15:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 22:22:36 +0000 (15:22 -0700)
Pull asm/scatterlist.h removal from Jens Axboe:
 "We don't have any specific arch scatterlist anymore, since parisc
  finally switched over.  Kill the include"

* 'for-4.2/sg' of git://git.kernel.dk/linux-block:
  remove scatterlist.h generation from arch Kbuild files
  remove <asm/scatterlist.h>

13 files changed:
1  2 
Documentation/scsi/scsi_mid_low_api.txt
arch/alpha/include/asm/pci.h
arch/frv/include/asm/pci.h
arch/ia64/include/asm/pci.h
arch/microblaze/include/asm/pci.h
arch/mips/include/asm/pci.h
arch/mn10300/include/asm/pci.h
arch/parisc/include/asm/pci.h
arch/powerpc/include/asm/pci.h
arch/x86/include/asm/pci.h
include/linux/blkdev.h
include/linux/scatterlist.h
lib/swiotlb.c

index 731bc4f4c5e64a1ef0a4fce0ea3bf352f8f4c389,731bc4f4c5e64a1ef0a4fce0ea3bf352f8f4c389..255075157511640622258f5d2801f5eceb51f13a
@@@ -1269,7 -1269,7 +1269,7 @@@ Members of interest
      request_buffer - either contains data buffer or scatter gather list
                       depending on the setting of use_sg. Scatter gather
                       elements are defined by 'struct scatterlist' found
--                     in include/asm/scatterlist.h .
++                     in include/linux/scatterlist.h .
      done         - function pointer that should be invoked by LLD when the
                     SCSI command is completed (successfully or otherwise).
                     Should only be called by an LLD if the LLD has accepted
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/swiotlb.c
Simple merge