On Thu, 2015-05-14 at 23:16 -0700, Minh Tran wrote: > Signed-off-by: Minh Tran <minh.t...@avagotech.com> > Signed-off-by: Jayamohan Kallickal <jayamohan.kallic...@avagotech.com> > --- > MAINTAINERS | 6 ++++-- > drivers/scsi/be2iscsi/be.h | 6 +++--- > drivers/scsi/be2iscsi/be_cmds.c | 6 +++--- > drivers/scsi/be2iscsi/be_cmds.h | 6 +++--- > drivers/scsi/be2iscsi/be_iscsi.c | 8 ++++---- > drivers/scsi/be2iscsi/be_iscsi.h | 8 ++++---- > drivers/scsi/be2iscsi/be_main.c | 12 ++++++------ > drivers/scsi/be2iscsi/be_main.h | 10 +++++----- > drivers/scsi/be2iscsi/be_mgmt.c | 8 ++++---- > drivers/scsi/be2iscsi/be_mgmt.h | 8 ++++---- > 10 files changed, 40 insertions(+), 38 deletions(-)
This patch conflicts horribly with [PATCH V2 0/7] be2iscsi driver update to 10.6.0.0. I fixed it up this time, but next time, just update MAINTAINERS on its own and sort out the rest during the usual merge window process. James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
