summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-06-22 16:27:54 -0700
committerDavid S. Miller <davem@davemloft.net>2021-06-22 16:27:54 -0700
commitf4b29d2ee903f15b5e3f9bbb485079b2a7fe6616 (patch)
tree64716994662a5e835fd2f23979876240d21678b6 /MAINTAINERS
parentce8eb4c728ef40b554b4f3d8963f11ed44502e00 (diff)
parente31f072ffab0397a328b31a9589dcf9733dc9c72 (diff)
downloadlinux-f4b29d2ee903f15b5e3f9bbb485079b2a7fe6616.tar.gz
linux-f4b29d2ee903f15b5e3f9bbb485079b2a7fe6616.tar.bz2
linux-f4b29d2ee903f15b5e3f9bbb485079b2a7fe6616.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) Nicolas Dichtel updates MAINTAINERS file to add Netfilter IRC channel. 2) Skip non-IPv6 packets in nft_exthdr. 3) Skip non-TCP packets in nft_osf. 4) Skip non-TCP/UDP packets in nft_tproxy. 5) Memleak in hardware offload infrastructure when counters are used for first time in a rule. 6) The VLAN transfer routine must use FLOW_DISSECTOR_KEY_BASIC instead of FLOW_DISSECTOR_KEY_CONTROL. Moreover, make a more robust check for 802.1q and 802.1ad to restore simple matching on transport protocols. 7) Fix bogus EPERM when listing a ruleset when table ownership flag is set on. 8) Honor table ownership flag when table is referenced by handle. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8c5ee008301a..afd74266bc21 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12659,6 +12659,7 @@ W: http://www.netfilter.org/
W: http://www.iptables.org/
W: http://www.nftables.org/
Q: http://patchwork.ozlabs.org/project/netfilter-devel/list/
+C: irc://irc.libera.chat/netfilter
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
F: include/linux/netfilter*