Messages in this thread | | | Date | Fri, 15 May 2015 15:25:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rcu tree with the net-next tree |
| |
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in net/netfilter/core.c between commit f7191483461c ("netfilter: add hook list to nf_hook_state") from the net-next tree and commit e4dcfe3a648b ("netfilter: Fix list_entry_rcu usage") from the rcu tree.
I fixed it up (I used the net-next tree version) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |