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

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

[Stephen Rothwell]

Hi Dave, Roland,

Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/nes/nes_nic.c between commit
2869975cfbd58dc6591d8c3ba1f171e7f758be28 ("RDMA/nes: Remove LLTX") from
the infiniband tree and commit d0929553bebcac828b612e7d6d239559e08feaf4
("infiniband: convert nes driver to net_device_ops") from the net tree.

Just a trivial context change (the commits deleted lines next to each
other).  I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/infiniband/hw/nes/nes_nic.c
index 025ed9f,ae8c688..0000000
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@@ -1598,9 -1618,10 +1601,9 @@@ struct net_device *nes_netdev_init(stru
  	netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
  	nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
  	netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
- 	netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
 -	netdev->features |= NETIF_F_LLTX;
  
  	/* Fill in the port structure */
+ 	nesvnic = netdev_priv(netdev);
  	nesvnic->netdev = netdev;
  	nesvnic->nesdev = nesdev;
  	nesvnic->msg_enable = netif_msg_init(debug, default_msg);

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

[Stephen Rothwell]

Hi Dave, Roland,

Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/cxgb3/cxio_hal.h between commit
d1fbe04eee32ed2642cff139b8592866f1d43f41 ("") from the infiniband tree
and commit a73efd0a8552927ebe5dff84936f7fdac4f7e314 ("iw_cxgb3: handle
chip reset notifications") from the net tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/infiniband/hw/cxgb3/cxio_hal.h
index e44dc22,9ed65b0..0000000
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.h
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.h
@@@ -110,7 -108,8 +110,9 @@@ struct cxio_rdev 
  	struct gen_pool *pbl_pool;
  	struct gen_pool *rqt_pool;
  	struct list_head entry;
 +	struct ch_embedded_info fw_info;
+ 	u32	flags;
+ #define	CXIO_ERROR_FATAL	1
  };
  
  static inline int cxio_num_stags(struct cxio_rdev *rdev_p)

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

[David Miller]

From: Roland Dreier <rdreier@cisco.com>
Date: Mon, 23 Mar 2009 09:36:34 -0700

> > Today's linux-next merge of the net tree got a conflict in
> > drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
> > 574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
> > net_device_ops") from the infiniband tree and commit
> > fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
> > net_device_ops") from the net tree.
> > 
> > Again different versions of the same change.  I used the net tree version.
> 
> I'll drop the netdev-ops topic branch from my tree and assume that
> Stephen's newer patches are the right ones.  Not sure why Stephen sent
> two different versions to two different trees but oh well...

I think because he works purely againt net-next-2.6 and he really
wanted to add the config option without risk of breaking allmodconfig
on x86.

That's only possible if all the netdev_ops conversions go into
net-next-2.6 as I explained.

Anyways, thanks Roland, I appreciate you helping us resolve this.

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

[Stephen Hemminger]

On Mon, 23 Mar 2009 09:36:34 -0700
Roland Dreier <rdreier@cisco.com> wrote:

> > Today's linux-next merge of the net tree got a conflict in
> > drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
> > 574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
> > net_device_ops") from the infiniband tree and commit
> > fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
> > net_device_ops") from the net tree.
> > 
> > Again different versions of the same change.  I used the net tree version.
> 
> I'll drop the netdev-ops topic branch from my tree and assume that
> Stephen's newer patches are the right ones.  Not sure why Stephen sent
> two different versions to two different trees but oh well...

I was looking at net-next tree and wanted to make allmodconfig
build w/o netdev_ops. The IB one hadn't bubbled up yet.

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

[Roland Dreier]

> Today's linux-next merge of the net tree got a conflict in
> drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
> 574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
> net_device_ops") from the infiniband tree and commit
> fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
> net_device_ops") from the net tree.
> 
> Again different versions of the same change.  I used the net tree version.

I'll drop the netdev-ops topic branch from my tree and assume that
Stephen's newer patches are the right ones.  Not sure why Stephen sent
two different versions to two different trees but oh well...

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Mar 2009 14:50:01 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
> 574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
> net_device_ops") from the infiniband tree and commit
> fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
> net_device_ops") from the net tree.
> 
> Again different versions of the same change.  I used the net tree version.

I'll work with Roland to resolve these somehow, thanks.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
net_device_ops") from the infiniband tree and commit
fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
net_device_ops") from the net tree.

Again different versions of the same change.  I used the net tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/nes/nes_nic.c between commit
77dfd6b11ac9f64e5f392be1ff3d14593dabaaf7 ("RDMA/nes: Convert to
net_device_ops") from the infiniband tree and commit
d0929553bebcac828b612e7d6d239559e08feaf4 ("infiniband: convert nes driver
to net_device_ops") from the net tree.

Again, presumably versions of the same thing.  I used the net tree
version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

Hi David,

Today's linux-next merge of the net tree got conflicts in
drivers/infiniband/hw/amso1100/c2.c and
drivers/infiniband/hw/amso1100/c2_provider.c between commit
7edd87ddd12dd9a735e59d8381d10f25dacc6505 ("RDMA/amso1100: Convert to
net_device_ops") from the infiniband tree and commit
687c75dcf342f71329bd193af553e96a29581238 ("infiniband: convert c2 to
net_device_ops") from the net tree.

Presumably these are two versions of the same thing (the one in the
infiniband tree dates from January).

I fixed the conflicts using the version in the net tree.  Someone should
check the result.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]