lkml.org 
[lkml]   [2016]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the target-merge tree with the net-next tree
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

\
 
 \ /
  Last update: 2016-02-29 08:21    [W:0.031 / U:4.752 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site