summaryrefslogtreecommitdiff
path: root/include/media/blackfin
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-08-18 18:45:34 -0700
committerDavid S. Miller <davem@davemloft.net>2016-08-18 18:45:34 -0700
commit53409afd3e6341d128e5120d3c202cf9a0b11dd2 (patch)
tree827159c1611c940347b2a0e470ce4a2d02304e25 /include/media/blackfin
parent184ca823481c99dadd7d946e5afd4bb921eab30d (diff)
parentb75911b66ad508a3c3f006ce37d9f9ebee34da43 (diff)
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 updates for your net tree, they are: 1) Dump only conntrack that belong to this namespace via /proc file. This is some fallout from the conversion to single conntrack table for all netns, patch from Liping Zhang. 2) Missing MODULE_ALIAS_NF_LOGGER() for the ARP family that prevents module autoloading, also from Liping Zhang. 3) Report overquota event to the right netnamespace, again from Liping. 4) Fix tproxy listener sk refcount that leads to crash, from Eric Dumazet. 5) Fix racy refcounting on object deletion from nfnetlink and rule removal both for nfacct and cttimeout, from Liping Zhang. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/media/blackfin')
0 files changed, 0 insertions, 0 deletions