linux-next: manual merge of the scsi tree with the tree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
include/scsi/sg.h between commit d15156138dad ("block SG_IO: add
SG_FLAG_Q_AT_HEAD flag") from the block tree and commit b15b9fab9f32
("sg: add SG_FLAG_Q_AT_TAIL flag") from the scsi tree.

I fixed it up (I used the version from the block tree) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature