diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-06-29 16:35:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 16:35:53 -0700 |
| commit | 0c12d91b7064e16e96939243187b12fbd99caac7 (patch) | |
| tree | 53fdcb3dda55a4089289856439a654c66839f8f6 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | davinci_cpdma: include linux/module.h (diff) | |
| parent | netfilter: nfnetlink: fix missing rcu_read_unlock in nfnetlink_rcv_msg (diff) | |
| download | wireguard-linux-0c12d91b7064e16e96939243187b12fbd99caac7.tar.xz wireguard-linux-0c12d91b7064e16e96939243187b12fbd99caac7.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following are 4 fixes and the update of the MAINTAINERS file
to point to my Netfilter trees.
They are:
* One refcount leak fix in IPVS IPv6 support from Eric Dumazet.
* One fix for interface comparison in ipset hash-netiface sets
from Florian Westphal.
* One fix for a missing rcu_read_unlock in nfnetlink from
Tomasz Bursztyka.
* One fix for a kernel crash if IPSET_CMD_NONE is set to ipset via
nfnetlink, again from Tomasz Bursztyka.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions