David S. Miller fb83eb93c6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ... Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains Netfilter updates for your net-next tree, they are: 1) Remove obsolete nf_log tracing from nf_tables, from Florian Westphal. 2) Add support for map lookups to numgen, random and hash expressions, from Laura Garcia. 3) Allow to register nat hooks for iptables and nftables at the same time. Patchset from Florian Westpha. 4) Timeout support for rbtree sets. 5) ip6_rpfilter works needs interface for link-local addresses, from Vincent Bernat. 6) Add nf_ct_hook and nf_nat_hook structures and use them. 7) Do not drop packets on packets raceing to insert conntrack entries into hashes, this is particularly a problem in nfqueue setups. 8) Address fallout from xt_osf separation to nf_osf, patches from Florian Westphal and Fernando Mancera. 9) Remove reference to struct nft_af_info, which doesn't exist anymore. From Taehee Yoo. This batch comes with is a conflict between 25fd386e0b ("netfilter: core: add missing __rcu annotation") in your tree and 2c205dd398 ("netfilter: add struct nf_nat_hook and use it") coming in this batch. This conflict can be solved by leaving the __rcu tag on __netfilter_net_init() - added by 25fd386e0b - and remove all code related to nf_nat_decode_session_hook - which is gone after 2c205dd398, as described by: diff --cc net/netfilter/core.c index e0ae4aae96f5,206fb2c4c319..168af54db975 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@@ -611,7 -580,13 +611,8 @@@ const struct nf_conntrack_zone nf_ct_zo EXPORT_SYMBOL_GPL(nf_ct_zone_dflt); #endif /* CONFIG_NF_CONNTRACK */ - static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max) -#ifdef CONFIG_NF_NAT_NEEDED -void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *); -EXPORT_SYMBOL(nf_nat_decode_session_hook); -#endif - + static void __net_init + __netfilter_net_init(struct nf_hook_entries __rcu **e, int max) { int h; I can also merge your net-next tree into nf-next, solve the conflict and resend the pull request if you prefer so. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-23 16:37:11 -04:00
..
acpi	xen: fixes for 4.17-rc1	2018-04-12 11:04:35 -07:00
asm-generic	earlycon: Use a pointer table to fix __earlycon_table stride	2018-04-23 10:06:59 +02:00
clocksource	ARM: SoC platform updates for 4.17	2018-04-05 21:21:08 -07:00
crypto
drm	drm: Fix HDCP downstream dev count read	2018-04-16 12:10:48 -04:00
dt-bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
keys
kvm	KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI	2018-04-27 12:39:09 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2018-05-23 16:37:11 -04:00
math-emu
media	MAINTAINERS & files: Canonize the e-mails I use at files	2018-05-04 06:21:06 -04:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2018-05-23 16:37:11 -04:00
pcmcia
ras
rdma	Merge candidates for 4.17 merge window	2018-04-06 17:35:43 -07:00
scsi	scsi: core: remove reference to scsi_show_extd_sense()	2018-04-18 23:37:39 -04:00
soc	soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure	2018-04-16 15:15:23 -07:00
sound	ALSA: control: Hardening for potential Spectre v1	2018-04-25 10:37:46 +02:00
target
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2018-05-23 16:37:11 -04:00
video
xen	xen/sndif: Sync up with the canonical definition in Xen	2018-04-17 08:26:33 -04:00