All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org, arnd@arndb.de, davem@davemloft.net,
	shemminger@linux-foundation.org, netdev@vger.kernel.org,
	eric.dumazet@gmail.com, sfr@canb.auug.org.au
Subject: Re: [GIT PULL rcu/urgent] revert ->br_port fix, obsoleted by netdev commit
Date: Sat, 3 Jul 2010 15:11:41 +0200	[thread overview]
Message-ID: <20100703131140.GD26067@elte.hu> (raw)
In-Reply-To: <20100701215655.GA24450@linux.vnet.ibm.com>


* 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

      reply	other threads:[~2010-07-03 13:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

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=20100703131140.GD26067@elte.hu \
    --to=mingo@elte.hu \
    --cc=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=sfr@canb.auug.org.au \
    --cc=shemminger@linux-foundation.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.