Florian Westphal d2bf2f34cc netfilter: nft_ct: labels get support ... This also adds NF_CT_LABELS_MAX_SIZE so it can be re-used as BUILD_BUG_ON in nft_ct. At this time, nft doesn't yet support writing to the label area; when this changes the label->words handling needs to be moved out of xt_connlabel.c into nf_conntrack_labels.c. Also removes a useless run-time check: words cannot grow beyond 4 (32 bit) or 2 (64bit) since xt_connlabel enforces a maximum of 128 labels. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2014-02-19 11:41:25 +01:00
..
acpi	Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'	2014-01-29 11:47:18 +01:00
asm-generic	mm: Use ptep/pmdp_set_numa() for updating _PAGE_NUMA bit	2014-02-17 11:19:36 +11:00
clocksource
crypto
drm	Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes	2014-02-19 08:21:26 +10:00
dt-bindings	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2014-01-30 17:07:18 -08:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
math-emu
media
memory
misc
net	netfilter: nft_ct: labels get support	2014-02-19 11:41:25 +01:00
pcmcia
ras
rdma	IB: Report using RoCE IP based gids in port caps	2014-02-13 14:46:03 -08:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-01-31 15:31:23 -08:00
sound
target	target: Simplify command completion by removing CMD_T_FAILED flag	2014-02-12 15:14:30 -08:00
trace	intel_pstate: Remove energy reporting from pstate_sample tracepoint	2014-02-13 02:11:18 +01:00
uapi	netfilter: nft_ct: labels get support	2014-02-19 11:41:25 +01:00
video
xen	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2014-02-14 10:45:18 -08:00
Kbuild