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

Hi James, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/qedf/qedf.h between commit: 8673daf4f55bf3b91 ("qedf: Add get_generic_tlv_data handler.") from the net-next tree and commit: 4b9b7fabb39b3e9d7 ("scsi: qedf: Improve firmware debug dump handling") from t

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

Hi James, Today's linux-next merge of the scsi tree got a conflict in drivers/target/target_core_user.c between commit 5538d294dd66 ("treewide: Add missing vmalloc.h inclusion") from the net-next tree and commit 7ad09a15e76b ("target: Minimize SCSI header #include directives") from the scsi tree.

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

; Manoj Malviya; Hannes Reinecke; Christoph Hellwig Subject: linux-next: manual merge of the scsi tree with the net-next tree Hi James, Today's linux-next merge of the scsi tree got a conflict in drivers/scsi/cxgbi/libcxgbi.h between commit fc8d0590d914 ("libcxgbi: Add ipv6 api to driver"

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

Hi James, Today's linux-next merge of the scsi tree got a conflict in drivers/scsi/cxgbi/libcxgbi.h between commit fc8d0590d914 ("libcxgbi: Add ipv6 api to driver") from the net-next tree and commit 1abf635d2f33 ("scsi: use 64-bit value for 'max_luns'") from the scsi tree. I fixed it up (see belo