Skip to contentSkip to conversation

MAINTAINERS: adjust to filesystem doc ReST conversion

PATCH In review Lukas Bulwahn 5 participants 18 messages Mar 4, 2020 – Mar 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MAINTAINERS: adjust to filesystem doc ReST conversion

Mauro's patch series <[email protected]> ("[PATCH 00/44] Manually convert filesystem FS documents to ReST") converts many Documentation/filesystems/ files to ReST.

Since then, ./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

warning: no file matches F: Documentation/filesystems/...

Adjust MAINTAINERS entries to all files converted from .txt to .rst in the patch series and address the 27 warnings.

---
Mauro, please ack.
Jonathan, pick pick this patch for doc-next.

Note there are still two further warnings remaining in Documentation:

warning: no file matches F: Documentation/networking/6lowpan.txt
warning: no file matches F: Documentation/kobject.txt

Patches for those warnings will follow.

 MAINTAINERS | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)
MAINTAINERS +27 -27
index 46fdb834d1fb..e19b275f2ac2 100644
@@ -214,7 +214,7 @@ Q:	http://patchwork.kernel.org/project/v9fs-devel/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 T:	git git://github.com/martinetd/linux.git
 S:	Maintained
-F:	Documentation/filesystems/9p.txt
+F:	Documentation/filesystems/9p.rst
 F:	fs/9p/
 F:	net/9p/
 F:	include/net/9p/
@@ -584,7 +584,7 @@ AFFS FILE SYSTEM
 M:	David Sterba <[email protected]>
 L:	[email protected]
 S:	Odd Fixes
-F:	Documentation/filesystems/affs.txt
+F:	Documentation/filesystems/affs.rst
 F:	fs/affs/
 
 AFS FILESYSTEM
@@ -593,7 +593,7 @@ L:	[email protected]
 S:	Supported
 F:	fs/afs/
 F:	include/trace/events/afs.h
-F:	Documentation/filesystems/afs.txt
+F:	Documentation/filesystems/afs.rst
 W:	https://www.infradead.org/~dhowells/kafs/
 
 AGPGART DRIVER
@@ -3076,7 +3076,7 @@ M:	Luis de Bethencourt <[email protected]>
 M:	Salah Triki <[email protected]>
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git
-F:	Documentation/filesystems/befs.txt
+F:	Documentation/filesystems/befs.rst
 F:	fs/befs/
 
 BFQ I/O SCHEDULER
@@ -3090,7 +3090,7 @@ F:	Documentation/block/bfq-iosched.rst
 BFS FILE SYSTEM
 M:	"Tigran A. Aivazian" <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/bfs.txt
+F:	Documentation/filesystems/bfs.rst
 F:	fs/bfs/
 F:	include/uapi/linux/bfs_fs.h
 
@@ -3623,7 +3623,7 @@ W:	http://btrfs.wiki.kernel.org/
 Q:	http://patchwork.kernel.org/project/linux-btrfs/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:	Maintained
-F:	Documentation/filesystems/btrfs.txt
+F:	Documentation/filesystems/btrfs.rst
 F:	fs/btrfs/
 F:	include/linux/btrfs*
 F:	include/uapi/linux/btrfs*
@@ -3920,7 +3920,7 @@ W:	http://ceph.com/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 T:	git git://github.com/ceph/ceph-client.git
 S:	Supported
-F:	Documentation/filesystems/ceph.txt
+F:	Documentation/filesystems/ceph.rst
 F:	fs/ceph/
 
 CERTIFICATE HANDLING
@@ -4432,7 +4432,7 @@ F:	include/linux/cpuidle.h
 CRAMFS FILESYSTEM
 M:	Nicolas Pitre <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/cramfs.txt
+F:	Documentation/filesystems/cramfs.rst
 F:	fs/cramfs/
 
 CREATIVE SB0540
@@ -5975,7 +5975,7 @@ W:	http://ecryptfs.org
 W:	https://launchpad.net/ecryptfs
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 S:	Odd Fixes
-F:	Documentation/filesystems/ecryptfs.txt
+F:	Documentation/filesystems/ecryptfs.rst
 F:	fs/ecryptfs/
 
 EDAC-AMD64
@@ -6297,7 +6297,7 @@ M:	Chao Yu <[email protected]>
 L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
-F:	Documentation/filesystems/erofs.txt
+F:	Documentation/filesystems/erofs.rst
 F:	fs/erofs/
 F:	include/trace/events/erofs.h
 
@@ -6358,7 +6358,7 @@ EXT2 FILE SYSTEM
 M:	Jan Kara <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/filesystems/ext2.txt
+F:	Documentation/filesystems/ext2.rst
 F:	fs/ext2/
 F:	include/linux/ext2*
 
@@ -6432,7 +6432,7 @@ L:	[email protected]
 W:	https://f2fs.wiki.kernel.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 S:	Maintained
-F:	Documentation/filesystems/f2fs.txt
+F:	Documentation/filesystems/f2fs.rst
 F:	Documentation/ABI/testing/sysfs-fs-f2fs
 F:	fs/f2fs/
 F:	include/linux/f2fs_fs.h
@@ -7474,13 +7474,13 @@ F:	drivers/infiniband/hw/hfi1
 HFS FILESYSTEM
 L:	[email protected]
 S:	Orphan
-F:	Documentation/filesystems/hfs.txt
+F:	Documentation/filesystems/hfs.rst
 F:	fs/hfs/
 
 HFSPLUS FILESYSTEM
 L:	[email protected]
 S:	Orphan
-F:	Documentation/filesystems/hfsplus.txt
+F:	Documentation/filesystems/hfsplus.rst
 F:	fs/hfsplus/
 
 HGA FRAMEBUFFER DRIVER
@@ -8351,7 +8351,7 @@ M:	Jan Kara <[email protected]>
 R:	Amir Goldstein <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/filesystems/inotify.txt
+F:	Documentation/filesystems/inotify.rst
 F:	fs/notify/inotify/
 F:	include/linux/inotify.h
 F:	include/uapi/linux/inotify.h
@@ -11854,7 +11854,7 @@ W:	https://nilfs.sourceforge.io/
 W:	https://nilfs.osdn.jp/
 T:	git git://github.com/konis/nilfs2.git
 S:	Supported
-F:	Documentation/filesystems/nilfs2.txt
+F:	Documentation/filesystems/nilfs2.rst
 F:	fs/nilfs2/
 F:	include/trace/events/nilfs2.h
 F:	include/uapi/linux/nilfs2_api.h
@@ -11963,7 +11963,7 @@ L:	[email protected]
 W:	http://www.tuxera.com/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
 S:	Supported
-F:	Documentation/filesystems/ntfs.txt
+F:	Documentation/filesystems/ntfs.rst
 F:	fs/ntfs/
 
 NUBUS SUBSYSTEM
@@ -12309,7 +12309,7 @@ OMFS FILESYSTEM
 M:	Bob Copeland <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/filesystems/omfs.txt
+F:	Documentation/filesystems/omfs.rst
 F:	fs/omfs/
 
 OMNIKEY CARDMAN 4000 DRIVER
@@ -12557,8 +12557,8 @@ M:	Joseph Qi <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	http://ocfs2.wiki.kernel.org
 S:	Supported
-F:	Documentation/filesystems/ocfs2.txt
-F:	Documentation/filesystems/dlmfs.txt
+F:	Documentation/filesystems/ocfs2.rst
+F:	Documentation/filesystems/dlmfs.rst
 F:	fs/ocfs2/
 
 ORANGEFS FILESYSTEM
@@ -12568,7 +12568,7 @@ L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 S:	Supported
 F:	fs/orangefs/
-F:	Documentation/filesystems/orangefs.txt
+F:	Documentation/filesystems/orangefs.rst
 
 ORINOCO DRIVER
 L:	[email protected]
@@ -13530,7 +13530,7 @@ S:	Maintained
 F:	fs/proc/
 F:	include/linux/proc_fs.h
 F:	tools/testing/selftests/proc/
-F:	Documentation/filesystems/proc.txt
+F:	Documentation/filesystems/proc.rst
 
 PROC SYSCTL
 M:	Luis Chamberlain <[email protected]>
@@ -15818,7 +15818,7 @@ L:	[email protected] (subscribers-only)
 W:	http://squashfs.org.uk
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
 S:	Maintained
-F:	Documentation/filesystems/squashfs.txt
+F:	Documentation/filesystems/squashfs.rst
 F:	fs/squashfs/
 
 SRM (Alpha) environment access
@@ -16261,7 +16261,7 @@ F:	drivers/platform/x86/system76_acpi.c
 SYSV FILESYSTEM
 M:	Christoph Hellwig <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/sysv-fs.txt
+F:	Documentation/filesystems/sysv-fs.rst
 F:	fs/sysv/
 F:	include/linux/sysv_fs.h
 
@@ -17126,7 +17126,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 W:	http://www.linux-mtd.infradead.org/doc/ubifs.html
 S:	Supported
-F:	Documentation/filesystems/ubifs.txt
+F:	Documentation/filesystems/ubifs.rst
 F:	fs/ubifs/
 
 UCLINUX (M68KNOMMU AND COLDFIRE)
@@ -17145,7 +17145,7 @@ F:	arch/m68k/include/asm/*_no.*
 UDF FILESYSTEM
 M:	Jan Kara <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/udf.txt
+F:	Documentation/filesystems/udf.rst
 F:	fs/udf/
 
 UDRAW TABLET
@@ -18585,7 +18585,7 @@ L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 S:	Maintained
 F:	fs/zonefs/
-F:	Documentation/filesystems/zonefs.txt
+F:	Documentation/filesystems/zonefs.rst
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:	Dan Streetman <[email protected]>
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw

Em Wed, 4 Mar 2020 08:29:50 +0100
Lukas Bulwahn <[email protected]> escreveu:

Quoted 7 lines

Mauro's patch series <[email protected]> ("[PATCH 00/44] Manually convert filesystem FS documents to ReST") converts many Documentation/filesystems/ files to ReST.

Since then, ./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

Quoted 7 lines

warning: no file matches F: Documentation/filesystems/...

Adjust MAINTAINERS entries to all files converted from .txt to .rst in the patch series and address the 27 warnings.

Quoted 10 lines

---
Mauro, please ack.
Jonathan, pick pick this patch for doc-next.

Note there are still two further warnings remaining in Documentation:

warning: no file matches F: Documentation/networking/6lowpan.txt
warning: no file matches F: Documentation/kobject.txt

Patches for those warnings will follow.

Btw, those can easily be fixed with:

	./scripts/documentation-file-ref-check --fix

I had already a similar patch to this one already on my tree, intending to submit later today. You were faster than me on that ;-)

Quoted 234 lines
 MAINTAINERS | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)
MAINTAINERS +26 -26
index 46fdb834d1fb..e19b275f2ac2 100644
@@ -214,7 +214,7 @@ Q:	http://patchwork.kernel.org/project/v9fs-devel/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 T:	git git://github.com/martinetd/linux.git
 S:	Maintained
-F:	Documentation/filesystems/9p.txt
+F:	Documentation/filesystems/9p.rst
 F:	fs/9p/
 F:	net/9p/
 F:	include/net/9p/
@@ -584,7 +584,7 @@ AFFS FILE SYSTEM
 M:	David Sterba <[email protected]>
 L:	[email protected]
 S:	Odd Fixes
-F:	Documentation/filesystems/affs.txt
+F:	Documentation/filesystems/affs.rst
 F:	fs/affs/
 
 AFS FILESYSTEM
@@ -593,7 +593,7 @@ L:	[email protected]
 S:	Supported
 F:	fs/afs/
 F:	include/trace/events/afs.h
-F:	Documentation/filesystems/afs.txt
+F:	Documentation/filesystems/afs.rst
 W:	https://www.infradead.org/~dhowells/kafs/
 
 AGPGART DRIVER
@@ -3076,7 +3076,7 @@ M:	Luis de Bethencourt <[email protected]>
 M:	Salah Triki <[email protected]>
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git
-F:	Documentation/filesystems/befs.txt
+F:	Documentation/filesystems/befs.rst
 F:	fs/befs/
 
 BFQ I/O SCHEDULER
@@ -3090,7 +3090,7 @@ F:	Documentation/block/bfq-iosched.rst
 BFS FILE SYSTEM
 M:	"Tigran A. Aivazian" <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/bfs.txt
+F:	Documentation/filesystems/bfs.rst
 F:	fs/bfs/
 F:	include/uapi/linux/bfs_fs.h
 
@@ -3623,7 +3623,7 @@ W:	http://btrfs.wiki.kernel.org/
 Q:	http://patchwork.kernel.org/project/linux-btrfs/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:	Maintained
-F:	Documentation/filesystems/btrfs.txt
+F:	Documentation/filesystems/btrfs.rst
 F:	fs/btrfs/
 F:	include/linux/btrfs*
 F:	include/uapi/linux/btrfs*
@@ -3920,7 +3920,7 @@ W:	http://ceph.com/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 T:	git git://github.com/ceph/ceph-client.git
 S:	Supported
-F:	Documentation/filesystems/ceph.txt
+F:	Documentation/filesystems/ceph.rst
 F:	fs/ceph/
 
 CERTIFICATE HANDLING
@@ -4432,7 +4432,7 @@ F:	include/linux/cpuidle.h
 CRAMFS FILESYSTEM
 M:	Nicolas Pitre <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/cramfs.txt
+F:	Documentation/filesystems/cramfs.rst
 F:	fs/cramfs/
 
 CREATIVE SB0540
@@ -5975,7 +5975,7 @@ W:	http://ecryptfs.org
 W:	https://launchpad.net/ecryptfs
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 S:	Odd Fixes
-F:	Documentation/filesystems/ecryptfs.txt
+F:	Documentation/filesystems/ecryptfs.rst
 F:	fs/ecryptfs/
 
 EDAC-AMD64
@@ -6297,7 +6297,7 @@ M:	Chao Yu <[email protected]>
 L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
-F:	Documentation/filesystems/erofs.txt
+F:	Documentation/filesystems/erofs.rst
 F:	fs/erofs/
 F:	include/trace/events/erofs.h
 
@@ -6358,7 +6358,7 @@ EXT2 FILE SYSTEM
 M:	Jan Kara <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/filesystems/ext2.txt
+F:	Documentation/filesystems/ext2.rst
 F:	fs/ext2/
 F:	include/linux/ext2*
 
@@ -6432,7 +6432,7 @@ L:	[email protected]
 W:	https://f2fs.wiki.kernel.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 S:	Maintained
-F:	Documentation/filesystems/f2fs.txt
+F:	Documentation/filesystems/f2fs.rst
 F:	Documentation/ABI/testing/sysfs-fs-f2fs
 F:	fs/f2fs/
 F:	include/linux/f2fs_fs.h
@@ -7474,13 +7474,13 @@ F:	drivers/infiniband/hw/hfi1
 HFS FILESYSTEM
 L:	[email protected]
 S:	Orphan
-F:	Documentation/filesystems/hfs.txt
+F:	Documentation/filesystems/hfs.rst
 F:	fs/hfs/
 
 HFSPLUS FILESYSTEM
 L:	[email protected]
 S:	Orphan
-F:	Documentation/filesystems/hfsplus.txt
+F:	Documentation/filesystems/hfsplus.rst
 F:	fs/hfsplus/
 
 HGA FRAMEBUFFER DRIVER
@@ -8351,7 +8351,7 @@ M:	Jan Kara <[email protected]>
 R:	Amir Goldstein <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/filesystems/inotify.txt
+F:	Documentation/filesystems/inotify.rst
 F:	fs/notify/inotify/
 F:	include/linux/inotify.h
 F:	include/uapi/linux/inotify.h
@@ -11854,7 +11854,7 @@ W:	https://nilfs.sourceforge.io/
 W:	https://nilfs.osdn.jp/
 T:	git git://github.com/konis/nilfs2.git
 S:	Supported
-F:	Documentation/filesystems/nilfs2.txt
+F:	Documentation/filesystems/nilfs2.rst
 F:	fs/nilfs2/
 F:	include/trace/events/nilfs2.h
 F:	include/uapi/linux/nilfs2_api.h
@@ -11963,7 +11963,7 @@ L:	[email protected]
 W:	http://www.tuxera.com/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
 S:	Supported
-F:	Documentation/filesystems/ntfs.txt
+F:	Documentation/filesystems/ntfs.rst
 F:	fs/ntfs/
 
 NUBUS SUBSYSTEM
@@ -12309,7 +12309,7 @@ OMFS FILESYSTEM
 M:	Bob Copeland <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/filesystems/omfs.txt
+F:	Documentation/filesystems/omfs.rst
 F:	fs/omfs/
 
 OMNIKEY CARDMAN 4000 DRIVER
@@ -12557,8 +12557,8 @@ M:	Joseph Qi <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	http://ocfs2.wiki.kernel.org
 S:	Supported
-F:	Documentation/filesystems/ocfs2.txt
-F:	Documentation/filesystems/dlmfs.txt
+F:	Documentation/filesystems/ocfs2.rst
+F:	Documentation/filesystems/dlmfs.rst
 F:	fs/ocfs2/
 
 ORANGEFS FILESYSTEM
@@ -12568,7 +12568,7 @@ L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 S:	Supported
 F:	fs/orangefs/
-F:	Documentation/filesystems/orangefs.txt
+F:	Documentation/filesystems/orangefs.rst
 
 ORINOCO DRIVER
 L:	[email protected]
@@ -13530,7 +13530,7 @@ S:	Maintained
 F:	fs/proc/
 F:	include/linux/proc_fs.h
 F:	tools/testing/selftests/proc/
-F:	Documentation/filesystems/proc.txt
+F:	Documentation/filesystems/proc.rst
 
 PROC SYSCTL
 M:	Luis Chamberlain <[email protected]>
@@ -15818,7 +15818,7 @@ L:	[email protected] (subscribers-only)
 W:	http://squashfs.org.uk
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
 S:	Maintained
-F:	Documentation/filesystems/squashfs.txt
+F:	Documentation/filesystems/squashfs.rst
 F:	fs/squashfs/
 
 SRM (Alpha) environment access
@@ -16261,7 +16261,7 @@ F:	drivers/platform/x86/system76_acpi.c
 SYSV FILESYSTEM
 M:	Christoph Hellwig <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/sysv-fs.txt
+F:	Documentation/filesystems/sysv-fs.rst
 F:	fs/sysv/
 F:	include/linux/sysv_fs.h
 
@@ -17126,7 +17126,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 W:	http://www.linux-mtd.infradead.org/doc/ubifs.html
 S:	Supported
-F:	Documentation/filesystems/ubifs.txt
+F:	Documentation/filesystems/ubifs.rst
 F:	fs/ubifs/
 
 UCLINUX (M68KNOMMU AND COLDFIRE)
@@ -17145,7 +17145,7 @@ F:	arch/m68k/include/asm/*_no.*
 UDF FILESYSTEM
 M:	Jan Kara <[email protected]>
 S:	Maintained
-F:	Documentation/filesystems/udf.txt
+F:	Documentation/filesystems/udf.rst
 F:	fs/udf/
 
 UDRAW TABLET

MAINTAINERS L: [email protected] · line 18591

Quoted 8 lines
MAINTAINERS +1 -1
@@ -18585,7 +18585,7 @@ L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 S:	Maintained
 F:	fs/zonefs/
-F:	Documentation/filesystems/zonefs.txt
+F:	Documentation/filesystems/zonefs.rst
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:	Dan Streetman <[email protected]>

Thanks,
Mauro

#2 lore raw
Quoted 8 lines · Mauro Carvalho Chehab

Btw, those can easily be fixed with:

	./scripts/documentation-file-ref-check --fix

I had already a similar patch to this one already on my tree, intending to submit later today. You were faster than me on that ;-)

Thanks for the hint. It is always good to know about the various check and clean-up scripts.

Lukas

maintainer
#3 lore raw
In reply to Lukas Bulwahn
Quoted 9 lines · On Wed, 4 Mar 2020 08:29:50 +0100 Lukas Bulwahn <[email protected]>…

Mauro's patch series <[email protected]> ("[PATCH 00/44] Manually convert filesystem FS documents to ReST") converts many Documentation/filesystems/ files to ReST.

Since then, ./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

warning: no file matches F: Documentation/filesystems/...

Quoted 8 lines

Adjust MAINTAINERS entries to all files converted from .txt to .rst in the patch series and address the 27 warnings.

---
Mauro, please ack.
Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

Thanks,

jon

#4 lore raw
Quoted 2 lines · Jonathan Corbet

On Wed, 4 Mar 2020 08:29:50 +0100
Lukas Bulwahn <[email protected]> wrote:

[]

Quoted 4 lines
Quoted 4 lines

./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

warning: no file matches F: Documentation/filesystems/...

[]

Quoted 1 line

Sigh, I need to work a MAINTAINERS check into my workflow...

checkpatch already bleats a warning on patches with any file move or rename.

It would be difficult to impossible to implement a real pattern verification mechanism in checkpatch though.

#5 lore raw
In reply to Jonathan Corbet

Em Wed, 4 Mar 2020 13:10:35 -0700
Jonathan Corbet <[email protected]> escreveu:

Quoted 21 lines
Quoted 9 lines · On Wed, 4 Mar 2020 08:29:50 +0100 Lukas Bulwahn <[email protected]>…

Mauro's patch series <[email protected]> ("[PATCH 00/44] Manually convert filesystem FS documents to ReST") converts many Documentation/filesystems/ files to ReST.

Since then, ./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

warning: no file matches F: Documentation/filesystems/...

Quoted 8 lines

Adjust MAINTAINERS entries to all files converted from .txt to .rst in the patch series and address the 27 warnings.

---
Mauro, please ack.
Jonathan, pick pick this patch for doc-next.

Quoted 4 lines

Sigh, I need to work a MAINTAINERS check into my workflow...

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

I'm starting to suspect that maybe the best workflow would be to just apply the patches at docs-next keeping links broken, and then run ./scripts/documentation-file-ref-check --fix by the end of a merge window, addressing such breakages.

There are usually lots of churn outside the merge window.

Another alternative would be to split the MAINTAINERS file on a per-subsystem basis. If I remember well, someone proposed this once at LKML. I vaguely remember that there were even a patch (or RFC) adding support for such thing for get_maintainers.pl.

Thanks,
Mauro

#6 lore raw
Quoted 9 lines · Mauro Carvalho Chehab

Em Wed, 4 Mar 2020 13:10:35 -0700
Jonathan Corbet <[email protected]> escreveu:

Quoted 5 lines

Sigh, I need to work a MAINTAINERS check into my workflow...

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

Quoted 7 lines

I'm starting to suspect that maybe the best workflow would be to just apply the patches at docs-next keeping links broken, and then run ./scripts/documentation-file-ref-check --fix by the end of a merge window, addressing such breakages.

There are usually lots of churn outside the merge window.

Agree, it is probably the simplest solution to get such things fixed at the end of the merge window; there are many of such 'automatic' fixes (and scripts that generate them). It just needs somebody to convince Linus to have a trusted end-of-merge-window clean-up team to provide a final pull request on Sunday afternoon to fix all those minor points.

Quoted 5 lines

Another alternative would be to split the MAINTAINERS file on a per-subsystem basis. If I remember well, someone proposed this once at LKML. I vaguely remember that there were even a patch (or RFC) adding support for such thing for get_maintainers.pl.

I would also support that idea. In the meantime, I am looking into the effort to identify and fix these issues when they are submitted to the mailing list. It is not the simplest solution, but at least a solution that I can try to work on individually at first.

Lukas

#7 lore raw
In reply to Mauro Carvalho Chehab
Quoted 26 lines · Mauro Carvalho Chehab

Em Wed, 4 Mar 2020 13:10:35 -0700
Jonathan Corbet <[email protected]> escreveu:

Quoted 23 lines
Quoted 9 lines · On Wed, 4 Mar 2020 08:29:50 +0100 Lukas Bulwahn <[email protected]>…

Mauro's patch series <[email protected]> ("[PATCH 00/44] Manually convert filesystem FS documents to ReST") converts many Documentation/filesystems/ files to ReST.

Since then, ./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

warning: no file matches F: Documentation/filesystems/...

Quoted 8 lines

Adjust MAINTAINERS entries to all files converted from .txt to .rst in the patch series and address the 27 warnings.

---
Mauro, please ack.
Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

Quoted 7 lines
Quoted 2 lines

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

I'm starting to suspect that maybe the best workflow would be to just apply the patches at docs-next keeping links broken, and then run ./scripts/documentation-file-ref-check --fix by the end of a merge window, addressing such breakages.

I'm not sure at all that that script will always do the right thing with MAINTAINERS, but it seems to work OK except for some renames where a .txt file was directly renamed to a .rst file in the same directory where there was a similarly named file in a different directory.

Likely the direct rename of a filename extension from .txt to .rst should always be applied by the script.

Anyway, for -next as of today:

$ git diff --shortstat
 64 files changed, 116 insertions(+), 116 deletions(-)
Quoted 6 lines

There are usually lots of churn outside the merge window.

Another alternative would be to split the MAINTAINERS file on a per-subsystem basis. If I remember well, someone proposed this once at LKML. I vaguely remember that there were even a patch (or RFC) adding support for such thing for get_maintainers.pl.

Yeah. get_maintainer.pl does work if the MAINTAINERS file is split up a few different ways.

There was also a tool to do the MAINTAINERS split.
https://lore.kernel.org/patchwork/patch/817857/

I doubt that would matter at all given today's tools and the general mechanisms of maintainers renaming files and not running checkpatch in the first place.

#8 lore raw

Em Wed, 04 Mar 2020 13:24:48 -0800
Joe Perches <[email protected]> escreveu:

Quoted 30 lines · Mauro Carvalho Chehab
Quoted 29 lines

Em Wed, 4 Mar 2020 13:10:35 -0700
Jonathan Corbet <[email protected]> escreveu:

Quoted 25 lines
Quoted 9 lines · On Wed, 4 Mar 2020 08:29:50 +0100 Lukas Bulwahn <[email protected]>…

Mauro's patch series <[email protected]> ("[PATCH 00/44] Manually convert filesystem FS documents to ReST") converts many Documentation/filesystems/ files to ReST.

Since then, ./scripts/get_maintainer.pl --self-test complains with 27 warnings on Documentation/filesystems/ of this kind:

warning: no file matches F: Documentation/filesystems/...

Quoted 8 lines

Adjust MAINTAINERS entries to all files converted from .txt to .rst in the patch series and address the 27 warnings.

---
Mauro, please ack.
Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

Quoted 7 lines
Quoted 4 lines

I'm starting to suspect that maybe the best workflow would be to just apply the patches at docs-next keeping links broken, and then run ./scripts/documentation-file-ref-check --fix by the end of a merge window, addressing such breakages.

I'm not sure at all that that script will always do the right thing with MAINTAINERS,

As it is based on some heuristics, whomever runs it should double-check the results.

Quoted 4 lines

but it seems to work OK
except for some renames where a .txt file was directly renamed to a .rst file in the same directory where there was a similarly named file in a different directory.

Yeah, the script could be smarter to catch this case.

Quoted 2 lines

Likely the direct rename of a filename extension from .txt to .rst should always be applied by the script.

Yeah, makes sense to me. Yet, I got one exception for this:
I found somewhere a case were there are both foo.txt and foo.rst, both with different contents.

The solution I took were to rename foo.txt to bar.txt, adjusting the cross-references, then convert bar.txt to bar.rst.

In any case, we're close to finish the conversion. I have already patches that convert everything to .rst (with a couple of exceptions), and I took the care of doing the cross-reference fixes there. I'm still adjusting some things on this tree. My current plans are to have them all applied up to Kernel 5.8, and then start looking on better organizing the docs (I'm already doing that for media docs).

Once all of those patches get merged, .txt -> .rst will be an exception.

Quoted 16 lines

Anyway, for -next as of today:

$ git diff --shortstat
 64 files changed, 116 insertions(+), 116 deletions(-)
Quoted 6 lines

There are usually lots of churn outside the merge window.

Another alternative would be to split the MAINTAINERS file on a per-subsystem basis. If I remember well, someone proposed this once at LKML. I vaguely remember that there were even a patch (or RFC) adding support for such thing for get_maintainers.pl.

Yeah. get_maintainer.pl does work if the MAINTAINERS file is split up a few different ways.

Quoted 6 lines

There was also a tool to do the MAINTAINERS split.
https://lore.kernel.org/patchwork/patch/817857/

I doubt that would matter at all given today's tools and the general mechanisms of maintainers renaming files and not running checkpatch in the first place.

Yeah, it may not produce any concrete results on some parts. It may help to reduce the conflicts there, though. Also, I guess some maintainers will take more care, if they start to have their own */MAINTAINERS files.

Thanks,
Mauro

#9 lore raw
In reply to Jonathan Corbet
Quoted 6 lines · Jonathan Corbet
Quoted 1 line · On Wed, 4 Mar 2020 08:29:50 +0100 Lukas Bulwahn <[email protected]>…

Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

I getting closer to have zero warnings on the MAINTAINER file matches and then, I would set up a bot following the mailing lists to warn when anyone sends a patch that potentially introduces such warning.

Quoted 3 lines

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

My patch was based on next-20200303, probably too much noise on MAINTAINERS, such that it does not apply cleanly on docs-next. If you want, I can send a patch that fits to docs-next. Anyway, merging will be similarly difficult later :(

Lukas

maintainer
#10 lore raw
Quoted 8 lines · On Wed, 4 Mar 2020 21:50:39 +0100 (CET) Lukas Bulwahn…
Quoted 3 lines

Thanks for fixing these, but ... what tree did you generate the patch against? I doesn't come close to applying to docs-next.

My patch was based on next-20200303, probably too much noise on MAINTAINERS, such that it does not apply cleanly on docs-next. If you want, I can send a patch that fits to docs-next. Anyway, merging will be similarly difficult later :(

Merge conflicts in MAINTAINERS are almost always trivial to resolve - Stephen won't mind :)

Thanks,

jon

#11 lore raw
In reply to Lukas Bulwahn
Quoted 5 lines · Lukas Bulwahn
Quoted 2 lines · Jonathan Corbet

On Wed, 4 Mar 2020 08:29:50 +0100
Lukas Bulwahn <[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

I getting closer to have zero warnings on the MAINTAINER file matches and then, I would set up a bot following the mailing lists to warn when anyone sends a patch that potentially introduces such warning.

Hey Lukas.

I wrote a hacky script that sent emails for invalid MAINTAINER F: and X: patterns a couple years back.

I ran it in September 2018 and March 2019.

It's attached if you want to play with it. The email sending bit is commented out.

The script is used like:

$ perl ./scripts/get_maintainer.pl --self-test=patterns | \
  cut -f2 -d: | \
  while read line ; do \
    perl ./dump_section.perl $line \
  done
#12 lore raw
Quoted 26 lines · Joe Perches
Quoted 5 lines · Lukas Bulwahn
Quoted 2 lines · Jonathan Corbet

On Wed, 4 Mar 2020 08:29:50 +0100
Lukas Bulwahn <[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

I getting closer to have zero warnings on the MAINTAINER file matches and then, I would set up a bot following the mailing lists to warn when anyone sends a patch that potentially introduces such warning.

Hey Lukas.

I wrote a hacky script that sent emails for invalid MAINTAINER F: and X: patterns a couple years back.

I ran it in September 2018 and March 2019.

It's attached if you want to play with it. The email sending bit is commented out.

Quoted 8 lines

The script is used like:

$ perl ./scripts/get_maintainer.pl --self-test=patterns | \
  cut -f2 -d: | \
  while read line ; do \
    perl ./dump_section.perl $line \
  done

Thanks, Joe. That is certainly helpful, I will try to make use of it in the future; fortunately, there really not too many invalid F: patterns left, and I can send the last few patches out myself.

Lukas

#13 lore raw

Em Fri, 6 Mar 2020 22:17:49 +0100 (CET)
Lukas Bulwahn <[email protected]> escreveu:

Quoted 37 lines · Joe Perches
Quoted 27 lines · Lukas Bulwahn
Quoted 13 lines · Jonathan Corbet
Quoted 7 lines
Quoted 1 line · On Wed, 4 Mar 2020 08:29:50 +0100 Lukas Bulwahn <[email protected]>…

Jonathan, pick pick this patch for doc-next.

Sigh, I need to work a MAINTAINERS check into my workflow...

I getting closer to have zero warnings on the MAINTAINER file matches and then, I would set up a bot following the mailing lists to warn when anyone sends a patch that potentially introduces such warning.

Hey Lukas.

I wrote a hacky script that sent emails for invalid MAINTAINER F: and X: patterns a couple years back.

I ran it in September 2018 and March 2019.

It's attached if you want to play with it. The email sending bit is commented out.

Quoted 8 lines

The script is used like:

$ perl ./scripts/get_maintainer.pl --self-test=patterns | \
  cut -f2 -d: | \
  while read line ; do \
    perl ./dump_section.perl $line \
  done
Quoted 3 lines

Thanks, Joe. That is certainly helpful, I will try to make use of it in the future; fortunately, there really not too many invalid F: patterns left, and I can send the last few patches out myself.

Talking about problems at MAINTAINERS file, while the entries are supposed to be in alphabetical order, there are some things at the wrong place there.

This can easily seen with:

	$ cat MAINTAINERS |grep -E '^[A-Z][A-Z]' >a;sort -f a >b;diff -U1 a b|less

See for example the first hunk:

@@ -54,3 +54,2 @@
ALACRITECH GIGABIT ETHERNET DRIVER
-FORCEDETH GIGABIT ETHERNET DRIVER
ALCATEL SPEEDTOUCH USB DRIVER

The FORCEDETH entry is completely misplaced.

Same happens here:

@@ -529,4 +529,2 @@
DIOLAN U2C-12 I2C DRIVER
-FILESYSTEM DIRECT ACCESS (DAX)
-DEVICE DIRECT ACCESS (DAX)
DIRECTORY NOTIFICATION (DNOTIFY)

With this name, the FILESYSTEM DIRECT ACCESS (DAX) is also misplaced. Maybe it was called something else starting with DEVICE in the past?

In any case, I wonder if it would make sense to re-order at least those completely out order entries. On a quick check, there are only 16 entries that seem to be really wrong, if we compare just the first two characters of the entries names.

I'm using this small perl script to check:

	open IN, "MAINTAINERS";
	my $prev = "00";
	while (<IN>) {
		next if (m/THE REST/);
		if (m/^([A-Z\d][A-Z\d])/) {
			$cur = $1;
			$entry = $_;
			$entry =~ s/\s+$//;
			print "$entry < $full_prev\n" if ($cur lt $prev);
			$prev = $cur;
			$full_prev = $entry;
		}
	}

It got those results:

ALCATEL SPEEDTOUCH USB DRIVER < FORCEDETH GIGABIT ETHERNET DRIVER
AMAZON ANNAPURNA LABS FIC DRIVER < ARM PRIMECELL VIC PL190/PL192 DRIVER
802.11 (including CFG80211/NL80211) < CFAG12864BFB LCD FRAMEBUFFER DRIVER
DEVICE DIRECT ACCESS (DAX) < FILESYSTEM DIRECT ACCESS (DAX)
GASKET DRIVER FRAMEWORK < GCC PLUGINS
NXP FSPI DRIVER < OBJAGG
OMFS FILESYSTEM < ONION OMEGA2+ BOARD
FLYSKY FSIA6B RC RECEIVER < PHOENIX RC FLIGHT CONTROLLER ADAPTER
HANTRO VPU CODEC DRIVER < ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
REALTEK WIRELESS DRIVER (rtlwifi family) < RTL8187 WIRELESS DRIVER
EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER < SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER < SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus) < SLEEPABLE READ-COPY UPDATE (SRCU)
EXTRA BOOT CONFIG < STMMAC ETHERNET DRIVER
TEMPO SEMICONDUCTOR DRIVERS < TRIVIAL PATCHES
RCMM REMOTE CONTROLS DECODER < WINBOND CIR DRIVER

Regards,
Mauro

#14 lore raw
Quoted 11 lines · Mauro Carvalho Chehab

Talking about problems at MAINTAINERS file, while the entries are supposed to be in alphabetical order, there are some things at the wrong place there.

This can easily seen with:

	$ cat MAINTAINERS |grep -E '^[A-Z][A-Z]' >a;sort -f a >b;diff -U1 a b|less

See for example the first hunk:

Review line 55

Quoted 3 lines
(quoted diff) +0 -1
@@ -54,3 +54,2 @@
 ALACRITECH GIGABIT ETHERNET DRIVER
-FORCEDETH GIGABIT ETHERNET DRIVER
 ALCATEL SPEEDTOUCH USB DRIVER

People are really bad at alphabetizing...

This could also be fixed by using Linus' original
script.

$ git checkout 7683e9e529258d01ce99216ad3be21f59eff83ec -- scripts/parse-maintainers.pl
$ perl ./scripts/parse-maintainers.pl < MAINTAINERS > MAINTAINERS.new
$ mv MAINTAINERS.new MAINTAINERS
$ git checkout HEAD -- scripts/parse-maintainers.pl

This currently produces this -next diff:

---
 MAINTAINERS | 1584 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 792 insertions(+), 792 deletions(-)
MAINTAINERS +792 -792
index c555f4..5846e94 100644
@@ -184,6 +184,23 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/net/hamradio/6pack.c
 
+802.11 (including CFG80211/NL80211)
+M:	Johannes Berg <[email protected]>
+L:	[email protected]
+W:	http://wireless.kernel.org/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
+S:	Maintained
+F:	net/wireless/
+F:	include/uapi/linux/nl80211.h
+F:	include/linux/ieee80211.h
+F:	include/net/wext.h
+F:	include/net/cfg80211.h
+F:	include/net/iw_handler.h
+F:	include/net/ieee80211_radiotap.h
+F:	Documentation/driver-api/80211/cfg80211.rst
+F:	Documentation/networking/regulatory.txt
+
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
 M:	Realtek linux nic maintainers <[email protected]>
 M:	Heiner Kallweit <[email protected]>
@@ -647,13 +664,6 @@ M:	Lino Sanfilippo <[email protected]>
 S:	Maintained
 F:	drivers/net/ethernet/alacritech/*
 
-FORCEDETH GIGABIT ETHERNET DRIVER
-M:	Rain River <[email protected]>
-M:	Zhu Yanjun <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/net/ethernet/nvidia/*
-
 ALCATEL SPEEDTOUCH USB DRIVER
 M:	Duncan Sands <[email protected]>
 L:	[email protected]
@@ -689,6 +699,14 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/staging/media/allegro-dvt/
 
+Allwinner A10 CSI driver
+M:	Maxime Ripard <[email protected]>
+L:	[email protected]
+T:	git git://linuxtv.org/media_tree.git
+F:	drivers/media/platform/sunxi/sun4i-csi/
+F:	Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+S:	Maintained
+
 ALLWINNER CPUFREQ DRIVER
 M:	Yangtao Li <[email protected]>
 L:	[email protected]
@@ -779,6 +797,12 @@ F:	drivers/tty/serial/altera_jtaguart.c
 F:	include/linux/altera_uart.h
 F:	include/linux/altera_jtaguart.h
 
+AMAZON ANNAPURNA LABS FIC DRIVER
+M:	Talel Shenhar <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
+F:	drivers/irqchip/irq-al-fic.c
+
 AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
 M:	Talel Shenhar <[email protected]>
 S:	Maintained
@@ -1274,6 +1298,12 @@ F:	arch/arm/include/asm/arch_timer.h
 F:	arch/arm64/include/asm/arch_timer.h
 F:	drivers/clocksource/arm_arch_timer.c
 
+ARM HDLCD DRM DRIVER
+M:	Liviu Dudau <[email protected]>
+S:	Supported
+F:	drivers/gpu/drm/arm/hdlcd_*
+F:	Documentation/devicetree/bindings/display/arm,hdlcd.txt
+
 ARM INTEGRATOR, VERSATILE AND REALVIEW SUPPORT
 M:	Linus Walleij <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -1298,12 +1328,6 @@ F:	drivers/mtd/maps/physmap_of_versatile.c
 F:	drivers/power/reset/arm-versatile-reboot.c
 F:	drivers/soc/versatile/
 
-ARM HDLCD DRM DRIVER
-M:	Liviu Dudau <[email protected]>
-S:	Supported
-F:	drivers/gpu/drm/arm/hdlcd_*
-F:	Documentation/devicetree/bindings/display/arm,hdlcd.txt
-
 ARM KOMEDA DRM-KMS DRIVER
 M:	James (Qian) Wang <[email protected]>
 M:	Liviu Dudau <[email protected]>
@@ -1316,16 +1340,6 @@ F:	drivers/gpu/drm/arm/display/komeda/
 F:	Documentation/devicetree/bindings/display/arm,komeda.txt
 F:	Documentation/gpu/komeda-kms.rst
 
-ARM MALI-DP DRM DRIVER
-M:	Liviu Dudau <[email protected]>
-M:	Brian Starkey <[email protected]>
-L:	Mali DP Maintainers <[email protected]>
-S:	Supported
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-F:	drivers/gpu/drm/arm/
-F:	Documentation/devicetree/bindings/display/arm,malidp.txt
-F:	Documentation/gpu/afbc.rst
-
 ARM MALI PANFROST DRM DRIVER
 M:	Rob Herring <[email protected]>
 M:	Tomeu Vizoso <[email protected]>
@@ -1337,6 +1351,16 @@ T:	git git://anongit.freedesktop.org/drm/drm-misc
 F:	drivers/gpu/drm/panfrost/
 F:	include/uapi/drm/panfrost_drm.h
 
+ARM MALI-DP DRM DRIVER
+M:	Liviu Dudau <[email protected]>
+M:	Brian Starkey <[email protected]>
+L:	Mali DP Maintainers <[email protected]>
+S:	Supported
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+F:	drivers/gpu/drm/arm/
+F:	Documentation/devicetree/bindings/display/arm,malidp.txt
+F:	Documentation/gpu/afbc.rst
+
 ARM MFM AND FLOPPY DRIVERS
 M:	Ian Molton <[email protected]>
 S:	Maintained
@@ -1415,12 +1439,6 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
 F:	drivers/irqchip/irq-vic.c
 
-AMAZON ANNAPURNA LABS FIC DRIVER
-M:	Talel Shenhar <[email protected]>
-S:	Maintained
-F:	Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
-F:	drivers/irqchip/irq-al-fic.c
-
 ARM SMMU DRIVERS
 M:	Will Deacon <[email protected]>
 R:	Robin Murphy <[email protected]>
@@ -1498,14 +1516,6 @@ F:	drivers/pinctrl/sunxi/
 F:	drivers/soc/sunxi/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
 
-Allwinner A10 CSI driver
-M:	Maxime Ripard <[email protected]>
-L:	[email protected]
-T:	git git://linuxtv.org/media_tree.git
-F:	drivers/media/platform/sunxi/sun4i-csi/
-F:	Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
-S:	Maintained
-
 ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 M:	Neil Armstrong <[email protected]>
 M:	Jerome Brunet <[email protected]>
@@ -1516,21 +1526,6 @@ F:	include/dt-bindings/clock/meson*
 F:	include/dt-bindings/clock/gxbb*
 F:	Documentation/devicetree/bindings/clock/amlogic*
 
-ARM/Amlogic Meson SoC support
-M:	Kevin Hilman <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-L:	[email protected]
-W:	http://linux-meson.com/
-S:	Maintained
-F:	arch/arm/mach-meson/
-F:	arch/arm/boot/dts/meson*
-F:	arch/arm64/boot/dts/amlogic/
-F:	drivers/pinctrl/meson/
-F:	drivers/mmc/host/meson*
-F:	drivers/soc/amlogic/
-F:	drivers/rtc/rtc-meson*
-N:	meson
-
 ARM/Amlogic Meson SoC Crypto Drivers
 M:	Corentin Labbe <[email protected]>
 L:	[email protected]
@@ -1546,6 +1541,21 @@ S:	Maintained
 F:	sound/soc/meson/
 F:	Documentation/devicetree/bindings/sound/amlogic*
 
+ARM/Amlogic Meson SoC support
+M:	Kevin Hilman <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+L:	[email protected]
+W:	http://linux-meson.com/
+S:	Maintained
+F:	arch/arm/mach-meson/
+F:	arch/arm/boot/dts/meson*
+F:	arch/arm64/boot/dts/amlogic/
+F:	drivers/pinctrl/meson/
+F:	drivers/mmc/host/meson*
+F:	drivers/soc/amlogic/
+F:	drivers/rtc/rtc-meson*
+N:	meson
+
 ARM/Annapurna Labs ALPINE ARCHITECTURE
 M:	Tsahee Zidenberg <[email protected]>
 M:	Antoine Tenart <[email protected]>
@@ -1789,6 +1799,16 @@ N:	imx
 N:	mxs
 X:	drivers/media/i2c/
 
+ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE
+M:	Shawn Guo <[email protected]>
+M:	Li Yang <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
+F:	arch/arm/boot/dts/ls1021a*
+F:	arch/arm64/boot/dts/freescale/fsl-*
+F:	arch/arm64/boot/dts/freescale/qoriq-*
+
 ARM/FREESCALE VYBRID ARM ARCHITECTURE
 M:	Shawn Guo <[email protected]>
 M:	Sascha Hauer <[email protected]>
@@ -1800,16 +1820,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:	arch/arm/mach-imx/*vf610*
 F:	arch/arm/boot/dts/vf*
 
-ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE
-M:	Shawn Guo <[email protected]>
-M:	Li Yang <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-F:	arch/arm/boot/dts/ls1021a*
-F:	arch/arm64/boot/dts/freescale/fsl-*
-F:	arch/arm64/boot/dts/freescale/qoriq-*
-
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -2500,16 +2510,6 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/memory/*emif*
 
-ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
-M:	Tero Kristo <[email protected]>
-M:	Nishanth Menon <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Supported
-F:	Documentation/devicetree/bindings/arm/ti/k3.txt
-F:	arch/arm64/boot/dts/ti/Makefile
-F:	arch/arm64/boot/dts/ti/k3-*
-F:	include/dt-bindings/pinctrl/k3.h
-
 ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 M:	Santosh Shilimkar <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -2537,6 +2537,16 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/power/reset/keystone-reset.c
 
+ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
+M:	Tero Kristo <[email protected]>
+M:	Nishanth Menon <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Supported
+F:	Documentation/devicetree/bindings/arm/ti/k3.txt
+F:	arch/arm64/boot/dts/ti/Makefile
+F:	arch/arm64/boot/dts/ti/k3-*
+F:	include/dt-bindings/pinctrl/k3.h
+
 ARM/THECUS N2100 MACHINE SUPPORT
 M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -2572,13 +2582,6 @@ F:	drivers/reset/reset-uniphier.c
 F:	drivers/tty/serial/8250/8250_uniphier.c
 N:	uniphier
 
-Ux500 CLOCK DRIVERS
-M:	Ulf Hansson <[email protected]>
-L:	[email protected]
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	drivers/clk/ux500/
-
 ARM/VERSATILE EXPRESS PLATFORM
 M:	Liviu Dudau <[email protected]>
 M:	Sudeep Holla <[email protected]>
@@ -3291,19 +3294,6 @@ S:	Supported
 F:	drivers/net/dsa/b53/*
 F:	include/linux/platform_data/b53.h
 
-BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
-M:	Florian Fainelli <[email protected]>
-M:	Ray Jui <[email protected]>
-M:	Scott Branden <[email protected]>
-M:	[email protected]
-T:	git git://github.com/broadcom/mach-bcm
-S:	Maintained
-N:	bcm281*
-N:	bcm113*
-N:	bcm216*
-N:	kona
-F:	arch/arm/mach-bcm/
-
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
 M:	Nicolas Saenz Julienne <[email protected]>
 L:	[email protected]
@@ -3317,6 +3307,19 @@ F:	drivers/staging/vc04_services
 F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:	drivers/pci/controller/pcie-brcmstb.c
 
+BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
+M:	Florian Fainelli <[email protected]>
+M:	Ray Jui <[email protected]>
+M:	Scott Branden <[email protected]>
+M:	[email protected]
+T:	git git://github.com/broadcom/mach-bcm
+S:	Maintained
+N:	bcm281*
+N:	bcm113*
+N:	bcm216*
+N:	kona
+F:	arch/arm/mach-bcm/
+
 BROADCOM BCM47XX MIPS ARCHITECTURE
 M:	Hauke Mehrtens <[email protected]>
 M:	Rafał Miłecki <[email protected]>
@@ -3533,6 +3536,15 @@ S:	Maintained
 F:	drivers/bcma/
 F:	include/linux/bcma/
 
+BROADCOM SPI DRIVER
+M:	Kamal Dasu <[email protected]>
+M:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
+F:	drivers/spi/spi-bcm-qspi.*
+F:	drivers/spi/spi-brcmstb-qspi.c
+F:	drivers/spi/spi-iproc-qspi.c
+
 BROADCOM STB AVS CPUFREQ DRIVER
 M:	Markus Mayer <[email protected]>
 M:	[email protected]
@@ -3549,14 +3561,6 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
 F:	drivers/thermal/broadcom/brcmstb*
 
-BROADCOM STB NAND FLASH DRIVER
-M:	Brian Norris <[email protected]>
-M:	Kamal Dasu <[email protected]>
-L:	[email protected]
-L:	[email protected]
-S:	Maintained
-F:	drivers/mtd/nand/raw/brcmnand/
-
 BROADCOM STB DPFE DRIVER
 M:	Markus Mayer <[email protected]>
 M:	[email protected]
@@ -3565,14 +3569,13 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
 F:	drivers/memory/brcmstb_dpfe.c
 
-BROADCOM SPI DRIVER
+BROADCOM STB NAND FLASH DRIVER
+M:	Brian Norris <[email protected]>
 M:	Kamal Dasu <[email protected]>
-M:	[email protected]
+L:	[email protected]
+L:	[email protected]
 S:	Maintained
-F:	Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
-F:	drivers/spi/spi-bcm-qspi.*
-F:	drivers/spi/spi-brcmstb-qspi.c
-F:	drivers/spi/spi-iproc-qspi.c
+F:	drivers/mtd/nand/raw/brcmnand/
 
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:	Florian Fainelli <[email protected]>
@@ -3957,23 +3960,6 @@ S:	Maintained
 F:	drivers/auxdisplay/cfag12864bfb.c
 F:	include/linux/cfag12864b.h
 
-802.11 (including CFG80211/NL80211)
-M:	Johannes Berg <[email protected]>
-L:	[email protected]
-W:	http://wireless.kernel.org/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
-S:	Maintained
-F:	net/wireless/
-F:	include/uapi/linux/nl80211.h
-F:	include/linux/ieee80211.h
-F:	include/net/wext.h
-F:	include/net/cfg80211.h
-F:	include/net/iw_handler.h
-F:	include/net/ieee80211_radiotap.h
-F:	Documentation/driver-api/80211/cfg80211.rst
-F:	Documentation/networking/regulatory.txt
-
 CHAR and MISC DRIVERS
 M:	Arnd Bergmann <[email protected]>
 M:	Greg Kroah-Hartman <[email protected]>
@@ -4023,6 +4009,14 @@ S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
 F:	drivers/platform/chrome/
 
+CHROMEOS EC CODEC DRIVER
+M:	Cheng-Yi Chiang <[email protected]>
+S:	Maintained
+R:	Enric Balletbo i Serra <[email protected]>
+R:	Guenter Roeck <[email protected]>
+F:	Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
+F:	sound/soc/codecs/cros_ec_codec.*
+
 CHROMEOS EC SUBDRIVERS
 M:	Benson Leung <[email protected]>
 M:	Enric Balletbo i Serra <[email protected]>
@@ -4032,14 +4026,6 @@ N:	cros_ec
 N:	cros-ec
 F:	drivers/power/supply/cros_usbpd-charger.c
 
-CHROMEOS EC CODEC DRIVER
-M:	Cheng-Yi Chiang <[email protected]>
-S:	Maintained
-R:	Enric Balletbo i Serra <[email protected]>
-R:	Guenter Roeck <[email protected]>
-F:	Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
-F:	sound/soc/codecs/cros_ec_codec.*
-
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:	Brian Austin <[email protected]>
 M:	Paul Handrigan <[email protected]>
@@ -4075,35 +4061,6 @@ F:	Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 F:	Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 F:	Documentation/hwmon/lochnagar.rst
 
-CISCO FCOE HBA DRIVER
-M:	Satish Kharat <[email protected]>
-M:	Sesidhar Baddela <[email protected]>
-M:	Karan Tilak Kumar <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/scsi/fnic/
-
-CISCO SCSI HBA DRIVER
-M:	Karan Tilak Kumar <[email protected]>
-M:	Sesidhar Baddela <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/scsi/snic/
-
-CISCO VIC ETHERNET NIC DRIVER
-M:	Christian Benvenuti <[email protected]>
-M:	Govindarajulu Varadarajan <[email protected]>
-M:	Parvi Kaustubhi <[email protected]>
-S:	Supported
-F:	drivers/net/ethernet/cisco/enic/
-
-CISCO VIC LOW LATENCY NIC DRIVER
-M:	Christian Benvenuti <[email protected]>
-M:	Nelson Escobar <[email protected]>
-M:	Parvi Kaustubhi <[email protected]>
-S:	Supported
-F:	drivers/infiniband/hw/usnic/
-
 CIRRUS LOGIC MADERA CODEC DRIVERS
 M:	Charles Keepax <[email protected]>
 M:	Richard Fitzgerald <[email protected]>
@@ -4127,6 +4084,35 @@ F:	drivers/pinctrl/cirrus/*
 F:	sound/soc/codecs/cs47l*
 F:	sound/soc/codecs/madera*
 
+CISCO FCOE HBA DRIVER
+M:	Satish Kharat <[email protected]>
+M:	Sesidhar Baddela <[email protected]>
+M:	Karan Tilak Kumar <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/scsi/fnic/
+
+CISCO SCSI HBA DRIVER
+M:	Karan Tilak Kumar <[email protected]>
+M:	Sesidhar Baddela <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/scsi/snic/
+
+CISCO VIC ETHERNET NIC DRIVER
+M:	Christian Benvenuti <[email protected]>
+M:	Govindarajulu Varadarajan <[email protected]>
+M:	Parvi Kaustubhi <[email protected]>
+S:	Supported
+F:	drivers/net/ethernet/cisco/enic/
+
+CISCO VIC LOW LATENCY NIC DRIVER
+M:	Christian Benvenuti <[email protected]>
+M:	Nelson Escobar <[email protected]>
+M:	Parvi Kaustubhi <[email protected]>
+S:	Supported
+F:	drivers/infiniband/hw/usnic/
+
 CLANG-FORMAT FILE
 M:	Miguel Ojeda <[email protected]>
 S:	Maintained
@@ -4300,6 +4286,19 @@ F:	Documentation/admin-guide/cgroup-v1/
 F:	include/linux/cgroup*
 F:	kernel/cgroup/
 
+CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
+M:	Tejun Heo <[email protected]>
+M:	Jens Axboe <[email protected]>
+L:	[email protected]
+L:	[email protected]
+T:	git git://git.kernel.dk/linux-block
+F:	Documentation/admin-guide/cgroup-v1/blkio-controller.rst
+F:	block/blk-cgroup.c
+F:	include/linux/blk-cgroup.h
+F:	block/blk-throttle.c
+F:	block/blk-iolatency.c
+F:	block/bfq-cgroup.c
+
 CONTROL GROUP - CPUSET
 M:	Li Zefan <[email protected]>
 L:	[email protected]
@@ -4321,19 +4320,6 @@ S:	Maintained
 F:	mm/memcontrol.c
 F:	mm/swap_cgroup.c
 
-CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
-M:	Tejun Heo <[email protected]>
-M:	Jens Axboe <[email protected]>
-L:	[email protected]
-L:	[email protected]
-T:	git git://git.kernel.dk/linux-block
-F:	Documentation/admin-guide/cgroup-v1/blkio-controller.rst
-F:	block/blk-cgroup.c
-F:	include/linux/blk-cgroup.h
-F:	block/blk-throttle.c
-F:	block/blk-iolatency.c
-F:	block/bfq-cgroup.c
-
 CORETEMP HARDWARE MONITORING DRIVER
 M:	Fenghua Yu <[email protected]>
 L:	[email protected]
@@ -4363,6 +4349,14 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/net/ethernet/ti/cpmac.c
 
+CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
+M:	Viresh Kumar <[email protected]>
+M:	Sudeep Holla <[email protected]>
+L:	[email protected]
+W:	http://www.arm.com/products/processors/technologies/biglittleprocessing.php
+S:	Maintained
+F:	drivers/cpufreq/vexpress-spc-cpufreq.c
+
 CPU FREQUENCY SCALING FRAMEWORK
 M:	"Rafael J. Wysocki" <[email protected]>
 M:	Viresh Kumar <[email protected]>
@@ -4381,13 +4375,17 @@ F:	include/linux/cpufreq.h
 F:	include/linux/sched/cpufreq.h
 F:	tools/testing/selftests/cpufreq/
 
-CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
-M:	Viresh Kumar <[email protected]>
-M:	Sudeep Holla <[email protected]>
+CPU IDLE TIME MANAGEMENT FRAMEWORK
+M:	"Rafael J. Wysocki" <[email protected]>
+M:	Daniel Lezcano <[email protected]>
 L:	[email protected]
-W:	http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 S:	Maintained
-F:	drivers/cpufreq/vexpress-spc-cpufreq.c
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+B:	https://bugzilla.kernel.org
+F:	Documentation/admin-guide/pm/cpuidle.rst
+F:	Documentation/driver-api/pm/cpuidle.rst
+F:	drivers/cpuidle/*
+F:	include/linux/cpuidle.h
 
 CPU POWER MONITORING SUBSYSTEM
 M:	Thomas Renninger <[email protected]>
@@ -4430,18 +4428,6 @@ L:	[email protected]
 S:	Supported
 F:	drivers/cpuidle/cpuidle-psci.c
 
-CPU IDLE TIME MANAGEMENT FRAMEWORK
-M:	"Rafael J. Wysocki" <[email protected]>
-M:	Daniel Lezcano <[email protected]>
-L:	[email protected]
-S:	Maintained
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
-B:	https://bugzilla.kernel.org
-F:	Documentation/admin-guide/pm/cpuidle.rst
-F:	Documentation/driver-api/pm/cpuidle.rst
-F:	drivers/cpuidle/*
-F:	include/linux/cpuidle.h
-
 CRAMFS FILESYSTEM
 M:	Nicolas Pitre <[email protected]>
 S:	Maintained
@@ -4739,6 +4725,11 @@ M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained
 F:	drivers/net/fddi/defxx.*
 
+DEFZA FDDI NETWORK DRIVER
+M:	"Maciej W. Rozycki" <[email protected]>
+S:	Maintained
+F:	drivers/net/fddi/defza.*
+
 DEINTERLACE DRIVERS FOR ALLWINNER H3
 M:	Jernej Skrabec <[email protected]>
 L:	[email protected]
@@ -4747,11 +4738,6 @@ S:	Maintained
 F:	drivers/media/platform/sunxi/sun8i-di/
 F:	Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
 
-DEFZA FDDI NETWORK DRIVER
-M:	"Maciej W. Rozycki" <[email protected]>
-S:	Maintained
-F:	drivers/net/fddi/defza.*
-
 DELL LAPTOP DRIVER
 M:	Matthew Garrett <[email protected]>
 M:	Pali Rohár <[email protected]>
@@ -4868,6 +4854,14 @@ S:	Maintained
 F:	drivers/base/devcoredump.c
 F:	include/linux/devcoredump.h
 
+DEVICE DIRECT ACCESS (DAX)
+M:	Dan Williams <[email protected]>
+M:	Vishal Verma <[email protected]>
+M:	Dave Jiang <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/dax/
+
 DEVICE FREQUENCY (DEVFREQ)
 M:	MyungJoo Ham <[email protected]>
 M:	Kyungmin Park <[email protected]>
@@ -4977,25 +4971,6 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/i2c/busses/i2c-diolan-u2c.c
 
-FILESYSTEM DIRECT ACCESS (DAX)
-M:	Dan Williams <[email protected]>
-R:	Matthew Wilcox <[email protected]>
-R:	Jan Kara <[email protected]>
-L:	[email protected]
-L:	[email protected]
-S:	Supported
-F:	fs/dax.c
-F:	include/linux/dax.h
-F:	include/trace/events/fs_dax.h
-
-DEVICE DIRECT ACCESS (DAX)
-M:	Dan Williams <[email protected]>
-M:	Vishal Verma <[email protected]>
-M:	Dave Jiang <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/dax/
-
 DIRECTORY NOTIFICATION (DNOTIFY)
 M:	Jan Kara <[email protected]>
 R:	Amir Goldstein <[email protected]>
@@ -5052,24 +5027,6 @@ F:	Documentation/driver-api/dma-buf.rst
 K:	dma_(buf|fence|resv)
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 
-DMA-BUF HEAPS FRAMEWORK
-M:	Sumit Semwal <[email protected]>
-R:	Andrew F. Davis <[email protected]>
-R:	Benjamin Gaignard <[email protected]>
-R:	Liam Mark <[email protected]>
-R:	Laura Abbott <[email protected]>
-R:	Brian Starkey <[email protected]>
-R:	John Stultz <[email protected]>
-S:	Maintained
-L:	[email protected]
-L:	[email protected]
-L:	[email protected] (moderated for non-subscribers)
-F:	include/uapi/linux/dma-heap.h
-F:	include/linux/dma-heap.h
-F:	drivers/dma-buf/dma-heap.c
-F:	drivers/dma-buf/heaps/*
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:	Vinod Koul <[email protected]>
 L:	[email protected]
@@ -5096,6 +5053,24 @@ F:	include/linux/dma-direct.h
 F:	include/linux/dma-mapping.h
 F:	include/linux/dma-noncoherent.h
 
+DMA-BUF HEAPS FRAMEWORK
+M:	Sumit Semwal <[email protected]>
+R:	Andrew F. Davis <[email protected]>
+R:	Benjamin Gaignard <[email protected]>
+R:	Liam Mark <[email protected]>
+R:	Laura Abbott <[email protected]>
+R:	Brian Starkey <[email protected]>
+R:	John Stultz <[email protected]>
+S:	Maintained
+L:	[email protected]
+L:	[email protected]
+L:	[email protected] (moderated for non-subscribers)
+F:	include/uapi/linux/dma-heap.h
+F:	include/linux/dma-heap.h
+F:	drivers/dma-buf/dma-heap.c
+F:	drivers/dma-buf/heaps/*
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+
 DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422
 M:	Lukasz Luba <[email protected]>
 L:	[email protected]
@@ -5137,12 +5112,6 @@ X:	Documentation/power/
 X:	Documentation/spi/
 T:	git git://git.lwn.net/linux.git docs-next
 
-DOCUMENTATION/ITALIAN
-M:	Federico Vaga <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	Documentation/translations/it_IT
-
 DOCUMENTATION SCRIPTS
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
@@ -5151,6 +5120,12 @@ F:	scripts/documentation-file-ref-check
 F:	scripts/sphinx-pre-install
 F:	Documentation/sphinx/parse-headers.pl
 
+DOCUMENTATION/ITALIAN
+M:	Federico Vaga <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/translations/it_IT
+
 DONGWOON DW9714 LENS VOICE COIL DRIVER
 M:	Sakari Ailus <[email protected]>
 L:	[email protected]
@@ -5242,6 +5217,15 @@ F:	drivers/power/avs/
 F:	include/linux/power/smartreflex.h
 L:	[email protected]
 
+DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
+M:	Maxime Ripard <[email protected]>
+M:	Chen-Yu Tsai <[email protected]>
+R:	Jernej Skrabec <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/gpu/drm/sun4i/sun8i*
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+
 DRM DRIVER FOR ARM PL111 CLCD
 M:	Eric Anholt <[email protected]>
 T:	git git://anongit.freedesktop.org/drm/drm-misc
@@ -5255,11 +5239,6 @@ S:	Maintained
 F:	drivers/gpu/drm/panel/panel-arm-versatile.c
 F:	Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
 
-DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
-M:	Dave Airlie <[email protected]>
-S:	Odd Fixes
-F:	drivers/gpu/drm/ast/
-
 DRM DRIVER FOR ASPEED BMC GFX
 M:	Joel Stanley <[email protected]>
 L:	[email protected]
@@ -5268,6 +5247,11 @@ S:	Supported
 F:	drivers/gpu/drm/aspeed/
 F:	Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
 
+DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
+M:	Dave Airlie <[email protected]>
+S:	Odd Fixes
+F:	drivers/gpu/drm/ast/
+
 DRM DRIVER FOR BOCHS VIRTUAL GPU
 M:	Gerd Hoffmann <[email protected]>
 L:	[email protected]
@@ -5305,6 +5289,13 @@ T:	git git://anongit.freedesktop.org/drm/drm-misc
 S:	Maintained
 F:	drivers/gpu/drm/tiny/gm12u320.c
 
+DRM DRIVER FOR HX8357D PANELS
+M:	Eric Anholt <[email protected]>
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+S:	Maintained
+F:	drivers/gpu/drm/tiny/hx8357d.c
+F:	Documentation/devicetree/bindings/display/himax,hx8357d.txt
+
 DRM DRIVER FOR ILITEK ILI9225 PANELS
 M:	David Lechner <[email protected]>
 T:	git git://anongit.freedesktop.org/drm/drm-misc
@@ -5319,13 +5310,6 @@ S:	Maintained
 F:	drivers/gpu/drm/tiny/ili9486.c
 F:	Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
 
-DRM DRIVER FOR HX8357D PANELS
-M:	Eric Anholt <[email protected]>
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-S:	Maintained
-F:	drivers/gpu/drm/tiny/hx8357d.c
-F:	Documentation/devicetree/bindings/display/himax,hx8357d.txt
-
 DRM DRIVER FOR INTEL I810 VIDEO CARDS
 S:	Orphan / Obsolete
 F:	drivers/gpu/drm/i810/
@@ -5401,17 +5385,17 @@ S:	Maintained
 F:	drivers/gpu/drm/qxl/
 F:	include/uapi/drm/qxl_drm.h
 
+DRM DRIVER FOR RAGE 128 VIDEO CARDS
+S:	Orphan / Obsolete
+F:	drivers/gpu/drm/r128/
+F:	include/uapi/drm/r128_drm.h
+
 DRM DRIVER FOR RAYDIUM RM67191 PANELS
 M:	Robert Chiras <[email protected]>
 S:	Maintained
 F:	drivers/gpu/drm/panel/panel-raydium-rm67191.c
 F:	Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
 
-DRM DRIVER FOR RAGE 128 VIDEO CARDS
-S:	Orphan / Obsolete
-F:	drivers/gpu/drm/r128/
-F:	include/uapi/drm/r128_drm.h
-
 DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 M:	Guido Günther <[email protected]>
 R:	Purism Kernel Team <[email protected]>
@@ -5429,12 +5413,6 @@ S:	Orphan / Obsolete
 F:	drivers/gpu/drm/sis/
 F:	include/uapi/drm/sis_drm.h
 
-DRM DRIVER FOR SITRONIX ST7701 PANELS
-M:	Jagan Teki <[email protected]>
-S:	Maintained
-F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
-F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
-
 DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:	David Lechner <[email protected]>
 T:	git git://anongit.freedesktop.org/drm/drm-misc
@@ -5442,6 +5420,12 @@ S:	Maintained
 F:	drivers/gpu/drm/tiny/st7586.c
 F:	Documentation/devicetree/bindings/display/sitronix,st7586.txt
 
+DRM DRIVER FOR SITRONIX ST7701 PANELS
+M:	Jagan Teki <[email protected]>
+S:	Maintained
+F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
+F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
+
 DRM DRIVER FOR SITRONIX ST7735R PANELS
 M:	David Lechner <[email protected]>
 T:	git git://anongit.freedesktop.org/drm/drm-misc
@@ -5481,13 +5465,6 @@ S:	Odd Fixes
 F:	drivers/gpu/drm/udl/
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 
-DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
-M:	Hans de Goede <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/gpu/drm/vboxvideo/
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-
 DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
 M:	Rodrigo Siqueira <[email protected]>
 R:	Haneen Mohammed <[email protected]>
@@ -5498,6 +5475,13 @@ L:	[email protected]
 F:	drivers/gpu/drm/vkms/
 F:	Documentation/gpu/vkms.rst
 
+DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
+M:	Hans de Goede <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/gpu/drm/vboxvideo/
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+
 DRM DRIVER FOR VMWARE VIRTUAL GPU
 M:	"VMware Graphics" <[email protected]>
 M:	Thomas Hellstrom <[email protected]>
@@ -5547,15 +5531,6 @@ F:	drivers/gpu/drm/sun4i/
 F:	Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 
-DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
-M:	Maxime Ripard <[email protected]>
-M:	Chen-Yu Tsai <[email protected]>
-R:	Jernej Skrabec <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/gpu/drm/sun4i/sun8i*
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-
 DRM DRIVERS FOR AMLOGIC SOCS
 M:	Neil Armstrong <[email protected]>
 L:	[email protected]
@@ -5708,6 +5683,17 @@ S:	Maintained
 F:	drivers/gpu/drm/stm
 F:	Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
 
+DRM DRIVERS FOR TI KEYSTONE
+M:	Jyri Sarha <[email protected]>
+M:	Tomi Valkeinen <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/gpu/drm/tidss/
+F:	Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
+F:	Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
+F:	Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+
 DRM DRIVERS FOR TI LCDC
 M:	Jyri Sarha <[email protected]>
 R:	Tomi Valkeinen <[email protected]>
@@ -5723,17 +5709,6 @@ S:	Maintained
 F:	drivers/gpu/drm/omapdrm/
 F:	Documentation/devicetree/bindings/display/ti/
 
-DRM DRIVERS FOR TI KEYSTONE
-M:	Jyri Sarha <[email protected]>
-M:	Tomi Valkeinen <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/gpu/drm/tidss/
-F:	Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
-F:	Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
-F:	Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-
 DRM DRIVERS FOR V3D
 M:	Eric Anholt <[email protected]>
 S:	Supported
@@ -5757,10 +5732,19 @@ R:	Russell King <[email protected]>
 R:	Christian Gmeiner <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
-S:	Maintained
-F:	drivers/gpu/drm/etnaviv/
-F:	include/uapi/drm/etnaviv_drm.h
-F:	Documentation/devicetree/bindings/display/etnaviv/
+S:	Maintained
+F:	drivers/gpu/drm/etnaviv/
+F:	include/uapi/drm/etnaviv_drm.h
+F:	Documentation/devicetree/bindings/display/etnaviv/
+
+DRM DRIVERS FOR XEN
+M:	Oleksandr Andrushchenko <[email protected]>
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+L:	[email protected]
+L:	[email protected] (moderated for non-subscribers)
+S:	Supported
+F:	drivers/gpu/drm/xen/
+F:	Documentation/gpu/xen-front.rst
 
 DRM DRIVERS FOR ZTE ZX
 M:	Shawn Guo <[email protected]>
@@ -5781,15 +5765,6 @@ F:	drivers/gpu/drm/panel/
 F:	include/drm/drm_panel.h
 F:	Documentation/devicetree/bindings/display/panel/
 
-DRM DRIVERS FOR XEN
-M:	Oleksandr Andrushchenko <[email protected]>
-T:	git git://anongit.freedesktop.org/drm/drm-misc
-L:	[email protected]
-L:	[email protected] (moderated for non-subscribers)
-S:	Supported
-F:	drivers/gpu/drm/xen/
-F:	Documentation/gpu/xen-front.rst
-
 DRM TTM SUBSYSTEM
 M:	Christian Koenig <[email protected]>
 M:	Huang Rui <[email protected]>
@@ -6147,6 +6122,14 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/edac/pnd2_edac.[ch]
 
+EDAC-QCOM
+M:	Channagoud Kadabi <[email protected]>
+M:	Venkata Narendra Kumar Gutta <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	drivers/edac/qcom_edac.c
+
 EDAC-R82600
 M:	Tim Small <[email protected]>
 L:	[email protected]
@@ -6179,14 +6162,6 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/edac/ti_edac.c
 
-EDAC-QCOM
-M:	Channagoud Kadabi <[email protected]>
-M:	Venkata Narendra Kumar Gutta <[email protected]>
-L:	[email protected]
-L:	[email protected]
-S:	Maintained
-F:	drivers/edac/qcom_edac.c
-
 EDIROL UA-101/UA-1000 DRIVER
 M:	Clemens Ladisch <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -6243,6 +6218,14 @@ M:	David Woodhouse <[email protected]>
 L:	[email protected]
 S:	Maintained
 
+EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
+M:	Adrian Hunter <[email protected]>
+M:	Ritesh Harjani <[email protected]>
+M:	Asutosh Das <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/mmc/host/cqhci*
+
 Emulex 10Gbps iSCSI - OneConnect DRIVER
 M:	Subbu Seetharaman <[email protected]>
 M:	Ketan Mukadam <[email protected]>
@@ -6419,6 +6402,15 @@ F:	include/linux/extcon.h
 F:	Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
 F:	Documentation/devicetree/bindings/extcon/
 
+EXTRA BOOT CONFIG
+M:	Masami Hiramatsu <[email protected]>
+S:	Maintained
+F:	lib/bootconfig.c
+F:	fs/proc/bootconfig.c
+F:	include/linux/bootconfig.h
+F:	tools/bootconfig/*
+F:	Documentation/admin-guide/bootconfig.rst
+
 EXYNOS DP DRIVER
 M:	Jingoo Han <[email protected]>
 L:	[email protected]
@@ -6537,6 +6529,17 @@ F:	include/uapi/linux/fcntl.h
 F:	fs/fcntl.c
 F:	fs/locks.c
 
+FILESYSTEM DIRECT ACCESS (DAX)
+M:	Dan Williams <[email protected]>
+R:	Matthew Wilcox <[email protected]>
+R:	Jan Kara <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Supported
+F:	fs/dax.c
+F:	include/linux/dax.h
+F:	include/trace/events/fs_dax.h
+
 FILESYSTEMS (VFS and infrastructure)
 M:	Alexander Viro <[email protected]>
 L:	[email protected]
@@ -6619,6 +6622,27 @@ S:	Odd Fixes
 L:	[email protected]
 F:	drivers/block/floppy.c
 
+FLYSKY FSIA6B RC RECEIVER
+M:	Markus Koch <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/input/joystick/fsia6b.c
+
+FORCEDETH GIGABIT ETHERNET DRIVER
+M:	Rain River <[email protected]>
+M:	Zhu Yanjun <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/ethernet/nvidia/*
+
+FPGA DFL DRIVERS
+M:	Wu Hao <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/fpga/dfl.rst
+F:	include/uapi/linux/fpga-dfl.h
+F:	drivers/fpga/dfl*
+
 FPGA MANAGER FRAMEWORK
 M:	Moritz Fischer <[email protected]>
 L:	[email protected]
@@ -6632,14 +6656,6 @@ F:	drivers/fpga/
 F:	include/linux/fpga/
 W:	http://www.rocketboards.org
 
-FPGA DFL DRIVERS
-M:	Wu Hao <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	Documentation/fpga/dfl.rst
-F:	include/uapi/linux/fpga-dfl.h
-F:	drivers/fpga/dfl*
-
 FPU EMULATOR
 M:	Bill Metzenthen <[email protected]>
 W:	http://floatingpoint.sourceforge.net/emulator/index.html
@@ -6713,6 +6729,24 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/i2c/busses/i2c-cpm.c
 
+FREESCALE IMX / MXC FEC DRIVER
+M:	Fugang Duan <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/ethernet/freescale/fec_main.c
+F:	drivers/net/ethernet/freescale/fec_ptp.c
+F:	drivers/net/ethernet/freescale/fec.h
+F:	Documentation/devicetree/bindings/net/fsl-fec.txt
+
+FREESCALE IMX / MXC FRAMEBUFFER DRIVER
+M:	Sascha Hauer <[email protected]>
+R:	Pengutronix Kernel Team <[email protected]>
+L:	[email protected]
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	include/linux/platform_data/video-imxfb.h
+F:	drivers/video/fbdev/imxfb.c
+
 FREESCALE IMX DDR PMU DRIVER
 M:	Frank Li <[email protected]>
 L:	[email protected]
@@ -6737,24 +6771,6 @@ S:	Maintained
 F:	drivers/i2c/busses/i2c-imx-lpi2c.c
 F:	Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
 
-FREESCALE IMX / MXC FEC DRIVER
-M:	Fugang Duan <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/net/ethernet/freescale/fec_main.c
-F:	drivers/net/ethernet/freescale/fec_ptp.c
-F:	drivers/net/ethernet/freescale/fec.h
-F:	Documentation/devicetree/bindings/net/fsl-fec.txt
-
-FREESCALE IMX / MXC FRAMEBUFFER DRIVER
-M:	Sascha Hauer <[email protected]>
-R:	Pengutronix Kernel Team <[email protected]>
-L:	[email protected]
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	include/linux/platform_data/video-imxfb.h
-F:	drivers/video/fbdev/imxfb.c
-
 FREESCALE QORIQ DPAA ETHERNET DRIVER
 M:	Madalin Bucur <[email protected]>
 L:	[email protected]
@@ -6982,6 +6998,13 @@ F:	tools/testing/selftests/futex/
 F:	tools/perf/bench/futex*
 F:	Documentation/*futex*
 
+GASKET DRIVER FRAMEWORK
+M:	Rob Springer <[email protected]>
+M:	Todd Poynor <[email protected]>
+M:	Ben Chan <[email protected]>
+S:	Maintained
+F:	drivers/staging/gasket/
+
 GCC PLUGINS
 M:	Kees Cook <[email protected]>
 R:	Emese Revfy <[email protected]>
@@ -6992,13 +7015,6 @@ F:	scripts/gcc-plugin.sh
 F:	scripts/Makefile.gcc-plugins
 F:	Documentation/core-api/gcc-plugins.rst
 
-GASKET DRIVER FRAMEWORK
-M:	Rob Springer <[email protected]>
-M:	Todd Poynor <[email protected]>
-M:	Ben Chan <[email protected]>
-S:	Maintained
-F:	drivers/staging/gasket/
-
 GCOV BASED KERNEL PROFILING
 M:	Peter Oberparleiter <[email protected]>
 S:	Maintained
@@ -7401,6 +7417,13 @@ T:	git git://linuxtv.org/anttip/media_tree.git
 S:	Maintained
 F:	drivers/media/usb/hackrf/
 
+HANTRO VPU CODEC DRIVER
+M:	Ezequiel Garcia <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/staging/media/hantro/
+F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt
+
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:	Frank Seidel <[email protected]>
 L:	[email protected]
@@ -7431,11 +7454,6 @@ F:	Documentation/admin-guide/hw_random.rst
 F:	drivers/char/hw_random/
 F:	include/linux/hw_random.h
 
-HARDWARE TRACING FACILITIES
-M:	Alexander Shishkin <[email protected]>
-S:	Maintained
-F:	drivers/hwtracing/
-
 HARDWARE SPINLOCK CORE
 M:	Ohad Ben-Cohen <[email protected]>
 M:	Bjorn Andersson <[email protected]>
@@ -7448,6 +7466,11 @@ F:	Documentation/hwspinlock.txt
 F:	drivers/hwspinlock/
 F:	include/linux/hwspinlock.h
 
+HARDWARE TRACING FACILITIES
+M:	Alexander Shishkin <[email protected]>
+S:	Maintained
+F:	drivers/hwtracing/
+
 HARMONY SOUND DRIVER
 L:	[email protected]
 S:	Maintained
@@ -7573,16 +7596,6 @@ F:	include/uapi/linux/if_hippi.h
 F:	net/802/hippi.c
 F:	drivers/net/hippi/
 
-HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
-M:	Zaibo Xu <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/crypto/hisilicon/sec2/sec_crypto.c
-F:	drivers/crypto/hisilicon/sec2/sec_main.c
-F:	drivers/crypto/hisilicon/sec2/sec_crypto.h
-F:	drivers/crypto/hisilicon/sec2/sec.h
-F:	Documentation/ABI/testing/debugfs-hisi-sec
-
 HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 M:	Zaibo Xu <[email protected]>
 L:	[email protected]
@@ -7592,6 +7605,13 @@ F:	drivers/crypto/hisilicon/hpre/hpre_main.c
 F:	drivers/crypto/hisilicon/hpre/hpre.h
 F:	Documentation/ABI/testing/debugfs-hisi-hpre
 
+HISILICON LPC BUS DRIVER
+M:	[email protected]
+W:	http://www.hisilicon.com
+S:	Maintained
+F:	drivers/bus/hisi_lpc.c
+F:	Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
+
 HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 M:	Yisen Zhuang <[email protected]>
 M:	Salil Mehta <[email protected]>
@@ -7600,18 +7620,6 @@ W:	http://www.hisilicon.com
 S:	Maintained
 F:	drivers/net/ethernet/hisilicon/hns3/
 
-HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
-M:	Zaibo Xu <[email protected]>
-S:	Maintained
-F:	drivers/char/hw_random/hisi-trng-v2.c
-
-HISILICON LPC BUS DRIVER
-M:	[email protected]
-W:	http://www.hisilicon.com
-S:	Maintained
-F:	drivers/bus/hisi_lpc.c
-F:	Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
-
 HISILICON NETWORK SUBSYSTEM DRIVER
 M:	Yisen Zhuang <[email protected]>
 M:	Salil Mehta <[email protected]>
@@ -7628,6 +7636,16 @@ S:	Supported
 F:	drivers/perf/hisilicon
 F:	Documentation/admin-guide/perf/hisi-pmu.rst
 
+HISILICON QM AND ZIP Controller DRIVER
+M:	Zhou Wang <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/crypto/hisilicon/qm.c
+F:	drivers/crypto/hisilicon/qm.h
+F:	drivers/crypto/hisilicon/sgl.c
+F:	drivers/crypto/hisilicon/zip/
+F:	Documentation/ABI/testing/debugfs-hisi-zip
+
 HISILICON ROCE DRIVER
 M:	Lijun Ou <[email protected]>
 M:	Wei Hu(Xavier) <[email protected]>
@@ -7643,22 +7661,27 @@ S:	Supported
 F:	drivers/scsi/hisi_sas/
 F:	Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
 
+HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
+M:	Zaibo Xu <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/crypto/hisilicon/sec2/sec_crypto.c
+F:	drivers/crypto/hisilicon/sec2/sec_main.c
+F:	drivers/crypto/hisilicon/sec2/sec_crypto.h
+F:	drivers/crypto/hisilicon/sec2/sec.h
+F:	Documentation/ABI/testing/debugfs-hisi-sec
+
+HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
+M:	Zaibo Xu <[email protected]>
+S:	Maintained
+F:	drivers/char/hw_random/hisi-trng-v2.c
+
 HISILICON V3XX SPI NOR FLASH Controller Driver
 M:	John Garry <[email protected]>
 W:	http://www.hisilicon.com
 S:	Maintained
 F:	drivers/spi/spi-hisi-sfc-v3xx.c
 
-HISILICON QM AND ZIP Controller DRIVER
-M:	Zhou Wang <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/crypto/hisilicon/qm.c
-F:	drivers/crypto/hisilicon/qm.h
-F:	drivers/crypto/hisilicon/sgl.c
-F:	drivers/crypto/hisilicon/zip/
-F:	Documentation/ABI/testing/debugfs-hisi-zip
-
 HMM - Heterogeneous Memory Management
 M:	Jérôme Glisse <[email protected]>
 L:	[email protected]
@@ -7970,6 +7993,18 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/i2c/i2c-stub.c
 
+I3C DRIVER FOR CADENCE I3C MASTER IP
+M:	Przemysław Gaj <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
+F:	drivers/i3c/master/i3c-master-cdns.c
+
+I3C DRIVER FOR SYNOPSYS DESIGNWARE
+M:	Vitor Soares <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
+F:	drivers/i3c/master/dw*
+
 I3C SUBSYSTEM
 M:	Boris Brezillon <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -7982,18 +8017,6 @@ F:	Documentation/driver-api/i3c
 F:	drivers/i3c/
 F:	include/linux/i3c/
 
-I3C DRIVER FOR SYNOPSYS DESIGNWARE
-M:	Vitor Soares <[email protected]>
-S:	Maintained
-F:	Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
-F:	drivers/i3c/master/dw*
-
-I3C DRIVER FOR CADENCE I3C MASTER IP
-M:	Przemysław Gaj <[email protected]>
-S:	Maintained
-F:	Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
-F:	drivers/i3c/master/i3c-master-cdns.c
-
 IA64 (Itanium) PLATFORM
 M:	Tony Luck <[email protected]>
 M:	Fenghua Yu <[email protected]>
@@ -8026,10 +8049,24 @@ F:	drivers/crypto/nx/nx.*
 F:	drivers/crypto/nx/nx_csbcpb.h
 F:	drivers/crypto/nx/nx_debugfs.c
 
+IBM Power IO DLPAR Driver for RPA-compliant PPC64 platform
+M:	Tyrel Datwyler <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Supported
+F:	drivers/pci/hotplug/rpadlpar*
+
 IBM Power Linux RAID adapter
 M:	Brian King <[email protected]>
 S:	Supported
-F:	drivers/scsi/ipr.*
+F:	drivers/scsi/ipr.*
+
+IBM Power PCI Hotplug Driver for RPA-compliant PPC64 platform
+M:	Tyrel Datwyler <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Supported
+F:	drivers/pci/hotplug/rpaphp*
 
 IBM Power SRIOV Virtual NIC Device Driver
 M:	Thomas Falcon <[email protected]>
@@ -8090,20 +8127,6 @@ F:	drivers/crypto/vmx/aes*
 F:	drivers/crypto/vmx/ghash*
 F:	drivers/crypto/vmx/ppc-xlate.pl
 
-IBM Power PCI Hotplug Driver for RPA-compliant PPC64 platform
-M:	Tyrel Datwyler <[email protected]>
-L:	[email protected]
-L:	[email protected]
-S:	Supported
-F:	drivers/pci/hotplug/rpaphp*
-
-IBM Power IO DLPAR Driver for RPA-compliant PPC64 platform
-M:	Tyrel Datwyler <[email protected]>
-L:	[email protected]
-L:	[email protected]
-S:	Supported
-F:	drivers/pci/hotplug/rpadlpar*
-
 IBM ServeRAID RAID DRIVER
 S:	Orphan
 F:	drivers/scsi/ips.*
@@ -8961,17 +8984,6 @@ S:	Supported
 W:	http://www.linux-iscsi.org
 F:	drivers/infiniband/ulp/isert
 
-ISDN/mISDN SUBSYSTEM
-M:	Karsten Keil <[email protected]>
-L:	[email protected] (subscribers-only)
-L:	[email protected]
-W:	http://www.isdn4linux.de
-S:	Maintained
-F:	drivers/isdn/mISDN/
-F:	drivers/isdn/hardware/
-F:	drivers/isdn/Kconfig
-F:	drivers/isdn/Makefile
-
 ISDN/CMTP OVER BLUETOOTH
 M:	Karsten Keil <[email protected]>
 L:	[email protected] (subscribers-only)
@@ -8984,6 +8996,17 @@ F:	net/bluetooth/cmtp/
 F:	include/linux/isdn/
 F:	include/uapi/linux/isdn/
 
+ISDN/mISDN SUBSYSTEM
+M:	Karsten Keil <[email protected]>
+L:	[email protected] (subscribers-only)
+L:	[email protected]
+W:	http://www.isdn4linux.de
+S:	Maintained
+F:	drivers/isdn/mISDN/
+F:	drivers/isdn/hardware/
+F:	drivers/isdn/Kconfig
+F:	drivers/isdn/Makefile
+
 IT87 HARDWARE MONITORING DRIVER
 M:	Jean Delvare <[email protected]>
 L:	[email protected]
@@ -9936,6 +9959,17 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/iio/dac/lltc,ltc1660.yaml
 F:	drivers/iio/dac/ltc1660.c
 
+LTC2947 HARDWARE MONITOR DRIVER
+M:	Nuno Sá <[email protected]>
+W:	http://ez.analog.com/community/linux-device-drivers
+L:	[email protected]
+S:	Supported
+F:	drivers/hwmon/ltc2947-core.c
+F:	drivers/hwmon/ltc2947-spi.c
+F:	drivers/hwmon/ltc2947-i2c.c
+F:	drivers/hwmon/ltc2947.h
+F:	Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
+
 LTC2983 IIO TEMPERATURE DRIVER
 M:	Nuno Sá <[email protected]>
 W:	http://ez.analog.com/community/linux-device-drivers
@@ -9951,17 +9985,6 @@ S:	Maintained
 F:	Documentation/hwmon/ltc4261.rst
 F:	drivers/hwmon/ltc4261.c
 
-LTC2947 HARDWARE MONITOR DRIVER
-M:	Nuno Sá <[email protected]>
-W:	http://ez.analog.com/community/linux-device-drivers
-L:	[email protected]
-S:	Supported
-F:	drivers/hwmon/ltc2947-core.c
-F:	drivers/hwmon/ltc2947-spi.c
-F:	drivers/hwmon/ltc2947-i2c.c
-F:	drivers/hwmon/ltc2947.h
-F:	Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
-
 LTC4306 I2C MULTIPLEXER DRIVER
 M:	Michael Hennerich <[email protected]>
 W:	http://ez.analog.com/community/linux-device-drivers
@@ -10072,6 +10095,14 @@ F:	include/linux/platform_data/mv88e6xxx.h
 F:	Documentation/devicetree/bindings/net/dsa/marvell.txt
 F:	Documentation/networking/devlink/mv88e6xxx.rst
 
+MARVELL ARMADA 3700 PHY DRIVERS
+M:	Miquel Raynal <[email protected]>
+S:	Maintained
+F:	drivers/phy/marvell/phy-mvebu-a3700-comphy.c
+F:	drivers/phy/marvell/phy-mvebu-a3700-utmi.c
+F:	Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
+F:	Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
+
 MARVELL ARMADA DRM SUPPORT
 M:	Russell King <[email protected]>
 S:	Maintained
@@ -10081,14 +10112,6 @@ F:	drivers/gpu/drm/armada/
 F:	include/uapi/drm/armada_drm.h
 F:	Documentation/devicetree/bindings/display/armada/
 
-MARVELL ARMADA 3700 PHY DRIVERS
-M:	Miquel Raynal <[email protected]>
-S:	Maintained
-F:	drivers/phy/marvell/phy-mvebu-a3700-comphy.c
-F:	drivers/phy/marvell/phy-mvebu-a3700-utmi.c
-F:	Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
-F:	Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
-
 MARVELL CRYPTO DRIVER
 M:	Boris Brezillon <[email protected]>
 M:	Arnaud Ebalard <[email protected]>
@@ -10159,17 +10182,14 @@ S:	Maintained
 F:	drivers/mtd/nand/raw/marvell_nand.c
 F:	Documentation/devicetree/bindings/mtd/marvell-nand.txt
 
-MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
-M:	Nicolas Pitre <[email protected]>
-S:	Odd Fixes
-F:	drivers/mmc/host/mvsdio.*
-
-MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
-M:	Hu Ziji <[email protected]>
-L:	[email protected]
+MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
+M:	Sunil Goutham <[email protected]>
+M:	Geetha sowjanya <[email protected]>
+M:	Subbaraya Sundeep <[email protected]>
+M:	hariprasad <[email protected]>
+L:	[email protected]
 S:	Supported
-F:	drivers/mmc/host/sdhci-xenon*
-F:	Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
+F:	drivers/net/ethernet/marvell/octeontx2/nic/
 
 MARVELL OCTEONTX2 RVU ADMIN FUNCTION DRIVER
 M:	Sunil Goutham <[email protected]>
@@ -10181,14 +10201,17 @@ S:	Supported
 F:	drivers/net/ethernet/marvell/octeontx2/af/
 F:	Documentation/networking/device_drivers/marvell/octeontx2.rst
 
-MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
-M:	Sunil Goutham <[email protected]>
-M:	Geetha sowjanya <[email protected]>
-M:	Subbaraya Sundeep <[email protected]>
-M:	hariprasad <[email protected]>
-L:	[email protected]
+MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
+M:	Nicolas Pitre <[email protected]>
+S:	Odd Fixes
+F:	drivers/mmc/host/mvsdio.*
+
+MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
+M:	Hu Ziji <[email protected]>
+L:	[email protected]
 S:	Supported
-F:	drivers/net/ethernet/marvell/octeontx2/nic/
+F:	drivers/mmc/host/sdhci-xenon*
+F:	Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
 
 MATROX FRAMEBUFFER DRIVER
 L:	[email protected]
@@ -10345,6 +10368,13 @@ F:	drivers/media/mc/
 F:	include/media/media-*.h
 F:	include/uapi/linux/media.h
 
+MEDIA DRIVER FOR FREESCALE IMX PXP
+M:	Philipp Zabel <[email protected]>
+L:	[email protected]
+T:	git git://linuxtv.org/media_tree.git
+S:	Maintained
+F:	drivers/media/platform/imx-pxp.[ch]
+
 MEDIA DRIVERS FOR ASCOT2E
 M:	Sergey Kozlov <[email protected]>
 M:	Abylay Ospan <[email protected]>
@@ -10401,13 +10431,6 @@ F:	drivers/staging/media/imx/
 F:	include/linux/imx-media.h
 F:	include/media/imx.h
 
-MEDIA DRIVER FOR FREESCALE IMX PXP
-M:	Philipp Zabel <[email protected]>
-L:	[email protected]
-T:	git git://linuxtv.org/media_tree.git
-S:	Maintained
-F:	drivers/media/platform/imx-pxp.[ch]
-
 MEDIA DRIVERS FOR FREESCALE IMX7
 M:	Rui Miguel Silva <[email protected]>
 L:	[email protected]
@@ -10465,6 +10488,15 @@ T:	git git://linuxtv.org/media_tree.git
 S:	Supported
 F:	drivers/media/pci/netup_unidvb/*
 
+MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
+M:	Dmitry Osipenko <[email protected]>
+L:	[email protected]
+L:	[email protected]
+T:	git git://linuxtv.org/media_tree.git
+S:	Maintained
+F:	Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
+F:	drivers/staging/media/tegra-vde/
+
 MEDIA DRIVERS FOR RENESAS - CEU
 M:	Jacopo Mondi <[email protected]>
 L:	[email protected]
@@ -10545,15 +10577,6 @@ S:	Supported
 F:	Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 F:	drivers/media/platform/stm32/stm32-dcmi.c
 
-MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
-M:	Dmitry Osipenko <[email protected]>
-L:	[email protected]
-L:	[email protected]
-T:	git git://linuxtv.org/media_tree.git
-S:	Maintained
-F:	Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
-F:	drivers/staging/media/tegra-vde/
-
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
@@ -10583,6 +10606,13 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/net/mediatek-bluetooth.txt
 F:	drivers/bluetooth/btmtkuart.c
 
+MEDIATEK BOARD LEVEL SHUTDOWN DRIVERS
+M:	Sean Wang <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/power/reset/mt6323-poweroff.txt
+F:	drivers/power/reset/mt6323-poweroff.c
+
 MEDIATEK CIR DRIVER
 M:	Sean Wang <[email protected]>
 S:	Maintained
@@ -10597,12 +10627,6 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/dma/mtk-*
 F:	drivers/dma/mediatek/
 
-MEDIATEK PMIC LED DRIVER
-M:	Sean Wang <[email protected]>
-S:	Maintained
-F:	drivers/leds/leds-mt6323.c
-F:	Documentation/devicetree/bindings/leds/leds-mt6323.txt
-
 MEDIATEK ETHERNET DRIVER
 M:	Felix Fietkau <[email protected]>
 M:	John Crispin <[email protected]>
@@ -10612,20 +10636,6 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/net/ethernet/mediatek/
 
-MEDIATEK SWITCH DRIVER
-M:	Sean Wang <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/net/dsa/mt7530.*
-F:	net/dsa/tag_mtk.c
-
-MEDIATEK BOARD LEVEL SHUTDOWN DRIVERS
-M:	Sean Wang <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	Documentation/devicetree/bindings/power/reset/mt6323-poweroff.txt
-F:	drivers/power/reset/mt6323-poweroff.c
-
 MEDIATEK JPEG DRIVER
 M:	Rick Chang <[email protected]>
 M:	Bin Liu <[email protected]>
@@ -10686,11 +10696,24 @@ S:	Maintained
 F:	drivers/mtd/nand/raw/mtk_*
 F:	Documentation/devicetree/bindings/mtd/mtk-nand.txt
 
+MEDIATEK PMIC LED DRIVER
+M:	Sean Wang <[email protected]>
+S:	Maintained
+F:	drivers/leds/leds-mt6323.c
+F:	Documentation/devicetree/bindings/leds/leds-mt6323.txt
+
 MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 M:	Sean Wang <[email protected]>
 S:	Maintained
 F:	drivers/char/hw_random/mtk-rng.c
 
+MEDIATEK SWITCH DRIVER
+M:	Sean Wang <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/dsa/mt7530.*
+F:	net/dsa/tag_mtk.c
+
 MEDIATEK USB3 DRD IP DRIVER
 M:	Chunfeng Yun <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -10981,6 +11004,21 @@ F:	drivers/tty/serial/atmel_serial.c
 F:	drivers/tty/serial/atmel_serial.h
 F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt
 
+MICROCHIP AT91 USART MFD DRIVER
+M:	Radu Pirea <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/mfd/at91-usart.c
+F:	include/dt-bindings/mfd/at91-usart.h
+F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt
+
+MICROCHIP AT91 USART SPI DRIVER
+M:	Radu Pirea <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/spi/spi-at91-usart.c
+F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt
+
 MICROCHIP AUDIO ASOC DRIVERS
 M:	Codrin Ciubotariu <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -11029,21 +11067,6 @@ S:	Supported
 F:	drivers/media/platform/atmel/atmel-isi.c
 F:	drivers/media/platform/atmel/atmel-isi.h
 
-MICROCHIP AT91 USART MFD DRIVER
-M:	Radu Pirea <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/mfd/at91-usart.c
-F:	include/dt-bindings/mfd/at91-usart.h
-F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt
-
-MICROCHIP AT91 USART SPI DRIVER
-M:	Radu Pirea <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/spi/spi-at91-usart.c
-F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt
-
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 M:	Woojung Huh <[email protected]>
 M:	Microchip Linux Driver Support <[email protected]>
@@ -11068,11 +11091,6 @@ S:	Maintained
 F:	drivers/video/fbdev/atmel_lcdfb.c
 F:	include/video/atmel_lcdc.h
 
-MICROCHIP MMC/SD/SDIO MCI DRIVER
-M:	Ludovic Desroches <[email protected]>
-S:	Maintained
-F:	drivers/mmc/host/atmel-mci.c
-
 MICROCHIP MCP16502 PMIC DRIVER
 M:	Andrei Stefanescu <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -11088,6 +11106,11 @@ S:	Supported
 F:	drivers/iio/adc/mcp3911.c
 F:	Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml
 
+MICROCHIP MMC/SD/SDIO MCI DRIVER
+M:	Ludovic Desroches <[email protected]>
+S:	Maintained
+F:	drivers/mmc/host/atmel-mci.c
+
 MICROCHIP NAND DRIVER
 M:	Tudor Ambarus <[email protected]>
 L:	[email protected]
@@ -11129,12 +11152,6 @@ S:	Supported
 F:	drivers/misc/atmel-ssc.c
 F:	include/linux/atmel-ssc.h
 
-MICROCHIP USBA UDC DRIVER
-M:	Cristian Birsan <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Supported
-F:	drivers/usb/gadget/udc/atmel_usba_udc.*
-
 MICROCHIP USB251XB DRIVER
 M:	Richard Leitner <[email protected]>
 L:	[email protected]
@@ -11142,6 +11159,12 @@ S:	Maintained
 F:	drivers/usb/misc/usb251xb.c
 F:	Documentation/devicetree/bindings/usb/usb251xb.txt
 
+MICROCHIP USBA UDC DRIVER
+M:	Cristian Birsan <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Supported
+F:	drivers/usb/gadget/udc/atmel_usba_udc.*
+
 MICROCHIP XDMA DRIVER
 M:	Ludovic Desroches <[email protected]>
 L:	[email protected]
@@ -11149,6 +11172,14 @@ L:	[email protected]
 S:	Supported
 F:	drivers/dma/at_xdmac.c
 
+MICROSEMI ETHERNET SWITCH DRIVER
+M:	Alexandre Belloni <[email protected]>
+M:	Microchip Linux Driver Support <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/net/ethernet/mscc/
+F:	include/soc/mscc/ocelot*
+
 MICROSEMI MIPS SOCS
 M:	Alexandre Belloni <[email protected]>
 M:	Microchip Linux Driver Support <[email protected]>
@@ -11171,14 +11202,6 @@ F:	include/linux/cciss*.h
 F:	include/uapi/linux/cciss*.h
 F:	Documentation/scsi/smartpqi.txt
 
-MICROSEMI ETHERNET SWITCH DRIVER
-M:	Alexandre Belloni <[email protected]>
-M:	Microchip Linux Driver Support <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/net/ethernet/mscc/
-F:	include/soc/mscc/ocelot*
-
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:	Chen Yu <[email protected]>
 L:	[email protected]
@@ -11220,6 +11243,13 @@ F:	Documentation/devicetree/bindings/power/mti,mips-cpc.txt
 F:	arch/mips/generic/
 F:	arch/mips/tools/generic-board-config.sh
 
+MIPS RINT INSTRUCTION EMULATION
+M:	Aleksandar Markovic <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	arch/mips/math-emu/sp_rint.c
+F:	arch/mips/math-emu/dp_rint.c
+
 MIPS/LOONGSON1 ARCHITECTURE
 M:	Keguang Zhang <[email protected]>
 L:	[email protected]
@@ -11249,13 +11279,6 @@ F:	drivers/platform/mips/cpu_hwmon.c
 F:	drivers/*/*loongson3*
 F:	drivers/*/*/*loongson3*
 
-MIPS RINT INSTRUCTION EMULATION
-M:	Aleksandar Markovic <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	arch/mips/math-emu/sp_rint.c
-F:	arch/mips/math-emu/dp_rint.c
-
 MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
 M:	Hans Verkuil <[email protected]>
 L:	[email protected]
@@ -11318,6 +11341,14 @@ S:	Maintained
 F:	include/linux/module.h
 F:	kernel/module.c
 
+MONOLITHIC POWER SYSTEM PMIC DRIVER
+M:	Saravanan Sekar <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/regulator/mps,mp*.yaml
+F:	drivers/regulator/mp5416.c
+F:	drivers/regulator/mpq7920.c
+F:	drivers/regulator/mpq7920.h
+
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 W:	http://popies.net/meye/
 S:	Orphan
@@ -11331,14 +11362,6 @@ S:	Maintained
 F:	Documentation/driver-api/serial/moxa-smartio.rst
 F:	drivers/tty/mxser.*
 
-MONOLITHIC POWER SYSTEM PMIC DRIVER
-M:	Saravanan Sekar <[email protected]>
-S:	Maintained
-F:	Documentation/devicetree/bindings/regulator/mps,mp*.yaml
-F:	drivers/regulator/mp5416.c
-F:	drivers/regulator/mpq7920.c
-F:	drivers/regulator/mpq7920.h
-
 MR800 AVERMEDIA USB FM RADIO DRIVER
 M:	Alexey Klimov <[email protected]>
 L:	[email protected]
@@ -11572,13 +11595,10 @@ S:	Maintained
 F:	Documentation/hwmon/nct6775.rst
 F:	drivers/hwmon/nct6775.c
 
-NET_FAILOVER MODULE
-M:	Sridhar Samudrala <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/net/net_failover.c
-F:	include/net/net_failover.h
-F:	Documentation/networking/net_failover.rst
+NETDEVSIM
+M:	Jakub Kicinski <[email protected]>
+S:	Maintained
+F:	drivers/net/netdevsim/*
 
 NETEM NETWORK EMULATOR
 M:	Stephen Hemminger <[email protected]>
@@ -11811,11 +11831,6 @@ NETWORKING [WIRELESS]
 L:	[email protected]
 Q:	http://patchwork.kernel.org/project/linux-wireless/list/
 
-NETDEVSIM
-M:	Jakub Kicinski <[email protected]>
-S:	Maintained
-F:	drivers/net/netdevsim/*
-
 NETXEN (1/10) GbE SUPPORT
 M:	Manish Chopra <[email protected]>
 M:	Rahul Verma <[email protected]>
@@ -11824,6 +11839,14 @@ L:	[email protected]
 S:	Supported
 F:	drivers/net/ethernet/qlogic/netxen/
 
+NET_FAILOVER MODULE
+M:	Sridhar Samudrala <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/net/net_failover.c
+F:	include/net/net_failover.h
+F:	Documentation/networking/net_failover.rst
+
 NEXTHOP
 M:	David Ahern <[email protected]>
 L:	[email protected]
@@ -12037,6 +12060,14 @@ F:	Documentation/ABI/stable/sysfs-bus-nvmem
 F:	include/linux/nvmem-consumer.h
 F:	include/linux/nvmem-provider.h
 
+NXP FSPI DRIVER
+R:	Yogesh Gaur <[email protected]>
+M:	Ashish Kumar <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/spi/spi-nxp-fspi.c
+F:	Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
+
 NXP FXAS21002C DRIVER
 M:	Rui Miguel Silva <[email protected]>
 L:	[email protected]
@@ -12092,14 +12123,6 @@ F:	lib/objagg.c
 F:	lib/test_objagg.c
 F:	include/linux/objagg.h
 
-NXP FSPI DRIVER
-R:	Yogesh Gaur <[email protected]>
-M:	Ashish Kumar <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/spi/spi-nxp-fspi.c
-F:	Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
-
 OBJTOOL
 M:	Josh Poimboeuf <[email protected]>
 M:	Peter Zijlstra <[email protected]>
@@ -12312,12 +12335,6 @@ F:	drivers/regulator/twl6030-regulator.c
 F:	include/linux/platform_data/i2c-omap.h
 F:	include/linux/platform_data/ti-sysc.h
 
-ONION OMEGA2+ BOARD
-M:	Harvey Hunt <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	arch/mips/boot/dts/ralink/omega2p.dts
-
 OMFS FILESYSTEM
 M:	Bob Copeland <[email protected]>
 L:	[email protected]
@@ -12420,12 +12437,6 @@ S:	Maintained
 F:	drivers/media/i2c/ov7740.c
 F:	Documentation/devicetree/bindings/media/i2c/ov7740.txt
 
-OMNIVISION OV9640 SENSOR DRIVER
-M:	Petr Cvek <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/media/i2c/ov9640.*
-
 OMNIVISION OV8856 SENSOR DRIVER
 M:	Ben Kao <[email protected]>
 L:	[email protected]
@@ -12433,6 +12444,12 @@ T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	drivers/media/i2c/ov8856.c
 
+OMNIVISION OV9640 SENSOR DRIVER
+M:	Petr Cvek <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/media/i2c/ov9640.*
+
 OMNIVISION OV9650 SENSOR DRIVER
 M:	Sakari Ailus <[email protected]>
 R:	Akinobu Mita <[email protected]>
@@ -12450,6 +12467,12 @@ S:	Maintained
 F:	drivers/mtd/nand/onenand/
 F:	include/linux/mtd/onenand*.h
 
+ONION OMEGA2+ BOARD
+M:	Harvey Hunt <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	arch/mips/boot/dts/ralink/omega2p.dts
+
 OP-TEE DRIVER
 M:	Jens Wiklander <[email protected]>
 L:	[email protected]
@@ -12926,6 +12949,13 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	drivers/pci/controller/dwc/pci-keystone.c
 
+PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
+M:	Linus Walleij <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
+F:	drivers/pci/controller/pci-v3-semi.c
+
 PCI ENDPOINT SUBSYSTEM
 M:	Kishon Vijay Abraham I <[email protected]>
 M:	Lorenzo Pieralisi <[email protected]>
@@ -12973,6 +13003,15 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
 F:	drivers/pci/controller/pci-xgene-msi.c
 
+PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
+M:	Lorenzo Pieralisi <[email protected]>
+R:	Andrew Murray <[email protected]>
+L:	[email protected]
+Q:	http://patchwork.ozlabs.org/project/linux-pci/list/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
+S:	Supported
+F:	drivers/pci/controller/
+
 PCI SUBSYSTEM
 M:	Bjorn Helgaas <[email protected]>
 L:	[email protected]
@@ -12992,15 +13031,6 @@ F:	arch/x86/pci/
 F:	arch/x86/kernel/quirks.c
 F:	arch/x86/kernel/early-quirks.c
 
-PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
-M:	Lorenzo Pieralisi <[email protected]>
-R:	Andrew Murray <[email protected]>
-L:	[email protected]
-Q:	http://patchwork.ozlabs.org/project/linux-pci/list/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
-S:	Supported
-F:	drivers/pci/controller/
-
 PCIE DRIVER FOR AMAZON ANNAPURNA LABS
 M:	Jonathan Chocron <[email protected]>
 L:	[email protected]
@@ -13075,13 +13105,6 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/pci/rockchip-pcie*
 F:	drivers/pci/controller/pcie-rockchip*
 
-PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
-M:	Linus Walleij <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
-F:	drivers/pci/controller/pci-v3-semi.c
-
 PCIE DRIVER FOR SOCIONEXT UNIPHIER
 M:	Kunihiko Hayashi <[email protected]>
 L:	[email protected]
@@ -13191,12 +13214,6 @@ S:	Maintained
 F:	Documentation/input/devices/pxrc.rst
 F:	drivers/input/joystick/pxrc.c
 
-FLYSKY FSIA6B RC RECEIVER
-M:	Markus Koch <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/input/joystick/fsia6b.c
-
 PHONET PROTOCOL
 M:	Remi Denis-Courmont <[email protected]>
 S:	Supported
@@ -13363,6 +13380,15 @@ M:	Logan Gunthorpe <[email protected]>
 S:	Maintained
 F:	drivers/dma/plx_dma.c
 
+PM-GRAPH UTILITY
+M:	"Todd E Brandt" <[email protected]>
+L:	[email protected]
+W:	https://01.org/pm-graph
+B:	https://bugzilla.kernel.org/buglist.cgi?component=pm-graph&product=Tools
+T:	git git://github.com/intel/pm-graph
+S:	Supported
+F:	tools/power/pm-graph
+
 PMBUS HARDWARE MONITORING DRIVERS
 M:	Guenter Roeck <[email protected]>
 L:	[email protected]
@@ -13405,15 +13431,6 @@ L:	[email protected]
 S:	Supported
 F:	drivers/scsi/pm8001/
 
-PM-GRAPH UTILITY
-M:	"Todd E Brandt" <[email protected]>
-L:	[email protected]
-W:	https://01.org/pm-graph
-B:	https://bugzilla.kernel.org/buglist.cgi?component=pm-graph&product=Tools
-T:	git git://github.com/intel/pm-graph
-S:	Supported
-F:	tools/power/pm-graph
-
 PNI RM3100 IIO DRIVER
 M:	Song Qiang <[email protected]>
 L:	[email protected]
@@ -13893,13 +13910,6 @@ F:	Documentation/devicetree/bindings/media/qcom,camss.txt
 F:	Documentation/media/v4l-drivers/qcom_camss.rst
 F:	drivers/media/platform/qcom/camss/
 
-QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
-M:	Ilia Lin <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
-F:	drivers/cpufreq/qcom-cpufreq-nvmem.c
-
 QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
 M:	Niklas Cassel <[email protected]>
 L:	[email protected]
@@ -13908,6 +13918,13 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
 F:	drivers/power/avs/qcom-cpr.c
 
+QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
+M:	Ilia Lin <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
+F:	drivers/cpufreq/qcom-cpufreq-nvmem.c
+
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 M:	Timur Tabi <[email protected]>
 L:	[email protected]
@@ -14103,6 +14120,11 @@ L:	[email protected]
 S:	Orphan
 F:	drivers/net/wireless/ray*
 
+RCMM REMOTE CONTROLS DECODER
+M:	Patrick Lerda <[email protected]>
+S:	Maintained
+F:	drivers/media/rc/ir-rcmm-decoder.c
+
 RCUTORTURE TEST FRAMEWORK
 M:	"Paul E. McKenney" <[email protected]>
 M:	Josh Triplett <[email protected]>
@@ -14198,6 +14220,20 @@ F:	Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 F:	drivers/net/dsa/realtek-smi*
 F:	drivers/net/dsa/rtl83*
 
+REALTEK WIRELESS DRIVER (rtlwifi family)
+M:	Ping-Ke Shih <[email protected]>
+L:	[email protected]
+W:	http://wireless.kernel.org/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:	Maintained
+F:	drivers/net/wireless/realtek/rtlwifi/
+
+REALTEK WIRELESS DRIVER (rtw88)
+M:	Yan-Hsuan Chuang <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/wireless/realtek/rtw88/
+
 REDPINE WIRELESS DRIVER
 M:	Amitkumar Karwar <[email protected]>
 M:	Siva Rebbagondla <[email protected]>
@@ -14387,13 +14423,6 @@ S:	Maintained
 F:	drivers/media/platform/rockchip/rga/
 F:	Documentation/devicetree/bindings/media/rockchip-rga.txt
 
-HANTRO VPU CODEC DRIVER
-M:	Ezequiel Garcia <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/staging/media/hantro/
-F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt
-
 ROCKER DRIVER
 M:	Jiri Pirko <[email protected]>
 L:	[email protected]
@@ -14493,20 +14522,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g
 S:	Maintained
 F:	drivers/net/wireless/realtek/rtl818x/rtl8187/
 
-REALTEK WIRELESS DRIVER (rtlwifi family)
-M:	Ping-Ke Shih <[email protected]>
-L:	[email protected]
-W:	http://wireless.kernel.org/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
-S:	Maintained
-F:	drivers/net/wireless/realtek/rtlwifi/
-
-REALTEK WIRELESS DRIVER (rtw88)
-M:	Yan-Hsuan Chuang <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/net/wireless/realtek/rtw88/
-
 RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 M:	Jes Sorensen <[email protected]>
 L:	[email protected]
@@ -14596,6 +14611,18 @@ S:	Supported
 F:	arch/s390/pci/
 F:	drivers/pci/hotplug/s390_pci_hpc.c
 
+S390 VFIO AP DRIVER
+M:	Tony Krowiak <[email protected]>
+M:	Pierre Morel <[email protected]>
+M:	Halil Pasic <[email protected]>
+L:	[email protected]
+W:	http://www.ibm.com/developerworks/linux/linux390/
+S:	Supported
+F:	drivers/s390/crypto/vfio_ap_drv.c
+F:	drivers/s390/crypto/vfio_ap_private.h
+F:	drivers/s390/crypto/vfio_ap_ops.c
+F:	Documentation/s390/vfio-ap.rst
+
 S390 VFIO-CCW DRIVER
 M:	Cornelia Huck <[email protected]>
 M:	Eric Farman <[email protected]>
@@ -14614,18 +14641,6 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:	Supported
 F:	drivers/s390/crypto/
 
-S390 VFIO AP DRIVER
-M:	Tony Krowiak <[email protected]>
-M:	Pierre Morel <[email protected]>
-M:	Halil Pasic <[email protected]>
-L:	[email protected]
-W:	http://www.ibm.com/developerworks/linux/linux390/
-S:	Supported
-F:	drivers/s390/crypto/vfio_ap_drv.c
-F:	drivers/s390/crypto/vfio_ap_private.h
-F:	drivers/s390/crypto/vfio_ap_ops.c
-F:	Documentation/s390/vfio-ap.rst
-
 S390 ZFCP DRIVER
 M:	Steffen Maier <[email protected]>
 M:	Benjamin Block <[email protected]>
@@ -14993,21 +15008,6 @@ S:	Maintained
 F:	drivers/mmc/host/sdhci*
 F:	include/linux/mmc/sdhci*
 
-EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
-M:	Adrian Hunter <[email protected]>
-M:	Ritesh Harjani <[email protected]>
-M:	Asutosh Das <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/mmc/host/cqhci*
-
-SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
-M:	Prabu Thangamuthu <[email protected]>
-M:	Manjunath M B <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/mmc/host/sdhci-pci-dwc-mshc.c
-
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 M:	Ludovic Desroches <[email protected]>
 L:	[email protected]
@@ -15106,6 +15106,14 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/media/rc/serial_ir.c
 
+SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
+M:	Srinivas Kandagatla <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	drivers/slimbus/
+F:	Documentation/devicetree/bindings/slimbus/
+F:	include/linux/slimbus.h
+
 SFC NETWORK DRIVER
 M:	Solarflare linux maintainers <[email protected]>
 M:	Edward Cree <[email protected]>
@@ -15251,12 +15259,6 @@ F:	drivers/media/usb/siano/
 F:	drivers/media/usb/siano/
 F:	drivers/media/mmc/siano/
 
-SIFIVE PDMA DRIVER
-M:	Green Wan <[email protected]>
-S:	Maintained
-F:	drivers/dma/sf-pdma/
-F:	Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
-
 SIFIVE DRIVERS
 M:	Palmer Dabbelt <[email protected]>
 M:	Paul Walmsley <[email protected]>
@@ -15275,6 +15277,12 @@ S:	Supported
 K:	fu540
 N:	fu540
 
+SIFIVE PDMA DRIVER
+M:	Green Wan <[email protected]>
+S:	Maintained
+F:	drivers/dma/sf-pdma/
+F:	Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
+
 SILEAD TOUCHSCREEN DRIVER
 M:	Hans de Goede <[email protected]>
 L:	[email protected]
@@ -15327,13 +15335,6 @@ F:	arch/arm/mach-s3c24xx/mach-bast.c
 F:	arch/arm/mach-s3c24xx/bast-ide.c
 F:	arch/arm/mach-s3c24xx/bast-irq.c
 
-SIPHASH PRF ROUTINES
-M:	Jason A. Donenfeld <[email protected]>
-S:	Maintained
-F:	lib/siphash.c
-F:	lib/test_siphash.c
-F:	include/linux/siphash.h
-
 SIOX
 M:	Thorsten Scherer <[email protected]>
 M:	Uwe Kleine-König <[email protected]>
@@ -15343,6 +15344,13 @@ F:	drivers/siox/*
 F:	drivers/gpio/gpio-siox.c
 F:	include/trace/events/siox.h
 
+SIPHASH PRF ROUTINES
+M:	Jason A. Donenfeld <[email protected]>
+S:	Maintained
+F:	lib/siphash.c
+F:	lib/test_siphash.c
+F:	include/linux/siphash.h
+
 SIS 190 ETHERNET DRIVER
 M:	Francois Romieu <[email protected]>
 L:	[email protected]
@@ -15394,14 +15402,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 F:	include/linux/srcu*.h
 F:	kernel/rcu/srcu*.c
 
-SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
-M:	Srinivas Kandagatla <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	drivers/slimbus/
-F:	Documentation/devicetree/bindings/slimbus/
-F:	include/linux/slimbus.h
-
 SMACK SECURITY MODULE
 M:	Casey Schaufler <[email protected]>
 L:	[email protected]
@@ -15481,6 +15481,29 @@ S:	Orphan
 F:	include/media/soc_camera.h
 F:	drivers/staging/media/soc_camera/
 
+SOCIONEXT (SNI) AVE NETWORK DRIVER
+M:	Kunihiko Hayashi <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/ethernet/socionext/sni_ave.c
+F:	Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
+
+SOCIONEXT (SNI) NETSEC NETWORK DRIVER
+M:	Jassi Brar <[email protected]>
+M:	Ilias Apalodimas <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/ethernet/socionext/netsec.c
+F:	Documentation/devicetree/bindings/net/socionext-netsec.txt
+
+SOCIONEXT (SNI) Synquacer SPI DRIVER
+M:	Masahisa Kojima <[email protected]>
+M:	Jassi Brar <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/spi/spi-synquacer.c
+F:	Documentation/devicetree/bindings/spi/spi-synquacer.txt
+
 SOCIONEXT SYNQUACER I2C DRIVER
 M:	Ard Biesheuvel <[email protected]>
 L:	[email protected]
@@ -15545,29 +15568,6 @@ F:	drivers/md/raid*
 F:	include/linux/raid/
 F:	include/uapi/linux/raid/
 
-SOCIONEXT (SNI) AVE NETWORK DRIVER
-M:	Kunihiko Hayashi <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/net/ethernet/socionext/sni_ave.c
-F:	Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
-
-SOCIONEXT (SNI) NETSEC NETWORK DRIVER
-M:	Jassi Brar <[email protected]>
-M:	Ilias Apalodimas <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/net/ethernet/socionext/netsec.c
-F:	Documentation/devicetree/bindings/net/socionext-netsec.txt
-
-SOCIONEXT (SNI) Synquacer SPI DRIVER
-M:	Masahisa Kojima <[email protected]>
-M:	Jassi Brar <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/spi/spi-synquacer.c
-F:	Documentation/devicetree/bindings/spi/spi-synquacer.txt
-
 SOLIDRUN CLEARFOG SUPPORT
 M:	Russell King <[email protected]>
 S:	Maintained
@@ -15915,16 +15915,24 @@ W:	http://wiki.laptop.org/go/DCON
 S:	Maintained
 F:	drivers/staging/olpc_dcon/
 
+STAGING - REALTEK RTL8188EU DRIVERS
+M:	Larry Finger <[email protected]>
+S:	Odd Fixes
+F:	drivers/staging/rtl8188eu/
+
 STAGING - REALTEK RTL8712U DRIVERS
 M:	Larry Finger <[email protected]>
 M:	Florian Schilhabel <[email protected]>.
 S:	Odd Fixes
 F:	drivers/staging/rtl8712/
 
-STAGING - REALTEK RTL8188EU DRIVERS
-M:	Larry Finger <[email protected]>
-S:	Odd Fixes
-F:	drivers/staging/rtl8188eu/
+STAGING - SEPS525 LCD CONTROLLER DRIVERS
+M:	Michael Hennerich <[email protected]>
+M:	Beniamin Bia <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/staging/fbtft/fb_seps525.c
+F:	Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
 
 STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
 M:	Sudip Mukherjee <[email protected]>
@@ -15956,14 +15964,6 @@ L:	[email protected]
 S:	Supported
 F:	drivers/staging/wilc1000/
 
-STAGING - SEPS525 LCD CONTROLLER DRIVERS
-M:	Michael Hennerich <[email protected]>
-M:	Beniamin Bia <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/staging/fbtft/fb_seps525.c
-F:	Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
-
 STAGING SUBSYSTEM
 M:	Greg Kroah-Hartman <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@ -16030,15 +16030,6 @@ S:	Supported
 F:	Documentation/networking/device_drivers/stmicro/
 F:	drivers/net/ethernet/stmicro/stmmac/
 
-EXTRA BOOT CONFIG
-M:	Masami Hiramatsu <[email protected]>
-S:	Maintained
-F:	lib/bootconfig.c
-F:	fs/proc/bootconfig.c
-F:	include/linux/bootconfig.h
-F:	tools/bootconfig/*
-F:	Documentation/admin-guide/bootconfig.rst
-
 SUN3/3X
 M:	Sam Creasey <[email protected]>
 W:	http://sammy.net/sun3/
@@ -16230,6 +16221,13 @@ F:	drivers/reset/reset-hsdk.c
 F:	include/dt-bindings/reset/snps,hsdk-reset.h
 F:	Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
 
+SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
+M:	Prabu Thangamuthu <[email protected]>
+M:	Manjunath M B <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/mmc/host/sdhci-pci-dwc-mshc.c
+
 SYSTEM CONFIGURATION (SYSCON)
 M:	Lee Jones <[email protected]>
 M:	Arnd Bergmann <[email protected]>
@@ -16543,6 +16541,13 @@ M:	Mark Gross <[email protected]>
 S:	Supported
 F:	drivers/char/tlclk.c
 
+TEMPO SEMICONDUCTOR DRIVERS
+M:	Steven Eckhoff <[email protected]>
+S:	Maintained
+F:	sound/soc/codecs/tscs*.c
+F:	sound/soc/codecs/tscs*.h
+F:	Documentation/devicetree/bindings/sound/tscs*.txt
+
 TENSILICA XTENSA PORT (xtensa)
 M:	Chris Zankel <[email protected]>
 M:	Max Filippov <[email protected]>
@@ -16552,6 +16557,19 @@ S:	Maintained
 F:	arch/xtensa/
 F:	drivers/irqchip/irq-xtensa-*
 
+Texas Instruments ASoC drivers
+M:	Peter Ujfalusi <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	sound/soc/ti/
+
+Texas Instruments' DAC7612 DAC Driver
+M:	Ricardo Ribalda <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	drivers/iio/dac/ti-dac7612.c
+F:	Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
+
 Texas Instruments' System Control Interface (TISCI) Protocol Driver
 M:	Nishanth Menon <[email protected]>
 M:	Tero Kristo <[email protected]>
@@ -16575,19 +16593,6 @@ F:	drivers/irqchip/irq-ti-sci-inta.c
 F:	include/linux/soc/ti/ti_sci_inta_msi.h
 F:	drivers/soc/ti/ti_sci_inta_msi.c
 
-Texas Instruments ASoC drivers
-M:	Peter Ujfalusi <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	sound/soc/ti/
-
-Texas Instruments' DAC7612 DAC Driver
-M:	Ricardo Ribalda <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	drivers/iio/dac/ti-dac7612.c
-F:	Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
-
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:	Hans Verkuil <[email protected]>
 L:	[email protected]
@@ -16610,6 +16615,15 @@ F:	include/uapi/linux/thermal.h
 F:	include/linux/cpu_cooling.h
 F:	Documentation/devicetree/bindings/thermal/
 
+THERMAL DRIVER FOR AMLOGIC SOCS
+M:	Guillaume La Roque <[email protected]>
+L:	[email protected]
+L:	[email protected]
+W:	http://linux-meson.com/
+S:	Supported
+F:	drivers/thermal/amlogic_thermal.c
+F:	Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
+
 THERMAL/CPU_COOLING
 M:	Amit Daniel Kachhap <[email protected]>
 M:	Daniel Lezcano <[email protected]>
@@ -16623,15 +16637,6 @@ F:	drivers/thermal/cpufreq_cooling.c
 F:	drivers/thermal/cpuidle_cooling.c
 F:	include/linux/cpu_cooling.h
 
-THERMAL DRIVER FOR AMLOGIC SOCS
-M:	Guillaume La Roque <[email protected]>
-L:	[email protected]
-L:	[email protected]
-W:	http://linux-meson.com/
-S:	Supported
-F:	drivers/thermal/amlogic_thermal.c
-F:	Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
-
 THINKPAD ACPI EXTRAS DRIVER
 M:	Henrique de Moraes Holschuh <[email protected]>
 L:	[email protected]
@@ -17047,13 +17052,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:	Maintained
 K:	^Subject:.*(?i)trivial
 
-TEMPO SEMICONDUCTOR DRIVERS
-M:	Steven Eckhoff <[email protected]>
-S:	Maintained
-F:	sound/soc/codecs/tscs*.c
-F:	sound/soc/codecs/tscs*.h
-F:	Documentation/devicetree/bindings/sound/tscs*.txt
-
 TTY LAYER
 M:	Greg Kroah-Hartman <[email protected]>
 M:	Jiri Slaby <[email protected]>
@@ -17642,6 +17640,13 @@ S:	Maintained
 F:	Documentation/fb/uvesafb.rst
 F:	drivers/video/fbdev/uvesafb.*
 
+Ux500 CLOCK DRIVERS
+M:	Ulf Hansson <[email protected]>
+L:	[email protected]
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	drivers/clk/ux500/
+
 VF610 NAND DRIVER
 M:	Stefan Agner <[email protected]>
 L:	[email protected]
@@ -17721,18 +17726,18 @@ W:	https://linuxtv.org
 S:	Maintained
 F:	drivers/media/platform/vicodec/*
 
-VIDEO MULTIPLEXER DRIVER
-M:	Philipp Zabel <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/media/platform/video-mux.c
-
 VIDEO I2C POLLING DRIVER
 M:	Matt Ranostay <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/media/i2c/video-i2c.c
 
+VIDEO MULTIPLEXER DRIVER
+M:	Philipp Zabel <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/media/platform/video-mux.c
+
 VIDEOBUF2 FRAMEWORK
 M:	Pawel Osciak <[email protected]>
 M:	Marek Szyprowski <[email protected]>
@@ -17779,6 +17784,19 @@ F:	drivers/net/vsockmon.c
 F:	drivers/vhost/vsock.c
 F:	tools/testing/vsock/
 
+VIRTIO BLOCK AND SCSI DRIVERS
+M:	"Michael S. Tsirkin" <[email protected]>
+M:	Jason Wang <[email protected]>
+R:	Paolo Bonzini <[email protected]>
+R:	Stefan Hajnoczi <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/block/virtio_blk.c
+F:	drivers/scsi/virtio_scsi.c
+F:	include/uapi/linux/virtio_blk.h
+F:	include/uapi/linux/virtio_scsi.h
+F:	drivers/vhost/scsi.c
+
 VIRTIO CONSOLE DRIVER
 M:	Amit Shah <[email protected]>
 L:	[email protected]
@@ -17802,19 +17820,6 @@ F:	include/uapi/linux/virtio_*.h
 F:	drivers/crypto/virtio/
 F:	mm/balloon_compaction.c
 
-VIRTIO BLOCK AND SCSI DRIVERS
-M:	"Michael S. Tsirkin" <[email protected]>
-M:	Jason Wang <[email protected]>
-R:	Paolo Bonzini <[email protected]>
-R:	Stefan Hajnoczi <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/block/virtio_blk.c
-F:	drivers/scsi/virtio_scsi.c
-F:	include/uapi/linux/virtio_blk.h
-F:	include/uapi/linux/virtio_scsi.h
-F:	drivers/vhost/scsi.c
-
 VIRTIO CRYPTO DRIVER
 M:	Gonglei <[email protected]>
 L:	[email protected]
@@ -18134,11 +18139,6 @@ M:	David Härdeman <[email protected]>
 S:	Maintained
 F:	drivers/media/rc/winbond-cir.c
 
-RCMM REMOTE CONTROLS DECODER
-M:	Patrick Lerda <[email protected]>
-S:	Maintained
-F:	drivers/media/rc/ir-rcmm-decoder.c
-
 WINSYSTEMS EBC-C384 WATCHDOG DRIVER
 M:	William Breathitt Gray <[email protected]>
 L:	[email protected]
@@ -18422,6 +18422,13 @@ F:	drivers/scsi/xen-scsifront.c
 F:	drivers/xen/xen-scsiback.c
 F:	include/xen/interface/io/vscsiif.h
 
+XEN SOUND FRONTEND DRIVER
+M:	Oleksandr Andrushchenko <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+L:	[email protected] (moderated for non-subscribers)
+S:	Supported
+F:	sound/xen/*
+
 XEN SWIOTLB SUBSYSTEM
 M:	Konrad Rzeszutek Wilk <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -18430,13 +18437,6 @@ S:	Supported
 F:	arch/x86/xen/*swiotlb*
 F:	drivers/xen/*swiotlb*
 
-XEN SOUND FRONTEND DRIVER
-M:	Oleksandr Andrushchenko <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-L:	[email protected] (moderated for non-subscribers)
-S:	Supported
-F:	sound/xen/*
-
 XFS FILESYSTEM
 M:	Darrick J. Wong <[email protected]>
 M:	[email protected]
@@ -18465,6 +18465,17 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/net/can/xilinx_can.txt
 F:	drivers/net/can/xilinx_can.c
 
+XILINX SD-FEC IP CORES
+M:	Derek Kiernan <[email protected]>
+M:	Dragan Cvetic <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt
+F:	Documentation/misc-devices/xilinx_sdfec.rst
+F:	drivers/misc/xilinx_sdfec.c
+F:	drivers/misc/Kconfig
+F:	drivers/misc/Makefile
+F:	include/uapi/misc/xilinx_sdfec.h
+
 XILINX UARTLITE SERIAL DRIVER
 M:	Peter Korsgaard <[email protected]>
 L:	[email protected]
@@ -18481,17 +18492,6 @@ F:	Documentation/devicetree/bindings/media/xilinx/
 F:	drivers/media/platform/xilinx/
 F:	include/uapi/linux/xilinx-v4l2-controls.h
 
-XILINX SD-FEC IP CORES
-M:	Derek Kiernan <[email protected]>
-M:	Dragan Cvetic <[email protected]>
-S:	Maintained
-F:	Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt
-F:	Documentation/misc-devices/xilinx_sdfec.rst
-F:	drivers/misc/xilinx_sdfec.c
-F:	drivers/misc/Kconfig
-F:	drivers/misc/Makefile
-F:	include/uapi/misc/xilinx_sdfec.h
-
 XILLYBUS DRIVER
 M:	Eli Billauer <[email protected]>
 L:	[email protected]
#15 lore raw

PATCH 1/1 parse-maintainers: Do not sort section content by default

Add an --order switch to control section reordering. Default for --order is off.

Change the default ordering to a slightly more sensible:

M:  Person acting as a maintainer
R:  Person acting as a patch reviewer
L:  Mailing list where patches should be sent
S:  Maintenance status
W:  URI for general information
Q:  URI for patchwork tracking
B:  URI for bug tracking/submission
C:  URI for chat
P:  URI or file for subsystem specific coding styles
T:  SCM tree type and location
F:  File and directory pattern
X:  File and directory exclusion pattern
N:  File glob
K:  Keyword - patch content regex
---
 scripts/parse-maintainers.pl | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)
scripts/parse-maintainers.pl +27 -4
index 255cef1..2ca4eb3 100644
@@ -8,13 +8,14 @@ my $input_file = "MAINTAINERS";
 my $output_file = "MAINTAINERS.new";
 my $output_section = "SECTION.new";
 my $help = 0;
-
+my $order = 0;
 my $P = $0;
 
 if (!GetOptions(
 		'input=s' => \$input_file,
 		'output=s' => \$output_file,
 		'section=s' => \$output_section,
+		'order!' => \$order,
 		'h|help|usage' => \$help,
 	    )) {
     die "$P: invalid argument - use --help if necessary\n";
@@ -32,6 +33,22 @@ usage: $P [options] <pattern matching regexes>
   --input => MAINTAINERS file to read (default: MAINTAINERS)
   --output => sorted MAINTAINERS file to write (default: MAINTAINERS.new)
   --section => new sorted MAINTAINERS file to write to (default: SECTION.new)
+  --order => Use the preferred section content output ordering (default: 0)
+    Preferred ordering of section output is:
+      M:  Person acting as a maintainer
+      R:  Person acting as a patch reviewer
+      L:  Mailing list where patches should be sent
+      S:  Maintenance status
+      W:  URI for general information
+      Q:  URI for patchwork tracking
+      B:  URI for bug tracking/submission
+      C:  URI for chat
+      P:  URI or file for subsystem specific coding styles
+      T:  SCM tree type and location
+      F:  File and directory pattern
+      X:  File and directory exclusion pattern
+      N:  File glob
+      K:  Keyword - patch content regex
 
 If <pattern match regexes> exist, then the sections that match the
 regexes are not written to the output file but are written to the
@@ -56,7 +73,7 @@ sub by_category($$) {
 
 sub by_pattern($$) {
     my ($a, $b) = @_;
-    my $preferred_order = 'MRPLSWTQBCFXNK';
+    my $preferred_order = 'MRLSWQBCPTFXNK';
 
     my $a1 = uc(substr($a, 0, 1));
     my $b1 = uc(substr($b, 0, 1));
@@ -105,8 +122,14 @@ sub alpha_output {
 		print $file $separator;
 	    }
 	    print $file $key . "\n";
-	    foreach my $pattern (sort by_pattern split('\n', %$hashref{$key})) {
-		print $file ($pattern . "\n");
+	    if ($order) {
+		foreach my $pattern (sort by_pattern split('\n', %$hashref{$key})) {
+		    print $file ($pattern . "\n");
+		}
+	    } else {
+		foreach my $pattern (split('\n', %$hashref{$key})) {
+		    print $file ($pattern . "\n");
+		}
 	    }
 	}
     }
#16 lore raw

Re: [PATCH] parse-maintainers: Do not sort section content by default

Quoted 5 lines · Joe Perches

Add an --order switch to control section reordering. Default for --order is off.

Change the default ordering to a slightly more sensible:

Quoted 14 lines
M:  Person acting as a maintainer
R:  Person acting as a patch reviewer
L:  Mailing list where patches should be sent
S:  Maintenance status
W:  URI for general information
Q:  URI for patchwork tracking
B:  URI for bug tracking/submission
C:  URI for chat
P:  URI or file for subsystem specific coding styles
T:  SCM tree type and location
F:  File and directory pattern
X:  File and directory exclusion pattern
N:  File glob
K:  Keyword - patch content regex

Linus? ping?

Quoted 75 lines
---
 scripts/parse-maintainers.pl | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)
scripts/parse-maintainers.pl +27 -4
index 255cef1..2ca4eb3 100644
@@ -8,13 +8,14 @@ my $input_file = "MAINTAINERS";
 my $output_file = "MAINTAINERS.new";
 my $output_section = "SECTION.new";
 my $help = 0;
-
+my $order = 0;
 my $P = $0;
 
 if (!GetOptions(
 		'input=s' => \$input_file,
 		'output=s' => \$output_file,
 		'section=s' => \$output_section,
+		'order!' => \$order,
 		'h|help|usage' => \$help,
 	    )) {
     die "$P: invalid argument - use --help if necessary\n";
@@ -32,6 +33,22 @@ usage: $P [options] <pattern matching regexes>
   --input => MAINTAINERS file to read (default: MAINTAINERS)
   --output => sorted MAINTAINERS file to write (default: MAINTAINERS.new)
   --section => new sorted MAINTAINERS file to write to (default: SECTION.new)
+  --order => Use the preferred section content output ordering (default: 0)
+    Preferred ordering of section output is:
+      M:  Person acting as a maintainer
+      R:  Person acting as a patch reviewer
+      L:  Mailing list where patches should be sent
+      S:  Maintenance status
+      W:  URI for general information
+      Q:  URI for patchwork tracking
+      B:  URI for bug tracking/submission
+      C:  URI for chat
+      P:  URI or file for subsystem specific coding styles
+      T:  SCM tree type and location
+      F:  File and directory pattern
+      X:  File and directory exclusion pattern
+      N:  File glob
+      K:  Keyword - patch content regex
 
 If <pattern match regexes> exist, then the sections that match the
 regexes are not written to the output file but are written to the
@@ -56,7 +73,7 @@ sub by_category($$) {
 
 sub by_pattern($$) {
     my ($a, $b) = @_;
-    my $preferred_order = 'MRPLSWTQBCFXNK';
+    my $preferred_order = 'MRLSWQBCPTFXNK';
 
     my $a1 = uc(substr($a, 0, 1));
     my $b1 = uc(substr($b, 0, 1));
@@ -105,8 +122,14 @@ sub alpha_output {
 		print $file $separator;
 	    }
 	    print $file $key . "\n";
-	    foreach my $pattern (sort by_pattern split('\n', %$hashref{$key})) {
-		print $file ($pattern . "\n");
+	    if ($order) {
+		foreach my $pattern (sort by_pattern split('\n', %$hashref{$key})) {
+		    print $file ($pattern . "\n");
+		}
+	    } else {
+		foreach my $pattern (split('\n', %$hashref{$key})) {
+		    print $file ($pattern . "\n");
+		}
 	    }
 	}
     }
#17 lore raw

Re: [PATCH] parse-maintainers: Do not sort section content by default

Quoted 2 lines · Joe Perches

Linus? ping?

Applied and pushed out.

Linus