Jiri Benc 48e92c44bd vxlan: fix multiple inclusion of vxlan.h ... The vxlan_get_sk_family inline function was added after the last #endif, making multiple inclusion of net/vxlan.h fail. Move it to the proper place. Reported-by: Mark Rustad <mark.d.rustad@intel.com> Fixes: 705cc62f67 ("vxlan: provide access function for vxlan socket address family") Signed-off-by: Jiri Benc <jbenc@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-25 14:32:04 -07:00
..
acpi
asm-generic
clocksource
crypto
drm	Merge tag 'topic/drm-fixes-2015-08-14' of git://anongit.freedesktop.org/drm-intel into drm-next	2015-08-15 14:52:12 +10:00
dt-bindings
keys
kvm
linux	NFC 4.3 pull request	2015-08-23 20:42:57 -07:00
math-emu
media
memory
misc
net	vxlan: fix multiple inclusion of vxlan.h	2015-08-25 14:32:04 -07:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2015-08-17 16:20:45 -07:00
soc
sound	ASoC: topology: Add Kconfig option for topology	2015-08-17 22:45:47 -07:00
target	iscsi-target: Fix iscsit_start_kthreads failure OOPs	2015-07-24 14:19:43 -07:00
trace
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-21 11:44:04 -07:00
video
xen
Kbuild