Merge patch series "Add support for Allwinner D1 CAN controllers"

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d516295..c4f95a9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3686,6 +3686,7 @@ F:        include/linux/filter.h
 F:     include/linux/tnum.h
 F:     kernel/bpf/core.c
 F:     kernel/bpf/dispatcher.c
+F:     kernel/bpf/mprog.c
 F:     kernel/bpf/syscall.c
 F:     kernel/bpf/tnum.c
 F:     kernel/bpf/trampoline.c
@@ -3696,7 +3697,7 @@ R:        David Vernet <void@manifault.com>
 L:     bpf@vger.kernel.org
 L:     bpf@ietf.org
 S:     Maintained
-F:     Documentation/bpf/instruction-set.rst
+F:     Documentation/bpf/standardization/
 
 BPF [GENERAL] (Safe Dynamic Programs and Tools)
 M:     Alexei Starovoitov <ast@kernel.org>
@@ -3779,13 +3780,15 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 F:     kernel/bpf/bpf_struct*
 
-BPF [NETWORKING] (tc BPF, sock_addr)
+BPF [NETWORKING] (tcx & tc BPF, sock_addr)
 M:     Martin KaFai Lau <martin.lau@linux.dev>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 R:     John Fastabend <john.fastabend@gmail.com>
 L:     bpf@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Maintained
+F:     include/net/tcx.h
+F:     kernel/bpf/tcx.c
 F:     net/core/filter.c
 F:     net/sched/act_bpf.c
 F:     net/sched/cls_bpf.c
@@ -3837,6 +3840,15 @@ S:       Maintained
 F:     kernel/bpf/stackmap.c
 F:     kernel/trace/bpf_trace.c
 
+BROADCOM ASP 2.0 ETHERNET DRIVER
+M:     Justin Chen <justin.chen@broadcom.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
+L:     bcm-kernel-feedback-list@broadcom.com
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
+F:     drivers/net/ethernet/broadcom/asp2/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Michael Chan <michael.chan@broadcom.com>
 L:     netdev@vger.kernel.org
@@ -7594,6 +7606,13 @@ L:       linux-mmc@vger.kernel.org
 S:     Supported
 F:     drivers/mmc/host/cqhci*
 
+EMS CPC-PCI CAN DRIVER
+M:     Gerhard Uttenthaler <uttenthaler@ems-wuensche.com>
+M:     support@ems-wuensche.com
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/sja1000/ems_pci.c
+
 EMULEX 10Gbps iSCSI - OneConnect DRIVER
 M:     Ketan Mukadam <ketan.mukadam@broadcom.com>
 L:     linux-scsi@vger.kernel.org