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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130422124334.92adfce6bdbcba7b08fe83a2@canb.auug.org.au>
Date:	Mon, 22 Apr 2013 12:43:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ivan Vecera <ivecera@...hat.com>,
	Patrick McHardy <kaber@...sh.net>
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                    sfr@...b.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;

Content of type "application/pgp-signature" skipped