Pablo Neira Ayuso b59eaf9e28 netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module ...

This resolves linking problems with CONFIG_IPV6=n:

net/built-in.o: In function `redirect_tg6':
xt_REDIRECT.c:(.text+0x6d021): undefined reference to `nf_nat_redirect_ipv6'

Reported-by: Andreas Ruprecht <rupran@einserver.de>
Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2014-11-27 13:08:42 +01:00

..

acpi

Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-10-24 11:29:31 -07:00

asm-generic

Revert "fast_hash: avoid indirect function calls"

2014-11-14 16:36:25 -05:00

clocksource

ARM: pxa: Add non device-tree timer link to clocksource

2014-07-23 12:02:39 +02:00

crypto

crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code

2014-10-14 10:51:22 +02:00

drm

drm/radeon: remove invalid pci id

2014-10-28 10:44:36 -04:00

dt-bindings

Merge tag 'omap-fixes-against-v3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

2014-11-16 15:09:53 -08:00

keys

KEYS: Restore partial ID matching functionality for asymmetric keys

2014-10-06 15:21:05 +01:00

kvm

arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs

2014-10-16 10:57:41 +02:00

linux

ipvlan: Initial check-in of the IPVLAN driver.

2014-11-24 15:29:18 -05:00

math-emu

…

media

Merge branch 'patchwork' into v4l_for_linus

2014-10-09 14:00:54 -03:00

memory

…

misc

cxl: Add new header for call backs and structs

2014-10-08 20:15:43 +11:00

net

netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module

2014-11-27 13:08:42 +01:00

pcmcia

…

ras

PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND

2014-09-25 09:42:40 -06:00

rdma

IB/mlx5, iser, isert: Add Signature API additions

2014-10-09 00:10:53 -07:00

rxrpc

include/rxrpc/types.h: Remove unused header

2014-08-29 20:33:39 -07:00

scsi

scsi: set REQ_QUEUE for the blk-mq case

2014-10-28 09:53:43 +01:00

soc/tegra

ARM: tegra: Convert PMC to a driver

2014-07-17 14:58:43 +02:00

sound

ASoC: dpcm: Fix race between FE/BE updates and trigger

2014-11-04 17:18:32 +00:00

target

target: Add force_pr_aptpl device attribute

2014-10-04 05:41:20 +00:00

trace

Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent

2014-10-30 07:37:37 +01:00

uapi

tipc: add tipc_netlink.h to uapi Kbuild

2014-11-24 16:21:10 -05:00

video

Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2014-10-18 18:03:02 -07:00

xen

xen: remove DEFINE_XENBUS_DRIVER() macro

2014-10-06 10:27:57 +01:00

Kbuild

…