The following commit has been merged in the master branch:
commit 980190a9473dd2c842518057bf9ddcbaeba75209
Merge: aa833fc394baad601b8f7779c1ae2ada3a06ce07
44c603f35cad3f3b0f58fece99502d81620da9b2
Author: Linus Torvalds <[email protected]>
Date: Thu Dec 4 15:18:33 2025 -0800
Merge tag 'mfd-next-6.19' of
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"Updates:
- Add Core, Regulator, Onkey and Battery Charger support for the NXP
PF1550 Power Management IC (PMIC)
- Introduce __SMC_KEY macro to fix GCC 15.2.1 errors in macsmc
- Add board definitions for TQMxCU1-HPCM and TQMxCU2-HPCM to the
tqmx86 driver
- Add support for Broadcom BCM2712 SoC to the bcm2835-pm driver
- Hook up the qnap-mcu-eeprom sub-device to qnap-mcu
Fixes:
- Enable compile testing for the Altera SOCFPGA System Manager driver
- Fix device reference leak in altr_sysmgr_regmap_lookup_by_phandle()
- Reserve the unused second I2C address for DA9063 to prevent
userspace interference
- Fix resource leak in da9055_device_init() by calling
regmap_del_irq_chip() in the error path
- Fix potential IRQ chip conflict when probing multiple MAX77620
devices by using devm_kmemdup for regmap_irq_chip
- Return -EPROBE_DEFER when a syscon devuice is not found to allow
deferred probing
- Update email address for the PF1550 PMIC driver in MAINTAINERS
- Correct file entry for PF1550 MFD driver in MAINTAINERS from
pfd1550.h to pf1550.h
- Calculate checksum on the actual number of received bytes in
qnap-mcu for error messages
- Use -EPROTO instead of -EIO for checksum errors in qnap-mcu
- Add proper error handling for command errors (e.g., "@8", "@9") in
qnap-mcu
- Fix missing irq_domain_remove() in error path of
mt63{58,97}_irq_init()
Cleanups:
- Mark SMC write buffer arguments as const in apple_smc_write(),
apple_smc_rw(), and apple_smc_write_atomic()
- Simplify the error handling path in da9055_device_init() by
removing a redundant mfd_remove_devices() call
- Use regmap_reg_range() and a real one-element array for
pmic_status_range in rohm-bd718x7 for cleaner initialization
- Remove select I2C_K1 from MFD_SPACEMIT_P1 to avoid build failures
when I2C_K1's dependencies are disabled
- Remove unneeded semicolon from ls2k_bmc_recover_pci_data()
- Drop OF dependency for MFD_MAX5970 in Kconfig to allow wider
compile testing and non-OF systems
- Make OF ID table style consistent in simple-mfd-i2c driver
- Update header inclusions in simple-mfd-i2c to follow IWYU (Include
What You Use) principle
- Move checksum verification logic to a separate function in qnap-mcu
- Use chained IRQs for S2MPG10 in the Samsung SEC driver to simplify
interrupt handling
- Drop a stray semicolon from sec-irq.c
Removals:
- Remove the unused TI WL1273 FM radio core driver
- Remove the unused wl1273-core.h header and tidy up its reference in
documentation
Device tree bindings:
- Add Device Tree binding for the NXP PF1550 PMIC
- Add missing GPIO pins and supply properties to the Silergy SY7636A
PMIC binding
- Add interrupt-controller property to the Maxim MAX77705 binding for
sub-device interrupt source determination
- Add Device Tree binding for the Renesas R2A11302FT PMIC
- Allow the wakeup-source property in the Dialog DA9063 binding
- Make interrupt-related properties optional in the TI TPS65910 PMIC
binding
- Document the Qualcomm PMIV0104 PMIC compatible string
- Document the Qualcomm PM7550 PMIC compatible string
- Enable power button subnode for TWL603x in the TI TWL binding
- Convert the Dialog DA9052/53 I2C binding from .txt to .yaml format,
including compatible string fallback and interrupt properties
- Document control-scb and sysreg-scb syscons on pic64gx with
fallback compatibles
- Document sama7g5-sfrbu and sama7d65-sfrbu syscons with fallback to
atmel,sama5d2-sfrbu
- Fix LEDs node schema in fsl,mc13xxx binding by adding led@ child
nodes and missing properties
- Add mt7981-topmisc compatible string to the syscon binding"
* tag 'mfd-next-6.19' of
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (42 commits)
mfd: sec: Drop a stray semicolon
mfd: qnap-mcu: Hook up the EEPROM sub-device
dt-bindings: mfd: syscon: Add mt7981-topmisc
dt-bindings: mfd: fsl,mc13xxx: Fix LEDs node schema
mfd: mt6358-irq: Fix missing irq_domain_remove() in error path
mfd: mt6397-irq: Fix missing irq_domain_remove() in error path
dt-bindings: mfd: Document syscons falling back to atmel,sama5d2-sfrbu
dt-bindings: mfd: Document control-scb and sysreg-scb on pic64gx
dt-bindings: mfd: Convert dlg,da9052-i2c.txt to yaml format
mfd: sec: Use chained IRQs for s2mpg10
mfd: qnap-mcu: Add proper error handling for command errors
mfd: qnap-mcu: Move checksum verification to its own function
mfd: qnap-mcu: Use EPROTO in stead of EIO on checksum errors
mfd: qnap-mcu: Calculate the checksum on the actual number of bytes
received
mfd: simple-mfd-i2c: Don't use "proxy" headers
mfd: simple-mfd-i2c: Make ID table style consistent
mfd: Kconfig: Drop OF dependency on MFD_MAX5970
mfd: ls2kbmc: Remove unneeded semicolon from ls2k_bmc_recover_pci_data()
dt-bindings: mfd: twl: Enable power button also for TWL603X
MAINTAINERS: Adjust file entry in NXP PF1550 PMIC MFD DRIVER
...
diff --combined .mailmap
index ec0b0109095c3,857054460bd9f..eb7515272ce6e
--- a/.mailmap
+++ b/.mailmap
@@@ -27,7 -27,6 +27,7 @@@ Alan Cox <[email protected]
Alan Cox <[email protected]>
Aleksandar Markovic <[email protected]>
<[email protected]>
Aleksey Gorelov <[email protected]>
+Alex Williamson <[email protected]> <[email protected]>
Alexander Lobakin <[email protected]> <[email protected]>
Alexander Lobakin <[email protected]> <[email protected]>
Alexander Lobakin <[email protected]> <[email protected]>
@@@ -174,7 -173,6 +174,7 @@@ Carlos Bilbao <[email protected]
Changbin Du <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
+Chen-Yu Tsai <[email protected]> <[email protected]>
Chester Lin <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
@@@ -207,7 -205,6 +207,7 @@@ Danilo Krummrich <[email protected]> <dak
David Brownell <[email protected]>
David Collins <[email protected]> <[email protected]>
David Heidelberg <[email protected]> <[email protected]>
+David Hildenbrand <[email protected]> <[email protected]>
David Rheinsberg <[email protected]> <[email protected]>
David Rheinsberg <[email protected]> <[email protected]>
David Rheinsberg <[email protected]> <[email protected]>
@@@ -230,7 -227,6 +230,7 @@@ Dmitry Safonov <[email protected]> <
Dmitry Safonov <[email protected]> <[email protected]>
Dmitry Safonov <[email protected]> <[email protected]>
Domen Puncer <[email protected]>
+Dong Aisheng <[email protected]> <[email protected]>
Douglas Gilbert <[email protected]>
Drew Fustini <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
@@@ -428,7 -424,7 +428,7 @@@ Kenneth W Chen <[email protected]
Kenneth Westfield <[email protected]> <[email protected]>
Kiran Gunda <[email protected]> <[email protected]>
Kirill Tkhai <[email protected]> <[email protected]>
-Kirill A. Shutemov <[email protected]> <[email protected]>
+Kiryl Shutsemau <[email protected]> <[email protected]>
Kishon Vijay Abraham I <[email protected]> <[email protected]>
Konrad Dybcio <[email protected]> <[email protected]>
Konrad Dybcio <[email protected]> <[email protected]>
@@@ -439,7 -435,6 +439,7 @@@ Krishna Manikandan <quic_mkrishn@quicin
Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
+Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Wilczyński <[email protected]> <[email protected]>
Krzysztof Wilczyński <[email protected]> <[email protected]>
Kshitiz Godara <[email protected]> <[email protected]>
@@@ -590,8 -585,8 +590,8 @@@ Nicolas Pitre <[email protected]> <nicol
Nicolas Pitre <[email protected]> <[email protected]>
Nicolas Saenz Julienne <[email protected]> <[email protected]>
Nicolas Saenz Julienne <[email protected]> <[email protected]>
-Nicolas Schier <[email protected]> <[email protected]>
-Nicolas Schier <[email protected]> <[email protected]>
+Nicolas Schier <[email protected]> <[email protected]>
+Nicolas Schier <[email protected]> <[email protected]>
Niklas Söderlund <[email protected]>
Nikolay Aleksandrov <[email protected]> <[email protected]>
Nikolay Aleksandrov <[email protected]> <[email protected]>
@@@ -608,8 -603,7 +608,8 @@@ Oleksij Rempel <[email protected]
Oleksij Rempel <[email protected]> <[email protected]>
Oliver Hartkopp <[email protected]> <[email protected]>
Oliver Hartkopp <[email protected]> <[email protected]>
-Oliver Upton <[email protected]> <[email protected]>
+Oliver Upton <[email protected]> <[email protected]>
+Oliver Upton <[email protected]> <[email protected]>
Ondřej Jirman <[email protected]> <[email protected]>
Oza Pawandeep <[email protected]> <[email protected]>
Pali Rohár <[email protected]> <[email protected]>
@@@ -638,7 -632,6 +638,7 @@@ Peter Oruba <[email protected]
Peter Oruba <[email protected]>
Pierre-Louis Bossart <[email protected]>
<[email protected]>
Pratyush Anand <[email protected]> <[email protected]>
+Pratyush Yadav <[email protected]> <[email protected]>
Praveen BP <[email protected]>
Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
Prasad Sodagudi <[email protected]> <[email protected]>
@@@ -649,7 -642,6 +649,7 @@@ Qais Yousef <[email protected]> <qais
Quentin Monnet <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Perret <[email protected]> <[email protected]>
+Rae Moar <[email protected]> <[email protected]>
Rafael J. Wysocki <[email protected]> <[email protected]>
Rajeev Nandan <[email protected]> <[email protected]>
Rajendra Nayak <[email protected]> <[email protected]>
@@@ -693,9 -685,8 +693,10 @@@ Sachin Mokashi <[email protected]
Sachin P Sant <[email protected]>
Sai Prakash Ranjan <[email protected]>
<[email protected]>
Sakari Ailus <[email protected]> <[email protected]>
+Sam Protsenko <[email protected]>
+Sam Protsenko <[email protected]> <[email protected]>
Sam Ravnborg <[email protected]>
+ Samuel Kayode <[email protected]> <[email protected]>
Sankeerth Billakanti <[email protected]> <[email protected]>
Santosh Shilimkar <[email protected]>
Santosh Shilimkar <[email protected]>
diff --combined MAINTAINERS
index 2865f56a89b65,e47976dc91df7..c995eb06d8f8e
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -915,7 -915,6 +915,7 @@@ F: drivers/staging/media/sunxi/cedrus
ALPHA PORT
M: Richard Henderson <[email protected]>
M: Matt Turner <[email protected]>
+M: Magnus Lindholm <[email protected]>
L: [email protected]
S: Odd Fixes
F: arch/alpha/
@@@ -1081,7 -1080,7 +1081,7 @@@ M: Austin Zheng <[email protected]
M: Jun Lei <[email protected]>
S: Supported
F: drivers/gpu/drm/amd/display/dc/dml/
-F: drivers/gpu/drm/amd/display/dc/dml2/
+F: drivers/gpu/drm/amd/display/dc/dml2_0/
AMD FAM15H PROCESSOR POWER MONITORING DRIVER
M: Huang Rui <[email protected]>
@@@ -1758,7 -1757,6 +1758,7 @@@ S: Supporte
W: http://wiki.analog.com/
W: https://ez.analog.com/linux-software-drivers
F: Documentation/devicetree/bindings/sound/adi,*
+F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
F: sound/soc/codecs/ad1*
F: sound/soc/codecs/ad7*
F: sound/soc/codecs/adau*
@@@ -1999,10 -1997,6 +1999,10 @@@ F: include/uapi/linux/if_arcnet.
ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
M: Arnd Bergmann <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
+M: Alexandre Belloni <[email protected]>
+M: Linus Walleij <[email protected]>
+R: Drew Fustini <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected]
S: Maintained
@@@ -2023,15 -2017,6 +2023,15 @@@ F: arch/arm64/include/asm/arch_timer.
F: drivers/clocksource/arm_arch_timer.c
F: drivers/clocksource/arm_arch_timer_mmio.c
+ARM ETHOS-U NPU DRIVER
+M: Rob Herring (Arm) <[email protected]>
+M: Tomeu Vizoso <[email protected]>
+L: [email protected]
+S: Supported
+T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
+F: drivers/accel/ethosu/
+F: include/uapi/drm/ethosu_accel.h
+
ARM GENERIC INTERRUPT CONTROLLER DRIVERS
M: Marc Zyngier <[email protected]>
L: [email protected] (moderated for non-subscribers)
@@@ -2107,8 -2092,7 +2107,8 @@@ F: drivers/gpu/drm/arm/display/komeda
ARM MALI PANFROST DRM DRIVER
M: Boris Brezillon <[email protected]>
M: Rob Herring <[email protected]>
-R: Steven Price <[email protected]>
+M: Steven Price <[email protected]>
+M: Adrián Larumbe <[email protected]>
L: [email protected]
S: Supported
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -2117,20 -2101,6 +2117,20 @@@ F: drivers/gpu/drm/ci/xfails/panfrost
F: drivers/gpu/drm/panfrost/
F: include/uapi/drm/panfrost_drm.h
+ARM MALI-C55 ISP DRIVER
+M: Daniel Scally <[email protected]>
+M: Jacopo Mondi <[email protected]>
+L: [email protected]
+S: Maintained
+T: git git://linuxtv.org/media_tree.git
+F: Documentation/admin-guide/media/mali-c55-graph.dot
+F: Documentation/admin-guide/media/mali-c55.rst
+F: Documentation/devicetree/bindings/media/arm,mali-c55.yaml
+F: Documentation/userspace-api/media/drivers/mali-c55.rst
+F: Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst
+F: drivers/media/platform/arm/mali-c55/
+F: include/uapi/linux/media/arm/mali-c55-config.h
+
ARM MALI PANTHOR DRM DRIVER
M: Boris Brezillon <[email protected]>
M: Steven Price <[email protected]>
@@@ -2328,7 -2298,7 +2328,7 @@@ S: Maintaine
F: drivers/clk/sunxi/
ARM/Allwinner sunXi SoC support
-M: Chen-Yu Tsai <[email protected]>
+M: Chen-Yu Tsai <[email protected]>
M: Jernej Skrabec <[email protected]>
M: Samuel Holland <[email protected]>
L: [email protected] (moderated for non-subscribers)
@@@ -2422,9 -2392,9 +2422,9 @@@ M: Martin Povišer <[email protected]
L: [email protected]
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
-F: Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
F: Documentation/devicetree/bindings/sound/apple,*
+F: Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
+F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
F: sound/soc/apple/*
F: sound/soc/codecs/cs42l83-i2c.c
F: sound/soc/codecs/cs42l84.*
@@@ -2468,14 -2438,12 +2468,14 @@@ F: Documentation/devicetree/bindings/pw
F: Documentation/devicetree/bindings/spi/apple,spi.yaml
F: Documentation/devicetree/bindings/spmi/apple,spmi.yaml
F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
+F: Documentation/hwmon/macsmc-hwmon.rst
F: arch/arm64/boot/dts/apple/
F: drivers/bluetooth/hci_bcm4377.c
F: drivers/clk/clk-apple-nco.c
F: drivers/cpufreq/apple-soc-cpufreq.c
F: drivers/dma/apple-admac.c
F: drivers/gpio/gpio-macsmc.c
+F: drivers/hwmon/macsmc-hwmon.c
F: drivers/pmdomain/apple/
F: drivers/i2c/busses/i2c-pasemi-core.c
F: drivers/i2c/busses/i2c-pasemi-platform.c
@@@ -3328,7 -3296,6 +3328,7 @@@ F: drivers/*/*/*rockchip
F: drivers/*/*rockchip*
F: drivers/clk/rockchip/
F: drivers/i2c/busses/i2c-rk3x.c
+F: drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
F: sound/soc/rockchip/
N: rockchip
@@@ -3470,6 -3437,7 +3470,6 @@@ 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/st/sti/c8sectpfe/
F: drivers/media/rc/st_rc.c
F: drivers/mmc/host/sdhci-st.c
F: drivers/phy/st/phy-miphy28lp.c
@@@ -3873,7 -3841,6 +3873,7 @@@ F: drivers/hwmon/asus-ec-sensors.
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
M: Corentin Chary <[email protected]>
M: Luke D. Jones <[email protected]>
+M: Denis Benato <[email protected]>
L: [email protected]
S: Maintained
W: https://asus-linux.org/
@@@ -3953,7 -3920,7 +3953,7 @@@ F: crypto/async_tx
F: include/linux/async_tx.h
AT24 EEPROM DRIVER
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -4333,7 -4300,7 +4333,7 @@@ F: Documentation/filesystems/befs.rs
F: fs/befs/
BFQ I/O SCHEDULER
-M: Yu Kuai <[email protected]>
+M: Yu Kuai <[email protected]>
L: [email protected]
S: Odd Fixes
F: Documentation/block/bfq-iosched.rst
@@@ -4426,15 -4393,13 +4426,15 @@@ BLOCK LAYE
M: Jens Axboe <[email protected]>
L: [email protected]
S: Maintained
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git
F: Documentation/ABI/stable/sysfs-block
F: Documentation/block/
F: block/
F: drivers/block/
F: include/linux/bio.h
F: include/linux/blk*
+F: include/uapi/linux/blk*
+F: include/uapi/linux/ioprio.h
F: kernel/trace/blktrace.c
F: lib/sbitmap.c
@@@ -4683,7 -4648,6 +4683,7 @@@ F: Documentation/userspace-api/ebpf
F: arch/*/net/*
F: include/linux/bpf*
F: include/linux/btf*
+F: include/linux/buildid.h
F: include/linux/filter.h
F: include/trace/events/xdp.h
F: include/uapi/linux/bpf*
@@@ -4840,7 -4804,6 +4840,7 @@@ F: drivers/net/ethernet/broadcom/b44.
BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
M: Florian Fainelli <[email protected]>
+M: Jonas Gorski <[email protected]>
L: [email protected]
L: [email protected] (subscribers-only)
S: Supported
@@@ -4849,7 -4812,6 +4849,7 @@@ F: drivers/net/dsa/b53/
F: drivers/net/dsa/bcm_sf2*
F: include/linux/dsa/brcm.h
F: include/linux/platform_data/b53.h
+F: net/dsa/tag_brcm.c
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
M: Florian Fainelli <[email protected]>
@@@ -5161,6 -5123,7 +5161,6 @@@ F: Documentation/devicetree/bindings/ne
F: drivers/net/ethernet/broadcom/genet/
F: drivers/net/ethernet/broadcom/unimac.h
F: drivers/net/mdio/mdio-bcm-unimac.c
-F: include/linux/platform_data/bcmgenet.h
F: include/linux/platform_data/mdio-bcm-unimac.h
BROADCOM IPROC ARM ARCHITECTURE
@@@ -6642,6 -6605,7 +6642,6 @@@ CRYPTOGRAPHIC RANDOM NUMBER GENERATO
M: Neil Horman <[email protected]>
L: [email protected]
S: Maintained
-F: crypto/ansi_cprng.c
F: crypto/rng.c
CS3308 MEDIA DRIVER
@@@ -7225,6 -7189,7 +7225,6 @@@ F: Documentation/devicetree/bindings/in
F: Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml
F: Documentation/devicetree/bindings/mfd/da90*.txt
F: Documentation/devicetree/bindings/mfd/dlg,da90*.yaml
-F: Documentation/devicetree/bindings/regulator/da92*.txt
F: Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
F: Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
F: Documentation/devicetree/bindings/sound/da[79]*.txt
@@@ -7343,7 -7308,6 +7343,7 @@@ F: Documentation/userspace-api/dma-buf-
F: drivers/dma-buf/
F: include/linux/*fence.h
F: include/linux/dma-buf.h
+F: include/linux/dma-buf/
F: include/linux/dma-resv.h
K: \bdma_(?:buf|fence|resv)\b
@@@ -7447,10 -7411,16 +7447,10 @@@ S: Maintaine
P: Documentation/doc-guide/maintainer-profile.rst
T: git git://git.lwn.net/linux.git docs-next
F: Documentation/
-F: scripts/check-variable-fonts.sh
-F: scripts/checktransupdate.py
-F: scripts/documentation-file-ref-check
-F: scripts/get_abi.py
F: scripts/kernel-doc*
-F: scripts/lib/abi/*
-F: scripts/lib/kdoc/*
-F: tools/docs/*
+F: tools/lib/python/*
+F: tools/docs/
F: tools/net/ynl/pyynl/lib/doc_generator.py
-F: scripts/sphinx-pre-install
X: Documentation/ABI/
X: Documentation/admin-guide/media/
X: Documentation/devicetree/
@@@ -7483,10 -7453,9 +7483,10 @@@ DOCUMENTATION SCRIPT
M: Mauro Carvalho Chehab <[email protected]>
L: [email protected]
S: Maintained
-F: Documentation/sphinx/parse-headers.pl
-F: scripts/documentation-file-ref-check
-F: scripts/sphinx-pre-install
+F: Documentation/sphinx/
+F: scripts/kernel-doc*
+F: tools/lib/python/*
+F: tools/docs/
DOCUMENTATION/ITALIAN
M: Federico Vaga <[email protected]>
@@@ -7509,7 -7478,7 +7509,7 @@@ F: Documentation/devicetree/bindings/me
F: drivers/media/i2c/dw9714.c
DONGWOON DW9719 LENS VOICE COIL DRIVER
-M: Daniel Scally <[email protected]>
+M: Daniel Scally <[email protected]>
L: [email protected]
S: Maintained
T: git git://linuxtv.org/media.git
@@@ -7667,7 -7636,8 +7667,7 @@@ F: drivers/accel
F: include/drm/drm_accel.h
DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
-M: Maxime Ripard <[email protected]>
-M: Chen-Yu Tsai <[email protected]>
+M: Chen-Yu Tsai <[email protected]>
R: Jernej Skrabec <[email protected]>
L: [email protected]
S: Supported
@@@ -7776,8 -7746,7 +7776,8 @@@ F: Documentation/devicetree/bindings/di
F: drivers/gpu/drm/panel/panel-edp.c
DRM DRIVER FOR GENERIC USB DISPLAY
-S: Orphan
+M: Ruben Wauters <[email protected]>
+S: Maintained
W: https://github.com/notro/gud/wiki
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
F: drivers/gpu/drm/gud/
@@@ -7899,7 -7868,6 +7899,7 @@@ DRM DRIVER for Qualcomm Adreno GPU
M: Rob Clark <[email protected]>
R: Sean Paul <[email protected]>
R: Konrad Dybcio <[email protected]>
+R: Akhil P Oommen <[email protected]>
L: [email protected]
L: [email protected]
L: [email protected]
@@@ -7919,7 -7887,7 +7919,7 @@@ DRM DRIVER for Qualcomm display hardwar
M: Rob Clark <[email protected]>
M: Dmitry Baryshkov <[email protected]>
R: Abhinav Kumar <[email protected]>
-R: Jessica Zhang <[email protected]>
+R: Jessica Zhang <[email protected]>
R: Sean Paul <[email protected]>
R: Marijn Suijten <[email protected]>
L: [email protected]
@@@ -8088,25 -8056,12 +8088,25 @@@ S: Maintaine
F: Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml
F: drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c
+DRM DRIVER FOR SAMSUNG S6E3FC2X01 DDIC
+M: David Heidelberg <[email protected]>
+S: Maintained
+F: Documentation/devicetree/bindings/display/panel/samsung,s6e3fc2x01.yaml
+F: drivers/gpu/drm/panel/panel-samsung-s6e3fc2x01.c
+
DRM DRIVER FOR SAMSUNG S6E3HA8 PANELS
M: Dzmitry Sankouski <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/display/panel/samsung,s6e3ha8.yaml
F: drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c
+DRM DRIVER FOR SAMSUNG SOFEF00 DDIC
+M: David Heidelberg <[email protected]>
+M: Casey Connolly <[email protected]>
+S: Maintained
+F: Documentation/devicetree/bindings/display/panel/samsung,sofef00.yaml
+F: drivers/gpu/drm/panel/panel-samsung-sofef00.c
+
DRM DRIVER FOR SHARP MEMORY LCD
M: Alex Lanzano <[email protected]>
S: Maintained
@@@ -8291,12 -8246,12 +8291,12 @@@ S: Supporte
W: https://drm.pages.freedesktop.org/maintainer-tools/drm-rust.html
T: git https://gitlab.freedesktop.org/drm/rust/kernel.git
F: drivers/gpu/drm/nova/
+F: drivers/gpu/drm/tyr/
F: drivers/gpu/nova-core/
F: rust/kernel/drm/
DRM DRIVERS FOR ALLWINNER A10
-M: Maxime Ripard <[email protected]>
-M: Chen-Yu Tsai <[email protected]>
+M: Chen-Yu Tsai <[email protected]>
L: [email protected]
S: Supported
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -8623,7 -8578,6 +8623,7 @@@ S: Supporte
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
F: drivers/gpu/drm/scheduler/
F: include/drm/gpu_scheduler.h
+F: include/drm/spsc_queue.h
DRM GPUVM
M: Danilo Krummrich <[email protected]>
@@@ -8646,7 -8600,7 +8646,7 @@@ F: drivers/gpu/drm/clients/drm_log.
DRM PANEL DRIVERS
M: Neil Armstrong <[email protected]>
-R: Jessica Zhang <[email protected]>
+R: Jessica Zhang <[email protected]>
L: [email protected]
S: Maintained
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -9226,9 -9180,6 +9226,9 @@@ S: Maintaine
F: kernel/power/energy_model.c
F: include/linux/energy_model.h
F: Documentation/power/energy-model.rst
+F: Documentation/netlink/specs/em.yaml
+F: include/uapi/linux/energy_model.h
+F: kernel/power/em_netlink*.*
EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER
M: Laurentiu Tudor <[email protected]>
@@@ -9250,7 -9201,6 +9250,7 @@@ R: Yue Hu <[email protected]
R: Jeffle Xu <[email protected]>
R: Sandeep Dhavale <[email protected]>
R: Hongbo Li <[email protected]>
+R: Chunhai Guo <[email protected]>
L: [email protected]
S: Maintained
W: https://erofs.docs.kernel.org
@@@ -9307,6 -9257,7 +9307,6 @@@ M: Ido Schimmel <[email protected]
L: [email protected]
L: [email protected]
S: Maintained
-W: http://www.linuxfoundation.org/en/Net:Bridge
F: include/linux/if_bridge.h
F: include/uapi/linux/if_bridge.h
F: include/linux/netfilter_bridge/
@@@ -10576,7 -10527,7 +10576,7 @@@ L: [email protected]
S: Supported
B:
https://bugzilla.kernel.org/enter_bug.cgi?product=File%20System&component=gfs2
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
-F: Documentation/filesystems/gfs2*
+F: Documentation/filesystems/gfs2/
F: fs/gfs2/
F: include/uapi/linux/gfs2_ondisk.h
@@@ -10719,7 -10670,7 +10719,7 @@@ F: tools/gpio/gpio-sloppy-logic-analyze
GPIO SUBSYSTEM
M: Linus Walleij <[email protected]>
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -10736,7 -10687,7 +10736,7 @@@ K: GPIOD_FLAGS_BIT_NONEXCLUSIV
K: devm_gpiod_unhinge
GPIO UAPI
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
R: Kent Gibson <[email protected]>
L: [email protected]
S: Maintained
@@@ -11568,7 -11519,7 +11568,7 @@@ F: include/linux/platform_data/huawei-g
HUGETLB SUBSYSTEM
M: Muchun Song <[email protected]>
M: Oscar Salvador <[email protected]>
-R: David Hildenbrand <[email protected]>
+R: David Hildenbrand <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@@ -12548,13 -12499,6 +12548,13 @@@ F: drivers/gpu/drm/xe
F: include/drm/intel/
F: include/uapi/drm/xe_drm.h
+INTEL ELKHART LAKE PSE I/O DRIVER
+M: Raag Jadav <[email protected]>
+L: [email protected]
+S: Supported
+F: drivers/platform/x86/intel/ehl_pse_io.c
+F: include/linux/ehl_pse_io_aux.h
+
INTEL ETHERNET DRIVERS
M: Tony Nguyen <[email protected]>
M: Przemek Kitszel <[email protected]>
@@@ -12571,7 -12515,6 +12571,7 @@@ F: include/linux/avf/virtchnl.
F: include/linux/net/intel/*/
INTEL ETHERNET PROTOCOL DRIVER FOR RDMA
+M: Krzysztof Czurylo <[email protected]>
M: Tatyana Nikolova <[email protected]>
L: [email protected]
S: Supported
@@@ -12618,7 -12561,6 +12618,7 @@@ F: drivers/dma/ioat
INTEL IAA CRYPTO DRIVER
M: Kristen Accardi <[email protected]>
M: Vinicius Costa Gomes <[email protected]>
+M: Kanchana P Sridhar <[email protected]>
L: [email protected]
S: Supported
F: Documentation/driver-api/crypto/iaa/iaa-crypto.rst
@@@ -12670,7 -12612,7 +12670,7 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
M: Yong Zhi <[email protected]>
M: Sakari Ailus <[email protected]>
M: Bingbu Cao <[email protected]>
-M: Dan Scally <[email protected]>
+M: Dan Scally <[email protected]>
R: Tianshu Qiu <[email protected]>
L: [email protected]
S: Maintained
@@@ -12913,8 -12855,7 +12913,8 @@@ F: tools/testing/selftests/sgx/
K: \bSGX_
INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
-M: Daniel Scally <[email protected]>
+M: Daniel Scally <[email protected]>
+M: Sakari Ailus <[email protected]>
S: Maintained
F: drivers/platform/x86/intel/int3472/
F: include/linux/platform_data/x86/int3472.h
@@@ -13169,15 -13110,6 +13169,15 @@@ F: include/uapi/linux/io_uring.
F: include/uapi/linux/io_uring/
F: io_uring/
+IO_URING ZCRX
+M: Pavel Begunkov <[email protected]>
+L: [email protected]
+L: [email protected]
+T: git https://github.com/isilence/linux.git zcrx/for-next
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git
+S: Maintained
+F: io_uring/zcrx.*
+
IPMI SUBSYSTEM
M: Corey Minyard <[email protected]>
L: [email protected] (moderated for non-subscribers)
@@@ -13313,8 -13245,10 +13313,8 @@@ T: git git://git.kernel.org/pub/scm/lin
F: drivers/infiniband/ulp/isert
ISDN/CMTP OVER BLUETOOTH
-M: Karsten Keil <[email protected]>
-L: [email protected] (subscribers-only)
L: [email protected]
-S: Odd Fixes
+S: Orphan
W: http://www.isdn4linux.de
F: Documentation/isdn/
F: drivers/isdn/capi/
@@@ -13323,8 -13257,10 +13323,8 @@@ F: include/uapi/linux/isdn
F: net/bluetooth/cmtp/
ISDN/mISDN SUBSYSTEM
-M: Karsten Keil <[email protected]>
-L: [email protected] (subscribers-only)
L: [email protected]
-S: Maintained
+S: Orphan
W: http://www.isdn4linux.de
F: drivers/isdn/Kconfig
F: drivers/isdn/Makefile
@@@ -13478,12 -13414,9 +13478,12 @@@ F: mm/kasan
F: scripts/Makefile.kasan
KCONFIG
+M: Nathan Chancellor <[email protected]>
+M: Nicolas Schier <[email protected]>
L: [email protected]
-S: Orphan
+S: Odd Fixes
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git
F: Documentation/kbuild/kconfig*
F: scripts/Kconfig.include
F: scripts/kconfig/
@@@ -13549,7 -13482,7 +13549,7 @@@ F: fs/autofs
KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
M: Nathan Chancellor <[email protected]>
-M: Nicolas Schier <[email protected]>
+M: Nicolas Schier <[email protected]>
L: [email protected]
S: Odd Fixes
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
@@@ -13668,7 -13601,7 +13668,7 @@@ F: fs/smb/server
KERNEL UNIT TESTING FRAMEWORK (KUnit)
M: Brendan Higgins <[email protected]>
M: David Gow <[email protected]>
-R: Rae Moar <[email protected]>
+R: Rae Moar <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
@@@ -13709,7 -13642,7 +13709,7 @@@ F: virt/kvm/
KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
M: Marc Zyngier <[email protected]>
-M: Oliver Upton <[email protected]>
+M: Oliver Upton <[email protected]>
R: Joey Gouly <[email protected]>
R: Suzuki K Poulose <[email protected]>
R: Zenghui Yu <[email protected]>
@@@ -13783,7 -13716,7 +13783,7 @@@ KERNEL VIRTUAL MACHINE for s390 (KVM/s3
M: Christian Borntraeger <[email protected]>
M: Janosch Frank <[email protected]>
M: Claudio Imbrenda <[email protected]>
-R: David Hildenbrand <[email protected]>
+R: David Hildenbrand <[email protected]>
L: [email protected]
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
@@@ -13848,7 -13781,6 +13848,7 @@@ F: Documentation/admin-guide/mm/kho.rs
F: Documentation/core-api/kho/*
F: include/linux/kexec_handover.h
F: kernel/kexec_handover.c
+F: lib/test_kho.c
F: tools/testing/selftests/kho/
KEYS-ENCRYPTED
@@@ -14104,7 -14036,7 +14104,7 @@@ F: tools/testing/selftests/landlock
K: landlock
K: LANDLOCK
-LANTIQ / INTEL Ethernet drivers
+LANTIQ / MAXLINEAR / INTEL Ethernet DSA drivers
M: Hauke Mehrtens <[email protected]>
L: [email protected]
S: Maintained
@@@ -14112,7 -14044,6 +14112,7 @@@ F: Documentation/devicetree/bindings/ne
F: drivers/net/dsa/lantiq/*
F: drivers/net/ethernet/lantiq_xrx200.c
F: net/dsa/tag_gswip.c
+F: net/dsa/tag_mxl-gsw1xx.c
LANTIQ MIPS ARCHITECTURE
M: John Crispin <[email protected]>
@@@ -14462,7 -14393,6 +14462,7 @@@ F: tools/memory-model
LINUX-NEXT TREE
M: Stephen Rothwell <[email protected]>
+M: Mark Brown <[email protected]>
L: [email protected]
S: Supported
B: mailto:[email protected] and the appropriate development tree
@@@ -14509,11 -14439,10 +14509,11 @@@ T: git
git://git.kernel.org/pub/scm/lin
F: Documentation/ABI/testing/sysfs-kernel-livepatch
F: Documentation/livepatch/
F: arch/powerpc/include/asm/livepatch.h
-F: include/linux/livepatch.h
+F: include/linux/livepatch*.h
F: kernel/livepatch/
F: kernel/module/livepatch.c
F: samples/livepatch/
+F: scripts/livepatch/
F: tools/testing/selftests/livepatch/
LLC (802.2)
@@@ -14587,7 -14516,6 +14587,7 @@@ S: Maintaine
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
locking/core
F: Documentation/locking/
F: arch/*/include/asm/spinlock*.h
+F: include/linux/local_lock*.h
F: include/linux/lockdep*.h
F: include/linux/mutex*.h
F: include/linux/rwlock*.h
@@@ -15237,15 -15165,6 +15237,15 @@@ S: Maintaine
F: Documentation/hwmon/max15301.rst
F: drivers/hwmon/pmbus/max15301.c
+MAX17616 HARDWARE MONITOR DRIVER
+M: Kim Seer Paller <[email protected]>
+L: [email protected]
+S: Supported
+W: https://ez.analog.com/linux-software-drivers
+F: Documentation/devicetree/bindings/hwmon/pmbus/adi,max17616.yaml
+F: Documentation/hwmon/max17616.rst
+F: drivers/hwmon/pmbus/max17616.c
+
MAX2175 SDR TUNER DRIVER
M: Ramesh Shanmugasundaram <[email protected]>
L: [email protected]
@@@ -15371,7 -15290,7 +15371,7 @@@ F: drivers/pwm/pwm-max7360.
F: include/linux/mfd/max7360.h
MAXIM MAX77650 PMIC MFD DRIVER
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/*/*max77650.yaml
@@@ -15473,12 -15392,14 +15473,12 @@@ S: Supporte
F: drivers/net/phy/mxl-86110.c
F: drivers/net/phy/mxl-gpy.c
-MCAN MMIO DEVICE DRIVER
-M: Chandrasekar Ramakrishnan <[email protected]>
+MCAN DEVICE DRIVER
+M: Markus Schneider-Pargmann <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
-F: drivers/net/can/m_can/m_can.c
-F: drivers/net/can/m_can/m_can.h
-F: drivers/net/can/m_can/m_can_platform.c
+F: drivers/net/can/m_can/
MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
R: Yasushi SHOJI <[email protected]>
@@@ -15602,8 -15523,6 +15602,8 @@@ F: drivers/media/pci/ddbridge/
MEDIA DRIVERS FOR FREESCALE IMX
M: Steve Longerbeam <[email protected]>
M: Philipp Zabel <[email protected]>
+R: Frank Li <[email protected]>
+L: [email protected]
L: [email protected]
S: Maintained
T: git git://linuxtv.org/media.git
@@@ -15618,8 -15537,6 +15618,8 @@@ M: Rui Miguel Silva <[email protected]
M: Laurent Pinchart <[email protected]>
M: Martin Kepplinger <[email protected]>
R: Purism Kernel Team <[email protected]>
+R: Frank Li <[email protected]>
+L: [email protected]
L: [email protected]
S: Maintained
T: git git://linuxtv.org/media.git
@@@ -16269,7 -16186,7 +16269,7 @@@ MEMORY CONTROLLER DRIVER
M: Krzysztof Kozlowski <[email protected]>
L: [email protected]
S: Maintained
-B: mailto:[email protected]
+B: mailto:[email protected]
T: git
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
F: Documentation/devicetree/bindings/memory-controllers/
F: drivers/memory/
@@@ -16285,7 -16202,7 +16285,7 @@@ T: git git://git.kernel.org/pub/scm/lin
F: drivers/devfreq/tegra30-devfreq.c
MEMORY HOT(UN)PLUG
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
M: Oscar Salvador <[email protected]>
L: [email protected]
S: Maintained
@@@ -16310,7 -16227,7 +16310,7 @@@ F: tools/mm
MEMORY MANAGEMENT - CORE
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
R: Lorenzo Stoakes <[email protected]>
R: Liam R. Howlett <[email protected]>
R: Vlastimil Babka <[email protected]>
@@@ -16366,7 -16283,7 +16366,7 @@@ F: mm/execmem.
MEMORY MANAGEMENT - GUP (GET USER PAGES)
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
R: Jason Gunthorpe <[email protected]>
R: John Hubbard <[email protected]>
R: Peter Xu <[email protected]>
@@@ -16382,7 -16299,7 +16382,7 @@@ F: tools/testing/selftests/mm/gup_test.
MEMORY MANAGEMENT - KSM (Kernel Samepage Merging)
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
R: Xu Xin <[email protected]>
R: Chengming Zhou <[email protected]>
L: [email protected]
@@@ -16398,7 -16315,7 +16398,7 @@@ F: mm/mm_slot.
MEMORY MANAGEMENT - MEMORY POLICY AND MIGRATION
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
R: Zi Yan <[email protected]>
R: Matthew Brost <[email protected]>
R: Joshua Hahn <[email protected]>
@@@ -16438,7 -16355,7 +16438,7 @@@ F: mm/workingset.
MEMORY MANAGEMENT - MISC
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
R: Lorenzo Stoakes <[email protected]>
R: Liam R. Howlett <[email protected]>
R: Vlastimil Babka <[email protected]>
@@@ -16526,7 -16443,7 +16526,7 @@@ F: mm/shuffle.
MEMORY MANAGEMENT - RECLAIM
M: Andrew Morton <[email protected]>
M: Johannes Weiner <[email protected]>
-R: David Hildenbrand <[email protected]>
+R: David Hildenbrand <[email protected]>
R: Michal Hocko <[email protected]>
R: Qi Zheng <[email protected]>
R: Shakeel Butt <[email protected]>
@@@ -16539,7 -16456,7 +16539,7 @@@ F: mm/workingset.
MEMORY MANAGEMENT - RMAP (REVERSE MAPPING)
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
M: Lorenzo Stoakes <[email protected]>
R: Rik van Riel <[email protected]>
R: Liam R. Howlett <[email protected]>
@@@ -16563,12 -16480,12 +16563,12 @@@ F: mm/secretmem.
MEMORY MANAGEMENT - SWAP
M: Andrew Morton <[email protected]>
+M: Chris Li <[email protected]>
+M: Kairui Song <[email protected]>
R: Kemeng Shi <[email protected]>
-R: Kairui Song <[email protected]>
R: Nhat Pham <[email protected]>
R: Baoquan He <[email protected]>
R: Barry Song <[email protected]>
-R: Chris Li <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/mm/swap-table.rst
@@@ -16584,7 -16501,7 +16584,7 @@@ F: mm/swapfile.
MEMORY MANAGEMENT - THP (TRANSPARENT HUGE PAGE)
M: Andrew Morton <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
M: Lorenzo Stoakes <[email protected]>
R: Zi Yan <[email protected]>
R: Baolin Wang <[email protected]>
@@@ -16686,7 -16603,7 +16686,7 @@@ MEMORY MAPPING - MADVISE (MEMORY ADVICE
M: Andrew Morton <[email protected]>
M: Liam R. Howlett <[email protected]>
M: Lorenzo Stoakes <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
R: Vlastimil Babka <[email protected]>
R: Jann Horn <[email protected]>
L: [email protected]
@@@ -17518,14 -17435,6 +17518,14 @@@ S: Maintaine
F: Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml
F: drivers/net/phy/motorcomm.c
+MOTORCOMM YT921X ETHERNET SWITCH DRIVER
+M: David Yang <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/devicetree/bindings/net/dsa/motorcomm,yt921x.yaml
+F: drivers/net/dsa/yt921x.*
+F: net/dsa/tag_yt921x.c
+
MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
M: Jiri Slaby <[email protected]>
S: Maintained
@@@ -17539,16 -17448,6 +17539,16 @@@ S: Maintaine
F: Documentation/devicetree/bindings/leds/backlight/mps,mp3309c.yaml
F: drivers/video/backlight/mp3309c.c
+MPAM DRIVER
+M: James Morse <[email protected]>
+M: Ben Horgan <[email protected]>
+R: Reinette Chatre <[email protected]>
+R: Fenghua Yu <[email protected]>
+S: Maintained
+F: drivers/resctrl/mpam_*
+F: drivers/resctrl/test_mpam_*
+F: include/linux/arm_mpam.h
+
MPS MP2869 DRIVER
M: Wensheng Wang <[email protected]>
L: [email protected]
@@@ -17563,13 -17462,6 +17563,13 @@@ S: Maintaine
F: Documentation/hwmon/mp2891.rst
F: drivers/hwmon/pmbus/mp2891.c
+MPS MP2925 DRIVER
+M: Noah Wang <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/hwmon/mp2925.rst
+F: drivers/hwmon/pmbus/mp2925.c
+
MPS MP29502 DRIVER
M: Wensheng Wang <[email protected]>
L: [email protected]
@@@ -17591,13 -17483,6 +17591,13 @@@ S: Maintaine
F: Documentation/hwmon/mp9941.rst
F: drivers/hwmon/pmbus/mp9941.c
+MPS MP9945 DRIVER
+M: Cosmo Chou <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/hwmon/mp9945.rst
+F: drivers/hwmon/pmbus/mp9945.c
+
MR800 AVERMEDIA USB FM RADIO DRIVER
M: Alexey Klimov <[email protected]>
L: [email protected]
@@@ -17705,14 -17590,6 +17705,14 @@@ T: git git://linuxtv.org/media.gi
F: Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
F: drivers/media/i2c/mt9v111.c
+MUCSE ETHERNET DRIVER
+M: Yibo Dong <[email protected]>
+L: [email protected]
+S: Maintained
+W: https://www.mucse.com/en/
+F: Documentation/networking/device_drivers/ethernet/mucse/
+F: drivers/net/ethernet/mucse/
+
MULTIFUNCTION DEVICES (MFD)
M: Lee Jones <[email protected]>
S: Maintained
@@@ -18136,16 -18013,6 +18136,16 @@@ X: net/rfkill
X: net/wireless/
X: tools/testing/selftests/net/can/
+NETWORKING [IOAM]
+M: Justin Iurman <[email protected]>
+S: Maintained
+F: Documentation/networking/ioam6*
+F: include/linux/ioam6*
+F: include/net/ioam6*
+F: include/uapi/linux/ioam6*
+F: net/ipv6/ioam6*
+F: tools/testing/selftests/net/ioam6*
+
NETWORKING [IPSEC]
M: Steffen Klassert <[email protected]>
M: Herbert Xu <[email protected]>
@@@ -18154,7 -18021,6 +18154,7 @@@ L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
T: git
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
+F: Documentation/networking/xfrm/
F: include/net/xfrm.h
F: include/uapi/linux/xfrm.h
F: net/ipv4/ah4.c
@@@ -18742,7 -18608,7 +18742,7 @@@ F: Documentation/devicetree/bindings/re
F: drivers/regulator/pf530x-regulator.c
NXP PF1550 PMIC MFD DRIVER
- M: Samuel Kayode <[email protected]>
+ M: Samuel Kayode <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/mfd/nxp,pf1550.yaml
@@@ -18750,7 -18616,7 +18750,7 @@@ F: drivers/input/misc/pf1550-onkey.
F: drivers/mfd/pf1550.c
F: drivers/power/supply/pf1550-charger.c
F: drivers/regulator/pf1550-regulator.c
- F: include/linux/mfd/pfd1550.h
+ F: include/linux/mfd/pf1550.h
NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
M: Jagan Teki <[email protected]>
@@@ -18792,7 -18658,7 +18792,7 @@@ NXP TFA9879 DRIVE
M: Peter Rosin <[email protected]>
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml
+F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
F: sound/soc/codecs/tfa9879*
NXP-NCI NFC DRIVER
@@@ -18896,10 -18762,6 +18896,10 @@@ S: Maintaine
F: arch/arm/*omap*/*clock*
OMAP DEVICE TREE SUPPORT
+M: Aaro Koskinen <[email protected]>
+M: Andreas Kemnade <[email protected]>
+M: Kevin Hilman <[email protected]>
+M: Roger Quadros <[email protected]>
M: Tony Lindgren <[email protected]>
L: [email protected]
L: [email protected]
@@@ -19120,9 -18982,10 +19120,9 @@@ T: git git://linuxtv.org/media.gi
F: drivers/media/i2c/ov08d10.c
OMNIVISION OV08X40 SENSOR DRIVER
-M: Jason Chen <[email protected]>
+M: Jimmy Su <[email protected]>
L: [email protected]
S: Maintained
-T: git git://linuxtv.org/media.git
F: drivers/media/i2c/ov08x40.c
F: Documentation/devicetree/bindings/media/i2c/ovti,ov08x40.yaml
@@@ -19215,7 -19078,7 +19215,7 @@@ F: Documentation/devicetree/bindings/me
F: drivers/media/i2c/ov5675.c
OMNIVISION OV5693 SENSOR DRIVER
-M: Daniel Scally <[email protected]>
+M: Daniel Scally <[email protected]>
L: [email protected]
S: Maintained
T: git git://linuxtv.org/media.git
@@@ -20018,7 -19881,7 +20018,7 @@@ F: drivers/pci/p2pdma.
F: include/linux/pci-p2pdma.h
PCI POWER CONTROL
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
@@@ -20283,7 -20146,6 +20283,7 @@@ R: Alexander Shishkin <alexander.shishk
R: Jiri Olsa <[email protected]>
R: Ian Rogers <[email protected]>
R: Adrian Hunter <[email protected]>
+R: James Clark <[email protected]>
L: [email protected]
L: [email protected]
S: Supported
@@@ -20615,7 -20477,7 +20615,7 @@@ F: include/linux/powercap.
F: kernel/configs/nopm.config
POWER SEQUENCING
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -20712,7 -20574,6 +20712,7 @@@ R: John Ogness <john.ogness@linutronix.
R: Sergey Senozhatsky <[email protected]>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
+F: Documentation/core-api/printk-basics.rst
F: include/linux/printk.h
F: kernel/printk/
@@@ -20913,14 -20774,6 +20913,14 @@@ F: include/linux/pwm.
F: include/linux/pwm_backlight.h
K: pwm_(config|apply_might_sleep|apply_atomic|ops)
+PWM SUBSYSTEM BINDINGS [RUST]
+M: Michal Wilczynski <[email protected]>
+L: [email protected]
+L: [email protected]
+S: Maintained
+F: rust/helpers/pwm.c
+F: rust/kernel/pwm.rs
+
PXA GPIO DRIVER
M: Robert Jarzmik <[email protected]>
L: [email protected]
@@@ -21178,7 -21031,6 +21178,7 @@@ F: Documentation/devicetree/bindings/ne
F: drivers/net/wwan/qcom_bam_dmux.c
QUALCOMM BLUETOOTH DRIVER
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
F: drivers/bluetooth/btqca.[ch]
@@@ -21307,7 -21159,7 +21307,7 @@@ F: Documentation/devicetree/bindings/i2
F: drivers/i2c/busses/i2c-qcom-cci.c
QUALCOMM INTERCONNECT BWMON DRIVER
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
@@@ -21428,7 -21280,7 +21428,7 @@@ F: Documentation/tee/qtee.rs
F: drivers/tee/qcomtee/
QUALCOMM TRUST ZONE MEMORY ALLOCATOR
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
F: drivers/firmware/qcom/qcom_tzmem.c
@@@ -21465,7 -21317,6 +21465,7 @@@ F: drivers/media/platform/qcom/venus
QUALCOMM WCN36XX WIRELESS DRIVER
M: Loic Poulain <[email protected]>
L: [email protected]
+L: [email protected]
S: Supported
W: https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
F: drivers/net/wireless/ath/wcn36xx/
@@@ -21803,11 -21654,6 +21803,11 @@@ S: Maintaine
F: Documentation/devicetree/bindings/spi/realtek,rtl9301-snand.yaml
F: drivers/spi/spi-realtek-rtl-snand.c
+REALTEK SYSTIMER DRIVER
+M: Hao-Wen Ting <[email protected]>
+S: Maintained
+F: drivers/clocksource/timer-realtek.c
+
REALTEK WIRELESS DRIVER (rtlwifi family)
M: Ping-Ke Shih <[email protected]>
L: [email protected]
@@@ -22069,13 -21915,6 +22069,13 @@@ S: Maintaine
F: Documentation/devicetree/bindings/net/renesas,rzv2h-gbeth.yaml
F: drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c
+RENESAS RZ/V2H(P) INPUT VIDEO CONTROL BLOCK DRIVER
+M: Daniel Scally <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/devicetree/bindings/media/renesas,r9a09g057-ivc.yaml
+F: drivers/media/platform/renesas/rzv2h-ivc/
+
RENESAS RZ/V2H(P) RSPI DRIVER
M: Fabrizio Castro <[email protected]>
L: [email protected]
@@@ -22279,7 -22118,7 +22279,7 @@@ F: drivers/reset/reset-mpfs.
F: drivers/rtc/rtc-mpfs.c
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/spi/spi-mpfs.c
F: drivers/usb/musb/mpfs.c
F: include/soc/microchip/mpfs.h
@@@ -22343,7 -22182,6 +22343,7 @@@ F: Documentation/devicetree/bindings/fi
F: Documentation/devicetree/bindings/mailbox/thead,th1520-mbox.yaml
F: Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml
F: Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml
+F: Documentation/devicetree/bindings/pwm/thead,th1520-pwm.yaml
F: Documentation/devicetree/bindings/reset/thead,th1520-reset.yaml
F: arch/riscv/boot/dts/thead/
F: drivers/clk/thead/clk-th1520-ap.c
@@@ -22354,7 -22192,6 +22354,7 @@@ F: drivers/pinctrl/pinctrl-th1520.
F: drivers/pmdomain/thead/
F: drivers/power/reset/th1520-aon-reboot.c
F: drivers/power/sequencing/pwrseq-thead-gpu.c
+F: drivers/pwm/pwm_th1520.rs
F: drivers/reset/reset-th1520.c
F: include/dt-bindings/clock/thead,th1520-clk-ap.h
F: include/dt-bindings/power/thead,th1520-power.h
@@@ -22384,16 -22221,6 +22384,16 @@@ S: Maintaine
F: Documentation/devicetree/bindings/net/can/rockchip,rk3568v2-canfd.yaml
F: drivers/net/can/rockchip/
+ROCKCHIP CAMERA INTERFACE (RKCIF) DRIVER
+M: Mehdi Djait <[email protected]>
+M: Michael Riesch <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/admin-guide/media/rkcif*
+F: Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml
+F: Documentation/devicetree/bindings/media/rockchip,rk3568-vicap.yaml
+F: drivers/media/platform/rockchip/rkcif/
+
ROCKCHIP CRYPTO DRIVERS
M: Corentin Labbe <[email protected]>
L: [email protected]
@@@ -22656,6 -22483,7 +22656,6 @@@ F: tools/verification
RUST
M: Miguel Ojeda <[email protected]>
-M: Alex Gaynor <[email protected]>
R: Boqun Feng <[email protected]>
R: Gary Guo <[email protected]>
R: Björn Roy Baron <[email protected]>
@@@ -22692,14 -22520,6 +22692,14 @@@ T: git https://github.com/Rust-for-Linu
F: rust/kernel/alloc.rs
F: rust/kernel/alloc/
+RUST [NUM]
+M: Alexandre Courbot <[email protected]>
+R: Yury Norov <[email protected]>
+L: [email protected]
+S: Maintained
+F: rust/kernel/num.rs
+F: rust/kernel/num/
+
RUST [PIN-INIT]
M: Benno Lossin <[email protected]>
L: [email protected]
@@@ -22810,7 -22630,7 +22810,7 @@@ F: arch/s390/m
S390 NETWORK DRIVERS
M: Alexandra Winter <[email protected]>
-R: Aswin Karuvally <[email protected]>
+M: Aswin Karuvally <[email protected]>
L: [email protected]
L: [email protected]
S: Supported
@@@ -24022,7 -23842,7 +24022,7 @@@ F: include/linux/property.
SOFTWARE RAID (Multiple Disks) SUPPORT
M: Song Liu <[email protected]>
-M: Yu Kuai <[email protected]>
+M: Yu Kuai <[email protected]>
L: [email protected]
S: Supported
Q: https://patchwork.kernel.org/project/linux-raid/list/
@@@ -24417,7 -24237,6 +24417,7 @@@ T: git git://git.kernel.org/pub/scm/lin
F: Documentation/devicetree/bindings/spi/
F: Documentation/spi/
F: drivers/spi/
+F: include/trace/events/spi*
F: include/linux/spi/
F: include/uapi/linux/spi/
F: tools/spi/
@@@ -24525,14 -24344,6 +24525,14 @@@ S: Maintaine
F: Documentation/hwmon/stpddc60.rst
F: drivers/hwmon/pmbus/stpddc60.c
+ST TSC1641 DRIVER
+M: Igor Reznichenko <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/devicetree/bindings/hwmon/st,tsc1641.yaml
+F: Documentation/hwmon/tsc1641.rst
+F: drivers/hwmon/tsc1641.c
+
ST VD55G1 DRIVER
M: Benjamin Mugnier <[email protected]>
M: Sylvain Petinot <[email protected]>
@@@ -25094,7 -24905,7 +25094,7 @@@ F: drivers/net/pcs/pcs-xpcs.
F: include/linux/pcs/pcs-xpcs.h
SYNOPSYS DESIGNWARE HDMI RX CONTROLLER DRIVER
-M: Shreeya Patel <[email protected]>
+M: Dmitry Osipenko <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
@@@ -25119,7 -24930,6 +25119,7 @@@ F: include/linux/soc/amd/isp4_misc.
SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
M: Jaehoon Chung <[email protected]>
+M: Shawn Lin <[email protected]>
L: [email protected]
S: Maintained
F: drivers/mmc/host/dw_mmc*
@@@ -25288,7 -25098,7 +25288,7 @@@ L: [email protected]
S: Maintained
W: https://linuxtv.org
Q: http://patchwork.linuxtv.org/project/linux-media/list/
-F: Documentation/devicetree/bindings/media/i2c/nxp,tda1997x.txt
+F: Documentation/devicetree/bindings/media/i2c/nxp,tda19971.yaml
F: drivers/media/i2c/tda1997x.*
TDA827x MEDIA DRIVER
@@@ -25837,7 -25647,7 +25837,7 @@@ F: Documentation/devicetree/bindings/cr
F: drivers/crypto/ti/
TI DAVINCI MACHINE SUPPORT
-M: Bartosz Golaszewski <[email protected]>
+M: Bartosz Golaszewski <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -26221,8 -26031,6 +26221,8 @@@ S: Supporte
W: https://www.tq-group.com/en/products/tq-embedded/
F: arch/arm/boot/dts/nxp/imx/*mba*.dts*
F: arch/arm/boot/dts/nxp/imx/*tqma*.dts*
+F: arch/arm/boot/dts/ti/omap/*mba*.dts*
+F: arch/arm/boot/dts/ti/omap/*tqma*.dts*
F: arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
F: arch/arm64/boot/dts/freescale/imx*mba*.dts*
F: arch/arm64/boot/dts/freescale/imx*tqma*.dts*
@@@ -27056,16 -26864,6 +27056,16 @@@ F: drivers/media/i2c/vd55g1.
F: drivers/media/i2c/vd56g3.c
F: drivers/media/i2c/vgxy61.c
+V4L2 GENERIC ISP PARAMETERS AND STATISTIC FORMATS
+M: Jacopo Mondi <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/driver-api/media/v4l2-isp.rst
+F: Documentation/userspace-api/media/v4l/v4l2-isp.rst
+F: drivers/media/v4l2-core/v4l2-isp.c
+F: include/media/v4l2-isp.h
+F: include/uapi/linux/media/v4l2-isp.h
+
VF610 NAND DRIVER
M: Stefan Agner <[email protected]>
L: [email protected]
@@@ -27087,7 -26885,7 +27087,7 @@@ S: Maintaine
F: drivers/vfio/cdx/*
VFIO DRIVER
-M: Alex Williamson <[email protected]>
+M: Alex Williamson <[email protected]>
L: [email protected]
S: Maintained
T: git https://github.com/awilliam/linux-vfio.git
@@@ -27250,7 -27048,7 +27250,7 @@@ T: git git://linuxtv.org/media.gi
F: drivers/media/test-drivers/vimc/*
VIRT LIB
-M: Alex Williamson <[email protected]>
+M: Alex Williamson <[email protected]>
M: Paolo Bonzini <[email protected]>
L: [email protected]
S: Supported
@@@ -27271,7 -27069,7 +27271,7 @@@ F: net/vmw_vsock/virtio_transport_commo
VIRTIO BALLOON
M: "Michael S. Tsirkin" <[email protected]>
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
L: [email protected]
S: Maintained
F: drivers/virtio/virtio_balloon.c
@@@ -27299,7 -27097,7 +27299,7 @@@ S: Maintaine
F: drivers/char/virtio_console.c
F: include/uapi/linux/virtio_console.h
-VIRTIO CORE AND NET DRIVERS
+VIRTIO CORE
M: "Michael S. Tsirkin" <[email protected]>
M: Jason Wang <[email protected]>
R: Xuan Zhuo <[email protected]>
@@@ -27312,6 -27110,7 +27312,6 @@@ F: Documentation/devicetree/bindings/vi
F: Documentation/driver-api/virtio/
F: drivers/block/virtio_blk.c
F: drivers/crypto/virtio/
-F: drivers/net/virtio_net.c
F: drivers/vdpa/
F: drivers/virtio/
F: include/linux/vdpa.h
@@@ -27320,6 -27119,7 +27320,6 @@@ F: include/linux/vringh.
F: include/uapi/linux/virtio_*.h
F: net/vmw_vsock/virtio*
F: tools/virtio/
-F: tools/testing/selftests/drivers/net/virtio_net/
VIRTIO CRYPTO DRIVER
M: Gonglei <[email protected]>
@@@ -27341,7 -27141,6 +27341,7 @@@ F: arch/s390/include/uapi/asm/virtio-cc
F: drivers/s390/virtio/
VIRTIO FILE SYSTEM
+M: German Maglione <[email protected]>
M: Vivek Goyal <[email protected]>
M: Stefan Hajnoczi <[email protected]>
M: Miklos Szeredi <[email protected]>
@@@ -27425,26 -27224,13 +27425,26 @@@ F: drivers/iommu/virtio-iommu.
F: include/uapi/linux/virtio_iommu.h
VIRTIO MEM DRIVER
-M: David Hildenbrand <[email protected]>
+M: David Hildenbrand <[email protected]>
L: [email protected]
S: Maintained
W: https://virtio-mem.gitlab.io/
F: drivers/virtio/virtio_mem.c
F: include/uapi/linux/virtio_mem.h
+VIRTIO NET DRIVER
+M: "Michael S. Tsirkin" <[email protected]>
+M: Jason Wang <[email protected]>
+R: Xuan Zhuo <[email protected]>
+R: Eugenio Pérez <[email protected]>
+L: [email protected]
+L: [email protected]
+S: Maintained
+F: drivers/net/virtio_net.c
+F: include/linux/virtio_net.h
+F: include/uapi/linux/virtio_net.h
+F: tools/testing/selftests/drivers/net/virtio_net/
+
VIRTIO PMEM DRIVER
M: Pankaj Gupta <[email protected]>
L: [email protected]
@@@ -27835,7 -27621,6 +27835,7 @@@ M: Jason A. Donenfeld <[email protected]
L: [email protected]
L: [email protected]
S: Maintained
+F: Documentation/netlink/specs/wireguard.yaml
F: drivers/net/wireguard/
F: tools/testing/selftests/wireguard/
@@@ -27862,7 -27647,6 +27862,7 @@@ F: Documentation/devicetree/bindings/ex
F: Documentation/devicetree/bindings/mfd/wlf,arizona.yaml
F: Documentation/devicetree/bindings/mfd/wm831x.txt
F: Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
+F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
F: Documentation/devicetree/bindings/sound/wlf,*.yaml
F: Documentation/devicetree/bindings/sound/wm*
F: Documentation/hwmon/wm83??.rst
@@@ -27922,7 -27706,7 +27922,7 @@@ F: drivers/acpi/pmic/intel_pmic_xpower.
N: axp288
X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
-M: Chen-Yu Tsai <[email protected]>
+M: Chen-Yu Tsai <[email protected]>
L: [email protected]
S: Maintained
N: axp[128]
@@@ -28046,7 -27830,7 +28046,7 @@@ F: arch/x86/kernel/stacktrace.
F: arch/x86/kernel/unwind_*.c
X86 TRUST DOMAIN EXTENSIONS (TDX)
-M: Kirill A. Shutemov <[email protected]>
+M: Kiryl Shutsemau <[email protected]>
R: Dave Hansen <[email protected]>
R: Rick Edgecombe <[email protected]>
L: [email protected]
@@@ -28506,13 -28290,6 +28506,13 @@@ L: [email protected]
S: Maintained
F: arch/x86/kernel/cpu/zhaoxin.c
+ZONED BLOCK DEVICE (BLOCK LAYER)
+M: Damien Le Moal <[email protected]>
+L: [email protected]
+S: Maintained
+F: block/blk-zoned.c
+F: include/uapi/linux/blkzoned.h
+
ZONED LOOP DEVICE
M: Damien Le Moal <[email protected]>
R: Christoph Hellwig <[email protected]>
diff --combined drivers/mfd/ls2k-bmc-core.c
index 69387dad66616,08d631d954ef0..e42f1de9e641d
--- a/drivers/mfd/ls2k-bmc-core.c
+++ b/drivers/mfd/ls2k-bmc-core.c
@@@ -265,7 -265,7 +265,7 @@@ static int ls2k_bmc_recover_pci_data(vo
if (!ls2k_bmc_bar0_addr_is_set(parent))
break;
mdelay(1);
- };
+ }
if (i == 0)
return false;
@@@ -469,7 -469,7 +469,7 @@@ static int ls2k_bmc_probe(struct pci_de
return ret;
ddata = devm_kzalloc(&dev->dev, sizeof(*ddata), GFP_KERNEL);
- if (IS_ERR(ddata)) {
+ if (!ddata) {
ret = -ENOMEM;
goto disable_pci;
}
@@@ -495,13 -495,9 +495,13 @@@
goto disable_pci;
}
- return devm_mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO,
- ls2k_bmc_cells, ARRAY_SIZE(ls2k_bmc_cells),
- &dev->resource[0], 0, NULL);
+ ret = devm_mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO,
+ ls2k_bmc_cells, ARRAY_SIZE(ls2k_bmc_cells),
+ &dev->resource[0], 0, NULL);
+ if (ret)
+ goto disable_pci;
+
+ return 0;
disable_pci:
pci_disable_device(dev);
--
LinuxNextTracking
