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

Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-07-02 17:11:28 -07:00

asm-generic

mm: clean up per architecture MM hook header files

2015-07-17 16:39:53 -07:00

clocksource

…

crypto

crypto: rng - Do not free default RNG when it becomes unused

2015-06-22 15:49:18 +08:00

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

Merge tag 'clk-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2015-07-01 19:22:00 -07:00

keys

…

kvm

…

linux

Merge tag 'nfc-next-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next

2015-08-23 20:42:57 -07:00

math-emu

…

media

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

2015-07-01 19:09:11 -07:00

memory

…

misc

cxl: Add AFU virtual PHB and kernel API

2015-06-03 13:27:20 +10:00

net

vxlan: fix multiple inclusion of vxlan.h

2015-08-25 14:32:04 -07:00

pcmcia

…

ras

tracing: add trace event for memory-failure

2015-06-24 17:49:43 -07:00

rdma

IB: Add rdma_cap_ib_switch helper and use where appropriate

2015-07-14 13:20:08 -04:00

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

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2015-06-26 12:20:00 -07:00

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

Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

2015-06-30 20:07:45 -07:00

uapi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-08-21 11:44:04 -07:00

video

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-06-26 13:18:51 -07:00

xen

…

Kbuild

…