[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100703131140.GD26067@elte.hu>
Date: Sat, 3 Jul 2010 15:11:41 +0200
From: Ingo Molnar <mingo@...e.hu>
To: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc: linux-kernel@...r.kernel.org, arnd@...db.de, davem@...emloft.net,
shemminger@...ux-foundation.org, netdev@...r.kernel.org,
eric.dumazet@...il.com, sfr@...b.auug.org.au
Subject: Re: [GIT PULL rcu/urgent] revert ->br_port fix, obsoleted by netdev
commit
* Paul E. McKenney <paulmck@...ux.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists