From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Aug 2019 20:16:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v5.15~5650^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e15dbcdeb9f66c9e6068f94aed60cee9844b621a;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Remove IP MASQUERADING record in MAINTAINERS file,
   from Denis Efremov.

2) Counter arguments are swapped in ebtables, from
   Todd Seidelmann.

3) Missing netlink attribute validation in flow_offload
   extension.

4) Incorrect alignment in xt_nfacct that breaks 32-bits
   userspace / 64-bits kernels, from Juliana Rodrigueiro.

5) Missing include guard in nf_conntrack_h323_types.h,
   from Masahiro Yamada.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

e15dbcdeb9f66c9e6068f94aed60cee9844b621a