Hi Nicholas,
Today's linux-next merge of the target-merge tree got a conflict in:
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
between commit:
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).
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
