]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:42:02 +0000 (07:42 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 8 Dec 2014 15:42:25 +0000 (07:42 -0800)
Conflicts:
drivers/scsi/scsi_debug.c

Agreed and tested resolution to a merge problem between a fix in scsi_debug
and a driver update

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
1  2 
MAINTAINERS
drivers/ata/libata-scsi.c
drivers/scsi/aacraid/linit.c
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
drivers/scsi/scsi.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_scan.c
drivers/scsi/ufs/ufshcd.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge