Merge branch 'pm-avs'
[linux-2.6-microblaze.git] / MAINTAINERS
index bb014c7..ef09649 100644 (file)
@@ -802,6 +802,13 @@ S: Maintained
 F:     Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
 F:     drivers/irqchip/irq-al-fic.c
 
+AMAZON ANNAPURNA LABS MEMORY CONTROLLER EDAC
+M:     Talel Shenhar <talel@amazon.com>
+M:     Talel Shenhar <talelshenhar@gmail.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
+F:     drivers/edac/al_mc_edac.c
+
 AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
 M:     Talel Shenhar <talel@amazon.com>
 S:     Maintained
@@ -1460,6 +1467,11 @@ S:       Odd Fixes
 F:     drivers/amba/
 F:     include/linux/amba/bus.h
 
+ARM PRIMECELL CLCD PL110 DRIVER
+M:     Russell King <linux@armlinux.org.uk>
+S:     Odd Fixes
+F:     drivers/video/fbdev/amba-clcd.*
+
 ARM PRIMECELL KMI PL050 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
 S:     Odd Fixes
@@ -1525,6 +1537,7 @@ F:        Documentation/devicetree/bindings/arm/actions.yaml
 F:     Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 F:     Documentation/devicetree/bindings/dma/owl-dma.txt
 F:     Documentation/devicetree/bindings/i2c/i2c-owl.txt
+F:     Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
 F:     Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 F:     Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
 F:     Documentation/devicetree/bindings/power/actions,owl-sps.txt
@@ -1536,6 +1549,7 @@ F:        drivers/clk/actions/
 F:     drivers/clocksource/timer-owl*
 F:     drivers/dma/owl-dma.c
 F:     drivers/i2c/busses/i2c-owl.c
+F:     drivers/irqchip/irq-owl-sirq.c
 F:     drivers/mmc/host/owl-mmc.c
 F:     drivers/pinctrl/actions/*
 F:     drivers/soc/actions/
@@ -1623,7 +1637,7 @@ N:        meson
 
 ARM/Annapurna Labs ALPINE ARCHITECTURE
 M:     Tsahee Zidenberg <tsahee@annapurnalabs.com>
-M:     Antoine Tenart <antoine.tenart@bootlin.com>
+M:     Antoine Tenart <atenart@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/boot/dts/alpine*
@@ -2445,7 +2459,7 @@ L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/s5p-cec.txt
-F:     drivers/media/platform/s5p-cec/
+F:     drivers/media/cec/platform/s5p/
 
 ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
 M:     Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
@@ -2504,7 +2518,7 @@ S:        Maintained
 F:     drivers/clk/socfpga/
 
 ARM/SOCFPGA EDAC SUPPORT
-M:     Thor Thayer <thor.thayer@linux.intel.com>
+M:     Dinh Nguyen <dinguyen@kernel.org>
 S:     Maintained
 F:     drivers/edac/altera_edac.
 
@@ -2590,7 +2604,7 @@ L:        linux-tegra@vger.kernel.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/tegra-cec.txt
-F:     drivers/media/platform/tegra-cec/
+F:     drivers/media/cec/platform/tegra/
 
 ARM/TETON BGA MACHINE SUPPORT
 M:     "Mark F. Brown" <mark.brown314@gmail.com>
@@ -4030,7 +4044,7 @@ S:        Supported
 W:     http://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/cec-gpio.txt
-F:     drivers/media/platform/cec-gpio/
+F:     drivers/media/cec/platform/cec-gpio/
 
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -4574,6 +4588,14 @@ L:       linux-arm-kernel@lists.infradead.org
 S:     Supported
 F:     drivers/cpuidle/cpuidle-psci.c
 
+CPUIDLE DRIVER - ARM PSCI PM DOMAIN
+M:     Ulf Hansson <ulf.hansson@linaro.org>
+L:     linux-pm@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Supported
+F:     drivers/cpuidle/cpuidle-psci.h
+F:     drivers/cpuidle/cpuidle-psci-domain.c
+
 CRAMFS FILESYSTEM
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
@@ -5373,12 +5395,11 @@ F:      include/linux/debugfs.h
 F:     include/linux/kobj*
 F:     lib/kobj*
 
-DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
-M:     Kevin Hilman <khilman@kernel.org>
+DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS)
 M:     Nishanth Menon <nm@ti.com>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-F:     drivers/power/avs/
+F:     drivers/soc/ti/smartreflex.c
 F:     include/linux/power/smartreflex.h
 
 DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
@@ -6179,7 +6200,7 @@ S:        Supported
 F:     drivers/edac/bluefield_edac.c
 
 EDAC-CALXEDA
-M:     Robert Richter <rric@kernel.org>
+M:     Andre Przywara <andre.przywara@arm.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/highbank*
@@ -7235,7 +7256,7 @@ F:        drivers/staging/gasket/
 GCC PLUGINS
 M:     Kees Cook <keescook@chromium.org>
 R:     Emese Revfy <re.emese@gmail.com>
-L:     kernel-hardening@lists.openwall.com
+L:     linux-hardening@vger.kernel.org
 S:     Maintained
 F:     Documentation/kbuild/gcc-plugins.rst
 F:     scripts/Makefile.gcc-plugins
@@ -8673,7 +8694,7 @@ F:        drivers/input/input-mt.c
 K:     \b(ABS|SYN)_MT_
 
 INSIDE SECURE CRYPTO DRIVER
-M:     Antoine Tenart <antoine.tenart@bootlin.com>
+M:     Antoine Tenart <atenart@kernel.org>
 L:     linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/inside-secure/
@@ -8752,7 +8773,8 @@ F:        include/drm/i915*
 F:     include/uapi/drm/i915_drm.h
 
 INTEL ETHERNET DRIVERS
-M:     Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+M:     Jesse Brandeburg <jesse.brandeburg@intel.com>
+M:     Tony Nguyen <anthony.l.nguyen@intel.com>
 L:     intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
 S:     Supported
 W:     http://www.intel.com/support/feedback.htm
@@ -8851,7 +8873,7 @@ INTEL IPU3 CSI-2 CIO2 DRIVER
 M:     Yong Zhi <yong.zhi@intel.com>
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 M:     Bingbu Cao <bingbu.cao@intel.com>
-R:     Tian Shu Qiu <tian.shu.qiu@intel.com>
+R:     Tianshu Qiu <tian.shu.qiu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
@@ -8860,7 +8882,7 @@ F:        drivers/media/pci/intel/ipu3/
 INTEL IPU3 CSI-2 IMGU DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 R:     Bingbu Cao <bingbu.cao@intel.com>
-R:     Tian Shu Qiu <tian.shu.qiu@intel.com>
+R:     Tianshu Qiu <tian.shu.qiu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/admin-guide/media/ipu3.rst
@@ -8925,8 +8947,8 @@ F:        arch/x86/include/asm/intel_punit_ipc.h
 F:     drivers/platform/x86/intel_punit_ipc.c
 
 INTEL PMC CORE DRIVER
-M:     Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
-M:     Vishwanath Somayaji <vishwanath.somayaji@intel.com>
+M:     Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
+M:     David E Box <david.e.box@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/intel_pmc_core*
@@ -9712,8 +9734,8 @@ M:        Catalin Marinas <catalin.marinas@arm.com>
 S:     Maintained
 F:     Documentation/dev-tools/kmemleak.rst
 F:     include/linux/kmemleak.h
-F:     mm/kmemleak-test.c
 F:     mm/kmemleak.c
+F:     samples/kmemleak/kmemleak-test.c
 
 KMOD KERNEL MODULE LOADER - USERMODE HELPER
 M:     Luis Chamberlain <mcgrof@kernel.org>
@@ -9796,7 +9818,7 @@ F:        drivers/scsi/53c700*
 LEAKING_ADDRESSES
 M:     Tobin C. Harding <me@tobin.cc>
 M:     Tycho Andersen <tycho@tycho.pizza>
-L:     kernel-hardening@lists.openwall.com
+L:     linux-hardening@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
 F:     scripts/leaking_addresses.pl
@@ -9867,15 +9889,6 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 F:     drivers/ata/pata_arasan_cf.c
 F:     include/linux/pata_arasan_cf_data.h
 
-LIBATA PATA DRIVERS
-M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-M:     Jens Axboe <axboe@kernel.dk>
-L:     linux-ide@vger.kernel.org
-S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
-F:     drivers/ata/ata_generic.c
-F:     drivers/ata/pata_*.c
-
 LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-ide@vger.kernel.org
@@ -11313,8 +11326,8 @@ S:      Supported
 W:     http://linux-meson.com/
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
-F:     drivers/media/platform/meson/ao-cec-g12a.c
-F:     drivers/media/platform/meson/ao-cec.c
+F:     drivers/media/cec/platform/meson/ao-cec-g12a.c
+F:     drivers/media/cec/platform/meson/ao-cec.c
 
 MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 M:     Liang Yang <liang.yang@amlogic.com>
@@ -11324,7 +11337,6 @@ F:      Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
 F:     drivers/mtd/nand/raw/meson_*
 
 MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
-M:     Maxime Jourdan <mjourdan@baylibre.com>
 M:     Neil Armstrong <narmstrong@baylibre.com>
 L:     linux-media@vger.kernel.org
 L:     linux-amlogic@lists.infradead.org
@@ -11775,6 +11787,13 @@ Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/usb/msi2500/
 
+MSTAR INTERRUPT CONTROLLER DRIVER
+M:     Mark-PK Tsai <mark-pk.tsai@mediatek.com>
+M:     Daniel Palmer <daniel@thingy.jp>
+S:     Maintained
+F:     Documentation/devicetree/bindings/interrupt-controller/mstar,mst-intc.yaml
+F:     drivers/irqchip/irq-mst-intc.c
+
 MSYSTEMS DISKONCHIP G3 MTD DRIVER
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-mtd@lists.infradead.org
@@ -12077,6 +12096,7 @@ NETWORKING [DSA]
 M:     Andrew Lunn <andrew@lunn.ch>
 M:     Vivien Didelot <vivien.didelot@gmail.com>
 M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Vladimir Oltean <olteanv@gmail.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/dsa/
 F:     drivers/net/dsa/
@@ -12502,6 +12522,7 @@ M:      Josh Poimboeuf <jpoimboe@redhat.com>
 M:     Peter Zijlstra <peterz@infradead.org>
 S:     Supported
 F:     tools/objtool/
+F:     include/linux/objtool.h
 
 OCELOT ETHERNET SWITCH DRIVER
 M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
@@ -12763,7 +12784,7 @@ T:      git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/ov2685.c
 
 OMNIVISION OV2740 SENSOR DRIVER
-M:     Tianshu Qiu <tian.shu.qiua@intel.com>
+M:     Tianshu Qiu <tian.shu.qiu@intel.com>
 R:     Shawn Tu <shawnx.tu@intel.com>
 R:     Bingbu Cao <bingbu.cao@intel.com>
 L:     linux-media@vger.kernel.org
@@ -12779,10 +12800,12 @@ T:    git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/ov5640.c
 
 OMNIVISION OV5647 SENSOR DRIVER
-M:     Luis Oliveira <lolivei@synopsys.com>
+M:     Dave Stevenson <dave.stevenson@raspberrypi.com>
+M:     Jacopo Mondi <jacopo@jmondi.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ov5647.yaml
 F:     drivers/media/i2c/ov5647.c
 
 OMNIVISION OV5670 SENSOR DRIVER
@@ -13045,7 +13068,9 @@ F:      lib/packing.c
 
 PADATA PARALLEL EXECUTION MECHANISM
 M:     Steffen Klassert <steffen.klassert@secunet.com>
+M:     Daniel Jordan <daniel.m.jordan@oracle.com>
 L:     linux-crypto@vger.kernel.org
+L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/core-api/padata.rst
 F:     include/linux/padata.h
@@ -13953,6 +13978,7 @@ PRINTK
 M:     Petr Mladek <pmladek@suse.com>
 M:     Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
 R:     Steven Rostedt <rostedt@goodmis.org>
+R:     John Ogness <john.ogness@linutronix.de>
 S:     Maintained
 F:     include/linux/printk.h
 F:     kernel/printk/
@@ -14236,7 +14262,7 @@ QLOGIC QLA3XXX NETWORK DRIVER
 M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx
+F:     Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
 F:     drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLA4XXX iSCSI DRIVER
@@ -14336,7 +14362,7 @@ L:      linux-pm@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
-F:     drivers/power/avs/qcom-cpr.c
+F:     drivers/soc/qcom/cpr.c
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 M:     Ilia Lin <ilia.lin@kernel.org>
@@ -14591,9 +14617,9 @@ M:      Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
-F:     drivers/media/i2c/rdacm20.c
 F:     drivers/media/i2c/max9271.c
 F:     drivers/media/i2c/max9271.h
+F:     drivers/media/i2c/rdacm20.c
 
 RDC R-321X SoC
 M:     Florian Fainelli <florian@openwrt.org>
@@ -14887,8 +14913,11 @@ F:     include/linux/hid-roccat*
 
 ROCKCHIP ISP V1 DRIVER
 M:     Helen Koike <helen.koike@collabora.com>
+M:     Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
+F:     Documentation/admin-guide/media/rkisp1.rst
+F:     Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
 F:     drivers/staging/media/rkisp1/
 
 ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
@@ -15384,6 +15413,7 @@ R:      Dietmar Eggemann <dietmar.eggemann@arm.com> (SCHED_NORMAL)
 R:     Steven Rostedt <rostedt@goodmis.org> (SCHED_FIFO/SCHED_RR)
 R:     Ben Segall <bsegall@google.com> (CONFIG_CFS_BANDWIDTH)
 R:     Mel Gorman <mgorman@suse.de> (CONFIG_NUMA_BALANCING)
+R:     Daniel Bristot de Oliveira <bristot@redhat.com> (SCHED_DEADLINE)
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@ -15505,8 +15535,8 @@ F:      drivers/mmc/host/sdricoh_cs.c
 SECO BOARDS CEC DRIVER
 M:     Ettore Chimenti <ek5.chimenti@gmail.com>
 S:     Maintained
-F:     drivers/media/platform/seco-cec/seco-cec.c
-F:     drivers/media/platform/seco-cec/seco-cec.h
+F:     drivers/media/cec/platform/seco/seco-cec.c
+F:     drivers/media/cec/platform/seco/seco-cec.h
 
 SECURE COMPUTING
 M:     Kees Cook <keescook@chromium.org>
@@ -15599,6 +15629,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
 F:     Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
 F:     Documentation/ABI/obsolete/sysfs-selinux-disable
 F:     Documentation/admin-guide/LSM/SELinux.rst
+F:     include/trace/events/avc.h
 F:     include/uapi/linux/selinux_netlink.h
 F:     scripts/selinux/
 F:     security/selinux/
@@ -16073,7 +16104,6 @@ F:      include/uapi/rdma/rdma_user_rxe.h
 SOFTLOGIC 6x10 MPEG CODEC
 M:     Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 M:     Anton Sviridenko <anton@corp.bluecherry.net>
-M:     Andrey Utkin <andrey.utkin@corp.bluecherry.net>
 M:     Andrey Utkin <andrey_utkin@fastmail.com>
 M:     Ismael Luceno <ismael@iodev.co.uk>
 L:     linux-media@vger.kernel.org
@@ -16541,7 +16571,7 @@ STI CEC DRIVER
 M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/stih-cec.txt
-F:     drivers/media/platform/sti/cec/
+F:     drivers/media/cec/platform/sti/
 
 STK1160 USB VIDEO CAPTURE DRIVER
 M:     Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
@@ -16725,6 +16755,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
 F:     drivers/gpio/gpio-dwapb.c
 
+SYNOPSYS DESIGNWARE APB SSI DRIVER
+M:     Serge Semin <fancer.lancer@gmail.com>
+L:     linux-spi@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
+F:     drivers/spi/spi-dw*
+
 SYNOPSYS DESIGNWARE AXI DMAC DRIVER
 M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 S:     Maintained
@@ -17591,7 +17628,7 @@ L:      linux-integrity@vger.kernel.org
 S:     Maintained
 W:     https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
 Q:     https://patchwork.kernel.org/project/linux-integrity/list/
-T:     git git://git.infradead.org/users/jjs/linux-tpmdd.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
 F:     drivers/char/tpm/
 
 TRACING
@@ -17728,6 +17765,7 @@ S:      Supported
 W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
 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
+F:     Documentation/filesystems/ubifs-authentication.rst
 F:     Documentation/filesystems/ubifs.rst
 F:     fs/ubifs/
 
@@ -18121,14 +18159,6 @@ T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/usb/uvc/
 F:     include/uapi/linux/uvcvideo.h
 
-USB VISION DRIVER
-M:     Hans Verkuil <hverkuil@xs4all.nl>
-L:     linux-media@vger.kernel.org
-S:     Odd Fixes
-W:     https://linuxtv.org
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/staging/media/usbvision/
-
 USB WEBCAM GADGET
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-usb@vger.kernel.org
@@ -18282,7 +18312,8 @@ F:      drivers/gpu/vga/vga_switcheroo.c
 F:     include/linux/vga_switcheroo.h
 
 VIA RHINE NETWORK DRIVER
-S:     Orphan
+S:     Maintained
+M:     Kevin Brace <kevinbrace@bracecomputerlab.com>
 F:     drivers/net/ethernet/via/via-rhine.c
 
 VIA SD/MMC CARD CONTROLLER DRIVER
@@ -18327,10 +18358,8 @@ S:     Maintained
 F:     drivers/media/platform/video-mux.c
 
 VIDEOBUF2 FRAMEWORK
-M:     Pawel Osciak <pawel@osciak.com>
+M:     Tomasz Figa <tfiga@chromium.org>
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
-M:     Kyungmin Park <kyungmin.park@samsung.com>
-R:     Tomasz Figa <tfiga@chromium.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/common/videobuf2/*
@@ -18520,6 +18549,14 @@ W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/test-drivers/vivid/*
 
+VIDTV VIRTUAL DIGITAL TV DRIVER
+M:     Daniel W. S. Almeida <dwlsalmeida@gmail.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/test-drivers/vidtv/*
+
 VLYNQ BUS
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     openwrt-devel@lists.openwrt.org (subscribers-only)
@@ -18887,11 +18924,11 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm
 F:     arch/x86/mm/
 
 X86 PLATFORM DRIVERS
-M:     Darren Hart <dvhart@infradead.org>
-M:     Andy Shevchenko <andy@infradead.org>
+M:     Hans de Goede <hdegoede@redhat.com>
+M:     Mark Gross <mgross@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
-S:     Odd Fixes
-T:     git git://git.infradead.org/linux-platform-drivers-x86.git
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 F:     drivers/platform/olpc/
 F:     drivers/platform/x86/
 
@@ -19240,6 +19277,16 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 F:     Documentation/filesystems/zonefs.rst
 F:     fs/zonefs/
 
+ZR36067 VIDEO FOR LINUX DRIVER
+M:     Corentin Labbe <clabbe@baylibre.com>
+L:     mjpeg-users@lists.sourceforge.net
+L:     linux-media@vger.kernel.org
+S:     Maintained
+W:     http://mjpeg.sourceforge.net/driver-zoran/
+Q:     https://patchwork.linuxtv.org/project/linux-media/list/
+F:     Documentation/driver-api/media/drivers/zoran.rst
+F:     drivers/staging/media/zoran/
+
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>
 L:     linux-mm@kvack.org