Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2f12abc..f326718 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1316,6 +1316,13 @@ L:       linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/aptina-pll.*
 
+AQUACOMPUTER D5 NEXT PUMP SENSOR DRIVER
+M:     Aleksa Savic <savicaleksa83@gmail.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/aquacomputer_d5next.rst
+F:     drivers/hwmon/aquacomputer_d5next.c
+
 AQUANTIA ETHERNET DRIVER (atlantic)
 M:     Igor Russkikh <irusskikh@marvell.com>
 L:     netdev@vger.kernel.org
@@ -2842,7 +2849,7 @@ AS3645A LED FLASH CONTROLLER DRIVER
 M:     Sakari Ailus <sakari.ailus@iki.fi>
 L:     linux-leds@vger.kernel.org
 S:     Maintained
-F:     drivers/leds/leds-as3645a.c
+F:     drivers/leds/flash/leds-as3645a.c
 
 ASAHI KASEI AK7375 LENS VOICE COIL DRIVER
 M:     Tianshu Qiu <tian.shu.qiu@intel.com>
@@ -4619,7 +4626,7 @@ F:        include/linux/clk/
 F:     include/linux/of_clk.h
 X:     drivers/clk/clkdev.c
 
-COMMON INTERNET FILE SYSTEM (CIFS)
+COMMON INTERNET FILE SYSTEM CLIENT (CIFS)
 M:     Steve French <sfrench@samba.org>
 L:     linux-cifs@vger.kernel.org
 L:     samba-technical@lists.samba.org (moderated for non-subscribers)
@@ -4628,6 +4635,7 @@ W:        http://linux-cifs.samba.org/
 T:     git git://git.samba.org/sfrench/cifs-2.6.git
 F:     Documentation/admin-guide/cifs/
 F:     fs/cifs/
+F:     fs/cifs_common/
 
 COMPACTPCI HOTPLUG CORE
 M:     Scott Murray <scott@spiteful.org>
@@ -10114,6 +10122,17 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
 F:     Documentation/dev-tools/kselftest*
 F:     tools/testing/selftests/
 
+KERNEL SMB3 SERVER (KSMBD)
+M:     Namjae Jeon <linkinjeon@kernel.org>
+M:     Sergey Senozhatsky <senozhatsky@chromium.org>
+M:     Steve French <sfrench@samba.org>
+M:     Hyunchul Lee <hyc.lee@gmail.com>
+L:     linux-cifs@vger.kernel.org
+S:     Maintained
+T:     git git://git.samba.org/ksmbd.git
+F:     fs/cifs_common/
+F:     fs/ksmbd/
+
 KERNEL UNIT TESTING FRAMEWORK (KUnit)
 M:     Brendan Higgins <brendanhiggins@google.com>
 L:     linux-kselftest@vger.kernel.org
@@ -10621,15 +10640,6 @@ F:     LICENSES/
 F:     scripts/spdxcheck-test.sh
 F:     scripts/spdxcheck.py
 
-LIGHTNVM PLATFORM SUPPORT
-M:     Matias Bjorling <mb@lightnvm.io>
-L:     linux-block@vger.kernel.org
-S:     Maintained
-W:     http://github/OpenChannelSSD
-F:     drivers/lightnvm/
-F:     include/linux/lightnvm.h
-F:     include/uapi/linux/lightnvm.h
-
 LINEAR RANGES HELPERS
 M:     Mark Brown <broonie@kernel.org>
 R:     Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
@@ -19752,6 +19762,15 @@ S:     Maintained
 F:     include/uapi/linux/virtio_snd.h
 F:     sound/virtio/*
 
+VIRTIO I2C DRIVER
+M:     Jie Deng <jie.deng@intel.com>
+M:     Viresh Kumar <viresh.kumar@linaro.org>
+L:     linux-i2c@vger.kernel.org
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-virtio.c
+F:     include/uapi/linux/virtio_i2c.h
+
 VIRTUAL BOX GUEST DEVICE DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 M:     Arnd Bergmann <arnd@arndb.de>