Pablo Neira Ayuso
d584a61a93
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y ...
LD init/built-in.o
net/built-in.o:(.data+0x4408): undefined reference to `nf_nat_tcp_seq_adjust'
make: *** [vmlinux] Error 1
This patch adds a new pointer hook (nfq_ct_nat_hook) similar to other existing
in Netfilter to solve our complicated configuration dependencies.
Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2012-06-22 02:49:52 +02:00
ACPI: fix acpi_bus.h build warnings when ACPI is not enabled
2012-06-04 00:29:11 -04:00
Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus
2012-06-13 12:01:33 +09:00
drm: increase DRM_OBJECT_MAX_PROPERTY to 24
2012-06-12 15:36:31 +01:00
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
2012-06-22 02:49:52 +02:00
netfilter: fix missing symbols if CONFIG_NETFILTER_NETLINK_QUEUE_CT unset
2012-06-18 21:09:17 -07:00
Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus
2012-05-21 09:00:47 -07:00
[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs
2012-05-23 09:43:13 +01:00
ASoC: Last minute updates
2012-05-22 02:58:55 +02:00
mm: vmscan: remove reclaim_mode_t
2012-05-29 16:22:19 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
xen: do not map the same GSI twice in PVHVM guests.
2012-05-21 14:11:36 -04:00
d584a61a93