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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 13 Sep 2010 12:37:45 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in net/core/dev.c
between commit 05532121da0728eaedac2a0a5c3cecad3a95d765 ("net: 802.1q:
make vlan_hwaccel_do_receive() return void") from the net tree and commit
cf66ba58b5cb8b1526e9dd2fb96ff8db048d4d44 ("netdev: Add tracepoints to
netdev layer") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc net/core/dev.c
index fc2dc93,2308cce..0000000
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2847,8 -2835,9 +2854,9 @@@ static int __netif_receive_skb(struct s
  	if (!netdev_tstamp_prequeue)
  		net_timestamp_check(skb);
  
+ 	trace_netif_receive_skb(skb);
 -	if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))
 -		return NET_RX_SUCCESS;
 +	if (vlan_tx_tag_present(skb))
 +		vlan_hwaccel_do_receive(skb);
  
  	/* if we've gotten here through NAPI, check netpoll */
  	if (netpoll_receive_skb(skb))