Mailing List Archive: Linux: Kernel

linux-next: manual merge of the net tree with the net-current tree

Index | Next | Previous | View Threaded

sfr at canb

Nov 5, 2009, 4:55 PM

Post #1 of 22 (657 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/usb/cdc_ether.c between commit
3a19d56c71bd3a08412d609d219ac8eec0819166 ("cdc_ether: additional Ericsson
MBM PID's to the whitelist") from the net-current tree and commit
e1e499eef2200c2a7120c9ebf297d48b195cf887 ("usbnet: Use wwan%d interface
name for mobile broadband devices") from the net tree.

Context changes. I fixed it up (see below) and can carry it as
necessary. This fix may not be completely correct ...

--
Cheers,
Stephen Rothwell sfr [at] canb

diff --cc drivers/net/usb/cdc_ether.c
index 21e1ba1,71e65fc..0000000
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@@ -542,62 -550,22 +550,62 @@@ static const struct usb_device_id produ
/* Ericsson F3607gw */
USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1904, USB_CLASS_COMM,
USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- .driver_info = (unsigned long) &cdc_info,
+ .driver_info = (unsigned long) &mbm_info,
}, {
- /* Ericsson F3307 */
+ /* Ericsson F3607gw ver 2 */
+ USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
+ /* Ericsson F3607gw ver 3 */
USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM,
USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- .driver_info = (unsigned long) &cdc_info,
+ .driver_info = (unsigned long) &mbm_info,
}, {
+ /* Ericsson F3307 */
+ USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
+ /* Ericsson F3307 ver 2 */
+ USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
+ /* Ericsson C3607w */
+ USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
/* Toshiba F3507g */
USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,
USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- .driver_info = (unsigned long) &cdc_info,
+ .driver_info = (unsigned long) &mbm_info,
}, {
+ /* Toshiba F3607gw */
+ USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
+ /* Toshiba F3607gw ver 2 */
+ USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
/* Dell F3507g */
USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM,
USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- .driver_info = (unsigned long) &cdc_info,
+ .driver_info = (unsigned long) &mbm_info,
+}, {
+ /* Dell F3607gw */
+ USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
+}, {
+ /* Dell F3607gw ver 2 */
+ USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM,
+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+ .driver_info = (unsigned long) &cdc_info,
},
{ }, // END
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

davem at davemloft

Nov 5, 2009, 5:40 PM

Post #2 of 22 (648 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
Date: Fri, 6 Nov 2009 11:55:54 +1100

> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/usb/cdc_ether.c between commit
> 3a19d56c71bd3a08412d609d219ac8eec0819166 ("cdc_ether: additional Ericsson
> MBM PID's to the whitelist") from the net-current tree and commit
> e1e499eef2200c2a7120c9ebf297d48b195cf887 ("usbnet: Use wwan%d interface
> name for mobile broadband devices") from the net tree.
>
> Context changes. I fixed it up (see below) and can carry it as
> necessary. This fix may not be completely correct ...

Thanks I'll take a look at this when merging net-2.6 into
net-next-2.6 later tonight.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 5, 2009, 6:32 PM

Post #3 of 22 (646 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi Dave,

On Thu, 05 Nov 2009 17:40:55 -0800 (PST) David Miller <davem [at] davemloft> wrote:
>
> Thanks I'll take a look at this when merging net-2.6 into
> net-next-2.6 later tonight.

OK, thanks.
--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/

sfr at canb

Nov 8, 2009, 6:03 PM

Post #4 of 22 (619 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/can/usb/ems_usb.c between commit
2b2072e902848a63168570f500a5726744b3873a ("ems_usb: Fix byte order issues
on big endian machines") from the net-current tree and commit
7b6856a0296a8f187bb88ba31fa83a08abba7966 ("can: provide library functions
for skb allocation") from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr [at] canb

diff --cc drivers/net/can/usb/ems_usb.c
index abdbd9c,3685f3e..0000000
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@@ -315,11 -315,7 +315,7 @@@ static void ems_usb_rx_can_msg(struct e
if (skb == NULL)
return;

- skb->protocol = htons(ETH_P_CAN);
-
- cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
-
- cf->can_id = msg->msg.can_msg.id;
+ cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);

if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

davem at davemloft

Nov 8, 2009, 8:59 PM

Post #5 of 22 (616 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
Date: Mon, 9 Nov 2009 13:03:23 +1100

> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/can/usb/ems_usb.c between commit
> 2b2072e902848a63168570f500a5726744b3873a ("ems_usb: Fix byte order issues
> on big endian machines") from the net-current tree and commit
> 7b6856a0296a8f187bb88ba31fa83a08abba7966 ("can: provide library functions
> for skb allocation") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> for a while.

I'll do a merge and resolve this, thanks Stephen!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 16, 2009, 6:16 PM

Post #6 of 22 (604 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi all,

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 sfr [at] canb

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

oliver at hartkopp

Nov 17, 2009, 12:00 AM

Post #7 of 22 (595 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hello Stephen,

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

davem at davemloft

Nov 17, 2009, 12:07 AM

Post #8 of 22 (594 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
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!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 17, 2009, 12:10 AM

Post #9 of 22 (597 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi Dave,

On Tue, 17 Nov 2009 00:07:20 -0800 (PST) David Miller <davem [at] davemloft> wrote:
>
> From: Stephen Rothwell <sfr [at] canb>
> 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 sfr [at] canb
http://www.canb.auug.org.au/~sfr/

sfr at canb

Nov 17, 2009, 12:16 AM

Post #10 of 22 (596 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi Oliver,

On Tue, 17 Nov 2009 09:00:18 +0100 Oliver Hartkopp <oliver [at] hartkopp> 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 sfr [at] canb
http://www.canb.auug.org.au/~sfr/

sfr at canb

Nov 22, 2009, 5:00 PM

Post #11 of 22 (572 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi all,

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 sfr [at] canb

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))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 22, 2009, 5:00 PM

Post #12 of 22 (573 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi all,

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 sfr [at] canb
http://www.canb.auug.org.au/~sfr/

davem at davemloft

Nov 22, 2009, 5:19 PM

Post #13 of 22 (572 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 22, 2009, 6:04 PM

Post #14 of 22 (573 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi Dave,

On Sun, 22 Nov 2009 17:19:32 -0800 (PST) David Miller <davem [at] davemloft> 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 <davem [at] davemloft>
Date: Sat Nov 21 11:22:25 2009 -0800

Did you push them out? master was down for a while yesterday ...

--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/

davem at davemloft

Nov 22, 2009, 6:11 PM

Post #15 of 22 (572 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
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!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

amit.salecha at qlogic

Nov 23, 2009, 10:09 AM

Post #16 of 22 (552 views)
Permalink

RE: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi Stephen

This merge looks ok and I have tested it.

Thanks
Amit Salecha

-----Original Message-----
From: Stephen Rothwell [mailto:sfr [at] canb]
Sent: Sunday, November 22, 2009 5:01 PM
To: David Miller; netdev [at] vger
Cc: linux-next [at] vger; linux-kernel [at] vger; Amit Salecha
Subject: linux-next: manual merge of the net tree with the net-current tree

Hi all,

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 sfr [at] canb

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))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 23, 2009, 7:11 PM

Post #17 of 22 (549 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/ich8lan.c between commit
818f33313caab9be2a10458500dbed4a88c1b334 ("e1000e: do not initiate
autonegotiation during OEM configuration") from the net-current tree and
commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
function pointers") from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix for
a while.
--
Cheers,
Stephen Rothwell sfr [at] canb

diff --cc drivers/net/e1000e/ich8lan.c
index eff3f47,568bb25..0000000
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1118,12 -1110,11 +1110,12 @@@ static s32 e1000_oem_bits_config_ich8la
oem_reg |= HV_OEM_BITS_LPLU;
}
/* Restart auto-neg to activate the bits */
- oem_reg |= HV_OEM_BITS_RESTART_AN;
+ if (!e1000_check_reset_block(hw))
+ oem_reg |= HV_OEM_BITS_RESTART_AN;
- ret_val = hw->phy.ops.write_phy_reg_locked(hw, HV_OEM_BITS, oem_reg);
+ ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);

out:
- hw->phy.ops.release_phy(hw);
+ hw->phy.ops.release(hw);

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

sfr at canb

Nov 23, 2009, 7:11 PM

Post #18 of 22 (547 views)
Permalink

linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/phy.c between commit
189983d469c6d98e64ddfb9f9ce76725cb082ee5 ("e1000e: remove unnecessary
82577 workaround causing link issues") from the net-current tree and
commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
function pointers") from the net tree.

I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/e1000e/phy.c
index 85f955f,99d53fa..0000000
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@@ -658,7 -659,16 +658,7 @@@ s32 e1000_copper_link_setup_82577(struc
/* Enable downshift */
phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;

- ret_val = phy->ops.write_phy_reg(hw, I82577_CFG_REG, phy_data);
+ ret_val = phy->ops.write_reg(hw, I82577_CFG_REG, phy_data);
- if (ret_val)
- goto out;
-
- /* Set number of link attempts before downshift */
- ret_val = phy->ops.read_reg(hw, I82577_CTRL_REG, &phy_data);
- if (ret_val)
- goto out;
- phy_data &= ~I82577_CTRL_DOWNSHIFT_MASK;
- ret_val = phy->ops.write_reg(hw, I82577_CTRL_REG, phy_data);

out:
return ret_val;
@@@ -2667,10 -2678,10 +2667,10 @@@ static s32 __e1000_read_phy_reg_hv(stru
out:
/* Revert to MDIO fast mode, if applicable */
if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
- ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
+ ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);

if (!locked)
- hw->phy.ops.release_phy(hw);
+ hw->phy.ops.release(hw);

return ret_val;
}
@@@ -2793,10 -2805,10 +2793,10 @@@ static s32 __e1000_write_phy_reg_hv(str
out:
/* Revert to MDIO fast mode, if applicable */
if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
- ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
+ ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);

if (!locked)
- hw->phy.ops.release_phy(hw);
+ hw->phy.ops.release(hw);

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

jeffrey.t.kirsher at intel

Nov 24, 2009, 11:52 PM

Post #19 of 22 (546 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

On Mon, Nov 23, 2009 at 19:11, Stephen Rothwell <sfr [at] canb> wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/ich8lan.c between commit
> 818f33313caab9be2a10458500dbed4a88c1b334 ("e1000e: do not initiate
> autonegotiation during OEM configuration") from the net-current tree and
> commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
> function pointers") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix for
> a while.
> --
> Cheers,
> Stephen Rothwell sfr [at] canb
>

I am checking your merge changes to e1000e now, sorry for the delayed response.

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

davem at davemloft

Nov 29, 2009, 5:11 PM

Post #20 of 22 (531 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
Date: Tue, 24 Nov 2009 14:11:22 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/ich8lan.c between commit
> 818f33313caab9be2a10458500dbed4a88c1b334 ("e1000e: do not initiate
> autonegotiation during OEM configuration") from the net-current tree and
> commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
> function pointers") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix for
> a while.

I took care of this merge when I pulled net-2.6 into net-next-2.6
last night.

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

davem at davemloft

Nov 29, 2009, 5:12 PM

Post #21 of 22 (531 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

From: Stephen Rothwell <sfr [at] canb>
Date: Tue, 24 Nov 2009 14:11:31 +1100

> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/phy.c between commit
> 189983d469c6d98e64ddfb9f9ce76725cb082ee5 ("e1000e: remove unnecessary
> 82577 workaround causing link issues") from the net-current tree and
> commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
> function pointers") from the net tree.
>
> I fixed it up (see below) and can carry the fix for a while.

This conflict also got dealt with last night when I pulled
net-2.6 into net-next-2.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

sfr at canb

Nov 29, 2009, 6:46 PM

Post #22 of 22 (529 views)
Permalink

Re: linux-next: manual merge of the net tree with the net-current tree [In reply to]

Hi Dave,

On Sun, 29 Nov 2009 17:11:31 -0800 (PST) David Miller <davem [at] davemloft> wrote:
>
> I took care of this merge when I pulled net-2.6 into net-next-2.6
> last night.

Excellent, thanks.

--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads