aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-01-28 10:51:51 -0800
committerDavid S. Miller <davem@davemloft.net>2019-01-28 10:51:51 -0800
commitff44a8373c882221c1ff30b87c42fba4f6938119 (patch)
tree94d2199f66423715c9b9ca0cac0fb91d48c4029b /drivers/net
parentnet: dsa: mv88e6xxx: Fix serdes irq setup going recursive (diff)
parentnetfilter: ipt_CLUSTERIP: fix warning unused variable cn (diff)
downloadlinux-dev-ff44a8373c882221c1ff30b87c42fba4f6938119.tar.xz
linux-dev-ff44a8373c882221c1ff30b87c42fba4f6938119.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter/IPVS fixes for net The following patchset contains Netfilter/IPVS fixes for your net tree: 1) The nftnl mutex is now per-netns, therefore use reference counter for matches and targets to deal with concurrent updates from netns. Moreover, place extensions in a pernet list. Patches from Florian Westphal. 2) Bail out with EINVAL in case of negative timeouts via setsockopt() through ip_vs_set_timeout(), from ZhangXiaoxu. 3) Spurious EINVAL on ebtables 32bit binary with 64bit kernel, also from Florian. 4) Reset TCP option header parser in case of fingerprint mismatch, otherwise follow up overlapping fingerprint definitions including TCP options do not work, from Fernando Fernandez Mancera. 5) Compilation warning in ipt_CLUSTER with CONFIG_PROC_FS unset. From Anders Roxell. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions