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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/emulex/benet/be_main.c between commit f11a869d4e38
("be2net: take care of __vlan_put_tag return value") from Linus' tree and
commit 86a9bad3ab6b ("net: vlan: add protocol argument to packet tagging
functions") from the net-next tree.

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

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
index 2886c9b,811d0a4..0000000
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@@ -759,9 -771,8 +771,9 @@@ static struct sk_buff *be_insert_vlan_i
  
        if (vlan_tx_tag_present(skb)) {
                vlan_tag = be_get_tx_vlan_tag(adapter, skb);
-               skb = __vlan_put_tag(skb, vlan_tag);
 -              __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
 -              skb->vlan_tci = 0;
++              skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
 +              if (skb)
 +                      skb->vlan_tci = 0;
        }
  
        return skb;

pgpPZoyDbkLDI.pgp
Description: PGP signature