diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-07-22 14:32:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-22 14:32:39 -0700 |
| commit | 7bd04bcf91e77bd0fe01c180546aacab4c7934be (patch) | |
| tree | ac8a84f1ab026998dfae0f95f0057756cc650681 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (diff) | |
| parent | netfilter: xt_socket: fix broken v0 support (diff) | |
| download | linux-dev-7bd04bcf91e77bd0fe01c180546aacab4c7934be.tar.xz linux-dev-7bd04bcf91e77bd0fe01c180546aacab4c7934be.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains Netfilter fixes for your net tree,
they are:
* Fix potential NULL dereference in the socket match if revision 0
is used, from Eric Dumazet.
* Fix missing expectation NAT initialization that results in dumping
the NAT part via ctnetlink, thus leading to problems in expectation
synchronization through conntrackd, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions