From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Koki Sanagi <sanagi.koki@jp.fujitsu.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Changli Gao <xiaosuo@gmail.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: linux-next: manual merge of the tip tree with the net tree
Date: Mon, 13 Sep 2010 12:37:45 +1000 [thread overview]
Message-ID: <20100913123745.e4a4df44.sfr@canb.auug.org.au> (raw)
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 sfr@canb.auug.org.au
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))
next reply other threads:[~2010-09-13 2:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 2:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-10-11 0:52 linux-next: manual merge of the tip tree with the net tree Stephen Rothwell
2010-06-21 6:16 Stephen Rothwell
2010-06-21 17:30 ` Paul E. McKenney
2010-06-21 23:42 ` Stephen Rothwell
2009-08-07 6:47 Stephen Rothwell
2009-08-13 0:33 ` David Miller
2009-08-13 4:04 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100913123745.e4a4df44.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sanagi.koki@jp.fujitsu.com \
--cc=tglx@linutronix.de \
--cc=xiaosuo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).