diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-19 22:16:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-19 22:16:07 +0200 |
| commit | e15dbcdeb9f66c9e6068f94aed60cee9844b621a (patch) | |
| tree | ab19d95d300e3c603a649e347ffb9a312b263c0f /MAINTAINERS | |
| parent | tcp: make sure EPOLLOUT wont be missed (diff) | |
| parent | netfilter: add include guard to nf_conntrack_h323_types.h (diff) | |
| download | linux-e15dbcdeb9f66c9e6068f94aed60cee9844b621a.tar.xz linux-e15dbcdeb9f66c9e6068f94aed60cee9844b621a.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 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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 08176d64eed5..22b8273069af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8454,11 +8454,6 @@ S: Maintained F: fs/io_uring.c F: include/uapi/linux/io_uring.h -IP MASQUERADING -M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> -S: Maintained -F: net/ipv4/netfilter/ipt_MASQUERADE.c - IPMI SUBSYSTEM M: Corey Minyard <minyard@acm.org> L: openipmi-developer@lists.sourceforge.net (moderated for non-subscribers) |