Re: linux-next: manual merge of the target-updates tree with the scsi-mkp tree

Hi all, With the merge window approaching, this is just a reminder that the following conflict still exists. No action is necessarily needed except to maybe mention this to Linus at the appropriate time. James, you have been added since you merged the scsi-mkp tree int the scsi tree. On Tue,

Re: linux-next: manual merge of the target-updates tree with the scsi-mkp tree

Hi all, With the merge window approaching, this is just a reminder that the following conflict still exists. No action is necessarily needed except to maybe mention this to Linus at the appropriate time. James, you have been added since you merged the scsi-mkp tree int the scsi tree. On Tue,

linux-next: manual merge of the target-updates tree with the scsi-mkp tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in: drivers/scsi/qla2xxx/qla_target.c between commit: f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit") from the scsi-mkp tree and commit: 6b26726af699 ("qla2xxx: Convert QLA_TGT_ABTS to

linux-next: manual merge of the target-updates tree with the scsi-mkp tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in: drivers/scsi/qla2xxx/qla_target.c between commit: f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit") from the scsi-mkp tree and commit: 6b26726af699 ("qla2xxx: Convert QLA_TGT_ABTS to