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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 29 Feb 2016 21:39:33 -0800
From:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hariprasad Shenai <hariprasad@...lsio.com>,
	Varun Prakash <varun@...lsio.com>,
	target-devel <target-devel@...r.kernel.org>
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.