Merge tag 'char-misc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 3947855..e91fe5b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -436,6 +436,15 @@ S: Orphan
 F:     drivers/platform/x86/wmi.c
 F:     include/uapi/linux/wmi.h
 
+ACRN HYPERVISOR SERVICE MODULE
+M:     Shuo Liu <shuo.a.liu@intel.com>
+L:     acrn-dev@lists.projectacrn.org (subscribers-only)
+S:     Supported
+W:     https://projectacrn.org
+F:     Documentation/virt/acrn/
+F:     drivers/virt/acrn/
+F:     include/uapi/linux/acrn.h
+
 AD1889 ALSA SOUND DRIVER
 L:     linux-parisc@vger.kernel.org
 S:     Maintained
@@ -1017,7 +1026,7 @@ F:        Documentation/devicetree/bindings/mux/adi,adgs1408.txt
 F:     drivers/mux/adgs1408.c
 
 ANALOG DEVICES INC ADIN DRIVER
-M:     Alexandru Ardelean <alexaundru.ardelean@analog.com>
+M:     Michael Hennerich <michael.hennerich@analog.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://ez.analog.com/community/linux-device-drivers
@@ -1025,7 +1034,7 @@ F:        Documentation/devicetree/bindings/net/adi,adin.yaml
 F:     drivers/net/phy/adin.c
 
 ANALOG DEVICES INC ADIS DRIVER LIBRARY
-M:     Alexandru Ardelean <alexandru.ardelean@analog.com>
+M:     Nuno Sa <nuno.sa@analog.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
 F:     drivers/iio/imu/adis.c
@@ -3731,6 +3740,13 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/tg3.*
 
+BROADCOM VK DRIVER
+M:     Scott Branden <scott.branden@broadcom.com>
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Supported
+F:     drivers/misc/bcm-vk/
+F:     include/uapi/linux/misc/bcm_vk.h
+
 BROCADE BFA FC SCSI DRIVER
 M:     Anil Gurumurthy <anil.gurumurthy@qlogic.com>
 M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
@@ -6950,9 +6966,10 @@ M:       Wu Hao <hao.wu@intel.com>
 R:     Tom Rix <trix@redhat.com>
 L:     linux-fpga@vger.kernel.org
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-bus-dfl
+F:     Documentation/ABI/testing/sysfs-bus-dfl*
 F:     Documentation/fpga/dfl.rst
 F:     drivers/fpga/dfl*
+F:     include/linux/dfl.h
 F:     include/uapi/linux/fpga-dfl.h
 
 FPGA MANAGER FRAMEWORK
@@ -14686,9 +14703,11 @@ M:     Stuart Yoder <stuyoder@gmail.com>
 M:     Laurentiu Tudor <laurentiu.tudor@nxp.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/ABI/stable/sysfs-bus-fsl-mc
 F:     Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 F:     Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst
 F:     drivers/bus/fsl-mc/
+F:     include/uapi/linux/fsl_mc.h
 
 QT1010 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
@@ -16731,6 +16750,7 @@ R:      Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 R:     Sanyog Kale <sanyog.r.kale@intel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
 F:     Documentation/driver-api/soundwire/
 F:     drivers/soundwire/
 F:     include/linux/soundwire/