diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-30 17:50:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-30 17:50:10 -0700 |
| commit | c3d7a089f945124770748b4eb7d5e2d1b40dadf9 (patch) | |
| tree | 92f47175820f11e7a47e0b5f106aaf01d9963a43 /Documentation/EDID | |
| parent | 94880a5b2e8144e77d2a0a384a68248104837f58 (diff) | |
| parent | daf1de9078792a4d60e36aa7ecf3aadca65277c2 (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 fixes for net:
1) Spurious warning when loading rules using the physdev match,
from Todd Seidelmann.
2) Fix FTP conntrack helper debugging output, from Thomas Jarosch.
3) Restore per-netns nf_conntrack_{acct,helper,timeout} sysctl knobs,
from Florian Westphal.
4) Clear skbuff timestamp from the flowtable datapath, also from Florian.
5) Fix incorrect byteorder of NFT_META_BRI_IIFVPROTO, from wenxu.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/EDID')
0 files changed, 0 insertions, 0 deletions