Another merge window, another MAINTAINERS file disaster. People have serious problems with the alphabet and sorting, and poor Jérôme Glisse and Radim Krčmář get their names mangled by locale issues, turning them into some mangled mess (probably others do too, but those two stood out when sorting things again). And we now have two copies of the same 'AS3645A LED FLASH CONTROLLER DRIVER' in the tree and in the MAINTAINERS file, but that's a separate issue - the duplication is real, and I left them as two entries for the same name. This does not try to sort the actual section pattern entries, although I may end up doing that later.
Unified · Split
| @@ -4391,6 +4391,12 @@ S: Supported · 4390 unmodified lines | ||
| 4391 | 4391 | F: drivers/gpu/drm/nouveau/ |
| 4392 | 4392 | F: include/uapi/drm/nouveau_drm.h |
| 4393 | 4393 | |
| 4394 | +DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS | |
| 4395 | +M: Noralf Trønnes <noralf@tronnes.org> | |
| 4396 | +S: Maintained | |
| 4397 | +F: drivers/gpu/drm/tinydrm/repaper.c | |
| 4398 | +F: Documentation/devicetree/bindings/display/repaper.txt | |
| 4399 | + | |
| 4394 | 4400 | DRM DRIVER FOR QEMU'S CIRRUS DEVICE |
| 4395 | 4401 | M: Dave Airlie <airlied@redhat.com> |
| 4396 | 4402 | M: Gerd Hoffmann <kraxel@redhat.com> |
| @@ -4409,12 +4415,6 @@ S: Maintained · 12 unmodified lines | ||
| 4409 | 4415 | F: drivers/gpu/drm/qxl/ |
| 4410 | 4416 | F: include/uapi/drm/qxl_drm.h |
| 4411 | 4417 | |
| 4412 | −DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS | |
| 4413 | −M: Noralf Trønnes <noralf@tronnes.org> | |
| 4414 | −S: Maintained | |
| 4415 | −F: drivers/gpu/drm/tinydrm/repaper.c | |
| 4416 | −F: Documentation/devicetree/bindings/display/repaper.txt | |
| 4417 | − | |
| 4418 | 4418 | DRM DRIVER FOR RAGE 128 VIDEO CARDS |
| 4419 | 4419 | S: Orphan / Obsolete |
| 4420 | 4420 | F: drivers/gpu/drm/r128/ |
| @@ -6208,22 +6208,22 @@ F: include/uapi/linux/if_hippi.h · 1787 unmodified lines | ||
| 6208 | 6208 | F: net/802/hippi.c |
| 6209 | 6209 | F: drivers/net/hippi/ |
| 6210 | 6210 | |
| 6211 | −HISILICON NETWORK SUBSYSTEM DRIVER | |
| 6211 | +HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3) | |
| 6212 | 6212 | M: Yisen Zhuang <yisen.zhuang@huawei.com> |
| 6213 | 6213 | M: Salil Mehta <salil.mehta@huawei.com> |
| 6214 | 6214 | L: netdev@vger.kernel.org |
| 6215 | 6215 | W: http://www.hisilicon.com |
| 6216 | 6216 | S: Maintained |
| 6217 | −F: drivers/net/ethernet/hisilicon/ | |
| 6218 | −F: Documentation/devicetree/bindings/net/hisilicon*.txt | |
| 6217 | +F: drivers/net/ethernet/hisilicon/hns3/ | |
| 6219 | 6218 | |
| 6220 | −HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3) | |
| 6219 | +HISILICON NETWORK SUBSYSTEM DRIVER | |
| 6221 | 6220 | M: Yisen Zhuang <yisen.zhuang@huawei.com> |
| 6222 | 6221 | M: Salil Mehta <salil.mehta@huawei.com> |
| 6223 | 6222 | L: netdev@vger.kernel.org |
| 6224 | 6223 | W: http://www.hisilicon.com |
| 6225 | 6224 | S: Maintained |
| 6226 | −F: drivers/net/ethernet/hisilicon/hns3/ | |
| 6225 | +F: drivers/net/ethernet/hisilicon/ | |
| 6226 | +F: Documentation/devicetree/bindings/net/hisilicon*.txt | |
| 6227 | 6227 | |
| 6228 | 6228 | HISILICON ROCE DRIVER |
| 6229 | 6229 | M: Lijun Ou <oulijun@huawei.com> |
| @@ -6240,6 +6240,13 @@ S: Supported · 10 unmodified lines | ||
| 6240 | 6240 | F: drivers/scsi/hisi_sas/ |
| 6241 | 6241 | F: Documentation/devicetree/bindings/scsi/hisilicon-sas.txt |
| 6242 | 6242 | |
| 6243 | +HMM - Heterogeneous Memory Management | |
| 6244 | +M: Jérôme Glisse <jglisse@redhat.com> | |
| 6245 | +L: linux-mm@kvack.org | |
| 6246 | +S: Maintained | |
| 6247 | +F: mm/hmm* | |
| 6248 | +F: include/linux/hmm* | |
| 6249 | + | |
| 6243 | 6250 | HOST AP DRIVER |
| 6244 | 6251 | M: Jouni Malinen <j@w1.fi> |
| 6245 | 6252 | L: linux-wireless@vger.kernel.org |
| @@ -7506,19 +7513,6 @@ F: include/kvm/iodev.h · 1260 unmodified lines | ||
| 7506 | 7513 | F: virt/kvm/* |
| 7507 | 7514 | F: tools/kvm/ |
| 7508 | 7515 | |
| 7509 | −KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86) | |
| 7510 | −M: Paolo Bonzini <pbonzini@redhat.com> | |
| 7511 | −M: Radim KrÄmář <rkrcmar@redhat.com> | |
| 7512 | −L: kvm@vger.kernel.org | |
| 7513 | −W: http://www.linux-kvm.org | |
| 7514 | −T: git git://git.kernel.org/pub/scm/virt/kvm/kvm.git | |
| 7515 | −S: Supported | |
| 7516 | −F: arch/x86/kvm/ | |
| 7517 | −F: arch/x86/include/uapi/asm/kvm* | |
| 7518 | −F: arch/x86/include/asm/kvm* | |
| 7519 | −F: arch/x86/kernel/kvm.c | |
| 7520 | −F: arch/x86/kernel/kvmclock.c | |
| 7521 | − | |
| 7522 | 7516 | KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd) |
| 7523 | 7517 | M: Joerg Roedel <joro@8bytes.org> |
| 7524 | 7518 | L: kvm@vger.kernel.org |
| @@ -7541,17 +7535,6 @@ F: arch/arm/kvm/ · 16 unmodified lines | ||
| 7541 | 7535 | F: virt/kvm/arm/ |
| 7542 | 7536 | F: include/kvm/arm_* |
| 7543 | 7537 | |
| 7544 | −KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc) | |
| 7545 | −M: Alexander Graf <agraf@suse.com> | |
| 7546 | −L: kvm-ppc@vger.kernel.org | |
| 7547 | −W: http://www.linux-kvm.org/ | |
| 7548 | −T: git git://github.com/agraf/linux-2.6.git | |
| 7549 | −S: Supported | |
| 7550 | −F: arch/powerpc/include/uapi/asm/kvm* | |
| 7551 | −F: arch/powerpc/include/asm/kvm* | |
| 7552 | −F: arch/powerpc/kvm/ | |
| 7553 | −F: arch/powerpc/kernel/kvm* | |
| 7554 | − | |
| 7555 | 7538 | KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) |
| 7556 | 7539 | M: Christoffer Dall <christoffer.dall@linaro.org> |
| 7557 | 7540 | M: Marc Zyngier <marc.zyngier@arm.com> |
| @@ -7570,6 +7553,17 @@ F: arch/mips/include/uapi/asm/kvm* · 12 unmodified lines | ||
| 7570 | 7553 | F: arch/mips/include/asm/kvm* |
| 7571 | 7554 | F: arch/mips/kvm/ |
| 7572 | 7555 | |
| 7556 | +KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc) | |
| 7557 | +M: Alexander Graf <agraf@suse.com> | |
| 7558 | +L: kvm-ppc@vger.kernel.org | |
| 7559 | +W: http://www.linux-kvm.org/ | |
| 7560 | +T: git git://github.com/agraf/linux-2.6.git | |
| 7561 | +S: Supported | |
| 7562 | +F: arch/powerpc/include/uapi/asm/kvm* | |
| 7563 | +F: arch/powerpc/include/asm/kvm* | |
| 7564 | +F: arch/powerpc/kvm/ | |
| 7565 | +F: arch/powerpc/kernel/kvm* | |
| 7566 | + | |
| 7573 | 7567 | KERNEL VIRTUAL MACHINE for s390 (KVM/s390) |
| 7574 | 7568 | M: Christian Borntraeger <borntraeger@de.ibm.com> |
| 7575 | 7569 | M: Cornelia Huck <cohuck@redhat.com> |
| @@ -7583,6 +7577,19 @@ F: arch/s390/include/asm/kvm* · 7 unmodified lines | ||
| 7583 | 7577 | F: arch/s390/kvm/ |
| 7584 | 7578 | F: arch/s390/mm/gmap.c |
| 7585 | 7579 | |
| 7580 | +KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86) | |
| 7581 | +M: Paolo Bonzini <pbonzini@redhat.com> | |
| 7582 | +M: Radim Krčmář <rkrcmar@redhat.com> | |
| 7583 | +L: kvm@vger.kernel.org | |
| 7584 | +W: http://www.linux-kvm.org | |
| 7585 | +T: git git://git.kernel.org/pub/scm/virt/kvm/kvm.git | |
| 7586 | +S: Supported | |
| 7587 | +F: arch/x86/kvm/ | |
| 7588 | +F: arch/x86/include/uapi/asm/kvm* | |
| 7589 | +F: arch/x86/include/asm/kvm* | |
| 7590 | +F: arch/x86/kernel/kvm.c | |
| 7591 | +F: arch/x86/kernel/kvmclock.c | |
| 7592 | + | |
| 7586 | 7593 | KERNFS |
| 7587 | 7594 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 7588 | 7595 | M: Tejun Heo <tj@kernel.org> |
| @@ -7822,13 +7829,6 @@ M: Sasha Levin <alexander.levin@verizon.com> · 233 unmodified lines | ||
| 7822 | 7829 | S: Maintained |
| 7823 | 7830 | F: tools/lib/lockdep/ |
| 7824 | 7831 | |
| 7825 | −HMM - Heterogeneous Memory Management | |
| 7826 | −M: Jérôme Glisse <jglisse@redhat.com> | |
| 7827 | −L: linux-mm@kvack.org | |
| 7828 | −S: Maintained | |
| 7829 | −F: mm/hmm* | |
| 7830 | −F: include/linux/hmm* | |
| 7831 | − | |
| 7832 | 7832 | LIBNVDIMM BLK: MMIO-APERTURE DRIVER |
| 7833 | 7833 | M: Ross Zwisler <ross.zwisler@linux.intel.com> |
| 7834 | 7834 | L: linux-nvdimm@lists.01.org |
| @@ -8423,6 +8423,14 @@ T: git git://linuxtv.org/media_tree.git · 588 unmodified lines | ||
| 8423 | 8423 | S: Supported |
| 8424 | 8424 | F: drivers/media/dvb-frontends/cxd2841er* |
| 8425 | 8425 | |
| 8426 | +MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES | |
| 8427 | +M: Daniel Scheller <d.scheller.oss@gmail.com> | |
| 8428 | +L: linux-media@vger.kernel.org | |
| 8429 | +W: https://linuxtv.org | |
| 8430 | +T: git git://linuxtv.org/media_tree.git | |
| 8431 | +S: Maintained | |
| 8432 | +F: drivers/media/pci/ddbridge/* | |
| 8433 | + | |
| 8426 | 8434 | MEDIA DRIVERS FOR FREESCALE IMX |
| 8427 | 8435 | M: Steve Longerbeam <slongerbeam@gmail.com> |
| 8428 | 8436 | M: Philipp Zabel <p.zabel@pengutronix.de> |
| @@ -8544,14 +8552,6 @@ T: git git://linuxtv.org/media_tree.git · 115 unmodified lines | ||
| 8544 | 8552 | S: Maintained |
| 8545 | 8553 | F: drivers/media/dvb-frontends/stv6111* |
| 8546 | 8554 | |
| 8547 | −MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES | |
| 8548 | −M: Daniel Scheller <d.scheller.oss@gmail.com> | |
| 8549 | −L: linux-media@vger.kernel.org | |
| 8550 | −W: https://linuxtv.org | |
| 8551 | −T: git git://linuxtv.org/media_tree.git | |
| 8552 | −S: Maintained | |
| 8553 | −F: drivers/media/pci/ddbridge/* | |
| 8554 | − | |
| 8555 | 8555 | MEDIA INPUT INFRASTRUCTURE (V4L/DVB) |
| 8556 | 8556 | M: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| 8557 | 8557 | M: Mauro Carvalho Chehab <mchehab@kernel.org> |
| @@ -8575,6 +8575,11 @@ F: include/uapi/linux/meye.h · 17 unmodified lines | ||
| 8575 | 8575 | F: include/uapi/linux/ivtv* |
| 8576 | 8576 | F: include/uapi/linux/uvcvideo.h |
| 8577 | 8577 | |
| 8578 | +MEDIATEK CIR DRIVER | |
| 8579 | +M: Sean Wang <sean.wang@mediatek.com> | |
| 8580 | +S: Maintained | |
| 8581 | +F: drivers/media/rc/mtk-cir.c | |
| 8582 | + | |
| 8578 | 8583 | MEDIATEK ETHERNET DRIVER |
| 8579 | 8584 | M: Felix Fietkau <nbd@openwrt.org> |
| 8580 | 8585 | M: John Crispin <john@phrozen.org> |
| @@ -8615,11 +8620,6 @@ L: linux-wireless@vger.kernel.org · 34 unmodified lines | ||
| 8615 | 8620 | S: Maintained |
| 8616 | 8621 | F: drivers/net/wireless/mediatek/mt7601u/ |
| 8617 | 8622 | |
| 8618 | −MEDIATEK CIR DRIVER | |
| 8619 | −M: Sean Wang <sean.wang@mediatek.com> | |
| 8620 | −S: Maintained | |
| 8621 | −F: drivers/media/rc/mtk-cir.c | |
| 8622 | − | |
| 8623 | 8623 | MEDIATEK RANDOM NUMBER GENERATOR SUPPORT |
| 8624 | 8624 | M: Sean Wang <sean.wang@mediatek.com> |
| 8625 | 8625 | S: Maintained |