The following commit has been merged in the master branch:
commit f96163865a1346b199cc38e827269296f0f24ab0
Merge: a619fe35ab41fded440d3762d4fbad84ff86a4d4
464257baf99200d1be1c053f15aa617056361e81
Author: Linus Torvalds <[email protected]>
Date: Wed Dec 3 11:34:28 2025 -0800
Merge tag 'docs-6.19' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"This has been another busy cycle for documentation, with a lot of
build-system thrashing. That work should slow down from here on out.
- The various scripts and tools for documentation were spread out in
several directories; now they are (almost) all coalesced under
tools/docs/. The holdout is the kernel-doc script, which cannot be
easily moved without some further thought.
- As the amount of Python code increases, we are accumulating modules
that are imported by multiple programs. These modules have been
pulled together under tools/lib/python/ -- at least, for
documentation-related programs. There is other Python code in the
tree that might eventually want to move toward this organization.
- The Perl kernel-doc.pl script has been removed. It is no longer
used by default, and nobody has missed it, least of all anybody who
actually had to look at it.
- The docs build was controlled by a complex mess of makefilese that
few dared to touch. Mauro has moved that logic into a new program
(tools/docs/sphinx-build-wrapper) that, with any luck at all, will
be far easier to understand and maintain.
- The get_feat.pl program, used to access information under
Documentation/features/, has been rewritten in Python, bringing an
end to the use of Perl in the docs subsystem.
- The top-level README file has been reorganized into a more
reader-friendly presentation.
- A lot of Chinese translation additions
- Typo fixes and documentation updates as usual"
* tag 'docs-6.19' of git://git.lwn.net/linux: (164 commits)
docs: makefile: move rustdoc check to the build wrapper
README: restructure with role-based documentation and guidelines
docs: kdoc: various fixes for grammar, spelling, punctuation
docs: kdoc_parser: use '@' for Excess enum value
docs: submitting-patches: Clarify that removal of Acks needs explanation
too
docs: kdoc_parser: add data/function attributes to ignore
docs: MAINTAINERS: update Mauro's files/paths
docs/zh_CN: Add wd719x.rst translation
docs/zh_CN: Add libsas.rst translation
get_feat.pl: remove it, as it got replaced by get_feat.py
Documentation/sphinx/kernel_feat.py: use class directly
tools/docs/get_feat.py: convert get_feat.pl to Python
Documentation/admin-guide: fix typo and comment in cscope example
docs/zh_CN: Add data-integrity.rst translation
docs/zh_CN: Add blk-mq.rst translation
docs/zh_CN: Add block/index.rst translation
docs/zh_CN: Update the Chinese translation of kbuild.rst
docs: bring some order to our Python module hierarchy
docs: Move the python libraries to tools/lib/python
Documentation/kernel-parameters: Move the kernel build options
...
diff --combined Documentation/admin-guide/kernel-parameters.txt
index 2b465eab41a19,5779cca1d0ac0..1e89d122f0841
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1,3 -1,101 +1,101 @@@
+ ACPI ACPI support is enabled.
+ AGP AGP (Accelerated Graphics Port) is enabled.
+ ALSA ALSA sound support is enabled.
+ APIC APIC support is enabled.
+ APM Advanced Power Management support is enabled.
+ APPARMOR AppArmor support is enabled.
+ ARM ARM architecture is enabled.
+ ARM64 ARM64 architecture is enabled.
+ AX25 Appropriate AX.25 support is enabled.
+ CLK Common clock infrastructure is enabled.
+ CMA Contiguous Memory Area support is enabled.
+ DRM Direct Rendering Management support is enabled.
+ DYNAMIC_DEBUG Build in debug messages and enable them at runtime
+ EARLY Parameter processed too early to be embedded in initrd.
+ EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
+ EFI EFI Partitioning (GPT) is enabled
+ EVM Extended Verification Module
+ FB The frame buffer device is enabled.
+ FTRACE Function tracing enabled.
+ GCOV GCOV profiling is enabled.
+ HIBERNATION HIBERNATION is enabled.
+ HW Appropriate hardware is enabled.
+ HYPER_V HYPERV support is enabled.
+ IMA Integrity measurement architecture is enabled.
+ IP_PNP IP DHCP, BOOTP, or RARP is enabled.
+ IPV6 IPv6 support is enabled.
+ ISAPNP ISA PnP code is enabled.
+ ISDN Appropriate ISDN support is enabled.
+ ISOL CPU Isolation is enabled.
+ JOY Appropriate joystick support is enabled.
+ KGDB Kernel debugger support is enabled.
+ KVM Kernel Virtual Machine support is enabled.
+ LIBATA Libata driver is enabled
+ LOONGARCH LoongArch architecture is enabled.
+ LOOP Loopback device support is enabled.
+ LP Printer support is enabled.
+ M68k M68k architecture is enabled.
+ These options have more detailed description inside of
+ Documentation/arch/m68k/kernel-options.rst.
+ MDA MDA console support is enabled.
+ MIPS MIPS architecture is enabled.
+ MOUSE Appropriate mouse support is enabled.
+ MSI Message Signaled Interrupts (PCI).
+ MTD MTD (Memory Technology Device) support is enabled.
+ NET Appropriate network support is enabled.
+ NFS Appropriate NFS support is enabled.
+ NUMA NUMA support is enabled.
+ OF Devicetree is enabled.
+ PARISC The PA-RISC architecture is enabled.
+ PCI PCI bus support is enabled.
+ PCIE PCI Express support is enabled.
+ PCMCIA The PCMCIA subsystem is enabled.
+ PNP Plug & Play support is enabled.
+ PPC PowerPC architecture is enabled.
+ PPT Parallel port support is enabled.
+ PS2 Appropriate PS/2 support is enabled.
+ PV_OPS A paravirtualized kernel is enabled.
+ RAM RAM disk support is enabled.
+ RDT Intel Resource Director Technology.
+ RISCV RISCV architecture is enabled.
+ S390 S390 architecture is enabled.
+ SCSI Appropriate SCSI support is enabled.
+ A lot of drivers have their options described inside
+ the Documentation/scsi/ sub-directory.
+ SDW SoundWire support is enabled.
+ SECURITY Different security models are enabled.
+ SELINUX SELinux support is enabled.
+ SERIAL Serial support is enabled.
+ SH SuperH architecture is enabled.
+ SMP The kernel is an SMP kernel.
+ SPARC Sparc architecture is enabled.
+ SUSPEND System suspend states are enabled.
+ SWSUSP Software suspend (hibernation) is enabled.
+ TPM TPM drivers are enabled.
+ UMS USB Mass Storage support is enabled.
+ USB USB support is enabled.
+ USBHID USB Human Interface Device support is enabled.
+ V4L Video For Linux support is enabled.
+ VGA The VGA console has been enabled.
+ VMMIO Driver for memory mapped virtio devices is enabled.
+ VT Virtual terminal support is enabled.
+ WDT Watchdog support is enabled.
+ X86-32 X86-32, aka i386 architecture is enabled.
+ X86-64 X86-64 architecture is enabled.
+ X86 Either 32-bit or 64-bit x86 (same as X86-32+X86-64)
+ X86_UV SGI UV support is enabled.
+ XEN Xen support is enabled
+ XTENSA xtensa architecture is enabled.
+
+ In addition, the following text indicates that the option
+
+ BOOT Is a boot loader parameter.
+ BUGS= Relates to possible processor bugs on the said processor.
+ KNL Is a kernel start-up parameter.
+
+
+ Kernel parameters
+
accept_memory= [MM]
Format: { eager | lazy }
default: lazy
@@@ -1907,16 -2005,6 +2005,16 @@@
/sys/power/pm_test). Only available when CONFIG_PM_DEBUG
is set. Default value is 5.
+ hibernate_compression_threads=
+ [HIBERNATION]
+ Set the number of threads used for compressing or
decompressing
+ hibernation images.
+
+ Format: <integer>
+ Default: 3
+ Minimum: 1
+ Example: hibernate_compression_threads=4
+
highmem=nn[KMG] [KNL,BOOT,EARLY] forces the highmem zone to have an
exact
size of <nn>. This works even on boxes that have no
highmem otherwise. This also works to reduce highmem
@@@ -6217,7 -6305,7 +6315,7 @@@
rdt= [HW,X86,RDT]
Turn on/off individual RDT features. List is:
cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,
- mba, smba, bmec, abmc.
+ mba, smba, bmec, abmc, sdciae.
E.g. to turn on cmt and turn off mba use:
rdt=cmt,!mba
@@@ -6414,7 -6502,7 +6512,7 @@@
that don't.
off - no mitigation
- auto - automatically select a migitation
+ auto - automatically select a mitigation
auto,nosmt - automatically select a mitigation,
disabling SMT if necessary for
the full mitigation (only on Zen1
@@@ -6510,10 -6598,6 +6608,10 @@@
Memory area to be used by remote processor image,
managed by CMA.
+ rseq_debug= [KNL] Enable or disable restartable sequence
+ debug mode. Defaults to
CONFIG_RSEQ_DEBUG_DEFAULT_ENABLE.
+ Format: <bool>
+
rt_group_sched= [KNL] Enable or disable SCHED_RR/FIFO group scheduling
when CONFIG_RT_GROUP_SCHED=y. Defaults to
!CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED.
@@@ -7164,7 -7248,7 +7262,7 @@@
limit. Default value is 8191 pools.
stacktrace [FTRACE]
- Enabled the stack tracer on boot up.
+ Enable the stack tracer on boot up.
stacktrace_filter=[function-list]
[FTRACE] Limit the functions that the stack tracer
diff --combined MAINTAINERS
index ff0106c3f1495,591bacd1ccf89..618e23f99dfa1
--- 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/
@@@ -1998,10 -1997,6 +1998,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
@@@ -3846,7 -3841,6 +3846,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/
@@@ -3926,7 -3920,7 +3926,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
@@@ -4399,7 -4393,7 +4399,7 @@@ 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/
@@@ -4810,7 -4804,6 +4810,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
@@@ -4819,7 -4812,6 +4819,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]>
@@@ -6613,6 -6605,7 +6613,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
@@@ -7418,16 -7411,10 +7418,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/
@@@ -7460,9 -7447,10 +7454,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]>
@@@ -9187,9 -9175,6 +9182,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]>
@@@ -9211,7 -9196,6 +9206,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
@@@ -9268,6 -9252,7 +9263,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/
@@@ -10680,7 -10665,7 +10675,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
@@@ -10697,7 -10682,7 +10692,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
@@@ -11529,7 -11514,7 +11524,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
@@@ -12525,7 -12510,6 +12520,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
@@@ -12572,7 -12556,6 +12567,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
@@@ -12867,8 -12850,7 +12862,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
@@@ -13123,15 -13105,6 +13118,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)
@@@ -13267,8 -13240,10 +13262,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/
@@@ -13277,8 -13252,10 +13272,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
@@@ -13432,12 -13409,9 +13427,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/
@@@ -13622,7 -13596,7 +13617,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
@@@ -13663,7 -13637,7 +13658,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]>
@@@ -13737,7 -13711,7 +13732,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
@@@ -13802,7 -13776,6 +13797,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
@@@ -14415,7 -14388,6 +14410,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
@@@ -14462,11 -14434,10 +14457,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)
@@@ -14540,7 -14511,6 +14535,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
@@@ -15315,7 -15285,7 +15310,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
@@@ -16211,7 -16181,7 +16206,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/
@@@ -16227,7 -16197,7 +16222,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
@@@ -16252,7 -16222,7 +16247,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]>
@@@ -16308,7 -16278,7 +16303,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]>
@@@ -16324,7 -16294,7 +16319,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]
@@@ -16340,7 -16310,7 +16335,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]>
@@@ -16380,7 -16350,7 +16375,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]>
@@@ -16468,7 -16438,7 +16463,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]>
@@@ -16481,7 -16451,7 +16476,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]>
@@@ -16505,12 -16475,12 +16500,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
@@@ -16526,7 -16496,7 +16521,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]>
@@@ -16628,7 -16598,7 +16623,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]
@@@ -17473,16 -17443,6 +17468,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]
@@@ -18048,16 -18008,6 +18043,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]>
@@@ -18796,10 -18746,6 +18791,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]
@@@ -19919,7 -19865,7 +19914,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
@@@ -20184,7 -20130,6 +20179,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
@@@ -20516,7 -20461,7 +20511,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
@@@ -21198,7 -21143,7 +21193,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
@@@ -21319,7 -21264,7 +21314,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
@@@ -21356,7 -21301,6 +21351,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/
@@@ -21694,11 -21638,6 +21689,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]
@@@ -22675,7 -22614,7 +22670,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
@@@ -25692,7 -25631,7 +25687,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
@@@ -26076,8 -26015,6 +26071,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*
@@@ -26932,7 -26869,7 +26927,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
@@@ -27095,7 -27032,7 +27090,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
@@@ -27116,7 -27053,7 +27111,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
@@@ -27144,7 -27081,7 +27139,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]>
@@@ -27157,6 -27094,7 +27152,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
@@@ -27165,6 -27103,7 +27160,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]>
@@@ -27186,7 -27125,6 +27181,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]>
@@@ -27270,26 -27208,13 +27265,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]
@@@ -27889,7 -27814,7 +27884,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]
diff --combined Makefile
index 6f0e72ff4d0cd,9ce6f6f52ea8f..03d9bb851effe
--- a/Makefile
+++ b/Makefile
@@@ -2,7 -2,7 +2,7 @@@
VERSION = 6
PATCHLEVEL = 18
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION =
NAME = Baby Opossum Posse
# *DOCUMENTATION*
@@@ -1061,9 -1061,6 +1061,9 @@@ NOSTDINC_FLAGS += -nostdin
# perform bounds checking.
KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3)
+# Allow including a tagged struct or union anonymously in another
struct/union.
+KBUILD_CFLAGS += -fms-extensions
+
# disable invalid "can't wrap" optimizations for signed / pointers
KBUILD_CFLAGS += -fno-strict-overflow
@@@ -1800,9 -1797,10 +1800,10 @@@ $(help-board-dirs): help-%
# Documentation targets
# ---------------------------------------------------------------------------
- DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs htmldocs-redirects \
- epubdocs cleandocs linkcheckdocs dochelp refcheckdocs \
- texinfodocs infodocs
+ DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \
+ linkcheckdocs dochelp refcheckdocs texinfodocs infodocs mandocs \
+ htmldocs-redirects
+
PHONY += $(DOC_TARGETS)
$(DOC_TARGETS):
$(Q)$(MAKE) $(build)=Documentation $@
--
LinuxNextTracking
