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

[Guan Xuetao]

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@xxxxxxxxxxxxxxxx 
> 
> 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/