Alexei Starovoitov da8b43c0e1 vxlan: combine VXLAN_FLOWBASED into VXLAN_COLLECT_METADATA ... IFLA_VXLAN_FLOWBASED is useless without IFLA_VXLAN_COLLECT_METADATA, so combine them into single IFLA_VXLAN_COLLECT_METADATA flag. 'flowbased' doesn't convey real meaning of the vxlan tunnel mode. This mode can be used by routing, tc+bpf and ovs. Only ovs is strictly flow based, so 'collect metadata' is a better name for this tunnel mode. Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-07 11:46:34 -07:00
..
accessibility
acpi	ACPI / PM: Use target_state to set the device power state	2015-07-28 16:29:08 +02:00
amba
android
ata	Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2015-07-24 16:54:59 -07:00
atm
auxdisplay
base
bcma	bcma: fix build error when build as module	2015-07-26 14:53:37 +03:00
block	null_blk: fix use-after-free problem	2015-07-22 13:30:20 -06:00
bluetooth	Bluetooth: btusb: match generic class code in interface descriptor	2015-07-30 13:42:26 +02:00
bus
cdrom
char	Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into for-linus	2015-07-15 21:46:59 +10:00
clk	Update Viresh Kumar's email address	2015-07-17 16:39:53 -07:00
clocksource
connector
cpufreq	cpufreq: Avoid attempts to create duplicate symbolic links	2015-07-28 17:19:26 +02:00
cpuidle
crypto
dca
devfreq
dio
dma	Update Viresh Kumar's email address	2015-07-17 16:39:53 -07:00
dma-buf
edac
eisa
extcon
firewire
firmware	* Fix a bug in the Common Platform Error Record (CPER) driver that	2015-07-21 09:52:51 +02:00
fmc
gpio	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-18 10:27:12 -07:00
gpu	Merge tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel	2015-07-31 12:11:01 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-07-30 11:03:04 -07:00
hsi
hv
hwmon	hwmon: (nct7802) Fix integer overflow seen when writing voltage limits	2015-07-29 20:06:50 -07:00
hwspinlock
hwtracing/coresight
i2c
ide
idle
iio	iio:light:stk3310: make endianness independent of host	2015-07-19 14:54:45 +01:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-07-30 11:03:04 -07:00
iommu	iommu/amd: Allow non-ATS devices in IOMMUv2 domains	2015-07-31 15:15:41 +02:00
ipack
irqchip	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-18 10:27:12 -07:00
isdn	isdn/gigaset: drop unused ldisc methods	2015-07-15 17:24:45 -07:00
leds
lguest
macintosh
mailbox
mcb
md	dm cache: fix device destroy hang due to improper prealloc_used accounting	2015-07-29 14:32:09 -04:00
media	x86/mm/pat, drivers/media/ivtv: Move the PAT warning and replace WARN() with pr_warn()	2015-07-21 09:42:54 +02:00
memory
memstick
message
mfd	Update Viresh Kumar's email address	2015-07-17 16:39:53 -07:00
misc	mei: prevent unloading mei hw modules while the device is opened.	2015-07-22 21:31:05 -07:00
mmc	mmc: sdhci-pxav3: fix platform_data is not initialized	2015-07-24 10:18:39 +02:00
mtd
net	vxlan: combine VXLAN_FLOWBASED into VXLAN_COLLECT_METADATA	2015-08-07 11:46:34 -07:00
nfc
ntb
nubus
nvdimm	libnvdimm: fix namespace seed creation	2015-07-25 09:57:56 -07:00
of	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
oprofile
parisc
parport	parport: Revert "parport: fix memory leak"	2015-07-25 12:48:05 -07:00
pci
pcmcia
phy	phy: berlin-usb: fix divider for BG2	2015-07-15 20:02:09 +05:30
pinctrl	Pin control fixes for the v4.2 series:	2015-07-21 15:27:27 -07:00
platform
pnp
power
powercap
pps
ps3
ptp
pwm
rapidio
ras
regulator	Merge remote-tracking branches 'regulator/fix/88pm800', 'regulator/fix/max8973', 'regulator/fix/s2mps11' and 'regulator/fix/supply' into regulator-linus	2015-07-24 16:19:25 +01:00
remoteproc
reset
rpmsg
rtc	rtc: armada38x: Remove unused variable from armada38x_rtc_set_time()	2015-07-18 00:42:31 +02:00
s390	virtio/vhost: fixes for 4.2	2015-07-23 13:07:04 -07:00
sbus
scsi	bnx2fc: Read npiv table from nvram and create vports.	2015-08-06 21:54:13 -07:00
sfi
sh
sn
soc
spi	Merge remote-tracking branches 'spi/fix/gqspi', 'spi/fix/imx', 'spi/fix/mg-spfi' and 'spi/fix/spidev' into spi-linus	2015-07-24 16:19:50 +01:00
spmi
ssb
staging	staging: vt6656: check ieee80211_bss_conf bssid not NULL	2015-07-19 11:48:19 +01:00
target	iscsi-target: Fix iser explicit logout TX kthread leak	2015-07-24 14:19:44 -07:00
tc
thermal
thunderbolt
tty	tty: vt: Fix !TASK_RUNNING diagnostic warning from paste_selection()	2015-07-23 18:08:29 -07:00
uio
usb	USB: OHCI: fix bad #define in ohci-tmio.c	2015-07-22 14:49:42 -07:00
uwb
vfio	vfio: Fix lockdep issue	2015-07-24 15:14:04 -06:00
vhost	vhost: fix error handling for memory region alloc	2015-07-27 18:05:05 +03:00
video
virt
virtio
vlynq
vme
w1
watchdog	Update Viresh Kumar's email address	2015-07-17 16:39:53 -07:00
xen
zorro
Kconfig
Makefile