diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-24 02:10:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-24 02:10:10 +0200 |
| commit | 0b4a9e1a591ca92726d32dbe043eb737734c6a0e (patch) | |
| tree | 8ee8e13183bc1852073e9a592780f069d73954f5 /net/netrom/nr_route.c | |
| parent | ipv4: Don't add deprecated new binary sysctl value. (diff) | |
| parent | netfilter: ctnetlink: fix compilation with NF_CONNTRACK_EVENTS=n (diff) | |
| download | linux-0b4a9e1a591ca92726d32dbe043eb737734c6a0e.tar.xz linux-0b4a9e1a591ca92726d32dbe043eb737734c6a0e.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo says:
====================
The following four patches provide Netfilter fixes for the cthelper
infrastructure that was recently merged mainstream, they are:
* two fixes for compilation breakage with two different configurations:
- CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
- NF_CONNTRACK_EVENTS=n and CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
* two fixes for sparse warnings.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/nr_route.c')
0 files changed, 0 insertions, 0 deletions