Florian Westphal e58f33cc84 netfilter: add defines for arp/decnet max hooks ... The kernel already has defines for this, but they are in uapi exposed headers. Including these from netns.h causes build errors and also adds unneeded dependencies on heads that we don't need. So move these defines to netfilter_defs.h and place the uapi ones in ifndef __KERNEL__ to keep them for userspace. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2018-01-08 18:01:08 +01:00
..
acpi	Merge branch 'acpi-ec' into acpi	2017-11-30 13:37:29 +01:00
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
clocksource	arm64 updates for 4.15	2017-11-15 10:56:56 -08:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2017-12-22 12:22:48 -08:00
drm	drm: rework delayed connector cleanup in connector_iter	2017-12-13 22:59:00 +01:00
dt-bindings	fixes/cleanups for rc1, non-desktop flags for VR	2017-11-23 21:04:56 -10:00
keys
kvm	KVM: arm/arm64: timer: Don't set irq as forwarded if no usable GIC	2017-12-18 10:53:23 +01:00
linux	netfilter: add defines for arp/decnet max hooks	2018-01-08 18:01:08 +01:00
math-emu
media	media updates for v4.15-rc1	2017-11-15 20:30:12 -08:00
memory
misc
net	netfilter: reduce size of hook entry point locations	2018-01-08 18:01:08 +01:00
pcmcia
ras
rdma	Updates for 4.15 kernel merge window	2017-11-15 14:54:53 -08:00
scsi	scsi: libsas: align sata_device's rps_resp on a cacheline	2017-11-21 23:06:32 -05:00
soc	We have two changes to the core framework this time around. The first being a	2017-11-17 20:04:24 -08:00
sound	ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization	2017-11-22 12:34:56 +01:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2017-11-24 19:19:20 -10:00
trace	net: dccp: Add DCCP sendmsg trace event	2018-01-02 14:27:30 -05:00
uapi	netfilter: add defines for arp/decnet max hooks	2018-01-08 18:01:08 +01:00
video	fbdev changes for v4.15:	2017-11-20 21:50:24 -10:00
xen	xen: fixes for 4.15-rc5	2017-12-22 12:30:10 -08:00