linux-kernel - Re: linux-next: manual merge of the net tree with the unicore32 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]

Message-ID: <1314090049.2128.224.camel@jtkirshe-mobl>
Date:	Tue, 23 Aug 2011 02:00:48 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Miller <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Guan Xuetao <gxt@...c.pku.edu.cn>,
	Zhang Shu <davidshuzhang@...il.com>,
	Chu Xiaowei <chuxiaowei@...c.pku.edu.cn>,
	Su Yonggang <tonyhook.su@...il.com>
Subject: Re: linux-next: manual merge of the net tree with the unicore32 tree

On Mon, 2011-08-22 at 20:02 -0700, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net tree got conflicts in
> drivers/net/Kconfig and drivers/net/Makefile between commit
> e8787de6fa83
> ("unicore32: add pkunity-v3 mac/net driver (umal)") from the unicore32
> tree and the network driver rearrangement from the net tree.
> 
> I just added the new driver from the unicore32 tree commit into each
> file
> (see below).
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au 

Hmm, well with the latest series of patches I sent out, I am pretty sure
this patch would not apply.

Is it best that this patch not be sent to netdev for driver
inclusion? :)

Download attachment "signature.asc" of type "application/pgp-signature" (491 bytes)