Jesse Gross 5243b6ac9e ip_tunnel: Protect tunnel functions with CONFIG_INET guard. ...

Tunnel constants can be used in generic code but in these cases
the inline functions in ip_tunnels.h cause compilation problems
if CONFIG_INET is not set.

CC: Pravin Shelar <pshelar@nicira.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2013-06-24 00:18:38 -07:00

..

acpi

ACPI / PM: Allow device power states to be used for CONFIG_PM unset

2013-05-22 00:19:28 +02:00

asm-generic

Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2013-06-11 11:16:43 -07:00

clocksource

Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-05-07 11:28:42 -07:00

crypto

crypto: sha512 - Expose generic sha512 routine to be callable from other modules

2013-04-25 21:00:57 +08:00

drm

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

2013-05-21 08:50:57 -07:00

dt-bindings

ARM: dt: create a DT header for the GIC

2013-04-05 12:23:24 -06:00

keys

…

linux

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

2013-06-19 16:49:39 -07:00

math-emu

…

media

Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-05-01 09:57:04 -07:00

memory

…

misc

…

net

ip_tunnel: Protect tunnel functions with CONFIG_INET guard.

2013-06-24 00:18:38 -07:00

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

Merge branch 'postmerge' into for-linus

2013-05-10 07:54:01 -07:00

sound

ASoC: dapm: Treat DAI widgets like AIF widgets for power

2013-06-07 15:54:50 +01:00

target

target: Propigate up ->cmd_kref put return via transport_generic_free_cmd

2013-05-31 01:21:23 -07:00

trace

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2013-05-14 09:30:54 -07:00

uapi

tcp: introduce a per-route knob for quick ack

2013-06-19 23:06:51 -07:00

video

Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes

2013-05-29 17:00:34 +08:00

xen

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

2013-06-05 16:37:30 -07:00

Kbuild

UAPI: remove empty Kbuild files

2013-04-30 17:04:09 -07:00