Re: linux-next: manual merge of the target-merge tree with the net-next tree

2016-02-29 Thread Stephen Rothwell
Hi Nicholas, On Mon, 29 Feb 2016 21:39:33 -0800 "Nicholas A. Bellinger" wrote: > > I'll include a note to Linus in target-pending/for-next-merge PULL > request, and will plan to wait until after DaveM's net-next is merged > for v4.6-rc0. The order doesn't really matter and Linus is cleverer tha

Re: linux-next: manual merge of the target-merge tree with the net-next tree

2016-02-29 Thread Nicholas A. Bellinger
On Mon, 2016-02-29 at 17:39 +1100, Stephen Rothwell wrote: > 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 tr

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

2016-02-28 Thread Stephen Rothwell
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") f