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

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

[Mark Brown]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in drivers/net/xen-netback/netback.c between commit 5bd076708664313f ("Xen-netback: Fix issue caused by using gso_type wrongly") from Linus' tree and commit 3e2234b3149f66 ("xen-netback: Handle foreign mapped pages on the guest RX path") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc drivers/net/xen-netback/netback.c
index 438d0c09b7e6,bc943205a691..000000000000
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -338,6 -348,10 +348,9 @@@ static int xenvif_gop_skb(struct sk_buf
        int head = 1;
        int old_meta_prod;
        int gso_type;
 -      int gso_size;
+       struct ubuf_info *ubuf = skb_shinfo(skb)->destructor_arg;
+       grant_ref_t foreign_grefs[MAX_SKB_FRAGS];
+       struct xenvif *foreign_vif = NULL;
  
        old_meta_prod = npo->meta_prod;
  

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/route.c between commit d189634ecab9 ("ipv6: Move ipv6 proc file
registration to end of init order") from the net tree and commit
c3426b47190d ("inet: Initialize per-netns inetpeer roots in net/ipv
{4,6}/route.c") from the net-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv6/route.c
index becb048,e649cd7..0000000
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -3007,11 -2929,31 +2938,36 @@@ static struct pernet_operations ip6_rou
  	.exit = ip6_route_net_exit,
  };
  
 +static struct pernet_operations ip6_route_net_late_ops = {
 +	.init = ip6_route_net_init_late,
 +	.exit = ip6_route_net_exit_late,
 +};
 +
+ static int __net_init ipv6_inetpeer_init(struct net *net)
+ {
+ 	struct inet_peer_base *bp = kmalloc(sizeof(*bp), GFP_KERNEL);
+ 
+ 	if (!bp)
+ 		return -ENOMEM;
+ 	inet_peer_base_init(bp);
+ 	net->ipv6.peers = bp;
+ 	return 0;
+ }
+ 
+ static void __net_exit ipv6_inetpeer_exit(struct net *net)
+ {
+ 	struct inet_peer_base *bp = net->ipv6.peers;
+ 
+ 	net->ipv6.peers = NULL;
+ 	inetpeer_invalidate_tree(bp);
+ 	kfree(bp);
+ }
+ 
+ static struct pernet_operations ipv6_inetpeer_ops = {
+ 	.init	=	ipv6_inetpeer_init,
+ 	.exit	=	ipv6_inetpeer_exit,
+ };
+ 
  static struct notifier_block ip6_route_dev_notifier = {
  	.notifier_call = ip6_route_dev_notify,
  	.priority = 0,

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/emulex/benet/be.h between commit c72adfd767af
("be2net: Add functionality to support RoCE driver") from the infiniband
tree and commit 941a77d582c8 ("be2net: Fix to allow get/set of debug
levels in the firmware") from the net-next tree.

Just context changes.  I fixed it up (see below) and carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/emulex/benet/be.h
index 7bb2e97,ff4eb8f..0000000
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -32,9 -32,8 +32,9 @@@
  #include <linux/u64_stats_sync.h>
  
  #include "be_hw.h"
 +#include "be_roce.h"
  
- #define DRV_VER			"4.2.116u"
+ #define DRV_VER			"4.2.220u"
  #define DRV_NAME		"be2net"
  #define BE_NAME			"ServerEngines BladeEngine2 10Gbps NIC"
  #define BE3_NAME		"ServerEngines BladeEngine3 10Gbps NIC"
@@@ -379,22 -404,7 +406,18 @@@ struct be_adapter 
  	u32 rx_fc;		/* Rx flow control */
  	u32 tx_fc;		/* Tx flow control */
  	bool stats_cmd_sent;
- 	int link_speed;
- 	u8 port_type;
- 	u8 transceiver;
- 	u8 autoneg;
  	u8 generation;		/* BladeEngine ASIC generation */
 +	u32 if_type;
 +	struct {
 +		u8 __iomem *base;	/* Door Bell */
 +		u32 size;
 +		u32 total_size;
 +		u64 io_addr;
 +	} roce_db;
 +	u32 num_msix_roce_vec;
 +	struct ocrdma_dev *ocrdma_dev;
 +	struct list_head entry;
 +
  	u32 flash_status;
  	struct completion flash_compl;
  
@@@ -606,17 -603,7 +626,19 @@@ extern void be_link_status_update(struc
  extern void be_parse_stats(struct be_adapter *adapter);
  extern int be_load_fw(struct be_adapter *adapter, u8 *func);
  extern bool be_is_wol_supported(struct be_adapter *adapter);
+ extern bool be_pause_supported(struct be_adapter *adapter);
+ extern u32 be_get_fw_log_level(struct be_adapter *adapter);
  
 +/*
 + * internal function to initialize-cleanup roce device.
 + */
 +extern void be_roce_dev_add(struct be_adapter *);
 +extern void be_roce_dev_remove(struct be_adapter *);
 +
 +/*
 + * internal function to open-close roce device during ifup-ifdown.
 + */
 +extern void be_roce_dev_open(struct be_adapter *);
 +extern void be_roce_dev_close(struct be_adapter *);
 +
  #endif				/* BE_H */

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

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

[wwguy]

On Mon, 2011-12-05 at 06:53 -0800, John W. Linville wrote:
> On Mon, Dec 05, 2011 at 03:34:16PM +1100, Stephen Rothwell wrote:
> > On Mon, 5 Dec 2011 12:34:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the net-next tree got a conflict in
> > > drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the
> > 
> > wireless (sorry)
> > 
> > > tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related
> > > functions to one place") from the net-next tree.
> > > 
> > > I just used the net-next version (which may require some fixes).
> 
> Yeah, I'll try to get that straightened-out over the next day or two.
> 
John, anything I can help?

Thanks
Wey
 

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

[John W. Linville]

On Mon, Dec 05, 2011 at 03:34:16PM +1100, Stephen Rothwell wrote:
> On Mon, 5 Dec 2011 12:34:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the
> 
> wireless (sorry)
> 
> > tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related
> > functions to one place") from the net-next tree.
> > 
> > I just used the net-next version (which may require some fixes).

Yeah, I'll try to get that straightened-out over the next day or two.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

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

[Stephen Rothwell]

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

On Mon, 5 Dec 2011 12:34:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the

wireless (sorry)

> tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related
> functions to one place") from the net-next tree.
> 
> I just used the net-next version (which may require some fixes).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the
tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related
functions to one place") from the net-next tree.

I just used the net-next version (which may require some fixes).

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

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