* linux-next: manual merge of the net tree with the unicore32 tree
@ 2011-08-23 3:02 Stephen Rothwell
2011-08-23 9:00 ` Jeff Kirsher
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-08-23 3:02 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Guan Xuetao, Zhang Shu, Chu Xiaowei,
Su Yonggang, Jeff Kirsher
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@canb.auug.org.au
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ef6b6be..df5e990 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -215,6 +215,12 @@ source "drivers/s390/net/Kconfig"
source "drivers/net/caif/Kconfig"
+config MAC_PUV3
+ tristate "PKUnity v3 UMAL Gigabit Network Adapter support"
+ depends on UNICORE32 && ARCH_PUV3
+ select MII
+ select PHYLIB
+
config XEN_NETDEV_FRONTEND
tristate "Xen network device frontend driver"
depends on XEN
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c33009b..9896ad1 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
+obj-$(CONFIG_MAC_PUV3) += mac-puv3.o
obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the net tree with the unicore32 tree
2011-08-23 3:02 linux-next: manual merge of the net tree with the unicore32 tree Stephen Rothwell
@ 2011-08-23 9:00 ` Jeff Kirsher
2011-08-24 1:28 ` Guan Xuetao
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Kirsher @ 2011-08-23 9:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Guan Xuetao, Zhang Shu, Chu Xiaowei,
Su Yonggang
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
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@canb.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? :)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the net tree with the unicore32 tree
2011-08-23 9:00 ` Jeff Kirsher
@ 2011-08-24 1:28 ` Guan Xuetao
0 siblings, 0 replies; 3+ messages in thread
From: Guan Xuetao @ 2011-08-24 1:28 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Stephen Rothwell, David Miller, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Zhang Shu, Chu Xiaowei, Su Yonggang
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@canb.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? :)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-24 1:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 3:02 linux-next: manual merge of the net tree with the unicore32 tree Stephen Rothwell
2011-08-23 9:00 ` Jeff Kirsher
2011-08-24 1:28 ` Guan Xuetao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox