diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-12-22 14:54:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-22 14:54:13 -0500 |
| commit | a7c09ae63d1a3d623e6c96bc29be2bb3eca47e42 (patch) | |
| tree | 894434b0b5d9ca56c1a39a994ffd6f9a1a20119a /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | Merge branch 'cdc_ncm-new-Dell-devices' (diff) | |
| parent | netfilter: nft_ct: include direction when dumping NFT_CT_L3PROTOCOL key (diff) | |
| download | linux-dev-a7c09ae63d1a3d623e6c96bc29be2bb3eca47e42.tar.xz linux-dev-a7c09ae63d1a3d623e6c96bc29be2bb3eca47e42.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains two netfilter fixes:
1) Oneliner from Florian to dump missing NFT_CT_L3PROTOCOL netlink
attribute, from Florian Westphal.
2) Another oneliner for nf_tables to use skb->protocol from the new
netdev family, we can't assume ethernet there.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions