linux-next: manual merge of the net tree with the net-current tree
Stephen Rothwell
Today's linux-next merge of the net tree got a conflict in
drivers/net/can/Kconfig between commit
b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf ("can: Fix driver Kconfig
structure") from the net-current tree and commits
3758bf25db8caeec667e4e56e030da0ec3060529 ("can: add TI CAN (HECC)
driver"), e0000163e30eeb112b41486ea113fd54f64e1f17 ("can: Driver for the
Microchip MCP251x SPI CAN controllers") and
afa17a500a3667f66df450100538d06769529bba ("net/can: add driver for mscan
family & mpc52xx_mscan") from the net tree.
I fixed it up (see below) and can carry the fix for a while. (I am not
sure the fix is entirely correct.)
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc drivers/net/can/Kconfig
index 772f6d2,c16e6ff..0000000
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -41,10 -95,38 +41,42 @@@ config CAN_AT9
---help---
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
+ config CAN_TI_HECC
+ depends on CAN_DEV && ARCH_OMAP3
+ tristate "TI High End CAN Controller"
+ ---help---
+ Driver for TI HECC (High End CAN Controller) module found on many
+ TI devices. The device specifications are available from www.ti.com
+
+ config CAN_MCP251X
+ tristate "Microchip MCP251x SPI CAN controllers"
+ depends on CAN_DEV && SPI
+ ---help---
+ Driver for the Microchip MCP251x SPI CAN controllers.
+
+ config CAN_MSCAN
+ depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+ tristate "Support for Freescale MSCAN based chips"
+ ---help---
+ The Motorola Scalable Controller Area Network (MSCAN) definition
+ is based on the MSCAN12 definition which is the specific
+ implementation of the Motorola Scalable CAN concept targeted for
+ the Motorola MC68HC12 Microcontroller Family.
+
+ config CAN_MPC52XX
+ tristate "Freescale MPC5xxx onboard CAN controller"
+ depends on CAN_MSCAN && PPC_MPC52xx
+ ---help---
+ If you say yes here you get support for Freescale's MPC52xx
+ onboard dualCAN controller.
+
+ This driver can also be built as a module. If so, the module
+ will be called mpc5xxx_can.
+
+source "drivers/net/can/sja1000/Kconfig"
+
+source "drivers/net/can/usb/Kconfig"
+
config CAN_DEBUG_DEVICES
bool "CAN devices debugging messages"
depends on CAN
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Oliver Hartkopp
Stephen Rothwell wrote:
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/can/Kconfig between commit
> b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf ("can: Fix driver Kconfig
> structure") from the net-current tree
Indeed this cleanup was made in net-2.6 to fix the Kconfig structure before
2.6.32 is finalized.
The commits
> 3758bf25db8caeec667e4e56e030da0ec3060529 ("can: add TI CAN (HECC)
> driver"), e0000163e30eeb112b41486ea113fd54f64e1f17 ("can: Driver for the
> Microchip MCP251x SPI CAN controllers") and
> afa17a500a3667f66df450100538d06769529bba ("net/can: add driver for mscan
> family & mpc52xx_mscan") from the net tree.
added Kconfig entries right behind the CAN_AT91 driver - and that's because
the net-2.6 patch "can: Fix driver Kconfig structure" refuses to apply cleanly
on net-next-2.6 ...
>
> I fixed it up (see below) and can carry the fix for a while. (I am not
> sure the fix is entirely correct.)
>
Yes. You only added the new Kconfig entries (for CAN_TI_HECC, CAN_MCP251X,
CAN_MSCAN, ...) to the patch "can: Fix driver Kconfig structure", right?
These are the only added items in drivers/net/can/Kconfig from net-2.6 to
net-next-2.6.
Thanks,
Oliver
David Miller
Date: Tue, 17 Nov 2009 13:16:37 +1100
> I fixed it up (see below) and can carry the fix for a while. (I am not
> sure the fix is entirely correct.)
I'll merge net-2.6 into net-next-2.6 so you won't see this tomorrow.
Thanks!
Stephen Rothwell
On Tue, 17 Nov 2009 00:07:20 -0800 (PST) David Miller <da...@davemloft.net> wrote:
>
> From: Stephen Rothwell <s...@canb.auug.org.au>
> Date: Tue, 17 Nov 2009 13:16:37 +1100
>
> > I fixed it up (see below) and can carry the fix for a while. (I am not
> > sure the fix is entirely correct.)
>
> I'll merge net-2.6 into net-next-2.6 so you won't see this tomorrow.
Great, thanks.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
Stephen Rothwell
On Tue, 17 Nov 2009 09:00:18 +0100 Oliver Hartkopp <oli...@hartkopp.net> wrote:
>
> Yes. You only added the new Kconfig entries (for CAN_TI_HECC, CAN_MCP251X,
> CAN_MSCAN, ...) to the patch "can: Fix driver Kconfig structure", right?
Yes.
> These are the only added items in drivers/net/can/Kconfig from net-2.6 to
> net-next-2.6.
And it looks like Dave will fix this up for me tomorrow.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
Stephen Rothwell
Today's linux-next merge of the net tree got a conflict in
drivers/net/netxen/netxen_nic_init.c between commit
5d521fd36de4e61ab16a358df54c5babe153396c ("netxen: fix memory
initialization") from the net-current tree and commit
0be367bd5d10634c0836f57a684432fee935d929 ("netxen: reset sequence
changes") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc drivers/net/netxen/netxen_nic_init.c
index 8a09043,6ee27a6..0000000
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@@ -544,9 -528,8 +528,10 @@@ int netxen_pinit_from_rom(struct netxen
continue;
if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */
continue;
+ if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)
+ continue;
- if (off == (NETXEN_CRB_PEG_NET_1 + 0x18))
+ if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&
+ !NX_IS_REVISION_P3P(adapter->ahw.revision_id))
buf[i].data = 0x1020;
/* skip the function enable register */
if (off == NETXEN_PCIE_REG(PCIE_SETUP_FUNCTION))
Stephen Rothwell
Today's linux-next merge of the net tree got a conflict in
drivers/ieee802154/fakehard.c between commit
56cf54831fd1be105e89a9df899e3b22442da180 ("ieee802154: dont leak skbs in
ieee802154_fake_xmit()") from the net-current tree and commit
8964be4a9a5ca8cab1219bb046db2f6d1936227c ("net: rename skb->iif to
skb->skb_iif") from the net tree.
The former removed the code modified by the latter, so I used the former.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
David Miller
Date: Mon, 23 Nov 2009 12:00:52 +1100
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee802154/fakehard.c between commit
> 56cf54831fd1be105e89a9df899e3b22442da180 ("ieee802154: dont leak skbs in
> ieee802154_fake_xmit()") from the net-current tree and commit
> 8964be4a9a5ca8cab1219bb046db2f6d1936227c ("net: rename skb->iif to
> skb->skb_iif") from the net tree.
>
> The former removed the code modified by the latter, so I used the former.
Hmmm... I specifically remember taking core of this conflict when I
merged net-next-2.6 into net-2.6 yesterday or the day before.
Stephen Rothwell
On Sun, 22 Nov 2009 17:19:32 -0800 (PST) David Miller <da...@davemloft.net> wrote:
>
> Hmmm... I specifically remember taking core of this conflict when I
> merged net-next-2.6 into net-2.6 yesterday or the day before.
These are the trees I picked up from master.kernel.org this morning:
$ git branch -r -v | grep '^ *net'
net-current/master 5d09e53 netxen : fix BOND_MODE_TLB/ALB mode.
net/master e994b7c tcp: Don't make syn cookies initial setting depend on CONFIG_SYSCTL
commit e994b7c901ded7200b525a707c6da71f2cf6d4bb
Author: David S. Miller <da...@davemloft.net>
Date: Sat Nov 21 11:22:25 2009 -0800
Did you push them out? master was down for a while yesterday ...
David Miller
Date: Mon, 23 Nov 2009 13:04:41 +1100
> Did you push them out? master was down for a while yesterday ...
That's what happened, I couldn't push out yesterday because
master wasn't responding. Let me push it out right now :-)
Thanks!
Amit Salecha
This merge looks ok and I have tested it.
Thanks
Amit Salecha
Stephen Rothwell
On Mon, 23 Nov 2009 12:09:10 -0600 Amit Salecha <amit.s...@qlogic.com> wrote:
>
> This merge looks ok and I have tested it.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au