summaryrefslogtreecommitdiff
path: root/include/uapi/linux/openvswitch.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-12-14 19:09:01 +0300
committerDavid S. Miller <davem@davemloft.net>2015-12-14 19:09:01 +0300
commit9e5be5bd4382a6cf4c128eec798cebf8b635c3dd (patch)
tree9fe44b7aa0fec0ba312b00522b96fb1b8d7a556d /include/uapi/linux/openvswitch.h
parent7f49e7a38b77a7538acf48762c22ccbd05d9535c (diff)
parenta907e36d54e0ff836e55e04531be201bf6b4d8c8 (diff)
downloadlinux-9e5be5bd4382a6cf4c128eec798cebf8b635c3dd.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== netfilter fixes for net The following patchset contains Netfilter fixes for you net tree, specifically for nf_tables and nfnetlink_queue, they are: 1) Avoid a compilation warning in nfnetlink_queue that was introduced in the previous merge window with the simplification of the conntrack integration, from Arnd Bergmann. 2) nfnetlink_queue is leaking the pernet subsystem registration from a failure path, patch from Nikolay Borisov. 3) Pass down netns pointer to batch callback in nfnetlink, this is the largest patch and it is not a bugfix but it is a dependency to resolve a splat in the correct way. 4) Fix a splat due to incorrect socket memory accounting with nfnetlink skbuff clones. 5) Add missing conntrack dependencies to NFT_DUP_IPV4 and NFT_DUP_IPV6. 6) Traverse the nftables commit list in reverse order from the commit path, otherwise we crash when the user applies an incremental update via 'nft -f' that deletes an object that was just introduced in this batch, from Xin Long. Regarding the compilation warning fix, many people have sent us (and keep sending us) patches to address this, that's why I'm including this batch even if this is not critical. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/openvswitch.h')
0 files changed, 0 insertions, 0 deletions