Merge tag 'x86_sgx_for_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
[linux-2.6-microblaze.git] / MAINTAINERS
index cf0f185..99b5ade 100644 (file)
@@ -1093,6 +1093,16 @@ S:       Maintained
 F:     Documentation/hid/amd-sfh*
 F:     drivers/hid/amd-sfh-hid/
 
+AMLOGIC DDR PMU DRIVER
+M:     Jiucheng Xu <jiucheng.xu@amlogic.com>
+L:     linux-amlogic@lists.infradead.org
+S:     Supported
+W:     http://www.amlogic.com
+F:     Documentation/admin-guide/perf/meson-ddr-pmu.rst
+F:     Documentation/devicetree/bindings/perf/amlogic,g12-ddr-pmu.yaml
+F:     drivers/perf/amlogic/
+F:     include/soc/amlogic/
+
 AMPHION VPU CODEC V4L2 DRIVER
 M:     Ming Qian <ming.qian@nxp.com>
 M:     Shijie Qin <shijie.qin@nxp.com>
@@ -1685,7 +1695,7 @@ M:        Miquel Raynal <miquel.raynal@bootlin.com>
 M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml
+F:     Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
 F:     drivers/memory/pl353-smc.c
 
 ARM PRIMECELL CLCD PL110 DRIVER
@@ -1897,6 +1907,7 @@ T:        git https://github.com/AsahiLinux/linux.git
 F:     Documentation/devicetree/bindings/arm/apple.yaml
 F:     Documentation/devicetree/bindings/arm/apple/*
 F:     Documentation/devicetree/bindings/clock/apple,nco.yaml
+F:     Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml
 F:     Documentation/devicetree/bindings/dma/apple,admac.yaml
 F:     Documentation/devicetree/bindings/i2c/apple,i2c.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/apple,*
@@ -1911,6 +1922,7 @@ F:        Documentation/devicetree/bindings/power/apple*
 F:     Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
 F:     arch/arm64/boot/dts/apple/
 F:     drivers/clk/clk-apple-nco.c
+F:     drivers/cpufreq/apple-soc-cpufreq.c
 F:     drivers/dma/apple-admac.c
 F:     drivers/i2c/busses/i2c-pasemi-core.c
 F:     drivers/i2c/busses/i2c-pasemi-platform.c
@@ -2197,7 +2209,7 @@ M:        Wei Xu <xuwei5@hisilicon.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 W:     http://www.hisilicon.com
-T:     git git://github.com/hisilicon/linux-hisi.git
+T:     git https://github.com/hisilicon/linux-hisi.git
 F:     arch/arm/boot/dts/hi3*
 F:     arch/arm/boot/dts/hip*
 F:     arch/arm/boot/dts/hisi*
@@ -2272,8 +2284,6 @@ F:        drivers/clocksource/timer-ixp4xx.c
 F:     drivers/crypto/ixp4xx_crypto.c
 F:     drivers/gpio/gpio-ixp4xx.c
 F:     drivers/irqchip/irq-ixp4xx.c
-F:     include/linux/irqchip/irq-ixp4xx.h
-F:     include/linux/platform_data/timer-ixp4xx.h
 
 ARM/INTEL KEEMBAY ARCHITECTURE
 M:     Paul J. Murphy <paul.j.murphy@intel.com>
@@ -2341,6 +2351,8 @@ M:        Gregory Clement <gregory.clement@bootlin.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
+F:     Documentation/devicetree/bindings/arm/marvell/marvell,dove.txt
+F:     Documentation/devicetree/bindings/arm/marvell/marvell,orion5x.txt
 F:     Documentation/devicetree/bindings/soc/dove/
 F:     arch/arm/boot/dts/dove*
 F:     arch/arm/boot/dts/orion5x*
@@ -2357,6 +2369,7 @@ M:        Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
+F:     Documentation/devicetree/bindings/arm/marvell/
 F:     arch/arm/boot/dts/armada*
 F:     arch/arm/boot/dts/kirkwood*
 F:     arch/arm/configs/mvebu_*_defconfig
@@ -2620,7 +2633,7 @@ W:        http://www.armlinux.org.uk/
 ARM/QUALCOMM SUPPORT
 M:     Andy Gross <agross@kernel.org>
 M:     Bjorn Andersson <andersson@kernel.org>
-R:     Konrad Dybcio <konrad.dybcio@somainline.org>
+R:     Konrad Dybcio <konrad.dybcio@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@ -2691,7 +2704,7 @@ F:        arch/arm/boot/dts/rtd*
 F:     arch/arm/mach-realtek/
 F:     arch/arm64/boot/dts/realtek/
 
-ARM/RENESAS ARCHITECTURE
+ARM/RISC-V/RENESAS ARCHITECTURE
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 M:     Magnus Damm <magnus.damm@gmail.com>
 L:     linux-renesas-soc@vger.kernel.org
@@ -2699,7 +2712,6 @@ S:        Supported
 Q:     http://patchwork.kernel.org/project/linux-renesas-soc/list/
 C:     irc://irc.libera.chat/renesas-soc
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
-F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
 F:     Documentation/devicetree/bindings/soc/renesas/
 F:     arch/arm/boot/dts/emev2*
@@ -2713,6 +2725,7 @@ F:        arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
 F:     arch/arm/mach-shmobile/
 F:     arch/arm64/boot/dts/renesas/
+F:     arch/riscv/boot/dts/renesas/
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -3984,7 +3997,7 @@ M:        Rafał Miłecki <rafal@milecki.pl>
 R:     Broadcom internal kernel review list <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/stblinux.git
+T:     git https://github.com/broadcom/stblinux.git
 F:     Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 F:     arch/arm64/boot/dts/broadcom/bcmbca/*
 N:     bcmbca
@@ -4009,7 +4022,7 @@ R:        Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-T:     git git://github.com/broadcom/stblinux.git
+T:     git https://github.com/broadcom/stblinux.git
 F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:     drivers/pci/controller/pcie-brcmstb.c
 F:     drivers/staging/vc04_services
@@ -4023,7 +4036,7 @@ M:        Ray Jui <rjui@broadcom.com>
 M:     Scott Branden <sbranden@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 S:     Maintained
-T:     git git://github.com/broadcom/mach-bcm
+T:     git https://github.com/broadcom/mach-bcm
 F:     arch/arm/mach-bcm/
 N:     bcm281*
 N:     bcm113*
@@ -4088,7 +4101,7 @@ M:        Florian Fainelli <f.fainelli@gmail.com>
 R:     Broadcom internal kernel review list <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/stblinux.git
+T:     git https://github.com/broadcom/stblinux.git
 F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:     arch/arm/boot/dts/bcm7*.dts*
 F:     arch/arm/include/asm/hardware/cache-b15-rac.h
@@ -4101,6 +4114,7 @@ N:        bcm7038
 N:     bcm7120
 
 BROADCOM BDC DRIVER
+M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
 L:     linux-usb@vger.kernel.org
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
@@ -4120,7 +4134,7 @@ M:        Florian Fainelli <f.fainelli@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-mips@vger.kernel.org
 S:     Maintained
-T:     git git://github.com/broadcom/stblinux.git
+T:     git https://github.com/broadcom/stblinux.git
 F:     arch/mips/bmips/*
 F:     arch/mips/boot/dts/brcm/bcm*.dts*
 F:     arch/mips/include/asm/mach-bmips/*
@@ -4207,6 +4221,7 @@ F:        Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
 F:     drivers/tty/serial/8250/8250_bcm7271.c
 
 BROADCOM BRCMSTB USB EHCI DRIVER
+M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-usb@vger.kernel.org
@@ -4223,6 +4238,7 @@ F:        Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
 F:     drivers/usb/misc/brcmstb-usb-pinmap.c
 
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
+M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-kernel@vger.kernel.org
@@ -4259,7 +4275,7 @@ M:        Scott Branden <sbranden@broadcom.com>
 R:     Broadcom internal kernel review list <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/stblinux.git
+T:     git https://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*
@@ -4329,7 +4345,7 @@ M:        Florian Fainelli <f.fainelli@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-T:     git git://github.com/broadcom/stblinux.git
+T:     git https://github.com/broadcom/stblinux.git
 F:     drivers/soc/bcm/bcm63xx/bcm-pmb.c
 F:     include/dt-bindings/soc/bcm-pmb.h
 
@@ -4459,13 +4475,15 @@ M:      Josef Bacik <josef@toxicpanda.com>
 M:     David Sterba <dsterba@suse.com>
 L:     linux-btrfs@vger.kernel.org
 S:     Maintained
-W:     http://btrfs.wiki.kernel.org/
-Q:     http://patchwork.kernel.org/project/linux-btrfs/list/
+W:     https://btrfs.readthedocs.io
+W:     https://btrfs.wiki.kernel.org/
+Q:     https://patchwork.kernel.org/project/linux-btrfs/list/
 C:     irc://irc.libera.chat/btrfs
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
 F:     Documentation/filesystems/btrfs.rst
 F:     fs/btrfs/
 F:     include/linux/btrfs*
+F:     include/trace/events/btrfs.h
 F:     include/uapi/linux/btrfs*
 
 BTTV VIDEO4LINUX DRIVER
@@ -4804,7 +4822,7 @@ R:        Jeff Layton <jlayton@kernel.org>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
-T:     git git://github.com/ceph/ceph-client.git
+T:     git https://github.com/ceph/ceph-client.git
 F:     include/linux/ceph/
 F:     include/linux/crush/
 F:     net/ceph/
@@ -4816,7 +4834,7 @@ R:        Jeff Layton <jlayton@kernel.org>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
-T:     git git://github.com/ceph/ceph-client.git
+T:     git https://github.com/ceph/ceph-client.git
 F:     Documentation/filesystems/ceph.rst
 F:     fs/ceph/
 
@@ -4906,7 +4924,7 @@ F:        drivers/platform/chrome/
 
 CHROMEOS EC CODEC DRIVER
 M:     Cheng-Yi Chiang <cychiang@chromium.org>
-M:     Tzung-Bi Shih <tzungbi@google.com>
+M:     Tzung-Bi Shih <tzungbi@kernel.org>
 R:     Guenter Roeck <groeck@chromium.org>
 L:     chrome-platform@lists.linux.dev
 S:     Maintained
@@ -4936,6 +4954,12 @@ S:       Maintained
 F:     drivers/platform/chrome/cros_usbpd_notify.c
 F:     include/linux/platform_data/cros_usbpd_notify.h
 
+CHROMEOS HPS DRIVER
+M:     Dan Callaghan <dcallagh@chromium.org>
+R:     Sami Kyöstilä <skyostil@chromium.org>
+S:     Maintained
+F:     drivers/platform/chrome/cros_hps_i2c.c
+
 CHRONTEL CH7322 CEC DRIVER
 M:     Joe Tessler <jrt@google.com>
 L:     linux-media@vger.kernel.org
@@ -5036,7 +5060,7 @@ F:        drivers/scsi/snic/
 
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
-M:     Govindarajulu Varadarajan <_govind@gmx.com>
+M:     Satish Kharat <satishkh@cisco.com>
 S:     Supported
 F:     drivers/net/ethernet/cisco/enic/
 
@@ -5266,6 +5290,7 @@ F:        tools/testing/selftests/cgroup/
 
 CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
 M:     Tejun Heo <tj@kernel.org>
+M:     Josef Bacik <josef@toxicpanda.com>
 M:     Jens Axboe <axboe@kernel.dk>
 L:     cgroups@vger.kernel.org
 L:     linux-block@vger.kernel.org
@@ -5273,6 +5298,7 @@ T:        git git://git.kernel.dk/linux-block
 F:     Documentation/admin-guide/cgroup-v1/blkio-controller.rst
 F:     block/bfq-cgroup.c
 F:     block/blk-cgroup.c
+F:     block/blk-iocost.c
 F:     block/blk-iolatency.c
 F:     block/blk-throttle.c
 F:     include/linux/blk-cgroup.h
@@ -5292,7 +5318,7 @@ M:        Johannes Weiner <hannes@cmpxchg.org>
 M:     Michal Hocko <mhocko@kernel.org>
 M:     Roman Gushchin <roman.gushchin@linux.dev>
 M:     Shakeel Butt <shakeelb@google.com>
-R:     Muchun Song <songmuchun@bytedance.com>
+R:     Muchun Song <muchun.song@linux.dev>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
 S:     Maintained
@@ -5578,8 +5604,6 @@ F:        drivers/scsi/cxgbi/cxgb3i
 
 CXGB4 CRYPTO DRIVER (chcr)
 M:     Ayush Sawal <ayush.sawal@chelsio.com>
-M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
-M:     Rohit Maheshwari <rohitm@chelsio.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
@@ -5587,8 +5611,6 @@ F:        drivers/crypto/chelsio
 
 CXGB4 INLINE CRYPTO DRIVER
 M:     Ayush Sawal <ayush.sawal@chelsio.com>
-M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
-M:     Rohit Maheshwari <rohitm@chelsio.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
@@ -5851,6 +5873,13 @@ L:       Dell.Client.Kernel@dell.com
 S:     Maintained
 F:     drivers/platform/x86/dell/dell-wmi-descriptor.c
 
+DELL WMI DDV DRIVER
+M:     Armin Wolf <W_Armin@gmx.de>
+S:     Maintained
+F:     Documentation/ABI/testing/debugfs-dell-wmi-ddv
+F:     Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv
+F:     drivers/platform/x86/dell/dell-wmi-ddv.c
+
 DELL WMI SYSMAN DRIVER
 M:     Divya Bharathi <divya.bharathi@dell.com>
 M:     Prasanth Ksr <prasanth.ksr@dell.com>
@@ -6026,11 +6055,12 @@ F:      include/net/devlink.h
 F:     include/uapi/linux/devlink.h
 F:     net/core/devlink.c
 
-DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT
+DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT
 M:     Christoph Niedermaier <cniedermaier@dh-electronics.com>
 L:     kernel@dh-electronics.com
 S:     Maintained
 F:     arch/arm/boot/dts/imx6*-dhcom-*
+F:     arch/arm/boot/dts/imx6*-dhcor-*
 
 DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
 M:     Marek Vasut <marex@denx.de>
@@ -6280,7 +6310,7 @@ M:        Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt
+F:     Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml
 F:     drivers/media/i2c/dw9714.c
 
 DONGWOON DW9768 LENS VOICE COIL DRIVER
@@ -8595,8 +8625,8 @@ F:        include/asm-generic/
 F:     include/uapi/asm-generic/
 
 GENERIC PHY FRAMEWORK
-M:     Kishon Vijay Abraham I <kishon@ti.com>
 M:     Vinod Koul <vkoul@kernel.org>
+M:     Kishon Vijay Abraham I <kishon@kernel.org>
 L:     linux-phy@lists.infradead.org
 S:     Supported
 Q:     https://patchwork.kernel.org/project/linux-phy/list/
@@ -9210,7 +9240,7 @@ W:        https://www.hisilicon.com
 F:     drivers/i2c/busses/i2c-hisi.c
 
 HISILICON LPC BUS DRIVER
-M:     john.garry@huawei.com
+M:     Jay Fang <f.fangjian@huawei.com>
 S:     Maintained
 W:     http://www.hisilicon.com
 F:     Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
@@ -9241,7 +9271,7 @@ F:        drivers/misc/hisi_hikey_usb.c
 
 HISILICON PMU DRIVER
 M:     Shaokun Zhang <zhangshaokun@hisilicon.com>
-M:     Qi Liu <liuqi115@huawei.com>
+M:     Jonathan Cameron <jonathan.cameron@huawei.com>
 S:     Supported
 W:     http://www.hisilicon.com
 F:     Documentation/admin-guide/perf/hisi-pcie-pmu.rst
@@ -9334,7 +9364,7 @@ S:        Maintained
 F:     drivers/crypto/hisilicon/trng/trng.c
 
 HISILICON V3XX SPI NOR FLASH Controller Driver
-M:     John Garry <john.garry@huawei.com>
+M:     Jay Fang <f.fangjian@huawei.com>
 S:     Maintained
 W:     http://www.hisilicon.com
 F:     drivers/spi/spi-hisi-sfc-v3xx.c
@@ -9359,7 +9389,7 @@ F:        drivers/net/wireless/intersil/hostap/
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 L:     platform-driver-x86@vger.kernel.org
 S:     Orphan
-F:     drivers/platform/x86/tc1100-wmi.c
+F:     drivers/platform/x86/hp/tc1100-wmi.c
 
 HPET:  High Precision Event Timers driver
 M:     Clemens Ladisch <clemens@ladisch.de>
@@ -9436,7 +9466,7 @@ F:        drivers/net/ethernet/huawei/hinic/
 
 HUGETLB SUBSYSTEM
 M:     Mike Kravetz <mike.kravetz@oracle.com>
-M:     Muchun Song <songmuchun@bytedance.com>
+M:     Muchun Song <muchun.song@linux.dev>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@ -9500,7 +9530,6 @@ 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>
-M:     Stephen Hemminger <sthemmin@microsoft.com>
 M:     Wei Liu <wei.liu@kernel.org>
 M:     Dexuan Cui <decui@microsoft.com>
 L:     linux-hyperv@vger.kernel.org
@@ -9771,7 +9800,10 @@ S:       Supported
 F:     drivers/pci/hotplug/rpaphp*
 
 IBM Power SRIOV Virtual NIC Device Driver
-M:     Dany Madden <drt@linux.ibm.com>
+M:     Haren Myneni <haren@linux.ibm.com>
+M:     Rick Lindsley <ricklind@linux.ibm.com>
+R:     Nick Child <nnac123@linux.ibm.com>
+R:     Dany Madden <danymadden@us.ibm.com>
 R:     Thomas Falcon <tlfalcon@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -10278,7 +10310,7 @@ T:      git https://github.com/intel/gvt-linux.git
 F:     drivers/gpu/drm/i915/gvt/
 
 INTEL HID EVENT DRIVER
-M:     Alex Hung <alex.hung@canonical.com>
+M:     Alex Hung <alexhung@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/intel/hid.c
@@ -11026,6 +11058,7 @@ KCONFIG
 M:     Masahiro Yamada <masahiroy@kernel.org>
 L:     linux-kbuild@vger.kernel.org
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-kbuild/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
 F:     Documentation/kbuild/kconfig*
 F:     scripts/Kconfig.include
@@ -11083,10 +11116,12 @@ F:    fs/autofs/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:     Masahiro Yamada <masahiroy@kernel.org>
-M:     Michal Marek <michal.lkml@markovi.net>
+R:     Nathan Chancellor <nathan@kernel.org>
 R:     Nick Desaulniers <ndesaulniers@google.com>
+R:     Nicolas Schier <nicolas@fjasle.eu>
 L:     linux-kbuild@vger.kernel.org
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-kbuild/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
 F:     Documentation/kbuild/
 F:     Makefile
@@ -11241,7 +11276,7 @@ L:      kvm@vger.kernel.org
 L:     kvm-riscv@lists.infradead.org
 L:     linux-riscv@lists.infradead.org
 S:     Maintained
-T:     git git://github.com/kvm-riscv/linux.git
+T:     git https://github.com/kvm-riscv/linux.git
 F:     arch/riscv/include/asm/kvm*
 F:     arch/riscv/include/uapi/asm/kvm*
 F:     arch/riscv/kvm/
@@ -11254,7 +11289,6 @@ M:      Claudio Imbrenda <imbrenda@linux.ibm.com>
 R:     David Hildenbrand <david@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 F:     Documentation/virt/kvm/s390*
 F:     arch/s390/include/asm/gmap.h
@@ -11849,7 +11883,7 @@ M:      Eric Piel <eric.piel@tremplin-utc.net>
 S:     Maintained
 F:     Documentation/misc-devices/lis3lv02d.rst
 F:     drivers/misc/lis3lv02d/
-F:     drivers/platform/x86/hp_accel.c
+F:     drivers/platform/x86/hp/hp_accel.c
 
 LIST KUNIT TEST
 M:     David Gow <davidgow@google.com>
@@ -12004,6 +12038,13 @@ F:     drivers/*/*loongarch*
 F:     Documentation/loongarch/
 F:     Documentation/translations/zh_CN/loongarch/
 
+LOONGSON-2 SOC SERIES GUTS DRIVER
+M:     Yinbo Zhu <zhuyinbo@loongson.cn>
+L:     loongarch@lists.linux.dev
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml
+F:     drivers/soc/loongson/loongson2_guts.c
+
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 M:     Sathya Prakash <sathya.prakash@broadcom.com>
 M:     Sreekanth Reddy <sreekanth.reddy@broadcom.com>
@@ -12217,7 +12258,6 @@ F:      arch/mips/boot/dts/img/pistachio*
 
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:     Andrew Lunn <andrew@lunn.ch>
-M:     Vivien Didelot <vivien.didelot@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
@@ -13618,6 +13658,12 @@ S:     Supported
 F:     drivers/misc/atmel-ssc.c
 F:     include/linux/atmel-ssc.h
 
+MICROCHIP SOC DRIVERS
+M:     Conor Dooley <conor@kernel.org>
+S:     Supported
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     drivers/soc/microchip/
+
 MICROCHIP USB251XB DRIVER
 M:     Richard Leitner <richard.leitner@skidata.com>
 L:     linux-usb@vger.kernel.org
@@ -14315,7 +14361,6 @@ F:      drivers/net/wireless/
 
 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
@@ -14520,7 +14565,7 @@ L:      linux-nilfs@vger.kernel.org
 S:     Supported
 W:     https://nilfs.sourceforge.io/
 W:     https://nilfs.osdn.jp/
-T:     git git://github.com/konis/nilfs2.git
+T:     git https://github.com/konis/nilfs2.git
 F:     Documentation/filesystems/nilfs2.rst
 F:     fs/nilfs2/
 F:     include/trace/events/nilfs2.h
@@ -14709,6 +14754,12 @@ F:     drivers/nvme/target/auth.c
 F:     drivers/nvme/target/fabrics-cmd-auth.c
 F:     include/linux/nvme-auth.h
 
+NVM EXPRESS HARDWARE MONITORING SUPPORT
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     linux-nvme@lists.infradead.org
+S:     Supported
+F:     drivers/nvme/host/hwmon.c
+
 NVM EXPRESS FC TRANSPORT DRIVERS
 M:     James Smart <james.smart@broadcom.com>
 L:     linux-nvme@lists.infradead.org
@@ -15426,6 +15477,7 @@ S:      Maintained
 W:     http://openvswitch.org
 F:     include/uapi/linux/openvswitch.h
 F:     net/openvswitch/
+F:     tools/testing/selftests/net/openvswitch/
 
 OPERATING PERFORMANCE POINTS (OPP)
 M:     Viresh Kumar <vireshk@kernel.org>
@@ -15617,7 +15669,7 @@ F:      drivers/input/serio/gscps2.c
 F:     drivers/input/serio/hp_sdc*
 F:     drivers/parisc/
 F:     drivers/parport/parport_gsc.*
-F:     drivers/tty/serial/8250/8250_gsc.c
+F:     drivers/tty/serial/8250/8250_parisc.c
 F:     drivers/video/console/sti*
 F:     drivers/video/fbdev/sti*
 F:     drivers/video/logo/logo_parisc*
@@ -15839,7 +15891,7 @@ F:      Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
 F:     drivers/pci/controller/dwc/*designware*
 
 PCI DRIVER FOR TI DRA7XX/J721E
-M:     Kishon Vijay Abraham I <kishon@ti.com>
+M:     Vignesh Raghavendra <vigneshr@ti.com>
 L:     linux-omap@vger.kernel.org
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -15856,10 +15908,10 @@ F:    Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
 F:     drivers/pci/controller/pci-v3-semi.c
 
 PCI ENDPOINT SUBSYSTEM
-M:     Kishon Vijay Abraham I <kishon@ti.com>
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
 R:     Krzysztof Wilczyński <kw@linux.com>
 R:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+R:     Kishon Vijay Abraham I <kishon@kernel.org>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 Q:     https://patchwork.kernel.org/project/linux-pci/list/
@@ -15930,6 +15982,7 @@ Q:      https://patchwork.kernel.org/project/linux-pci/list/
 B:     https://bugzilla.kernel.org
 C:     irc://irc.oftc.net/linux-pci
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
+F:     Documentation/devicetree/bindings/pci/
 F:     drivers/pci/controller/
 F:     drivers/pci/pci-bridge-emul.c
 F:     drivers/pci/pci-bridge-emul.h
@@ -16036,7 +16089,7 @@ F:      Documentation/devicetree/bindings/pci/microchip*
 F:     drivers/pci/controller/*microchip*
 
 PCIE DRIVER FOR QUALCOMM MSM
-M:     Stanimir Varbanov <svarbanov@mm-sol.com>
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -16126,7 +16179,8 @@ F:      include/linux/peci-cpu.h
 F:     include/linux/peci.h
 
 PENSANDO ETHERNET DRIVERS
-M:     Shannon Nelson <snelson@pensando.io>
+M:     Shannon Nelson <shannon.nelson@amd.com>
+M:     Brett Creeley <brett.creeley@amd.com>
 M:     drivers@pensando.io
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -16641,10 +16695,10 @@ F:    net/psample
 
 PSTORE FILESYSTEM
 M:     Kees Cook <keescook@chromium.org>
-M:     Anton Vorontsov <anton@enomsg.org>
-M:     Colin Cross <ccross@android.com>
-M:     Tony Luck <tony.luck@intel.com>
-S:     Maintained
+R:     Tony Luck <tony.luck@intel.com>
+R:     Guilherme G. Piccoli <gpiccoli@igalia.com>
+L:     linux-hardening@vger.kernel.org
+S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
 F:     Documentation/admin-guide/ramoops.rst
 F:     Documentation/admin-guide/pstore-blk.rst
@@ -16665,6 +16719,7 @@ F:      Documentation/driver-api/ptp.rst
 F:     drivers/net/phy/dp83640*
 F:     drivers/ptp/*
 F:     include/linux/ptp_cl*
+K:     (?:\b|_)ptp(?:\b|_)
 
 PTP VIRTUAL CLOCK SUPPORT
 M:     Yangbo Lu <yangbo.lu@nxp.com>
@@ -17208,7 +17263,7 @@ R:      Dongsheng Yang <dongsheng.yang@easystack.cn>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
-T:     git git://github.com/ceph/ceph-client.git
+T:     git https://github.com/ceph/ceph-client.git
 F:     Documentation/ABI/testing/sysfs-bus-rbd
 F:     drivers/block/rbd.c
 F:     drivers/block/rbd_types.h
@@ -17461,10 +17516,8 @@ S:     Maintained
 F:     drivers/net/wireless/realtek/rtw89/
 
 REDPINE WIRELESS DRIVER
-M:     Amitkumar Karwar <amitkarwar@gmail.com>
-M:     Siva Rebbagondla <siva8118@gmail.com>
 L:     linux-wireless@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/net/wireless/rsi/
 
 REGISTER MAP ABSTRACTION
@@ -17709,7 +17762,7 @@ F:      arch/riscv/
 N:     riscv
 K:     riscv
 
-RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
+RISC-V MICROCHIP FPGA SUPPORT
 M:     Conor Dooley <conor.dooley@microchip.com>
 M:     Daire McNamara <daire.mcnamara@microchip.com>
 L:     linux-riscv@lists.infradead.org
@@ -17727,17 +17780,26 @@ F:    Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
 F:     arch/riscv/boot/dts/microchip/
 F:     drivers/char/hw_random/mpfs-rng.c
 F:     drivers/clk/microchip/clk-mpfs.c
-F:     drivers/i2c/busses/i2c-microchip-core.c
+F:     drivers/i2c/busses/i2c-microchip-corei2c.c
 F:     drivers/mailbox/mailbox-mpfs.c
 F:     drivers/pci/controller/pcie-microchip-host.c
 F:     drivers/reset/reset-mpfs.c
 F:     drivers/rtc/rtc-mpfs.c
-F:     drivers/soc/microchip/
+F:     drivers/soc/microchip/mpfs-sys-controller.c
 F:     drivers/spi/spi-microchip-core-qspi.c
 F:     drivers/spi/spi-microchip-core.c
 F:     drivers/usb/musb/mpfs.c
 F:     include/soc/microchip/mpfs.h
 
+RISC-V MISC SOC SUPPORT
+M:     Conor Dooley <conor@kernel.org>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-riscv/list/
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     Documentation/devicetree/bindings/riscv/
+F:     arch/riscv/boot/dts/
+
 RNBD BLOCK DRIVERS
 M:     Md. Haris Iqbal <haris.iqbal@ionos.com>
 M:     Jack Wang <jinpu.wang@ionos.com>
@@ -17801,7 +17863,7 @@ S:      Odd Fixes
 F:     drivers/tty/serial/rp2.*
 
 ROHM BD99954 CHARGER IC
-R:     Matti Vaittinen <mazziesaccount@gmail.com>
+M:     Matti Vaittinen <mazziesaccount@gmail.com>
 S:     Supported
 F:     drivers/power/supply/bd99954-charger.c
 F:     drivers/power/supply/bd99954-charger.h
@@ -17824,7 +17886,7 @@ F:      drivers/regulator/bd9571mwv-regulator.c
 F:     include/linux/mfd/bd9571mwv.h
 
 ROHM POWER MANAGEMENT IC DEVICE DRIVERS
-R:     Matti Vaittinen <mazziesaccount@gmail.com>
+M:     Matti Vaittinen <mazziesaccount@gmail.com>
 S:     Supported
 F:     drivers/clk/clk-bd718x7.c
 F:     drivers/gpio/gpio-bd71815.c
@@ -17978,7 +18040,7 @@ L:      linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/savage/
 
-S390
+S390 ARCHITECTURE
 M:     Heiko Carstens <hca@linux.ibm.com>
 M:     Vasily Gorbik <gor@linux.ibm.com>
 M:     Alexander Gordeev <agordeev@linux.ibm.com>
@@ -17986,7 +18048,6 @@ R:      Christian Borntraeger <borntraeger@linux.ibm.com>
 R:     Sven Schnelle <svens@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
 F:     Documentation/driver-api/s390-drivers.rst
 F:     Documentation/s390/
@@ -17998,7 +18059,6 @@ M:      Vineeth Vijayan <vneethv@linux.ibm.com>
 M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
@@ -18006,7 +18066,6 @@ M:      Stefan Haberland <sth@linux.ibm.com>
 M:     Jan Hoeppner <hoeppner@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     block/partitions/ibm.c
 F:     drivers/s390/block/dasd*
 F:     include/linux/dasd_mod.h
@@ -18016,7 +18075,6 @@ M:      Matthew Rosato <mjrosato@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
@@ -18025,7 +18083,6 @@ M:      Wenjia Zhang <wenjia@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/net/*iucv*
 F:     include/net/iucv/
 F:     net/iucv/
@@ -18036,15 +18093,22 @@ M:    Wenjia Zhang <wenjia@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/net/
 
+S390 MM
+M:     Alexander Gordeev <agordeev@linux.ibm.com>
+M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
+L:     linux-s390@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
+F:     arch/s390/include/asm/pgtable.h
+F:     arch/s390/mm
+
 S390 PCI SUBSYSTEM
 M:     Niklas Schnelle <schnelle@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     arch/s390/pci/
 F:     drivers/pci/hotplug/s390_pci_hpc.c
 F:     Documentation/s390/pci.rst
@@ -18055,7 +18119,6 @@ M:      Halil Pasic <pasic@linux.ibm.com>
 M:     Jason Herne <jjherne@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     Documentation/s390/vfio-ap*
 F:     drivers/s390/crypto/vfio_ap*
 
@@ -18084,7 +18147,6 @@ S390 ZCRYPT DRIVER
 M:     Harald Freudenberger <freude@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
@@ -18092,7 +18154,6 @@ M:      Steffen Maier <maier@linux.ibm.com>
 M:     Benjamin Block <bblock@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/scsi/zfcp_*
 
 S3C ADC BATTERY DRIVER
@@ -18131,7 +18192,6 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/staging/media/deprecated/saa7146/
-F:     include/media/drv-intf/saa7146*
 
 SAFESETID SECURITY MODULE
 M:     Micah Morton <mortonm@chromium.org>
@@ -18211,7 +18271,6 @@ F:      include/media/drv-intf/s3c_camif.h
 
 SAMSUNG S3FWRN5 NFC DRIVER
 M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-M:     Krzysztof Opasiak <k.opasiak@samsung.com>
 L:     linux-nfc@lists.01.org (subscribers-only)
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
@@ -18666,7 +18725,6 @@ M:      Wenjia Zhang <wenjia@linux.ibm.com>
 M:     Jan Karcher <jaka@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     net/smc/
 
 SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
@@ -18777,7 +18835,6 @@ M:      Palmer Dabbelt <palmer@dabbelt.com>
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
-T:     git git://github.com/sifive/riscv-linux.git
 N:     sifive
 K:     [^@]sifive
 
@@ -18796,6 +18853,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
 F:     drivers/dma/sf-pdma/
 
+SIFIVE SOC DRIVERS
+M:     Conor Dooley <conor@kernel.org>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     drivers/soc/sifive/
+
 SILEAD TOUCHSCREEN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-input@vger.kernel.org
@@ -19597,6 +19661,11 @@ M:     Ion Badulescu <ionut@badula.org>
 S:     Odd Fixes
 F:     drivers/net/ethernet/adaptec/starfire*
 
+STARFIVE DEVICETREES
+M:     Emil Renner Berthing <kernel@esmil.dk>
+S:     Maintained
+F:     arch/riscv/boot/dts/starfive/
+
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <kernel@esmil.dk>
 S:     Maintained
@@ -19969,6 +20038,7 @@ F:      drivers/clk/clk-sc[mp]i.c
 F:     drivers/cpufreq/sc[mp]i-cpufreq.c
 F:     drivers/firmware/arm_scmi/
 F:     drivers/firmware/arm_scpi.c
+F:     drivers/powercap/arm_scmi_powercap.c
 F:     drivers/regulator/scmi-regulator.c
 F:     drivers/reset/reset-scmi.c
 F:     include/linux/sc[mp]i_protocol.h
@@ -21181,15 +21251,6 @@ S:     Maintained
 F:     Documentation/usb/ehci.rst
 F:     drivers/usb/host/ehci*
 
-USB GADGET/PERIPHERAL SUBSYSTEM
-M:     Felipe Balbi <balbi@kernel.org>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-W:     http://www.linux-usb.org/gadget
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
-F:     drivers/usb/gadget/
-F:     include/linux/usb/gadget*
-
 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 M:     Jiri Kosina <jikos@kernel.org>
 M:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
@@ -21293,16 +21354,9 @@ L:     linux-usb@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 W:     https://github.com/petkan/pegasus
-T:     git git://github.com/petkan/pegasus.git
+T:     git https://github.com/petkan/pegasus.git
 F:     drivers/net/usb/pegasus.*
 
-USB PHY LAYER
-M:     Felipe Balbi <balbi@kernel.org>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
-F:     drivers/usb/phy/
-
 USB PRINTER DRIVER (usblp)
 M:     Pete Zaitcev <zaitcev@redhat.com>
 L:     linux-usb@vger.kernel.org
@@ -21330,7 +21384,7 @@ L:      linux-usb@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 W:     https://github.com/petkan/rtl8150
-T:     git git://github.com/petkan/rtl8150.git
+T:     git https://github.com/petkan/rtl8150.git
 F:     drivers/net/usb/rtl8150.c
 
 USB SERIAL SUBSYSTEM
@@ -22121,6 +22175,7 @@ F:      Documentation/watchdog/
 F:     drivers/watchdog/
 F:     include/linux/watchdog.h
 F:     include/uapi/linux/watchdog.h
+F:     include/trace/events/watchdog.h
 
 WHISKEYCOVE PMIC GPIO DRIVER
 M:     Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
@@ -22761,7 +22816,7 @@ 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/
+F:     drivers/media/pci/zoran/
 
 ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
 M:     Minchan Kim <minchan@kernel.org>