From: David S. Miller <davem@davemloft.net>
Date: Sat, 31 Aug 2019 00:50:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v5.4.17~2825^2~9
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c3d7a089f945124770748b4eb7d5e2d1b40dadf9;p=arm%2Flinux.git

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>
---

c3d7a089f945124770748b4eb7d5e2d1b40dadf9