tree ab19d95d300e3c603a649e347ffb9a312b263c0f
parent ef8d8ccdc216f797e66cb4a1372f5c4c285ce1e4
parent 38a429c898ddd210cc35463b096389f97c3c5a73
author David S. Miller <davem@davemloft.net> 1566245767 -0700
committer David S. Miller <davem@davemloft.net> 1566245767 -0700

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