linux-next: manual merge of the target-merge tree with the net-next tree
From: Stephen Rothwell
Date: Mon Feb 29 2016 - 01:39:27 EST
Today's linux-next merge of the target-merge tree got a conflict in:
ba9cee6aa67d ("cxgb4/iw_cxgb4: TOS support")
from the net-next tree and commit:
c973e2a3ff1b ("cxgb4: add definitions for iSCSI target ULD")
from the target-merge tree.
I fixed it up (the latter was a superset of the former) and can carry
the fix as necessary (no action is required).