Skip to content

Commit a812a3f

Browse files
author
Paolo Abeni
committed
Merge branch 'maintainers-networking-updates'
Simon Horman says: ==================== MAINTAINERS: Networking updates This series includes Networking-related updates to MAINTAINERS. * Patches 1-4 aim to assign header files with "*net*' and '*skbuff*' in their name to Networking-related sections within Maintainers. There are a few such files left over after this patches. I have to sent separate patches to add them to SCSI SUBSYSTEM and NETWORKING DRIVERS (WIRELESS) sections [1][2]. [1] https://lore.kernel.org/linux-scsi/[email protected]/ [2] https://lore.kernel.org/linux-wireless/[email protected]/ * Patch 5 updates the status of the JME driver to 'Odd Fixes' ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
2 parents af688a9 + 46097a9 commit a812a3f

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

MAINTAINERS

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3504,7 +3504,9 @@ S: Maintained
35043504
W: http://linux-atm.sourceforge.net
35053505
F: drivers/atm/
35063506
F: include/linux/atm*
3507+
F: include/linux/sonet.h
35073508
F: include/uapi/linux/atm*
3509+
F: include/uapi/linux/sonet.h
35083510

35093511
ATMEL MACB ETHERNET DRIVER
35103512
M: Nicolas Ferre <[email protected]>
@@ -11993,7 +11995,7 @@ F: fs/jfs/
1199311995
JME NETWORK DRIVER
1199411996
M: Guo-Fu Tseng <[email protected]>
1199511997
11996-
S: Maintained
11998+
S: Odd Fixes
1199711999
F: drivers/net/ethernet/jme.*
1199812000

1199912001
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
@@ -15877,15 +15879,18 @@ F: drivers/net/
1587715879
F: include/dt-bindings/net/
1587815880
F: include/linux/cn_proc.h
1587915881
F: include/linux/etherdevice.h
15882+
F: include/linux/ethtool_netlink.h
1588015883
F: include/linux/fcdevice.h
1588115884
F: include/linux/fddidevice.h
1588215885
F: include/linux/hippidevice.h
1588315886
F: include/linux/if_*
1588415887
F: include/linux/inetdevice.h
15885-
F: include/linux/netdevice.h
15888+
F: include/linux/netdev*
15889+
F: include/linux/platform_data/wiznet.h
1588615890
F: include/uapi/linux/cn_proc.h
15891+
F: include/uapi/linux/ethtool_netlink.h
1588715892
F: include/uapi/linux/if_*
15888-
F: include/uapi/linux/netdevice.h
15893+
F: include/uapi/linux/netdev*
1588915894
F: tools/testing/selftests/drivers/net/
1589015895
X: drivers/net/wireless/
1589115896

@@ -15937,14 +15942,28 @@ F: include/linux/framer/framer-provider.h
1593715942
F: include/linux/framer/framer.h
1593815943
F: include/linux/in.h
1593915944
F: include/linux/indirect_call_wrapper.h
15945+
F: include/linux/inet.h
15946+
F: include/linux/inet_diag.h
1594015947
F: include/linux/net.h
15941-
F: include/linux/netdevice.h
15942-
F: include/linux/skbuff.h
15948+
F: include/linux/netdev*
15949+
F: include/linux/netlink.h
15950+
F: include/linux/netpoll.h
15951+
F: include/linux/rtnetlink.h
15952+
F: include/linux/seq_file_net.h
15953+
F: include/linux/skbuff*
1594315954
F: include/net/
15955+
F: include/uapi/linux/genetlink.h
15956+
F: include/uapi/linux/hsr_netlink.h
1594415957
F: include/uapi/linux/in.h
15958+
F: include/uapi/linux/inet_diag.h
15959+
F: include/uapi/linux/nbd-netlink.h
1594515960
F: include/uapi/linux/net.h
1594615961
F: include/uapi/linux/net_namespace.h
15947-
F: include/uapi/linux/netdevice.h
15962+
F: include/uapi/linux/netconf.h
15963+
F: include/uapi/linux/netdev*
15964+
F: include/uapi/linux/netlink.h
15965+
F: include/uapi/linux/netlink_diag.h
15966+
F: include/uapi/linux/rtnetlink.h
1594815967
F: lib/net_utils.c
1594915968
F: lib/random32.c
1595015969
F: net/
@@ -21055,6 +21074,7 @@ SOCKET TIMESTAMPING
2105521074
M: Willem de Bruijn <[email protected]>
2105621075
S: Maintained
2105721076
F: Documentation/networking/timestamping.rst
21077+
F: include/linux/net_tstamp.h
2105821078
F: include/uapi/linux/net_tstamp.h
2105921079
F: tools/testing/selftests/net/so_txtime.c
2106021080

0 commit comments

Comments
 (0)