linux-next: manual merge of the target-bva tree with the target-updates tree
From: Stephen Rothwell
Date: Sun Feb 19 2017 - 21:51:42 EST
Today's linux-next merge of the target-bva tree got conflicts in:
9a584bf9bf0a ("target/iscsi: split iscsit_check_dataout_hdr()")
79e57cfe00f4 ("target/cxgbit: add T6 iSCSI DDP completion feature")
from the target-updates tree and commit:
b6f2cd5ab404 ("target/iscsi: split iscsit_check_dataout_hdr()")
b0d5eab94c37 ("target/cxgbit: add T6 iSCSI DDP completion feature")
from the target-bva tree.
I fixed it up (the target-update versions are updates from the others,
so I used those) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.