Merge tag 'media/v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:

 - a major reorg at platform Kconfig/Makefile files, organizing them per
   vendor. The other media Kconfig/Makefile files also sorted

 - New sensor drivers: hi847, isl7998x, ov08d10

 - New Amphion vpu decoder stateful driver

 - New Atmel microchip csi2dc driver

 - tegra-vde driver promoted from staging

 - atomisp: some fixes for it to work on BYT

 - imx7-mipi-csis driver promoted from staging and renamed

 - camss driver got initial support for VFE hardware version Titan 480

 - mtk-vcodec has gained support for MT8192

 - lots of driver changes, fixes and improvements

* tag 'media/v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (417 commits)
  media: nxp: Restrict VIDEO_IMX_MIPI_CSIS to ARCH_MXC or COMPILE_TEST
  media: amphion: cleanup media device if register it fail
  media: amphion: fix some issues to improve robust
  media: amphion: fix some error related with undefined reference to __divdi3
  media: amphion: fix an issue that using pm_runtime_get_sync incorrectly
  media: vidtv: use vfree() for memory allocated with vzalloc()
  media: m5mols/m5mols.h: document new reset field
  media: pixfmt-yuv-planar.rst: fix PIX_FMT labels
  media: platform: Remove unnecessary print function dev_err()
  media: amphion: Add missing of_node_put() in vpu_core_parse_dt()
  media: mtk-vcodec: Add missing of_node_put() in mtk_vdec_hw_prob_done()
  media: platform: amphion: Fix build error without MAILBOX
  media: spi: Kconfig: Place SPI drivers on a single menu
  media: i2c: Kconfig: move camera drivers to the top
  media: atomisp: fix bad usage at error handling logic
  media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/
  media: media/*/Kconfig: sort entries
  media: Kconfig: cleanup VIDEO_DEV dependencies
  media: platform/*/Kconfig: make manufacturer menus more uniform
  media: platform: Create vendor/{Makefile,Kconfig} files
  ...

diff --combined MAINTAINERS
index 8c317c5,49d1e43..f817a62
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -190,9 -190,8 +190,9 @@@ M: Johannes Berg <johannes@sipsolutions
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  W:    https://wireless.wiki.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
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/driver-api/80211/cfg80211.rst
  F:    Documentation/networking/regulatory.rst
  F:    include/linux/ieee80211.h
@@@ -1002,7 -1001,6 +1002,7 @@@ L:      linux-pm@vger.kernel.or
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
@@@ -1032,6 -1030,15 +1032,15 @@@ S:    Maintaine
  F:    Documentation/hid/amd-sfh*
  F:    drivers/hid/amd-sfh-hid/
  
+ AMPHION VPU CODEC V4L2 DRIVER
+ M:    Ming Qian <ming.qian@nxp.com>
+ M:    Shijie Qin <shijie.qin@nxp.com>
+ M:    Zhou Peng <eagle.zhou@nxp.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/amphion,vpu.yaml
+ F:    drivers/media/platform/amphion/
+ 
  AMS AS73211 DRIVER
  M:    Christian Eggers <ceggers@arri.de>
  L:    linux-iio@vger.kernel.org
@@@ -1621,7 -1628,6 +1630,7 @@@ M:      Olof Johansson <olof@lixom.net
  M:    soc@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/boot/dts/Makefile
  F:    arch/arm64/boot/dts/Makefile
@@@ -1629,7 -1635,6 +1638,7 @@@
  ARM SUB-ARCHITECTURES
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/mach-*/
  F:    arch/arm/plat-*/
@@@ -1770,7 -1775,7 +1779,7 @@@ T:      git https://github.com/AsahiLinux/li
  F:    Documentation/devicetree/bindings/arm/apple.yaml
  F:    Documentation/devicetree/bindings/arm/apple/*
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
 -F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@@ -1783,7 -1788,6 +1792,7 @@@ F:      drivers/irqchip/irq-apple-aic.
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    drivers/soc/apple/*
 +F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
  F:    include/linux/apple-mailbox.h
@@@ -2255,7 -2259,7 +2264,7 @@@ F:      drivers/phy/mediatek
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  W:    http://www.linux4sam.org
@@@ -2573,14 -2577,11 +2582,14 @@@ F:   sound/soc/rockchip
  N:    rockchip
  
  ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
 +R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
@@@ -2615,7 -2616,7 +2624,7 @@@ M:      Łukasz Stelmach <l.stelmach@samsung
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
- F:    drivers/media/platform/s5p-g2d/
+ F:    drivers/media/platform/samsung/s5p-g2d/
  
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -2632,7 -2633,7 +2641,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
- F:    drivers/media/platform/s5p-jpeg/
+ F:    drivers/media/platform/samsung/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -2640,7 -2641,7 +2649,7 @@@ M:      Andrzej Hajda <andrzej.hajda@intel.c
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
- F:    drivers/media/platform/s5p-mfc/
+ F:    drivers/media/platform/samsung/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
@@@ -2709,7 -2710,7 +2718,7 @@@ F:      drivers/clocksource/clksrc_st_lpc.
  F:    drivers/cpufreq/sti-cpufreq.c
  F:    drivers/dma/st_fdma*
  F:    drivers/i2c/busses/i2c-st.c
- F:    drivers/media/platform/sti/c8sectpfe/
+ F:    drivers/media/platform/st/sti/c8sectpfe/
  F:    drivers/media/rc/st_rc.c
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/st/phy-miphy28lp.c
@@@ -2740,7 -2741,7 +2749,7 @@@ N:      stm3
  N:    stm
  
  ARM/Synaptics SoC support
 -M:    Jisheng Zhang <Jisheng.Zhang@synaptics.com>
 +M:    Jisheng Zhang <jszhang@kernel.org>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -3025,7 -3026,7 +3034,7 @@@ L:      linux-media@vger.kernel.or
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
- F:    drivers/media/platform/aspeed-video.c
+ F:    drivers/media/platform/aspeed/
  
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <corentin.chary@gmail.com>
@@@ -3057,12 -3058,6 +3066,12 @@@ L:    linux-hwmon@vger.kernel.or
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_ec_sensors.c
  
 +ASUS EC HARDWARE MONITOR DRIVER
 +M:    Eugene Shalygin <eugene.shalygin@gmail.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwmon/asus-ec-sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:    João Paulo Rechi Vita <jprvita@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -3146,9 -3141,11 +3155,9 @@@ W:     https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@kernel.org>
  L:    linux-wireless@vger.kernel.org
 -S:    Supported
 +S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath6kl/
  
  ATI_REMOTE2 DRIVER
@@@ -3205,7 -3202,6 +3214,7 @@@ ATOMIC INFRASTRUCTUR
  M:    Will Deacon <will@kernel.org>
  M:    Peter Zijlstra <peterz@infradead.org>
  R:    Boqun Feng <boqun.feng@gmail.com>
 +R:    Mark Rutland <mark.rutland@arm.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
@@@ -3387,7 -3383,7 +3396,7 @@@ L:      linux-media@vger.kernel.or
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- F:    drivers/media/platform/sti/bdisp
+ F:    drivers/media/platform/st/sti/bdisp
  
  BECKHOFF CX5020 ETHERCAT MASTER DRIVER
  M:    Dariusz Marcinkiewicz <reksio@newterm.pl>
@@@ -3448,7 -3444,6 +3457,7 @@@ F:      Documentation/ABI/stable/sysfs-bloc
  F:    Documentation/block/
  F:    block/
  F:    drivers/block/
 +F:    include/linux/bio.h
  F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
@@@ -3914,7 -3909,7 +3923,7 @@@ M:      Scott Branden <sbranden@broadcom.com
  M:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://github.com/broadcom/cygnus-linux.git
 +T:    git git://github.com/broadcom/stblinux.git
  F:    arch/arm64/boot/dts/broadcom/northstar2/*
  F:    arch/arm64/boot/dts/broadcom/stingray/*
  F:    drivers/clk/bcm/clk-ns*
@@@ -4170,8 -4165,9 +4179,8 @@@ N:      csk
  K:    csky
  
  CA8210 IEEE-802.15.4 RADIO DRIVER
 -M:    Harry Morris <h.morris@cascoda.com>
  L:    linux-wpan@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  W:    https://github.com/Cascoda/ca8210-linux.git
  F:    Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
  F:    drivers/net/ieee802154/ca8210.c
@@@ -4252,7 -4248,7 +4261,7 @@@ L:      linux-media@vger.kernel.or
  S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/cafe_ccic*
- F:    drivers/media/platform/marvell-ccic/
+ F:    drivers/media/platform/marvell/
  
  CAIF NETWORK LAYER
  L:    netdev@vger.kernel.org
@@@ -4556,7 -4552,6 +4565,7 @@@ F:      drivers/platform/chrome
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <cychiang@chromium.org>
 +M:    Tzung-Bi Shih <tzungbi@google.com>
  R:    Guenter Roeck <groeck@chromium.org>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4776,7 -4771,7 +4785,7 @@@ M:      Philipp Zabel <p.zabel@pengutronix.d
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/coda.yaml
- F:    drivers/media/platform/coda/
+ F:    drivers/media/platform/chips-media/
  
  CODE OF CONDUCT
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -4922,8 -4917,7 +4931,8 @@@ F:      kernel/cgroup/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <hannes@cmpxchg.org>
  M:    Michal Hocko <mhocko@kernel.org>
 -M:    Vladimir Davydov <vdavydov.dev@gmail.com>
 +M:    Roman Gushchin <roman.gushchin@linux.dev>
 +M:    Shakeel Butt <shakeelb@google.com>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -5326,7 -5320,6 +5335,7 @@@ DATA ACCESS MONITO
  M:    SeongJae Park <sj@kernel.org>
  L:    linux-mm@kvack.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
  F:    Documentation/vm/damon/
  F:    include/linux/damon.h
@@@ -5420,7 -5413,6 +5429,7 @@@ F:      drivers/platform/x86/dell/dell-rbtn.
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 +F:    Documentation/ABI/obsolete/procfs-i8k
  F:    drivers/hwmon/dell-smm-hwmon.c
  F:    include/uapi/linux/i8k.h
  
@@@ -5490,7 -5482,7 +5499,7 @@@ L:      linux-media@vger.kernel.or
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- F:    drivers/media/platform/sti/delta
+ F:    drivers/media/platform/st/sti/delta
  
  DELTA AHE-50DC FAN CONTROL MODULE DRIVER
  M:    Zev Weiss <zev@bewilderbeest.net>
@@@ -6318,8 -6310,8 +6327,8 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/vboxvideo/
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
  M:    Zack Rusin <zackr@vmware.com>
 +R:    VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7023,6 -7015,12 +7032,6 @@@ L:     linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 -EDAC-SIFIVE
 -M:    Yash Shah <yash.shah@sifive.com>
 -L:    linux-edac@vger.kernel.org
 -S:    Supported
 -F:    drivers/edac/sifive_edac.c
 -
  EDAC-SKYLAKE
  M:    Tony Luck <tony.luck@intel.com>
  L:    linux-edac@vger.kernel.org
@@@ -7193,7 -7191,7 +7202,7 @@@ F:      drivers/net/can/usb/etas_es58x
  
  ETHERNET BRIDGE
  M:    Roopa Prabhu <roopa@nvidia.com>
 -M:    Nikolay Aleksandrov <nikolay@nvidia.com>
 +M:    Nikolay Aleksandrov <razor@blackwall.org>
  L:    bridge@lists.linux-foundation.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -7219,10 -7217,8 +7228,10 @@@ F:    drivers/net/mdio/of_mdio.
  F:    drivers/net/pcs/
  F:    drivers/net/phy/
  F:    include/dt-bindings/net/qca-ar803x.h
 +F:    include/linux/linkmode.h
  F:    include/linux/*mdio*.h
  F:    include/linux/mdio/*.h
 +F:    include/linux/mii.h
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
@@@ -7236,9 -7232,6 +7245,9 @@@ F:      net/core/of_net.
  EXEC & BINFMT API
  R:    Eric Biederman <ebiederm@xmission.com>
  R:    Kees Cook <keescook@chromium.org>
 +L:    linux-mm@kvack.org
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
  F:    arch/alpha/kernel/binfmt_loader.c
  F:    arch/x86/ia32/ia32_aout.c
  F:    fs/*binfmt_*.c
@@@ -7246,7 -7239,6 +7255,7 @@@ F:      fs/exec.
  F:    include/linux/binfmts.h
  F:    include/linux/elf.h
  F:    include/uapi/linux/binfmts.h
 +F:    include/uapi/linux/elf.h
  F:    tools/testing/selftests/exec/
  N:    asm/elf.h
  N:    binfmt
@@@ -7282,9 -7274,7 +7291,9 @@@ Extended Verification Module (EVM
  M:    Mimi Zohar <zohar@linux.ibm.com>
  L:    linux-integrity@vger.kernel.org
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/evm/
 +F:    security/integrity/
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
  M:    Ard Biesheuvel <ardb@kernel.org>
@@@ -7592,12 -7582,6 +7601,12 @@@ S:    Maintaine
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
  F:    arch/x86/math-emu/
  
 +FRAMEBUFFER CORE
 +M:    Daniel Vetter <daniel@ffwll.ch>
 +F:    drivers/video/fbdev/core/
 +S:    Odd Fixes
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  FRAMEBUFFER LAYER
  M:    Helge Deller <deller@gmx.de>
  L:    linux-fbdev@vger.kernel.org
@@@ -7761,7 -7745,8 +7770,7 @@@ M:      Qiang Zhao <qiang.zhao@nxp.com
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/soc/fsl/qe/
 -F:    include/soc/fsl/*qe*.h
 -F:    include/soc/fsl/*ucc*.h
 +F:    include/soc/fsl/qe/
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <leoyang.li@nxp.com>
@@@ -7792,7 -7777,6 +7801,7 @@@ F:      Documentation/devicetree/bindings/mi
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
 +F:    include/soc/fsl/
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
@@@ -8660,7 -8644,7 +8669,7 @@@ S:      Maintaine
  F:    drivers/gpio/gpio-hisi.c
  
  HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Longfang Liu <liulongfang@huawei.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-hpre
@@@ -8740,8 -8724,8 +8749,8 @@@ F:      Documentation/devicetree/bindings/sc
  F:    drivers/scsi/hisi_sas/
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 -M:    Zaibo Xu <xuzaibo@huawei.com>
  M:    Kai Ye <yekai13@huawei.com>
 +M:    Longfang Liu <liulongfang@huawei.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-sec
@@@ -8772,7 -8756,7 +8781,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    drivers/mfd/hi6421-spmi-pmic.c
  
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Weili Qian <qianweili@huawei.com>
  S:    Maintained
  F:    drivers/crypto/hisilicon/trng/trng.c
  
@@@ -8886,7 -8870,7 +8895,7 @@@ L:      linux-media@vger.kernel.or
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- F:    drivers/media/platform/sti/hva
+ F:    drivers/media/platform/st/sti/hva
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Naoya Horiguchi <naoya.horiguchi@nec.com>
@@@ -8921,6 -8905,12 +8930,12 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/hi846.c
  
+ HYNIX HI847 SENSOR DRIVER
+ M:    Shawn Tu <shawnx.tu@intel.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    drivers/media/i2c/hi847.c
+ 
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
@@@ -9275,15 -9265,6 +9290,15 @@@ S:    Maintaine
  W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
 +IDMAPPED MOUNTS
 +M:    Christian Brauner <brauner@kernel.org>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +F:    Documentation/filesystems/idmappings.rst
 +F:    tools/testing/selftests/mount_setattr/
 +F:    include/linux/mnt_idmapping.h
 +
  IDT VersaClock 5 CLOCK DRIVER
  M:    Luca Ceresoli <luca@lucaceresoli.net>
  S:    Maintained
@@@ -9541,7 -9522,6 +9556,7 @@@ L:      linux-integrity@vger.kernel.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/ima/
 +F:    security/integrity/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
@@@ -10035,6 -10015,14 +10050,14 @@@ L: linux-iio@vger.kernel.or
  F:    Documentation/devicetree/bindings/counter/interrupt-counter.yaml
  F:    drivers/counter/interrupt-cnt.c
  
+ INTERSIL ISL7998X VIDEO DECODER DRIVER
+ M:    Michael Tretter <m.tretter@pengutronix.de>
+ R:    Pengutronix Kernel Team <kernel@pengutronix.de>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/i2c/isil,isl79987.yaml
+ F:    drivers/media/i2c/isl7998x.c
+ 
  INVENSENSE ICM-426xx IMU DRIVER
  M:    Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
  L:    linux-iio@vger.kernel.org
@@@ -10334,7 -10322,7 +10357,7 @@@ M:   Mikhail Ulyanov <mikhail.ulyanov@cog
  L:    linux-media@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
- F:    drivers/media/platform/rcar_jpu.c
+ F:    drivers/media/platform/renesas/rcar_jpu.c
  
  JSM Neo PCI based serial card
  L:    linux-serial@vger.kernel.org
@@@ -10473,8 -10461,6 +10496,8 @@@ KERNEL REGRESSION
  M:    Thorsten Leemhuis <linux@leemhuis.info>
  L:    regressions@lists.linux.dev
  S:    Supported
 +F:    Documentation/admin-guide/reporting-regressions.rst
 +F:    Documentation/process/handling-regressions.rst
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <shuah@kernel.org>
@@@ -10680,14 -10666,6 +10703,14 @@@ F: include/linux/keyctl.
  F:    include/uapi/linux/keyctl.h
  F:    security/keys/
  
 +KEYS/KEYRINGS_INTEGRITY
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
 +M:    Mimi Zohar <zohar@linux.ibm.com>
 +L:    linux-integrity@vger.kernel.org
 +L:    keyrings@vger.kernel.org
 +S:    Supported
 +F:    security/integrity/platform_certs
 +
  KFENCE
  M:    Alexander Potapenko <glider@google.com>
  M:    Marco Elver <elver@google.com>
@@@ -10922,12 -10900,6 +10945,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/pata_arasan_cf.c
  F:    include/linux/pata_arasan_cf_data.h
  
 +LIBATA PATA DRIVERS
 +R:    Sergey Shtylyov <s.shtylyov@omp.ru>
 +L:    linux-ide@vger.kernel.org
 +F:    drivers/ata/ata_*.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
@@@ -11158,17 -11130,12 +11181,17 @@@ F:        lib/list-test.
  LITEX PLATFORM
  M:    Karol Gugala <kgugala@antmicro.com>
  M:    Mateusz Holenko <mholenko@antmicro.com>
 +M:    Gabriel Somlo <gsomlo@gmail.com>
 +M:    Joel Stanley <joel@jms.id.au>
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/litex,*.yaml
  F:    arch/openrisc/boot/dts/or1klitex.dts
 -F:    drivers/soc/litex/litex_soc_ctrl.c
 -F:    drivers/tty/serial/liteuart.c
  F:    include/linux/litex.h
 +F:    drivers/tty/serial/liteuart.c
 +F:    drivers/soc/litex/*
 +F:    drivers/net/ethernet/litex/*
 +F:    drivers/mmc/host/litex_mmc.c
 +N:    litex
  
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
@@@ -11422,9 -11389,8 +11445,9 @@@ M:   Johannes Berg <johannes@sipsolutions
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  W:    https://wireless.wiki.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
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/networking/mac80211-injection.rst
  F:    Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
  F:    drivers/net/wireless/mac80211_hwsim.[ch]
@@@ -11708,7 -11674,7 +11731,7 @@@ F:   drivers/iio/proximity/mb1232.
  
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <iskren.chernev@gmail.com>
 -R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +R:    Krzysztof Kozlowski <krzk@kernel.org>
  R:    Marek Szyprowski <m.szyprowski@samsung.com>
  R:    Matheus Castello <matheus@castello.eng.br>
  L:    linux-pm@vger.kernel.org
@@@ -11718,7 -11684,7 +11741,7 @@@ F:   drivers/power/supply/max17040_batter
  
  MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
  R:    Hans de Goede <hdegoede@redhat.com>
 -R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +R:    Krzysztof Kozlowski <krzk@kernel.org>
  R:    Marek Szyprowski <m.szyprowski@samsung.com>
  R:    Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
  R:    Purism Kernel Team <kernel@puri.sm>
@@@ -11752,7 -11718,7 +11775,7 @@@ MAXIM MAX77802 PMIC REGULATOR DEVICE DR
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/*/*max77802.txt
 +F:    Documentation/devicetree/bindings/*/*max77802.yaml
  F:    drivers/regulator/max77802-regulator.c
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -11763,26 -11729,23 +11786,26 @@@ F:        Documentation/devicetree/bindings/po
  F:    drivers/power/supply/max77976_charger.c
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <cw00.choi@samsung.com>
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 +F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
 +F:    Documentation/devicetree/bindings/*/maxim,max77843.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
 -F:    Documentation/devicetree/bindings/mfd/max14577.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
 +F:    drivers/*/*max77843.c
  F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
  F:    drivers/*/max77693*.c
@@@ -11878,7 -11841,7 +11901,7 @@@ M:   Philipp Zabel <p.zabel@pengutronix.d
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
- F:    drivers/media/platform/imx-pxp.[ch]
+ F:    drivers/media/platform/nxp/imx-pxp.[ch]
  
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <serjk@netup.ru>
@@@ -11943,10 -11906,10 +11966,10 @@@ L:        linux-media@vger.kernel.or
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/imx7.rst
+ F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
- F:    Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
+ F:    drivers/media/platform/imx/imx-mipi-csis.c
  F:    drivers/staging/media/imx/imx7-media-csi.c
- F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <aospan@netup.ru>
@@@ -12001,7 -11964,7 +12024,7 @@@ L:   linux-tegra@vger.kernel.or
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
- F:    drivers/staging/media/tegra-vde/
+ F:    drivers/media/platform/nvidia/tegra-vde/
  
  MEDIA DRIVERS FOR RENESAS - CEU
  M:    Jacopo Mondi <jacopo@jmondi.org>
@@@ -12010,7 -11973,7 +12033,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,ceu.yaml
- F:    drivers/media/platform/renesas-ceu.c
+ F:    drivers/media/platform/renesas/renesas-ceu.c
  F:    include/media/drv-intf/renesas-ceu.h
  
  MEDIA DRIVERS FOR RENESAS - DRIF
@@@ -12020,7 -11983,7 +12043,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,drif.yaml
- F:    drivers/media/platform/rcar_drif.c
+ F:    drivers/media/platform/renesas/rcar_drif.c
  
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -12029,7 -11992,7 +12052,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fcp.yaml
- F:    drivers/media/platform/rcar-fcp.c
+ F:    drivers/media/platform/renesas/rcar-fcp.c
  F:    include/media/rcar-fcp.h
  
  MEDIA DRIVERS FOR RENESAS - FDP1
@@@ -12039,7 -12002,7 +12062,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fdp1.yaml
- F:    drivers/media/platform/rcar_fdp1.c
+ F:    drivers/media/platform/renesas/rcar_fdp1.c
  
  MEDIA DRIVERS FOR RENESAS - VIN
  M:    Niklas Söderlund <niklas.soderlund@ragnatech.se>
@@@ -12050,8 -12013,8 +12073,8 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
- F:    drivers/media/platform/rcar-isp.c
- F:    drivers/media/platform/rcar-vin/
+ F:    drivers/media/platform/renesas/rcar-isp.c
+ F:    drivers/media/platform/renesas/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -12061,7 -12024,7 +12084,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.yaml
- F:    drivers/media/platform/vsp1/
+ F:    drivers/media/platform/renesas/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
  L:    linux-media@vger.kernel.org
@@@ -12083,7 -12046,7 +12106,7 @@@ L:   linux-media@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
- F:    drivers/media/platform/stm32/stm32-dcmi.c
+ F:    drivers/media/platform/st/stm32/stm32-dcmi.c
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
@@@ -12167,7 -12130,7 +12190,7 @@@ M:   Rick Chang <rick.chang@mediatek.com
  M:    Bin Liu <bin.liu@mediatek.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
- F:    drivers/media/platform/mtk-jpeg/
+ F:    drivers/media/platform/mediatek/jpeg/
  
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <minghsiu.tsai@mediatek.com>
@@@ -12175,8 -12138,8 +12198,8 @@@ M:   Houlong Wei <houlong.wei@mediatek.co
  M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-mdp.txt
- F:    drivers/media/platform/mtk-mdp/
- F:    drivers/media/platform/mtk-vpu/
+ F:    drivers/media/platform/mediatek/mdp/
+ F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MEDIA DRIVER
  M:    Tiffany Lin <tiffany.lin@mediatek.com>
@@@ -12184,8 -12147,8 +12207,8 @@@ M:   Andrew-CT Chen <andrew-ct.chen@media
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
- F:    drivers/media/platform/mtk-vcodec/
- F:    drivers/media/platform/mtk-vpu/
+ F:    drivers/media/platform/mediatek/vcodec/
+ F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MMC/SD/SDIO DRIVER
  M:    Chaotian Jing <chaotian.jing@mediatek.com>
@@@ -12456,7 -12419,7 +12479,7 @@@ F:   include/uapi/linux/membarrier.
  F:    kernel/sched/membarrier.c
  
  MEMBLOCK
 -M:    Mike Rapoport <rppt@linux.ibm.com>
 +M:    Mike Rapoport <rppt@kernel.org>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    Documentation/core-api/boot-time-mm.rst
@@@ -12464,7 -12427,7 +12487,7 @@@ F:   include/linux/memblock.
  F:    mm/memblock.c
  
  MEMORY CONTROLLER DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@@ -12560,7 -12523,7 +12583,7 @@@ L:   linux-amlogic@lists.infradead.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
- F:    drivers/media/platform/meson/ge2d/
+ F:    drivers/media/platform/amlogic/meson-ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <liang.yang@amlogic.com>
@@@ -12642,6 -12605,13 +12665,13 @@@ L: alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/atmel
  
+ MICROCHIP CSI2DC DRIVER
+ M:    Eugen Hristev <eugen.hristev@microchip.com>
+ L:    linux-media@vger.kernel.org
+ S:    Supported
+ F:    Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
+ F:    drivers/media/platform/atmel/microchip-csi2dc.c
+ 
  MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
  L:    linux-crypto@vger.kernel.org
@@@ -12667,11 -12637,8 +12697,8 @@@ L:  linux-media@vger.kernel.or
  S:    Supported
  F:    Documentation/devicetree/bindings/media/atmel,isc.yaml
  F:    Documentation/devicetree/bindings/media/microchip,xisc.yaml
- F:    drivers/media/platform/atmel/atmel-isc-base.c
- F:    drivers/media/platform/atmel/atmel-isc-regs.h
- F:    drivers/media/platform/atmel/atmel-isc.h
- F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
- F:    drivers/media/platform/atmel/atmel-sama7g5-isc.c
+ F:    drivers/media/platform/atmel/atmel-isc*
+ F:    drivers/media/platform/atmel/atmel-sama*-isc*
  F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
@@@ -13354,8 -13321,8 +13381,8 @@@ W:   http://www.iptables.org
  W:    http://www.nftables.org/
  Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
  C:    irc://irc.libera.chat/netfilter
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
  F:    include/net/netfilter/
@@@ -13412,7 -13379,6 +13439,7 @@@ F:   net/core/drop_monitor.
  NETWORKING DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Jakub Kicinski <kuba@kernel.org>
 +M:    Paolo Abeni <pabeni@redhat.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13435,10 -13401,9 +13462,10 @@@ NETWORKING DRIVERS (WIRELESS
  M:    Kalle Valo <kvalo@kernel.org>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
 -Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 +W:    https://wireless.wiki.kernel.org/
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/devicetree/bindings/net/wireless/
  F:    drivers/net/wireless/
  
@@@ -13459,7 -13424,6 +13486,7 @@@ F:   tools/testing/selftests/drivers/net/
  NETWORKING [GENERAL]
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Jakub Kicinski <kuba@kernel.org>
 +M:    Paolo Abeni <pabeni@redhat.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13512,11 -13476,7 +13539,11 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  F:    arch/x86/net/*
 +F:    include/linux/ip.h
 +F:    include/linux/ipv6*
 +F:    include/net/fib*
  F:    include/net/ip*
 +F:    include/net/route.h
  F:    net/ipv4/
  F:    net/ipv6/
  
@@@ -13577,6 -13537,10 +13604,6 @@@ F:  include/net/tls.
  F:    include/uapi/linux/tls.h
  F:    net/tls/*
  
 -NETWORKING [WIRELESS]
 -L:    linux-wireless@vger.kernel.org
 -Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -
  NETXEN (1/10) GbE SUPPORT
  M:    Manish Chopra <manishc@marvell.com>
  M:    Rahul Verma <rahulv@marvell.com>
@@@ -13603,7 -13567,7 +13630,7 @@@ F:   include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-nfc@lists.01.org (subscribers-only)
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -13624,7 -13588,7 +13651,7 @@@ F:   tools/testing/selftests/nci
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@hammerspace.com>
 -M:    Anna Schumaker <anna.schumaker@netapp.com>
 +M:    Anna Schumaker <anna@kernel.org>
  L:    linux-nfs@vger.kernel.org
  S:    Maintained
  W:    http://client.linux-nfs.org
@@@ -13737,7 -13701,7 +13764,7 @@@ F:   scripts/nsdep
  NTB AMD DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  F:    drivers/ntb/hw/amd/
  
@@@ -13745,7 -13709,7 +13772,7 @@@ NTB DRIVER COR
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
  M:    Allen Hubbe <allenbh@gmail.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -13757,13 -13721,13 +13784,13 @@@ F:        tools/testing/selftests/ntb
  
  NTB IDT DRIVER
  M:    Serge Semin <fancer.lancer@gmail.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  F:    drivers/ntb/hw/idt/
  
  NTB INTEL DRIVER
  M:    Dave Jiang <dave.jiang@intel.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  W:    https://github.com/davejiang/linux/wiki
  T:    git https://github.com/davejiang/linux.git
@@@ -13917,7 -13881,7 +13944,7 @@@ F:   Documentation/devicetree/bindings/re
  F:    drivers/regulator/pf8x00-regulator.c
  
  NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14130,7 -14094,7 +14157,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/ti,omap3isp.txt
- F:    drivers/media/platform/omap3isp/
+ F:    drivers/media/platform/ti/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
  OMAP MMC SUPPORT
@@@ -14238,6 -14202,12 +14265,12 @@@ M: Harald Welte <laforge@gnumonks.org
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
+ OMNIVISION OG01A1B SENSOR DRIVER
+ M:    Shawn Tu <shawnx.tu@intel.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    drivers/media/i2c/og01a1b.c
+ 
  OMNIVISION OV02A10 SENSOR DRIVER
  M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
  L:    linux-media@vger.kernel.org
@@@ -14246,6 -14216,13 +14279,13 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
  F:    drivers/media/i2c/ov02a10.c
  
+ OMNIVISION OV08D10 SENSOR DRIVER
+ M:    Jimmy Su <jimmy.su@intel.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ T:    git git://linuxtv.org/media_tree.git
+ F:    drivers/media/i2c/ov08d10.c
+ 
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
@@@ -14442,7 -14419,6 +14482,7 @@@ M:   Rob Herring <robh+dt@kernel.org
  M:    Frank Rowand <frowand.list@gmail.com>
  L:    devicetree@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  W:    http://www.devicetree.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/ABI/testing/sysfs-firmware-ofw
@@@ -14454,7 -14430,6 +14494,7 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Rob Herring <robh+dt@kernel.org>
  L:    devicetree@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  Q:    http://patchwork.ozlabs.org/project/devicetree-bindings/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/devicetree/
@@@ -14641,9 -14616,8 +14681,9 @@@ F:   include/uapi/linux/ppdev.
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <jgross@suse.com>
 -M:    Deep Shah <sdeep@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +M:    Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
 +R:    Alexey Makhalov <amakhalov@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
  L:    x86@kernel.org
  S:    Supported
@@@ -15189,7 -15163,7 +15229,7 @@@ M:   Ingo Molnar <mingo@redhat.com
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  R:    Mark Rutland <mark.rutland@arm.com>
  R:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 -R:    Jiri Olsa <jolsa@redhat.com>
 +R:    Jiri Olsa <jolsa@kernel.org>
  R:    Namhyung Kim <namhyung@kernel.org>
  L:    linux-perf-users@vger.kernel.org
  L:    linux-kernel@vger.kernel.org
@@@ -15344,13 -15318,11 +15384,13 @@@ F:        drivers/pinctrl/renesas
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <tomasz.figa@gmail.com>
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
  F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@@ -15572,7 -15544,6 +15612,7 @@@ F:   drivers/net/ppp/pptp.
  
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <hannes@cmpxchg.org>
 +M:    Suren Baghdasaryan <surenb@google.com>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
@@@ -15608,7 -15579,6 +15648,7 @@@ M:   Iurii Zaikin <yzaikin@google.com
  L:    linux-kernel@vger.kernel.org
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl-next
  F:    fs/proc/proc_sysctl.c
  F:    include/linux/sysctl.h
  F:    kernel/sysctl-test.c
@@@ -15956,7 -15926,6 +15996,7 @@@ S:   Supporte
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath10k/
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <kvalo@kernel.org>
@@@ -15964,12 -15933,11 +16004,12 @@@ L:        ath11k@lists.infradead.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath11k/
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.txt
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    ath9k-devel@qca.qualcomm.com
 +M:    Toke Høiland-Jørgensen <toke@toke.dk>
  L:    linux-wireless@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
  F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
@@@ -16044,6 -16012,14 +16084,6 @@@ F:  Documentation/devicetree/bindings/mi
  F:    drivers/misc/fastrpc.c
  F:    include/uapi/misc/fastrpc.h
  
 -QUALCOMM GENERIC INTERFACE I2C DRIVER
 -M:    Akash Asthana <akashast@codeaurora.org>
 -M:    Mukesh Savaliya <msavaliy@codeaurora.org>
 -L:    linux-i2c@vger.kernel.org
 -L:    linux-arm-msm@vger.kernel.org
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-qcom-geni.c
 -
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Brian Cain <bcain@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
@@@ -16115,8 -16091,8 +16155,8 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
  QUALCOMM RMNET DRIVER
 -M:    Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
 -M:    Sean Tranchetti <stranche@codeaurora.org>
 +M:    Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
 +M:    Sean Tranchetti <quic_stranche@quicinc.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
@@@ -16142,10 -16118,11 +16182,10 @@@ F:        Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@kernel.org>
 +M:    Loic Poulain <loic.poulain@linaro.org>
  L:    wcn36xx@lists.infradead.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
 -T:    git git://github.com/KrasnikovEugene/wcn36xx.git
  F:    drivers/net/wireless/ath/wcn36xx/
  
  QUANTENNA QTNFMAC WIRELESS DRIVER
@@@ -16247,7 -16224,6 +16287,7 @@@ M:   Jason A. Donenfeld <Jason@zx2c4.com
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
  S:    Maintained
  F:    drivers/char/random.c
 +F:    drivers/virt/vmgenid.c
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <mporter@kernel.crashing.org>
@@@ -16362,8 -16338,6 +16402,8 @@@ F:   tools/testing/selftests/resctrl
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <paulmck@kernel.org>
 +M:    Frederic Weisbecker <frederic@kernel.org> (kernel/rcu/tree_nocb.h)
 +M:    Neeraj Upadhyay <quic_neeraju@quicinc.com> (kernel/rcu/tasks.h)
  M:    Josh Triplett <josh@joshtriplett.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -16411,7 -16385,6 +16451,7 @@@ F:   drivers/watchdog/realtek_otto_wdt.
  
  REALTEK RTL83xx SMI DSA ROUTER CHIPS
  M:    Linus Walleij <linus.walleij@linaro.org>
 +M:    Alvin Šipraga <alsi@bang-olufsen.dk>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
  F:    drivers/net/dsa/realtek-smi*
@@@ -16531,14 -16504,6 +16571,14 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
 +RENESAS R-CAR SATA DRIVER
 +R:    Sergey Shtylyov <s.shtylyov@omp.ru>
 +S:    Supported
 +L:    linux-ide@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +F:    Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
 +F:    drivers/ata/sata_rcar.c
 +
  RENESAS R-CAR THERMAL DRIVERS
  M:    Niklas Söderlund <niklas.soderlund@ragnatech.se>
  L:    linux-renesas-soc@vger.kernel.org
@@@ -16607,9 -16572,8 +16647,9 @@@ M:   Johannes Berg <johannes@sipsolutions
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  W:    https://wireless.wiki.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
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/ABI/stable/sysfs-class-rfkill
  F:    Documentation/driver-api/rfkill.rst
  F:    include/linux/rfkill.h
@@@ -16680,8 -16644,7 +16720,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/rockchip/rockchip_i2s_tdm.*
  
  ROCKCHIP ISP V1 DRIVER
- M:    Helen Koike <helen.koike@collabora.com>
- M:    Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
+ M:    Dafna Hirschfeld <dafna@fastmail.com>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -16874,8 -16837,8 +16913,8 @@@ F:   drivers/video/fbdev/savage
  S390
  M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <gor@linux.ibm.com>
 -M:    Christian Borntraeger <borntraeger@linux.ibm.com>
 -R:    Alexander Gordeev <agordeev@linux.ibm.com>
 +M:    Alexander Gordeev <agordeev@linux.ibm.com>
 +R:    Christian Borntraeger <borntraeger@linux.ibm.com>
  R:    Sven Schnelle <svens@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
@@@ -16990,7 -16953,7 +17029,7 @@@ W:   http://www.ibm.com/developerworks/li
  F:    drivers/s390/scsi/zfcp_*
  
  S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-samsung-soc@vger.kernel.org
  S:    Odd Fixes
  F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17035,7 -16998,7 +17074,7 @@@ F:   Documentation/admin-guide/LSM/SafeSe
  F:    security/safesetid/
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
@@@ -17043,7 -17006,7 +17082,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/samsung/
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -17078,7 -17041,7 +17117,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-kernel@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
@@@ -17100,11 -17063,11 +17139,11 @@@ M:        Sylwester Nawrocki <sylvester.nawroc
  L:    linux-media@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
- F:    drivers/media/platform/s3c-camif/
+ F:    drivers/media/platform/samsung/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Krzysztof Opasiak <k.opasiak@samsung.com>
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Maintained
@@@ -17126,7 -17089,7 +17165,7 @@@ S:   Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Vladimir Zapolskiy <vz@mleia.com>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
@@@ -17140,13 -17103,12 +17179,13 @@@ M:        Sylwester Nawrocki <s.nawrocki@samsu
  L:    linux-media@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
- F:    drivers/media/platform/exynos4-is/
+ F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  M:    Tomasz Figa <tomasz.figa@gmail.com>
  M:    Chanwoo Choi <cw00.choi@samsung.com>
 +R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
@@@ -17161,12 -17123,12 +17200,12 @@@ F:        include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Andi Shyti <andi@etezian.org>
  L:    linux-spi@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    Documentation/devicetree/bindings/spi/samsung,spi*.yaml
  F:    drivers/spi/spi-s3c*
  F:    include/linux/platform_data/spi-s3c64xx.h
  F:    include/linux/spi/s3c24xx-fiq.h
@@@ -17178,12 -17140,11 +17217,12 @@@ S:        Supporte
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +M:    Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
 -S:    Supported
 -T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -17575,7 -17536,7 +17614,7 @@@ F:   include/media/i2c/rj54n1cb0c.
  SH_VOU V4L2 OUTPUT DRIVER
  L:    linux-media@vger.kernel.org
  S:    Orphan
- F:    drivers/media/platform/sh_vou.c
+ F:    drivers/media/platform/renesas/sh_vou.c
  F:    include/media/drv-intf/sh_vou.h
  
  SI2157 MEDIA DRIVER
@@@ -17784,21 -17745,6 +17823,21 @@@ S: Maintaine
  W:    http://www.winischhofer.at/linuxsisusbvga.shtml
  F:    drivers/usb/misc/sisusbvga/
  
 +SL28 CPLD MFD DRIVER
 +M:    Michael Walle <michael@walle.cc>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
 +F:    Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
 +F:    Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
 +F:    Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
 +F:    Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
 +F:    drivers/gpio/gpio-sl28cpld.c
 +F:    drivers/hwmon/sl28cpld-hwmon.c
 +F:    drivers/irqchip/irq-sl28cpld.c
 +F:    drivers/pwm/pwm-sl28cpld.c
 +F:    drivers/watchdog/sl28cpld_wdt.c
 +
  SLAB ALLOCATOR
  M:    Christoph Lameter <cl@linux.com>
  M:    Pekka Enberg <penberg@kernel.org>
@@@ -17806,10 -17752,8 +17845,10 @@@ M: David Rientjes <rientjes@google.com
  M:    Joonsoo Kim <iamjoonsoo.kim@lge.com>
  M:    Andrew Morton <akpm@linux-foundation.org>
  M:    Vlastimil Babka <vbabka@suse.cz>
 +R:    Roman Gushchin <roman.gushchin@linux.dev>
  L:    linux-mm@kvack.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
  F:    include/linux/sl?b*.h
  F:    mm/sl?b*
  
@@@ -18347,7 -18291,8 +18386,8 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/imu/st_lsm6dsx/
  
  ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
- M:    Mickael Guene <mickael.guene@st.com>
+ M:    Benjamin Mugnier <benjamin.mugnier@foss.st.com>
+ M:    Sylvain Petinot <sylvain.petinot@foss.st.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -18586,13 -18531,6 +18626,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
  F:    drivers/rtc/rtc-sunplus.c
  
 +SUNPLUS SPI CONTROLLER INTERFACE DRIVER
 +M:    Li-hao Kuo <lhjeff911@gmail.com>
 +L:    linux-spi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
 +F:    drivers/spi/spi-sunplus-sp7021.c
 +
  SUPERH
  M:    Yoshinori Sato <ysato@users.sourceforge.jp>
  M:    Rich Felker <dalias@libc.org>
@@@ -19324,7 -19262,7 +19364,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
- F:    drivers/media/platform/am437x/
+ F:    drivers/media/platform/ti/am437x/
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <edubezval@gmail.com>
@@@ -19383,7 -19321,7 +19423,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
- F:    drivers/media/platform/davinci/
+ F:    drivers/media/platform/ti/davinci/
  F:    include/media/davinci/
  
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@@ -19469,7 -19407,8 +19509,8 @@@ W:   http://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
- F:    drivers/media/platform/ti-vpe/
+ F:    drivers/media/platform/ti/cal/
+ F:    drivers/media/platform/ti/vpe/
  
  TI WILINK WIRELESS DRIVERS
  L:    linux-wireless@vger.kernel.org
@@@ -19540,15 -19479,6 +19581,15 @@@ S: Maintaine
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
 +TMP464 HARDWARE MONITOR DRIVER
 +M:    Agathe Porte <agathe.porte@nokia.com>
 +M:    Guenter Roeck <linux@roeck-us.net>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
 +F:    Documentation/hwmon/tmp464.rst
 +F:    drivers/hwmon/tmp464.c
 +
  TMP513 HARDWARE MONITOR DRIVER
  M:    Eric Tremblay <etremblay@distech-controls.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -19687,14 -19617,6 +19728,14 @@@ F: Documentation/trace/timerlat-tracer.
  F:    Documentation/trace/hwlat_detector.rst
  F:    arch/*/kernel/trace.c
  
 +Real-time Linux Analysis (RTLA) tools
 +M:    Daniel Bristot de Oliveira <bristot@kernel.org>
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +L:    linux-trace-devel@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/tools/rtla/
 +F:    tools/tracing/rtla/
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <src.res@email.cn>
  L:    linux-doc-tw-discuss@lists.sourceforge.net
@@@ -20442,8 -20364,8 +20483,8 @@@ F:   drivers/media/common/videobuf2/
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
- M:    Helen Koike <helen.koike@collabora.com>
- R:    Shuah Khan <skhan@linuxfoundation.org>
+ M:    Shuah Khan <skhan@linuxfoundation.org>
+ R:    Kieran Bingham <kieran.bingham@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  W:    https://linuxtv.org
@@@ -20698,33 -20620,30 +20739,33 @@@ F:        tools/testing/vsock
  
  VMWARE BALLOON DRIVER
  M:    Nadav Amit <namit@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Deep Shah <sdeep@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +M:    Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
 +M:    Alexey Makhalov <amakhalov@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
 +L:    x86@kernel.org
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vmware
  F:    arch/x86/include/asm/vmware.h
  F:    arch/x86/kernel/cpu/vmware.c
  
  VMWARE PVRDMA DRIVER
  M:    Bryan Tan <bryantan@vmware.com>
  M:    Vishnu Dasa <vdasa@vmware.com>
 -M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
  VMware PVSCSI driver
  M:    Vishal Bhakta <vbhakta@vmware.com>
 -M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/vmw_pvscsi.c
@@@ -20732,7 -20651,7 +20773,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
  M:    Vivek Thampi <vithampi@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/ptp/ptp_vmw.c
@@@ -20740,15 -20659,14 +20781,15 @@@
  VMWARE VMCI DRIVER
  M:    Jorgen Hansen <jhansen@vmware.com>
  M:    Vishnu Dasa <vdasa@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-kernel@vger.kernel.org
 -L:    pv-drivers@vmware.com (private)
  S:    Maintained
  F:    drivers/misc/vmw_vmci/
  
  VMWARE VMMOUSE SUBDRIVER
 -M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +M:    Zack Rusin <zackr@vmware.com>
 +R:    VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  F:    drivers/input/mouse/vmmouse.c
@@@ -20756,7 -20674,7 +20797,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <doshir@vmware.com>
 -M:    pv-drivers@vmware.com
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -21132,7 -21050,7 +21173,7 @@@ L:   linux-media@vger.kernel.or
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- F:    drivers/media/tuners/tuner-xc2028.*
+ F:    drivers/media/tuners/xc2028.*
  
  XDP (eXpress Data Path)
  M:    Alexei Starovoitov <ast@kernel.org>
@@@ -21352,11 -21270,6 +21393,11 @@@ T: git https://github.com/Xilinx/linux-
  F:    Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
  F:    drivers/phy/xilinx/phy-zynqmp.c
  
 +XILINX ZYNQMP SHA3 DRIVER
 +M:    Harsha <harsha.harsha@xilinx.com>
 +S:    Maintained
 +F:    drivers/crypto/xilinx/zynqmp-sha.c
 +
  XILINX EVENT MANAGEMENT DRIVER
  M:    Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
  S:    Maintained
@@@ -21537,6 -21450,7 +21578,6 @@@ THE RES
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
  S:    Buried alive in reporters
 -Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  F:    *
  F:    */