netfilter: nft_objref: make it builtin
[platform/kernel/linux-starfive.git] / MAINTAINERS
index fde9278..657b223 100644 (file)
@@ -554,7 +554,7 @@ M:  Michael Hennerich <michael.hennerich@analog.com>
 S:     Supported
 W:     http://wiki.analog.com/ADP5588
 W:     https://ez.analog.com/linux-software-drivers
-F:     drivers/gpio/gpio-adp5588.c
+F:     Documentation/devicetree/bindings/input/adi,adp5588.yaml
 F:     drivers/input/keyboard/adp5588-keys.c
 
 ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
@@ -752,7 +752,7 @@ ALIBABA PMU DRIVER
 M:     Shuai Xue <xueshuai@linux.alibaba.com>
 S:     Supported
 F:     Documentation/admin-guide/perf/alibaba_pmu.rst
-F:     drivers/perf/alibaba_uncore_dwr_pmu.c
+F:     drivers/perf/alibaba_uncore_drw_pmu.c
 
 ALIENWARE WMI DRIVER
 L:     Dell.Client.Kernel@dell.com
@@ -1915,6 +1915,7 @@ F:        drivers/dma/apple-admac.c
 F:     drivers/i2c/busses/i2c-pasemi-core.c
 F:     drivers/i2c/busses/i2c-pasemi-platform.c
 F:     drivers/iommu/apple-dart.c
+F:     drivers/iommu/io-pgtable-dart.c
 F:     drivers/irqchip/irq-apple-aic.c
 F:     drivers/mailbox/apple-mailbox.c
 F:     drivers/nvme/host/apple.c
@@ -2066,6 +2067,7 @@ F:        drivers/hwtracing/coresight/*
 F:     include/dt-bindings/arm/coresight-cti-dt.h
 F:     include/linux/coresight*
 F:     samples/coresight/*
+F:     tools/perf/tests/shell/coresight/*
 F:     tools/perf/arch/arm/util/auxtrace.c
 F:     tools/perf/arch/arm/util/cs-etm.c
 F:     tools/perf/arch/arm/util/cs-etm.h
@@ -2437,6 +2439,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 T:     git git://github.com/microchip-ung/linux-upstream.git
 F:     arch/arm64/boot/dts/microchip/
+F:     drivers/net/ethernet/microchip/vcap/
 F:     drivers/pinctrl/pinctrl-microchip-sgpio.c
 N:     sparx5
 
@@ -3237,6 +3240,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
 F:     drivers/usb/gadget/udc/aspeed_udc.c
 
+ASPEED CRYPTO DRIVER
+M:     Neal Liu <neal_liu@aspeedtech.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
+F:     drivers/crypto/aspeed/
+
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
 L:     acpi4asus-user@lists.sourceforge.net
@@ -4450,13 +4460,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
@@ -5162,6 +5174,7 @@ M:        Steve French <sfrench@samba.org>
 R:     Paulo Alcantara <pc@cjr.nz> (DFS, global name space)
 R:     Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files)
 R:     Shyam Prasad N <sprasad@microsoft.com> (multichannel)
+R:     Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
 L:     linux-cifs@vger.kernel.org
 L:     samba-technical@lists.samba.org (moderated for non-subscribers)
 S:     Supported
@@ -5256,6 +5269,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
@@ -5263,6 +5277,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
@@ -5656,6 +5671,12 @@ Q:       http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/common/cypress_firmware*
 
+CYPRESS CY8C95X0 PINCTRL DRIVER
+M:     Patrick Rudolph <patrick.rudolph@9elements.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/pinctrl/pinctrl-cy8c95x0.c
+
 CYPRESS CY8CTMA140 TOUCHSCREEN DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
@@ -6163,6 +6184,7 @@ F:        include/asm-generic/dma-mapping.h
 F:     include/linux/dma-direct.h
 F:     include/linux/dma-mapping.h
 F:     include/linux/dma-map-ops.h
+F:     include/linux/swiotlb.h
 F:     kernel/dma/
 
 DMA MAPPING BENCHMARK
@@ -6263,7 +6285,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
@@ -6305,6 +6327,7 @@ F:        drivers/net/ethernet/freescale/dpaa2/Kconfig
 F:     drivers/net/ethernet/freescale/dpaa2/Makefile
 F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-eth*
 F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-mac*
+F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk*
 F:     drivers/net/ethernet/freescale/dpaa2/dpkg.h
 F:     drivers/net/ethernet/freescale/dpaa2/dpmac*
 F:     drivers/net/ethernet/freescale/dpaa2/dpni*
@@ -8433,6 +8456,19 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/fujitsu-tablet.c
 
+FUNCTION HOOKS (FTRACE)
+M:     Steven Rostedt <rostedt@goodmis.org>
+M:     Masami Hiramatsu <mhiramat@kernel.org>
+R:     Mark Rutland <mark.rutland@arm.com>
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
+F:     Documentation/trace/ftrace*
+F:     kernel/trace/ftrace*
+F:     kernel/trace/fgraph.c
+F:     arch/*/*/*/*ftrace*
+F:     arch/*/*/*ftrace*
+F:     include/*/ftrace.h
+
 FUNGIBLE ETHERNET DRIVERS
 M:     Dimitris Michailidis <dmichail@fungible.com>
 L:     netdev@vger.kernel.org
@@ -9690,6 +9726,13 @@ S:       Orphan
 F:     Documentation/ia64/
 F:     arch/ia64/
 
+IBM Operation Panel Input Driver
+M:     Eddie James <eajames@linux.ibm.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/input/ibm,op-panel.yaml
+F:     drivers/input/misc/ibm-panel.c
+
 IBM Power 842 compression accelerator
 M:     Haren Myneni <haren@us.ibm.com>
 S:     Supported
@@ -10669,8 +10712,8 @@ L:      iommu@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 F:     drivers/iommu/dma-iommu.c
+F:     drivers/iommu/dma-iommu.h
 F:     drivers/iommu/iova.c
-F:     include/linux/dma-iommu.h
 F:     include/linux/iova.h
 
 IOMMU SUBSYSTEM
@@ -10982,7 +11025,6 @@ F:      arch/*/include/asm/*kasan.h
 F:     arch/*/mm/kasan_init*
 F:     include/linux/kasan*.h
 F:     lib/Kconfig.kasan
-F:     lib/test_kasan*.c
 F:     mm/kasan/
 F:     scripts/Makefile.kasan
 
@@ -11168,7 +11210,8 @@ R:      Alexandru Elisei <alexandru.elisei@arm.com>
 R:     Suzuki K Poulose <suzuki.poulose@arm.com>
 R:     Oliver Upton <oliver.upton@linux.dev>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
+L:     kvmarm@lists.linux.dev
+L:     kvmarm@lists.cs.columbia.edu (deprecated, moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
 F:     arch/arm64/include/asm/kvm*
@@ -11416,13 +11459,27 @@ F:    kernel/kmod.c
 F:     lib/test_kmod.c
 F:     tools/testing/selftests/kmod/
 
+KMSAN
+M:     Alexander Potapenko <glider@google.com>
+R:     Marco Elver <elver@google.com>
+R:     Dmitry Vyukov <dvyukov@google.com>
+L:     kasan-dev@googlegroups.com
+S:     Maintained
+F:     Documentation/dev-tools/kmsan.rst
+F:     arch/*/include/asm/kmsan.h
+F:     arch/*/mm/kmsan_*
+F:     include/linux/kmsan*.h
+F:     lib/Kconfig.kmsan
+F:     mm/kmsan/
+F:     scripts/Makefile.kmsan
+
 KPROBES
 M:     Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 M:     Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/kprobes.rst
 F:     include/asm-generic/kprobes.h
 F:     include/linux/kprobes.h
@@ -12146,6 +12203,18 @@ L:     linux-man@vger.kernel.org
 S:     Maintained
 W:     http://www.kernel.org/doc/man-pages
 
+MAPLE TREE
+M:     Liam R. Howlett <Liam.Howlett@oracle.com>
+L:     linux-mm@kvack.org
+S:     Supported
+F:     Documentation/core-api/maple_tree.rst
+F:     include/linux/maple_tree.h
+F:     include/trace/events/maple_tree.h
+F:     lib/maple_tree.c
+F:     lib/test_maple_tree.c
+F:     tools/testing/radix-tree/linux/maple_tree.h
+F:     tools/testing/radix-tree/maple.c
+
 MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
 M:     Rahul Bedarkar <rahulbedarkar89@gmail.com>
 L:     linux-mips@vger.kernel.org
@@ -12244,7 +12313,7 @@ M:      Marcin Wojtas <mw@semihalf.com>
 M:     Russell King <linux@armlinux.org.uk>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/marvell-pp2.txt
+F:     Documentation/devicetree/bindings/net/marvell,pp2.yaml
 F:     drivers/net/ethernet/marvell/mvpp2/
 
 MARVELL MWIFIEX WIRELESS DRIVER
@@ -12877,6 +12946,12 @@ S:     Supported
 F:     Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml
 F:     drivers/media/platform/mediatek/jpeg/
 
+MEDIATEK KEYPAD DRIVER
+M:     Mattijs Korpershoek <mkorpershoek@baylibre.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
+F:     drivers/input/keyboard/mt6779-keypad.c
+
 MEDIATEK MDP DRIVER
 M:     Minghsiu Tsai <minghsiu.tsai@mediatek.com>
 M:     Houlong Wei <houlong.wei@mediatek.com>
@@ -12929,7 +13004,7 @@ MEDIATEK MT7621/28/88 I2C DRIVER
 M:     Stefan Roese <sr@denx.de>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
+F:     Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
 F:     drivers/i2c/busses/i2c-mt7621.c
 
 MEDIATEK MT7621 PCIE CONTROLLER DRIVER
@@ -15296,17 +15371,6 @@ L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/ulp/opa_vnic
 
-OPEN FIRMWARE AND DEVICE TREE OVERLAYS
-M:     Pantelis Antoniou <pantelis.antoniou@konsulko.com>
-M:     Frank Rowand <frowand.list@gmail.com>
-L:     devicetree@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/dynamic-resolution-notes.rst
-F:     Documentation/devicetree/overlay-notes.rst
-F:     drivers/of/overlay.c
-F:     drivers/of/resolver.c
-K:     of_overlay_notifier_
-
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:     Rob Herring <robh+dt@kernel.org>
 M:     Frank Rowand <frowand.list@gmail.com>
@@ -15319,6 +15383,9 @@ F:      Documentation/ABI/testing/sysfs-firmware-ofw
 F:     drivers/of/
 F:     include/linux/of*.h
 F:     scripts/dtc/
+K:     of_overlay_notifier_
+K:     of_overlay_fdt_apply
+K:     of_overlay_remove
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 M:     Rob Herring <robh+dt@kernel.org>
@@ -15356,7 +15423,7 @@ M:      Stafford Horne <shorne@gmail.com>
 L:     openrisc@lists.librecores.org
 S:     Maintained
 W:     http://openrisc.io
-T:     git git://github.com/openrisc/linux.git
+T:     git https://github.com/openrisc/linux.git
 F:     Documentation/devicetree/bindings/openrisc/
 F:     Documentation/openrisc/
 F:     arch/openrisc/
@@ -15784,7 +15851,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)
@@ -15801,9 +15868,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/
@@ -15817,8 +15885,8 @@ F:      drivers/pci/endpoint/
 F:     tools/pci/
 
 PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
-M:     Russell Currey <ruscur@russell.cc>
-M:     Oliver O'Halloran <oohall@gmail.com>
+M:     Mahesh J Salgaonkar <mahesh@linux.ibm.com>
+R:     Oliver O'Halloran <oohall@gmail.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.rst
@@ -16295,6 +16363,12 @@ F:     Documentation/devicetree/bindings/pinctrl/sunplus,*
 F:     drivers/pinctrl/sunplus/
 F:     include/dt-bindings/pinctrl/sppctl*.h
 
+PINE64 PINEPHONE KEYBOARD DRIVER
+M:     Samuel Holland <samuel@sholland.org>
+S:     Supported
+F:     Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml
+F:     drivers/input/keyboard/pinephone-keyboard.c
+
 PKTCDVD DRIVER
 M:     linux-block@vger.kernel.org
 S:     Orphan
@@ -16603,6 +16677,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>
@@ -16980,7 +17055,7 @@ M:      Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 M:     Amol Maheshwari <amahesh@qti.qualcomm.com>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/misc/qcom,fastrpc.txt
+F:     Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
 F:     drivers/misc/fastrpc.c
 F:     include/uapi/misc/fastrpc.h
 
@@ -17640,6 +17715,7 @@ M:      Palmer Dabbelt <palmer@dabbelt.com>
 M:     Albert Ou <aou@eecs.berkeley.edu>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
+Q:     https://patchwork.kernel.org/project/linux-riscv/list/
 P:     Documentation/riscv/patch-acceptance.rst
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
 F:     arch/riscv/
@@ -17651,12 +17727,13 @@ M:    Conor Dooley <conor.dooley@microchip.com>
 M:     Daire McNamara <daire.mcnamara@microchip.com>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
-F:     Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
+F:     Documentation/devicetree/bindings/clock/microchip,mpfs*.yaml
 F:     Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
 F:     Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml
 F:     Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml
 F:     Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
 F:     Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml
+F:     Documentation/devicetree/bindings/riscv/microchip.yaml
 F:     Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml
 F:     Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
 F:     Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
@@ -18067,7 +18144,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>
@@ -18147,7 +18223,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
@@ -18599,6 +18674,7 @@ F:      drivers/misc/sgi-xp/
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 M:     Karsten Graul <kgraul@linux.ibm.com>
 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/
@@ -19544,8 +19620,8 @@ M:      Emil Renner Berthing <kernel@esmil.dk>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
-F:     drivers/pinctrl/pinctrl-starfive.c
-F:     include/dt-bindings/pinctrl/pinctrl-starfive.h
+F:     drivers/pinctrl/starfive/
+F:     include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 
 STARFIVE JH7100 RESET CONTROLLER DRIVER
 M:     Emil Renner Berthing <kernel@esmil.dk>
@@ -19733,16 +19809,6 @@ S:     Maintained
 F:     Documentation/admin-guide/svga.rst
 F:     arch/x86/boot/video*
 
-SWIOTLB SUBSYSTEM
-M:     Christoph Hellwig <hch@infradead.org>
-L:     iommu@lists.linux.dev
-S:     Supported
-W:     http://git.infradead.org/users/hch/dma-mapping.git
-T:     git git://git.infradead.org/users/hch/dma-mapping.git
-F:     arch/*/kernel/pci-swiotlb.c
-F:     include/linux/swiotlb.h
-F:     kernel/dma/swiotlb.c
-
 SWITCHDEV
 M:     Jiri Pirko <jiri@resnulli.us>
 M:     Ivan Vecera <ivecera@redhat.com>
@@ -20776,14 +20842,11 @@ F:    drivers/hwmon/pmbus/tps546d24.c
 
 TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
-M:     Ingo Molnar <mingo@redhat.com>
+M:     Masami Hiramatsu <mhiramat@kernel.org>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
-F:     Documentation/trace/ftrace.rst
-F:     arch/*/*/*/*ftrace*
-F:     arch/*/*/*ftrace*
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
+F:     Documentation/trace/*
 F:     fs/tracefs/
-F:     include/*/ftrace.h
 F:     include/linux/trace*.h
 F:     include/trace/
 F:     kernel/trace/
@@ -20792,7 +20855,7 @@ F:      tools/testing/selftests/ftrace/
 
 TRACING MMIO ACCESSES (MMIOTRACE)
 M:     Steven Rostedt <rostedt@goodmis.org>
-M:     Ingo Molnar <mingo@kernel.org>
+M:     Masami Hiramatsu <mhiramat@kernel.org>
 R:     Karol Herbst <karolherbst@gmail.com>
 R:     Pekka Paalanen <ppaalanen@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -21241,7 +21304,7 @@ 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
@@ -21278,7 +21341,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
@@ -21500,6 +21563,7 @@ R:      Cornelia Huck <cohuck@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Maintained
 T:     git git://github.com/awilliam/linux-vfio.git
+F:     Documentation/ABI/testing/sysfs-devices-vfio-dev
 F:     Documentation/driver-api/vfio.rst
 F:     drivers/vfio/
 F:     include/linux/vfio.h
@@ -21680,6 +21744,10 @@ F:     include/linux/virtio*.h
 F:     include/uapi/linux/virtio_*.h
 F:     tools/virtio/
 
+IFCVF VIRTIO DATA PATH ACCELERATOR
+R:     Zhu Lingshan <lingshan.zhu@intel.com>
+F:     drivers/vdpa/ifcvf/
+
 VIRTIO BALLOON
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 M:     David Hildenbrand <david@redhat.com>
@@ -22064,6 +22132,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>
@@ -22462,8 +22531,10 @@ M:     Stefano Stabellini <sstabellini@kernel.org>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:     iommu@lists.linux.dev
 S:     Supported
-F:     arch/x86/xen/*swiotlb*
-F:     drivers/xen/*swiotlb*
+F:     arch/*/include/asm/xen/swiotlb-xen.h
+F:     drivers/xen/swiotlb-xen.c
+F:     include/xen/arm/swiotlb-xen.h
+F:     include/xen/swiotlb-xen.h
 
 XFS FILESYSTEM
 C:     irc://irc.oftc.net/xfs
@@ -22702,7 +22773,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>