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] [day] [month] [year] [list]

Message-ID: <1314149322.29738.14.camel@epip-laptop>
Date:	Wed, 24 Aug 2011 09:28:42 +0800
From:	Guan Xuetao <gxt@...c.pku.edu.cn>
To:	jeffrey.t.kirsher@...el.com
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	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>,
	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 Tue, 2011-08-23 at 02:00 -0700, Jeff Kirsher wrote:
> 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.
Ok, I see.
Thanks Jeff, and thanks Stephen.

Guan Xuetao

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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/