From: Linus Torvalds Date: Tue, 16 Jun 2026 03:05:59 +0000 (+0530) Subject: Merge tag 'docs-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a87bbc4578fd686d535fbd62e8bc73fc6c7c5415;p=thirdparty%2Flinux.git Merge tag 'docs-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux Pull documentation updates from Jonathan Corbet: "Things have calmed down a bit on the docs front, with no earthshaking changes this time around: - Ongoing work on the Japanese and Portuguese translations - Better integration of the MAINTAINERS file into the rendered documents, including a search interface - A seemingly infinite supply of fixes for typos, minor grammatical issues, and related problems that LLMs find with abandon" * tag 'docs-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux: (93 commits) docs: pt_BR: Translate 3.Early-stage.rst into Portuguese docs: pt_BR: update "Purpose of Defconfigs" section in maintainer-soc.rst Documentation: bug-hunting.rst: fix grammar docs/ja_JP: translate submitting-patches.rst (interleaved-replies) docs: Fix minor grammatical error docs/{it_it,sp_SP,zh_CN,zh_TW}: update references to removed CONFIG_DEBUG_SLAB Documentation: process: fix brackets Documentation: arch: fix brackets docs/dyndbg: explain flags parse 1st docs/dyndbg: update examples \012 to \n docs: kernel-parameters: Fix stale sticore file paths docs: real-time: Fix duplicated sched(7) text docs: kgdb: Fix stale source file paths docs: sonypi: Fix stale header file path docs: kernel-parameters: Remove sa1100ir IrDA parameter iommu: Documentation: rearrange, update kernel-parameters docs: md: fix grammar in speed_limit description docs: changes.rst: restore pahole 1.26 minimum (regressed by sort) Documentation: Fix syntax of kmalloc_objs example in coding style doc docs: pt_BR: update maintainer-handbooks ... --- a87bbc4578fd686d535fbd62e8bc73fc6c7c5415 diff --cc Documentation/translations/pt_BR/process/changes.rst index 6bbfe60fd9730,a105581dcf64e..51c7fe41663e6 --- a/Documentation/translations/pt_BR/process/changes.rst +++ b/Documentation/translations/pt_BR/process/changes.rst @@@ -28,12 -29,12 +29,12 @@@ necessárias em todos os sistemas; obvi PC Card por exemplo, provavelmente não precisará se preocupar com o pcmciautils. ====================== =============== ======================================== - Programa Versão mínima Comando para verificar a versão + Programa Versão mínima Comando para verificar a versão ====================== =============== ======================================== GNU C 8.1 gcc --version -Clang/LLVM (optional) 15.0.0 clang --version +Clang/LLVM (optional) 17.0.1 clang --version - Rust (optional) 1.78.0 rustc --version - bindgen (optional) 0.65.1 bindgen --version + Rust (optional) 1.85.0 rustc --version + bindgen (optional) 0.71.1 bindgen --version GNU make 4.0 make --version bash 4.2 bash --version binutils 2.30 ld -v diff --cc Documentation/watchdog/watchdog-kernel-api.rst index 7a907cb6f3d3f,350e9037a69eb..19755d0d3020e --- a/Documentation/watchdog/watchdog-kernel-api.rst +++ b/Documentation/watchdog/watchdog-kernel-api.rst @@@ -38,18 -38,10 +38,18 @@@ The watchdog_unregister_device routine device. The parameter of this routine is the pointer to the registered watchdog_device structure. - The watchdog subsystem includes an registration deferral mechanism, - which allows you to register an watchdog as early as you wish during + The watchdog subsystem includes a registration deferral mechanism, + which allows you to register a watchdog as early as you wish during the boot process. +There is also a resource-managed watchdog_register_device(), +devm_watchdog_register_device(). If you use this to register a watchdog +device, watchdog_unregister_device() is called automatically on driver +detach:: + + int devm_watchdog_register_device(struct device *dev, + struct watchdog_device *wdd); + The watchdog device structure looks like this:: struct watchdog_device {