2013-04-22 02:43:50

by Stephen Rothwell

[permalink] [raw]

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

---

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 [email protected]

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;

---

Attachments:

(No filename) (1.04 kB)
(No filename) (836.00 B)
Download all attachments

2013-04-23 00:41:37

by David Miller

[permalink] [raw]

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

---

From: Stephen Rothwell <[email protected]>
Date: Mon, 22 Apr 2013 12:43:34 +1000

> 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).

I took care of this during the net --> net-next merge, thanks!