* [GIT PULL rcu/urgent] revert ->br_port fix, obsoleted by netdev commit
@ 2010-07-01 21:56 Paul E. McKenney
2010-07-03 13:11 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Paul E. McKenney @ 2010-07-01 21:56 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, arnd, davem, shemminger, netdev, eric.dumazet, sfr
Hello, Ingo,
This pull request reverts commit 81bdf5bd, which has been obsoleted
by commit f350a0a87374 from the netdev folks. This conflict was caught
in the -next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git rcu/next
Thanx, Paul
------------------>
Paul E. McKenney (1):
Revert "net: Make accesses to ->br_port safe for sparse RCU"
include/linux/if_bridge.h | 3 ---
net/bridge/br_fdb.c | 2 +-
net/bridge/br_private.h | 5 -----
net/bridge/netfilter/ebt_redirect.c | 2 +-
net/bridge/netfilter/ebt_ulog.c | 4 ++--
net/bridge/netfilter/ebtables.c | 4 ++--
net/netfilter/nfnetlink_log.c | 4 ++--
net/netfilter/nfnetlink_queue.c | 4 ++--
8 files changed, 10 insertions(+), 18 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [GIT PULL rcu/urgent] revert ->br_port fix, obsoleted by netdev commit
2010-07-01 21:56 [GIT PULL rcu/urgent] revert ->br_port fix, obsoleted by netdev commit Paul E. McKenney
@ 2010-07-03 13:11 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2010-07-03 13:11 UTC (permalink / raw)
To: Paul E. McKenney
Cc: linux-kernel, arnd, davem, shemminger, netdev, eric.dumazet, sfr
* Paul E. McKenney <paulmck@linux.vnet.ibm.com> wrote:
> Hello, Ingo,
>
> This pull request reverts commit 81bdf5bd, which has been obsoleted
> by commit f350a0a87374 from the netdev folks. This conflict was caught
> in the -next tree.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git rcu/next
>
> Thanx, Paul
>
> ------------------>
> Paul E. McKenney (1):
> Revert "net: Make accesses to ->br_port safe for sparse RCU"
>
> include/linux/if_bridge.h | 3 ---
> net/bridge/br_fdb.c | 2 +-
> net/bridge/br_private.h | 5 -----
> net/bridge/netfilter/ebt_redirect.c | 2 +-
> net/bridge/netfilter/ebt_ulog.c | 4 ++--
> net/bridge/netfilter/ebtables.c | 4 ++--
> net/netfilter/nfnetlink_log.c | 4 ++--
> net/netfilter/nfnetlink_queue.c | 4 ++--
> 8 files changed, 10 insertions(+), 18 deletions(-)
Pulled, thanks a lot Paul!
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-03 13:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-01 21:56 [GIT PULL rcu/urgent] revert ->br_port fix, obsoleted by netdev commit Paul E. McKenney
2010-07-03 13:11 ` Ingo Molnar
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).