2016-03-01 05:39:38

by Nicholas A. Bellinger

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

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 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).
>

Thanks Stephen.

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.

2016-03-01 05:52:45

by Stephen Rothwell

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

Hi Nicholas,

On Mon, 29 Feb 2016 21:39:33 -0800 "Nicholas A. Bellinger" <[email protected]> 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 than I am :-)

--
Cheers,
Stephen Rothwell