diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-16 20:44:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-16 20:44:54 +0100 |
| commit | 5ff1dd24168c6dda68d72897a847c364581744ae (patch) | |
| tree | 0bfef71c2b98ad9cd2df6336a7df14eaf6e53b84 /drivers/net/usb/kalmia.c | |
| parent | neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions. (diff) | |
| parent | netfilter: nft_ct: fix compilation warning if NF_CONNTRACK_MARK is not set (diff) | |
| download | linux-5ff1dd24168c6dda68d72897a847c364581744ae.tar.xz linux-5ff1dd24168c6dda68d72897a847c364581744ae.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables
Pablo Neira Ayuso says:
====================
This small batch contains several Netfilter fixes for your net-next
tree, more specifically:
* Fix compilation warning in nft_ct in NF_CONNTRACK_MARK is not set,
from Kristian Evensen.
* Add dependency to IPV6 for NF_TABLES_INET. This one has been reported
by the several robots that are testing .config combinations, from Paul
Gortmaker.
* Fix default base chain policy setting in nf_tables, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/kalmia.c')
0 files changed, 0 insertions, 0 deletions