diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-14 15:06:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-14 15:06:48 +0100 |
| commit | 9e86316f48fcaa24c0fd332aba17b76ce8dfcb12 (patch) | |
| tree | 7de501d457c87286bf6d048298fe4f776fa51c31 /MAINTAINERS | |
| parent | fca998622ff9d8aba674835dbe19c3c80f2f22c5 (diff) | |
| parent | 879e280b8486d4612ad1aa050d6fada2dd80cf1c (diff) | |
| download | linux-next-9e86316f48fcaa24c0fd332aba17b76ce8dfcb12.tar.gz linux-next-9e86316f48fcaa24c0fd332aba17b76ce8dfcb12.zip | |
Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
# Conflicts:
# net/core/neighbour.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6e8d05375873..4713def0b36d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7925,6 +7925,7 @@ S: Supported F: Documentation/devicetree/bindings/dpll/dpll-device.yaml F: Documentation/devicetree/bindings/dpll/dpll-pin.yaml F: Documentation/driver-api/dpll.rst +F: Documentation/netlink/specs/dpll.yaml F: drivers/dpll/ F: include/linux/dpll.h F: include/uapi/linux/dpll.h @@ -18493,7 +18494,7 @@ M: David Yang <mmyangfl@gmail.com> L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/dsa/motorcomm,yt921x.yaml -F: drivers/net/dsa/yt921x.* +F: drivers/net/dsa/motorcomm/ F: net/dsa/tag_yt921x.c MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD @@ -28094,6 +28095,12 @@ F: Documentation/devicetree/bindings/clock/ultrarisc,dp1000-clk.yaml F: drivers/clk/ultrarisc/* F: include/dt-bindings/clock/ultrarisc,dp1000-clk.h +ULTRARISC DP1000 DWMAC GLUE LAYER +M: Jia Wang <wangjia@ultrarisc.com> +S: Maintained +F: Documentation/devicetree/bindings/net/ultrarisc,dp1000-gmac.yaml +F: drivers/net/ethernet/stmicro/stmmac/dwmac-ultrarisc.c + ULTRARISC DP1000 PINCTRL DRIVER M: Jia Wang <wangjia@ultrarisc.com> L: linux-gpio@vger.kernel.org |