The branch main has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9f83fca88643a1fddcaffccd39115a0b48305c6f
commit 9f83fca88643a1fddcaffccd39115a0b48305c6f
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2023-02-28 15:42:47 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2023-02-28 18:33:03 +0000
MAINTAINERS+GitHub: Reflect ipfilter was moved from contrib to netpfil
Reflect the fact that ipfilter was moved from contrib to netpfil
on December 20, 2021 by 3b9b51fe464e. And that ipfilter userland
was moved from contrib to sbin/ipf by 41edb306f056 that same day.
---
.github/CODEOWNERS | 4 ++--
MAINTAINERS | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 441774e12449..0d9aed6b5f3b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,7 +35,7 @@
/contrib/atf @ngie-eign
/contrib/capsicum-test @ngie-eign
/contrib/googletest @ngie-eign
-/contrib/ipfilter @cschuber
+/sbin/ipf @cschuber
/contrib/libcxxrt @DimitryAndric @emaste
/contrib/llvm-project @DimitryAndric
/contrib/llvm-project/libunwind @DimitryAndric @emaste @bsdjhb
@@ -69,7 +69,7 @@
/sys/arm64/rockchip @evadot
/sys/compat/linprocfs/ @dag-erling
/sys/compat/linuxkpi @hselasky
-/sys/contrib/ipfilter @cschuber
+/sys/netpfil/ipfilter @cschuber
/sys/crypto/openssl/ @juikim
/sys/dev/drm2 @bsdimp
/sys/dev/iscsi/ @trasz
diff --git a/MAINTAINERS b/MAINTAINERS
index 4bcc352b1fc1..936c6ada9532 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -40,7 +40,7 @@ ath(4) adrian Pre-commit review requested,
send to freebsd-wirel...@freebsd.org
contrib/atf ngie,#test Pre-commit review requested.
contrib/capsicum-test ngie,#capsicum,#test Pre-commit review requested.
contrib/googletest ngie,#test Pre-commit review requested.
-contrib/ipfilter cy Pre-commit review requested.
+sbin/ipf cy Pre-commit review requested.
contrib/libcxxrt dim,emaste Pre-commit review preferred.
contrib/llvm-project/compiler-rt dim Pre-commit review preferred.
contrib/llvm-project/libcxx dim Pre-commit review preferred.
@@ -103,7 +103,7 @@ sys/compat/linuxkpi hselasky If in doubt,
ask.
(to avoid drm graphics drivers
impact)
sys/contrib/dev/ice erj Pre-commit phabricator review requested.
-sys/contrib/ipfilter cy Pre-commit review requested.
+sys/netpfil/ipfilter cy Pre-commit review requested.
sys/dev/e1000 erj Pre-commit phabricator review requested.
sys/dev/ixgbe erj Pre-commit phabricator review requested.
sys/dev/ixl erj Pre-commit phabricator review requested.
