* linux-next: manual merge of the target-merge tree with the net-next tree
@ 2016-02-29 6:39 Stephen Rothwell
2016-03-01 5:39 ` Nicholas A. Bellinger
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2016-02-29 6:39 UTC (permalink / raw)
To: Nicholas A. Bellinger, David Miller, netdev
Cc: linux-next, linux-kernel, Hariprasad Shenai, Varun Prakash
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the target-merge tree with the net-next tree
2016-02-29 6:39 linux-next: manual merge of the target-merge tree with the net-next tree Stephen Rothwell
@ 2016-03-01 5:39 ` Nicholas A. Bellinger
2016-03-01 5:52 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Nicholas A. Bellinger @ 2016-03-01 5:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Hariprasad Shenai,
Varun Prakash, target-devel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the target-merge tree with the net-next tree
2016-03-01 5:39 ` Nicholas A. Bellinger
@ 2016-03-01 5:52 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2016-03-01 5:52 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: David Miller, netdev, linux-next, linux-kernel, Hariprasad Shenai,
Varun Prakash, target-devel
Hi Nicholas,
On Mon, 29 Feb 2016 21:39:33 -0800 "Nicholas A. Bellinger" <nab@linux-iscsi.org> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-01 5:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-29 6:39 linux-next: manual merge of the target-merge tree with the net-next tree Stephen Rothwell
2016-03-01 5:39 ` Nicholas A. Bellinger
2016-03-01 5:52 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).