linux-next: manual merge of the tip tree with the net tree
in [Kernel]
|
Prev: linux-next: manual merge of the tip tree with the block tree
Next: [PATCH RESEND] btrfs: Don't return extent in fiemap if we meet with a hole.
From: Stephen Rothwell on 21 Jun 2010 02:20 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. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Paul E. McKenney on 21 Jun 2010 13:40 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 sfr(a)canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 21 Jun 2010 19:50
Hi Paul, On Mon, 21 Jun 2010 10:30:11 -0700 "Paul E. McKenney" <paulmck(a)linux.vnet.ibm.com> wrote: > > I defer to Jiri on this one, and will withdraw my patch. OK, thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |