From: Linus Torvalds Date: Thu, 25 Jun 2015 22:22:36 +0000 (-0700) Subject: Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block X-Git-Tag: v4.2-rc1~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad90fb97515b732bc27a0109baa10af636c3c8cd;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block 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 --- ad90fb97515b732bc27a0109baa10af636c3c8cd diff --cc Documentation/scsi/scsi_mid_low_api.txt index 731bc4f4c5e64,731bc4f4c5e64..2550751575116 --- a/Documentation/scsi/scsi_mid_low_api.txt +++ b/Documentation/scsi/scsi_mid_low_api.txt @@@ -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