Joe Stringer
33db4125ec
openvswitch: Rename LABEL->LABELS
...
Conntrack LABELS (plural) are exposed by conntrack; rename the OVS name
for these to be consistent with conntrack.
Fixes: c2ac667 "openvswitch: Allow matching on conntrack label"
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-05 06:34:28 -07:00
..
acpi
ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
2015-09-15 03:05:45 +02:00
asm-generic
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2015-09-19 19:13:03 -07:00
clocksource
crypto
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-09-08 12:41:25 -07:00
drm
dt-bindings
Merge branch 'drivers/reset' into next/late
2015-09-09 15:42:45 -07:00
keys
kvm
arm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS'
2015-09-17 13:13:27 +01:00
linux
Merge git://git.infradead.org/intel-iommu
2015-10-02 07:59:29 -04:00
math-emu
media
media updates for v4.3-rc1
2015-09-11 16:42:39 -07:00
memory
misc
net
tcp/dccp: fix old style declarations
2015-10-05 04:02:59 -07:00
pcmcia
ras
rdma
Changes for 4.3-rc1
2015-09-19 20:04:11 -07:00
rxrpc
scsi
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-09-11 19:00:42 -07:00
soc
IOMMU Updates for Linux v4.3
2015-09-08 17:22:35 -07:00
sound
target
target: Propigate backend read-only to core_tpg_add_lun
2015-09-24 23:17:21 -07:00
trace
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-09-11 16:13:47 -07:00
uapi
openvswitch: Rename LABEL->LABELS
2015-10-05 06:34:28 -07:00
video
libnvdimm for 4.3:
2015-09-08 14:35:59 -07:00
xen
xen: MFN/GFN/BFN terminology changes for 4.3-rc0
2015-09-10 16:21:11 -07:00
Kbuild