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

From: "Paul E. McKenney" <[email-masked]>
Date: Mon, 21 Jun 2010 10:30:11 -0700

On Mon, Jun 21, 2010 at 04:16:09PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> net/bridge/br_fdb.c net/bridge/netfilter/ebt_redirect.c
> net/bridge/netfilter/ebt_ulog.c net/bridge/netfilter/ebtables.c
> net/netfilter/nfnetlink_log.c between commit
> f350a0a87374418635689471606454abc7beaa3a ("bridge: use rx_handler_data
> pointer to store net_bridge_port pointer") from the net tree and commit
> 81bdf5bd7349bd4523538cbd7878f334bc2bfe14 ("net: Make accesses to
> ->br_port safe for sparse RCU") from the tip tree.
> 
> The net tree commit looks like a superset of the tip tree commit, so I
> effectively reverted the tip tree commit.

I defer to Jiri on this one, and will withdraw my patch.

							Thanx, Paul

> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> http://www.canb.auug.org.au/~sfr/