From: Linus Torvalds Date: Thu, 31 Jul 2025 15:36:51 +0000 (-0700) Subject: Merge tag 'docs-6.17' of git://git.lwn.net/linux X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1cce98493a095925fb51be045ccf6e08edb4aa0;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'docs-6.17' of git://git.lwn.net/linux Pull documentation updates from Jonathan Corbet: "It has been a relatively busy cycle for docs, especially the build system: - The Perl kernel-doc script was added to 2.3.52pre1 just after the turn of the millennium. Over the following 25 years, it accumulated a vast amount of cruft, all in a language few people want to deal with anymore. Mauro's Python replacement in 6.16 faithfully reproduced all of the cruft in the hope of avoiding regressions. Now that we have a more reasonable code base, though, we can work on cleaning it up; many of the changes this time around are toward that end. - A reorganization of the ext4 docs into the usual TOC format. - Various Chinese translations and updates. - A new script from Mauro to help with docs-build testing. - A new document for linked lists - A sweep through MAINTAINERS fixing broken GitHub git:// repository links. ...and lots of fixes and updates" * tag 'docs-6.17' of git://git.lwn.net/linux: (147 commits) scripts: add origin commit identification based on specific patterns sphinx: kernel_abi: fix performance regression with O= Documentation: core-api: entry: Replace deprecated KVM entry/exit functions docs: fault-injection: drop reference to md-faulty docs: document linked lists scripts: kdoc: make it backward-compatible with Python 3.7 docs: kernel-doc: emit warnings for ancient versions of Python Documentation/rtla: Describe exit status Documentation/rtla: Add include common_appendix.rst docs: kernel: Clarify printk_ratelimit_burst reset behavior Documentation: ioctl-number: Don't repeat macro names Documentation: ioctl-number: Shorten macros table Documentation: ioctl-number: Correct full path to papr-physical-attestation.h Documentation: ioctl-number: Extend "Include File" column width Documentation: ioctl-number: Fix linuxppc-dev mailto link overlayfs.rst: fix typos docs: kdoc: emit a warning for ancient versions of Python docs: kdoc: clean up check_sections() docs: kdoc: directly access the always-there KdocItem fields docs: kdoc: straighten up dump_declaration() ... --- b1cce98493a095925fb51be045ccf6e08edb4aa0 diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst index 4f1532a251d27,677456c312282..406a9f4d08694 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@@ -219,31 -223,32 +223,31 @@@ Code Seq# Include Fil fs/xfs/linux-2.6/xfs_ioctl32.h, include/linux/falloc.h, linux/fs.h, - 'X' all fs/ocfs2/ocfs_fs.h conflict! + 'X' all fs/ocfs2/ocfs_fs.h conflict! -'X' 01 linux/pktcdvd.h conflict! 'Z' 14-15 drivers/message/fusion/mptctl.h - '[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices - - 'a' all linux/atm*.h, linux/sonet.h ATM on linux - - 'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver - 'b' 00-FF conflict! bit3 vme host bridge - - 'b' 00-0F linux/dma-buf.h conflict! - 'c' 00-7F linux/comstats.h conflict! - 'c' 00-7F linux/coda.h conflict! - 'c' 00-1F linux/chio.h conflict! - 'c' 80-9F arch/s390/include/asm/chsc.h conflict! + '[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices + + 'a' all linux/atm*.h, linux/sonet.h ATM on linux + + 'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver + 'b' 00-FF conflict! bit3 vme host bridge + + 'b' 00-0F linux/dma-buf.h conflict! + 'c' 00-7F linux/comstats.h conflict! + 'c' 00-7F linux/coda.h conflict! + 'c' 00-1F linux/chio.h conflict! + 'c' 80-9F arch/s390/include/asm/chsc.h conflict! 'c' A0-AF arch/x86/include/asm/msr.h conflict! - 'd' 00-FF linux/char/drm/drm.h conflict! - 'd' 02-40 pcmcia/ds.h conflict! + 'd' 00-FF linux/char/drm/drm.h conflict! + 'd' 02-40 pcmcia/ds.h conflict! 'd' F0-FF linux/digi1.h - 'e' all linux/digi1.h conflict! - 'f' 00-1F linux/ext2_fs.h conflict! - 'f' 00-1F linux/ext3_fs.h conflict! - 'f' 00-0F fs/jfs/jfs_dinode.h conflict! - 'f' 00-0F fs/ext4/ext4.h conflict! - 'f' 00-0F linux/fs.h conflict! - 'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! + 'e' all linux/digi1.h conflict! + 'f' 00-1F linux/ext2_fs.h conflict! + 'f' 00-1F linux/ext3_fs.h conflict! + 'f' 00-0F fs/jfs/jfs_dinode.h conflict! + 'f' 00-0F fs/ext4/ext4.h conflict! + 'f' 00-0F linux/fs.h conflict! + 'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! 'f' 13-27 linux/fscrypt.h 'f' 81-8F linux/fsverity.h 'g' 00-0F linux/usb/gadgetfs.h diff --cc MAINTAINERS index 4f03e230f3c5e,b021279673226..b0845415ddc02 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3909,8 -3814,8 +3909,8 @@@ ATHEROS 71XX/9XXX GPIO DRIVE M: Alban Bedel S: Maintained W: https://github.com/AlbanBedel/linux - T: git git://github.com/AlbanBedel/linux + T: git https://github.com/AlbanBedel/linux.git -F: Documentation/devicetree/bindings/gpio/gpio-ath79.txt +F: Documentation/devicetree/bindings/gpio/qca,ar7100-gpio.yaml F: drivers/gpio/gpio-ath79.c ATHEROS 71XX/9XXX USB PHY DRIVER @@@ -25458,18 -25193,12 +25458,18 @@@ TRADITIONAL CHINESE DOCUMENTATIO M: Hu Haowen <2023002089@link.tyut.edu.cn> S: Maintained W: https://github.com/srcres258/linux-doc - T: git git://github.com/srcres258/linux-doc.git doc-zh-tw + T: git https://github.com/srcres258/linux-doc.git doc-zh-tw F: Documentation/translations/zh_TW/ -TRIGGER SOURCE - PWM +TRIGGER SOURCE - ADI UTIL SIGMA DELTA SPI +M: David Lechner +S: Maintained +F: Documentation/devicetree/bindings/trigger-source/adi,util-sigma-delta-spi.yaml + +TRIGGER SOURCE M: David Lechner S: Maintained +F: Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml F: Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml TRUSTED SECURITY MODULE (TSM) INFRASTRUCTURE