Subject: linux-next: Tree for Aug 27

From: Stephen Rothwell <[email-masked]>
Date: Wed, 27 Aug 2025 14:29:04 +1000

Hi all,

Changes since 20250826:

The drm-exynos tree still had its build failure so I used the version
from next-20250820.

The devicetree tree gained a conflict against the sound-asoc tree.

The kunit-next tree still had its build failure so I used the version
from next-20250815.

Non-merge commits (relative to Linus' tree): 4152
 4359 files changed, 145869 insertions(+), 61767 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There is also the merge.log file in the Next
directory.  Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 405 trees (counting Linus' and 404 trees of bug
fix patches pending for the current release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (fab1beda7597 Merge tag 'devicetree-fixes-for-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
Merging fixes/fixes (89be9a83ccf1 Linux 6.16-rc7)
Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging vfs-brauner-fixes/vfs.fixes (be1e0283021e coredump: don't pointlessly check and spew warnings)
Merging fscrypt-current/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging fsverity-current/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging btrfs-fixes/next-fixes (5bde317fa7b9 Merge branch 'misc-6.17' into next-fixes)
Merging vfs-fixes/fixes (fb924b7b8669 change_mnt_propagation(): calculate propagation source only if we'll need it)
Merging erofs-fixes/fixes (27ad534606c4 erofs: fix invalid algorithm for encoded extents)
Merging nfsd-fixes/nfsd-fixes (bee47cb026e7 sunrpc: fix handling of server side tls alerts)
Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
Merging overlayfs-fixes/ovl-fixes (e8bd877fb76b ovl: fix possible double unlink)
Merging bcachefs/for-next (ff88bc84fa9a bcachefs: Distinguish between missing and removed devs in check_fix_ptr())
Merging fscrypt/for-next (0e6608d4938e fscrypt: Remove redundant __GFP_NOWARN)
Merging btrfs/for-next (44f40f58ffe8 Merge branch 'for-next-next-v6.17-20250826' into for-next-20250826)
Merging ceph/master (c6d08336aadd ceph: fix potential race condition on operations with CEPH_I_ODIRECT flag)
Merging cifs/for-next (0bbb1e8693b1 smb: client: Fix mount deadlock by avoiding super block iteration in DFS reconnect)
Merging configfs/configfs-next (c6b190822459 MAINTAINERS: add configfs Rust abstractions)
Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
Merging dlm/next (8e4021078863 dlm: check for undefined release_option values)
Merging erofs/dev (df0ce6cefa45 erofs: support to readahead dirent blocks in erofs_readdir())
Merging exfat/dev (cf5c57400c3f exfat: drop redundant conversion to bool)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (17e58687367a Merge fsnotify changes with fixed up authorship.)
Merging ext4/dev (9d98cf463225 jbd2: prevent softlockup in jbd2_log_do_checkpoint())
Merging f2fs/dev (4978f0a5ee23 f2fs: clean up w/ get_left_section_blocks())
Merging fsverity/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging fuse/for-next (29314269244c fuse: zero initialize inode private data)
CONFLICT (content): Merge conflict in fs/fuse/inode.c
Merging gfs2/for-next (702dc4b956f8 gfs2: Fix unlikely race in gdlm_put_lock)
Merging jfs/jfs-next (856db3759202 jfs: fix metapage reference count leak in dbAllocCtl)
Merging ksmbd/ksmbd-for-next (1b237f190eb3 Linux 6.17-rc3)
Merging nfs/linux-next (76d2e3890fb1 NFS: Fix a race when updating an existing write)
Merging nfs-anna/linux-next (38074de35b01 NFSv4/flexfiles: Fix handling of NFS level errors in I/O)
Merging nfsd/nfsd-next (d3a94fd82de3 lockd: Remove space before newline)
Merging ntfs3/master (8f5ae30d69d7 Linux 6.17-rc1)
Merging orangefs/for-next (2138e89cb066 fs/orangefs: Allow 2 more characters in do_c_string())
Merging overlayfs/overlayfs-next (6f9ccdad0fea ovl: Annotate struct ovl_entry with __counted_by())
Merging ubifs/next (99dbb2a1bd66 ubifs: stop using write_cache_pages)
Merging v9fs/9p-next (674b56aa57f9 net/9p: fix double req put in p9_fd_cancelled)
Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
Merging xfs/for-next (ae668cd567a6 xfs: do not propagate ENODATA disk errors into xattr code)
Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes)
Merging vfs-brauner/vfs.all (f86ade9ec2f5 Merge branch 'vfs-6.18.rust' into vfs.all)
Merging vfs/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging mm-hotfixes/mm-hotfixes-unstable (c5e80b3b4f4c mm/damon/core: set quota->charged_from to jiffies at first charge window)
Merging fs-current (9e498ec1031a Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git)
Merging kbuild-current/kbuild-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging arm-soc-fixes/arm/fixes (0c952efa0d7c Merge tag 'tegra-for-6.17-arm64-dt-v3' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes)
Merging davinci-current/davinci/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging drivers-memory-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging sophgo-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging m68k-current/for-linus (c8995932db2b m68k: mac: Improve clocksource driver commentary)
Merging powerpc-fixes/fixes (8763d2257f52 powerpc/boot/install.sh: Fix shellcheck warnings)
Merging s390-fixes/fixes (57834ce5a6a4 s390/mm: Prevent possible preempt_count overflow)
Merging net/main (007a5ffadc4f net: dlink: fix multicast stats being counted incorrectly)
Merging bpf/master (27861fc720be bpf: Drop rqspinlock usage in ringbuf)
Merging ipsec/master (52565a935213 net: kcm: Fix race condition in kcm_unattach())
Merging netfilter/main (007a5ffadc4f net: dlink: fix multicast stats being counted incorrectly)
Merging ipvs/main (d942fe13f72b net: ti: icssg-prueth: Fix skb handling for XDP_PASS)
Merging wireless/for-next (7e2f3213e85e wifi: mac80211: increase scan_ies_len for S1G)
Merging ath/for-current (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging iwlwifi/fixes (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (1b237f190eb3 Linux 6.17-rc3)
Merging sound-current/for-linus (051b02b17a8b ALSA: hda/realtek: Fix headset mic for TongFang X6[AF]R5xxY)
Merging sound-asoc-fixes/for-linus (ebba78e34d47 ASoC: fixup snd_soc_lookup_component_nolocked())
Merging regmap-fixes/for-linus (8f5ae30d69d7 Linux 6.17-rc1)
Merging regulator-fixes/for-linus (ef3e9c91ed87 regulator: pm8008: fix probe failure due to negative voltage selector)
Merging spi-fixes/for-linus (00f92a39973f Merge remote-tracking branch 'spi/for-6.16' into spi-linus)
Merging pci-current/for-linus (8f5ae30d69d7 Linux 6.17-rc1)
Merging driver-core.current/driver-core-linus (1b237f190eb3 Linux 6.17-rc3)
Merging tty.current/tty-linus (cfd956dcb101 tty: hvc_console: Call hvc_kick in hvc_write unconditionally)
Merging usb.current/usb-linus (1b237f190eb3 Linux 6.17-rc3)
Merging usb-serial-fixes/usb-linus (cba70aff623b USB: serial: option: add Telit Cinterion FN990A w/audio compositions)
Merging phy/fixes (aac1256a41cf dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Update pcie phy bindings)
Merging staging.current/staging-linus (52ff2b840bc7 staging: axis-fifo: fix maximum TX packet length check)
Merging iio-fixes/fixes-togreg (1315cc2dbd50 iio: xilinx-ams: Fix AMS_ALARM_THR_DIRECT_MASK)
Merging counter-current/counter-current (c17b750b3ad9 Linux 6.17-rc2)
Merging char-misc.current/char-misc-linus (1b237f190eb3 Linux 6.17-rc3)
Merging soundwire-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging thunderbolt-fixes/fixes (1b237f190eb3 Linux 6.17-rc3)
Merging input-current/for-linus (ab93e0dd72c3 Merge branch 'next' into for-linus)
Merging crypto-current/master (9d9b193ed73a crypto: hash - Increase HASH_MAX_DESCSIZE for hmac(sha3-224-s390))
Merging libcrypto-fixes/libcrypto-fixes (fd7e5de4b2ed lib/crypto: ensure generated *.S files are removed on make clean)
Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to order)
Merging kselftest-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging dmaengine-fixes/fixes (39aaa337449e dmaengine: idxd: Fix double free in idxd_setup_wqs())
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (6463cbe08b0c mtd: spinand: fix memory leak of ECC engine conf)
Merging mfd-fixes/for-mfd-fixes (d9d79e4f7dc9 mfd: Fix building without CONFIG_OF)
Merging v4l-dvb-fixes/fixes (6f6fbd9a0c5a media: Remove redundant pm_runtime_mark_last_busy() calls)
Merging reset-fixes/reset/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging mips-fixes/mips-fixes (1b237f190eb3 Linux 6.17-rc3)
Merging at91-fixes/at91-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging omap-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
Merging kvm-fixes/master (038d61fd6422 Linux 6.16)
Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure)
Merging hwmon-fixes/hwmon (6d24d3a1a5c6 hwmon: mlxreg-fan: Prevent fans from getting stuck at 0 RPM)
Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging cxl-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging dma-mapping-fixes/dma-mapping-fixes (89a2d212bdb4 dma/pool: Ensure DMA_DIRECT_REMAP allocations are decrypted)
Merging drivers-x86-fixes/fixes (132bfcd24925 platform/x86: asus-wmi: Fix ROG button mapping, tablet mode on ASUS ROG Z13)
Merging samsung-krzk-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl-samsung-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging devicetree-fixes/dt/linus (80af3745ca46 of: dynamic: Fix use after free in of_changeset_add_prop_helper())
Merging dt-krzk-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging scsi-fixes/fixes (6300d5c54387 scsi: ufs: ufs-qcom: Fix ESI null pointer dereference)
Merging drm-fixes/drm-fixes (1b237f190eb3 Linux 6.17-rc3)
Merging drm-intel-fixes/for-linux-next-fixes (1b237f190eb3 Linux 6.17-rc3)
Merging mmc-fixes/fixes (d2d7a96b29ea mmc: sdhci_am654: Disable HS400 for AM62P SR1.0 and SR1.1)
Merging rtc-fixes/rtc-fixes (08d82d0cad51 rtc: pcf2127: add missing semicolon after statement)
Merging gnss-fixes/gnss-linus (1b237f190eb3 Linux 6.17-rc3)
Merging hyperv-fixes/hyperv-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging risc-v-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging riscv-dt-fixes/riscv-dt-fixes (19272b37aa4f Linux 6.16-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
Merging spdx/spdx-linus (8f5ae30d69d7 Linux 6.17-rc1)
Merging gpio-brgl-fixes/gpio/for-current (6fe31c8b5300 MAINTAINERS: Change Altera-PIO driver maintainer)
Merging gpio-intel-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl-intel-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging auxdisplay-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging kunit-fixes/kunit-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging memblock-fixes/fixes (b3dcc9d1d806 memblock: fix kernel-doc for MEMBLOCK_RSRV_NOINIT)
Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
Merging perf-current/perf-tools (f79a62f4b3c7 tools headers: Sync uapi/linux/vhost.h with the kernel source)
Merging efi-fixes/urgent (134ed1093907 efi: stmm: Drop unneeded null pointer check)
Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging iommufd-fixes/for-rc (1b237f190eb3 Linux 6.17-rc3)
Merging rust-fixes/rust-fixes (1b237f190eb3 Linux 6.17-rc3)
Merging w1-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pmdomain-fixes/fixes (d8f3ae7b38fe pmdomain: renesas: rcar-sysc: Make rcar_sysc_onecell_np __initdata)
Merging i2c-host-fixes/i2c/i2c-host-fixes (82b350dd8185 i2c: rtl9300: Add missing count byte for SMBus Block Ops)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging thead-clk-fixes/thead-clk-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging pwrseq-fixes/pwrseq/for-current (8f5ae30d69d7 Linux 6.17-rc1)
Merging thead-dt-fixes/thead-dt-fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging ftrace-fixes/ftrace/fixes (327e28664307 fgraph: Do not enable function_graph tracer when setting funcgraph-args)
Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio())
Merging trace-fixes/trace/fixes (bfb336cf97df ftrace: Also allocate and copy hash for reading of filter files)
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
Merging spacemit-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging tip-fixes/tip/urgent (3a5b128e683a Merge branch into tip/master: 'x86/urgent')
Merging slab-fixes/slab/for-next-fixes (b4efccec8d06 mm/slub: avoid accessing metadata when pointer is invalid in object_err())
Merging drm-msm-fixes/msm-fixes (3cf6147f2b51 soc: qcom: use no-UBWC config for MSM8956/76)
Merging uml-fixes/fixes (2dca89df0d11 Merge tag 'uml-for-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux)
Merging fwctl-fixes/for-rc (f12343013022 pds_fwctl: Remove the use of dev_err_probe())
Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops)
Merging drm-misc-fixes/for-linux-next-fixes (16fdb3cc6af8 Revert "drm/tegra: Use dma_buf from GEM object instance")
Merging linus/for-next (ffd294d346d1 Linux 6.13)
Merging mm-stable/mm-stable (1b237f190eb3 Linux 6.17-rc3)
Merging mm-nonmm-stable/mm-nonmm-stable (1b237f190eb3 Linux 6.17-rc3)
Merging mm-unstable/mm-unstable (f279bb633c0a mm-filemap-align-last_index-to-folio-size-fix)
Merging mm-nonmm-unstable/mm-nonmm-unstable (e86f9ec8e8a2 watchdog: skip checks when panic is in progress)
Merging kbuild/kbuild-next (0354e81b7bd6 scripts/misc-check: update export checks for EXPORT_SYMBOL_FOR_MODULES())
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (6235ce77749f perf record: Cache build-ID of hit DSOs only)
Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
Merging dma-mapping/dma-mapping-for-next (110aa2c74dbd swiotlb: Remove redundant __GFP_NOWARN)
Merging asm-generic/master (582847f97024 Makefile.kcov: apply needed compiler option unconditionally in CFLAGS_KCOV)
Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
Merging arm/for-next (8dd85887ad83 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (5b1ae9de7133 Merge branch 'for-next/feat_mte_store_only' into for-next/core)
Merging arm-perf/for-next/perf (e480898e767c drivers/perf: hisi: Support PMUs with no interrupt)
Merging arm-soc/for-next (9f9d41d64322 Merge tag 'arm-soc/for-6.17/drivers-part2' of https://github.com/Broadcom/stblinux into arm/fixes)
Merging amlogic/for-next (58abdca0eb65 Merge branch 'v6.17/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ddd574ba141e Merge branch 'apple-soc/drivers-6.18' into asahi-soc/for-next)
Merging at91/at91-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging bmc/for-next (f070580abddc Merge branches 'aspeed/dt', 'aspeed/drivers', 'nuvoton/arm/dt' and 'nuvoton/arm64/dt' into for-next)
Merging broadcom/next (89abb622d518 Merge branch 'drivers/next' into next)
Merging davinci/davinci/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging drivers-memory/for-next (1aba1eab0bd8 dt-bindings: memory: Update brcmstb-memc-ddr binding with older chips)
Merging fsl/soc_fsl (c37fd8d610d9 dt-bindings: soc: fsl: qe: Add an interrupt controller for QUICC Engine Ports)
Merging imx-mxs/for-next (ad62b4d86f51 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (6cbb623586d5 Merge branches 'v6.16-next/arm32', 'v6.16-next/dts32', 'v6.16-next/dts64' and 'v6.16-next/soc' into for-next)
Merging mvebu/for-next (23f5a19d1fa3 Merge branch 'mvebu/fixes' into mvebu/for-next)
Merging omap/for-next (db91121f001a Merge branch 'omap-for-v6.17/soc' into tmp/omap-next-20250707.142928)
Merging qcom/for-next (a679f3f6931c Merge branches 'arm32-defconfig-for-v6.18', 'arm32-for-6.18', 'arm64-defconfig-for-6.18', 'arm64-for-6.18', 'clk-fixes-for-6.17', 'clk-for-6.18', 'drivers-fixes-for-6.17' and 'drivers-for-6.18' into for-next)
Merging renesas/next (2267d9509084 Merge branches 'renesas-arm-defconfig-for-v6.18', 'renesas-arm-soc-for-v6.18', 'renesas-drivers-for-v6.18' and 'renesas-dts-for-v6.18' into renesas-next)
Merging reset/reset/next (1527cd3b89f0 reset: remove unneeded 'fast_io' parameter in regmap_config)
Merging rockchip/for-next (4d5ee1f8d7b1 Merge branch 'v6.18-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (42feeddbbce6 Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (9512db4ff7ad Merge branch 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (349ae53a949c Merge branch 'dt/riscv' into for-next)
Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only))
Merging spacemit/for-next (8bee15484b9c Merge branch 'spacemit-clk-for-6.18' into spacemit-for-next)
Merging stm32/stm32-next (1a32f7427eb3 arm64: dts: st: remove empty line in stm32mp251.dtsi)
Merging sunxi/sunxi/for-next (0239b6f7bfc4 Merge branches 'sunxi/fixes-for-6.17' and 'sunxi/dt-for-6.18' into sunxi/for-next)
Merging tee/next (0518f0b44b9a Merge branch 'optee_typo_fix_for_v6.17' into next)
Merging tegra/for-next (499b75defe56 Merge branch for-6.17/arm64/defconfig into for-next)
Merging thead-dt/thead-dt-for-next (5052d5cf1359 riscv: dts: thead: th1520: Add IMG BXM-4-64 GPU node)
Merging ti/ti-next (b6d89e53defc Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next)
Merging xilinx/for-next (3a0e3f82b8ee Merge branch 'zynqmp/dt' into for-next)
Merging clk/clk-next (54f5212c8f21 Merge branch 'clk-cleanup' into clk-next)
Merging clk-imx/for-next (c78865241ecf MAINTAINERS: Update i.MX Clock Entry)
Merging clk-renesas/renesas-clk (6bbf77bb2256 clk: renesas: r9a09g047: Add GPT clocks and resets)
Merging thead-clk/thead-clk-for-next (c567bc5fc68c clk: thead: th1520-ap: set all AXI clocks to CLK_IS_CRITICAL)
Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
Merging loongarch/loongarch-next (538c06e3964a LoongArch: KVM: Add address alignment check in pch_pic register access)
Merging m68k/for-next (c8995932db2b m68k: mac: Improve clocksource driver commentary)
Merging m68knommu/for-next (1b237f190eb3 Linux 6.17-rc3)
Merging microblaze/next (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging mips/mips-next (1b237f190eb3 Linux 6.17-rc3)
Merging openrisc/for-next (f0eedcf22581 openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging parisc-hd/for-next (89f686a0fb6e parisc: Revise __get_user() to probe user read access)
Merging powerpc/next (c17b750b3ad9 Linux 6.17-rc2)
Merging risc-v/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging riscv-dt/riscv-dt-for-next (481ee0fcbb9a riscv: dts: starfive: jh7110-common: drop no-sdio property from mmc1)
Merging riscv-soc/riscv-soc-for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging s390/for-next (c3c93dc3a423 Merge branch 'fixes' into for-next)
Merging sh/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
Merging uml/next (fc9ed2f6589d um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers)
Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging fs-next (fa6b8e01ab82 Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git)
CONFLICT (content): Merge conflict in fs/bcachefs/darray.c
Merging printk/for-next (8990f1983843 Merge branch 'rework/ringbuffer-kunit-test' into for-next)
Merging pci/next (685b1192b8b1 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comments for better understanding)
Merging hid/for-next (9ba479eca512 Merge branch 'for-6.17/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (5f6cbecd84b5 Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (5b4488c9ec00 i2c: rtl9300: Implement I2C block read and write)
Merging i3c/i3c/next (3b661ca549b9 i3c: add missing include to internal header)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (9703c672af8d MAINTAINERS: Mark coretemp driver as orphaned)
Merging jc_docs/docs-next (ee9a66919354 Merge branch 'mauro-pdf' into docs-mw)
Merging v4l-dvb/next (16428e2449ab media: mc: Improve unconnected pads debugging message in link exploration)
Applying: fix up for "media: cadence: cdns-csi2rx: Support multiple pixels per clockcycle"
Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
Merging pm/linux-next (ab9d47aa84d1 Merge branch 'thermal-intel' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (f434ec220066 arm64: dts: ti: k3-am62p: Fix supported hardware for 1GHz OPP)
Merging cpupower/cpupower (357d1fc38aad cpupower: Allow control of boost feature on non-x86 based systems with boost support.)
Merging devfreq/devfreq-next (1b237f190eb3 Linux 6.17-rc3)
Merging pmdomain/next (ffeebf7587f5 pmdomain: mediatek: Convert all SoCs to new style regmap retrieval)
Merging opp/opp/linux-next (05db35963eef OPP: Add support to find OPP for a set of keys)
Merging thermal/thermal/linux-next (1d264d3a1988 dt-bindings: thermal: tegra: Document Tegra210B01)
Merging rdma/for-next (211dc59b7bb5 IB/hfi1: Use for_each_online_cpu() instead of for_each_cpu())
Merging net-next/main (3c14917953a5 ibmvnic: Increase max subcrq indirect entries with fallback)
Merging bpf-next/for-next (5b6d6fe1ca7b Merge branch 'bpf-next/net' into for-next)
Merging ipsec-next/master (9f4f591cd5a4 xfrm: xfrm_user: use strscpy() for alg_name)
Merging mlx5-next/mlx5-next (40653f280b26 {rdma,net}/mlx5: export mlx5_vport_get_vhca_id)
Merging netfilter-next/main (df534e757321 net: phylink: remove stale an_enabled from doc)
Merging ipvs-next/main (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging bluetooth/master (c49a788e88e4 Bluetooth: hci_sync: fix set_local_name race condition)
Merging wireless-next/for-next (ee6960bdbb74 Merge branch 'net-airoha-add-ppe-support-for-rx-wlan-offload')
Merging ath-next/for-next (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging iwlwifi-next/next (433570ee392f wifi: iwlwifi: mld: don't validate keys state on resume)
Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
Merging mtd/mtd/next (9cf9db888f38 Merge tag 'nand/for-6.17' into mtd/next)
Merging nand/nand/next (fb2fae70e7e9 mtd: spinand: winbond: Add comment about the maximum frequency)
Merging spi-nor/spi-nor/next (2e3a7476ec39 mtd: spi-nor: Fix spi_nor_try_unlock_all())
Merging crypto/master (501302d5cee0 padata: Reset next CPU when reorder sequence wraps around)
Merging libcrypto/libcrypto-next (44781c45f266 lib/crypto: tests: Add KUnit tests for MD5 and HMAC-MD5)
Merging drm/drm-next (1cd0c7afef97 Merge tag 'drm-misc-next-2025-08-21' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/nova/file.rs
Merging drm-exynos/for-linux-next (d07e4c00696f drm/exynos: dsi: add support for exynos7870)
$ git reset --hard HEAD^
Merging next-20250820 version of drm-exynos
Merging drm-misc/for-linux-next (6380b1ceba77 accel/amdxdna: Fix incorrect type used for a local variable)
Merging amdgpu/drm-next (c6dc4f8861cf Reapply "drm/amdgpu: fix incorrect vm flags to map bo")
Merging drm-intel/for-linux-next (c65ee1b1ffc6 drm/i915/psr: Do not unnecessarily remove underrun on idle PSR WA)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_tc.c
Merging drm-msm/msm-next (8290d37ad2b0 drm/msm: Small function param doc fix)
Merging drm-msm-lumag/msm-next-lumag (75717bce00d1 drm/msm: Don't use %pK through printk)
  75717bce00d1 ("drm/msm: Don't use %pK through printk")
Merging drm-nova/nova-next (331c24e6ce81 rust: transmute: add `as_bytes_mut` method to `AsBytes` trait)
Merging drm-xe/drm-xe-next (d738e1be2b2b drm/xe/wcl: Extend L3bank mask workaround)
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (6d85b579a9ca fbdev: Use string choices helpers)
Merging regmap/for-next (5c36b86d2bf6 regmap: Remove superfluous check for !config in __regmap_init())
Merging sound/for-next (cdbd2acef252 ALSA: usb-audio: us144mkii: Fixes for handshake, MIDI out and cleanup)
Merging ieee1394/for-next (a901f493d066 firewire: ohci: remove module-local workqueue)
Merging sound-asoc/for-next (4e6f93f4f2b9 Merge remote-tracking branch 'asoc/for-6.18' into asoc-next)
Merging modules/modules-next (5eb4b9a4cdbb params: Replace deprecated strcpy() with strscpy() and memcpy())
Merging input/next (80025149db06 Input: include export.h in modules using EXPORT_SYMBOL*())
Applying: input: remove second addition of <linux/stdarg.h>
Merging block/for-next (96d3396f22ae Merge branch 'block-6.17' into for-next)
Merging device-mapper/for-next (8d33a030c566 dm: fix NULL pointer dereference in __dm_suspend())
Merging libata/for-next (8985d90d4bbd dt-bindings: ata: highbank: Minor whitespace cleanup in example)
Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem())
Merging mmc/next (4b43f2bcc84d mmc: dw_mmc-rockchip: use modern PM macros)
Merging mfd/for-mfd-next (c0eb742dd61c dt-bindings: mfd: qnap,ts433-mcu: Allow nvmem-layout child node)
Merging backlight/for-backlight-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging battery/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging regulator/for-next (33f8a53c98d6 Merge remote-tracking branch 'regulator/for-6.18' into regulator-next)
Merging security/next (67fe7be7dffd MAINTAINERS: add the associated Rust helper to the CREDENTIALS section)
Merging apparmor/apparmor-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging integrity/next-integrity (a4cc916bf572 lib/digsig: Use SHA-1 library instead of crypto_shash)
Merging selinux/next (f20e70a341dd selinux: Remove redundant __GFP_NOWARN)
Merging smack/next (6ddd169d0288 smack: fix kernel-doc warnings for smk_import_valid_label())
Merging tomoyo/master (038d61fd6422 Linux 6.16)
Merging tpmdd/next (be48bcf004f9 Merge tag 'for-6.17-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging watchdog/master (48defdf6b083 watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition)
Merging iommu/next (9ba0de19f4ca Merge branch 'fixes' into next)
Merging audit/next (70d00858645c audit: add a missing tab)
Merging devicetree/for-next (3b553ee7a66f dt-bindings: interrupt-controller: marvell,cp110-icu: Document address-cells)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml
Merging dt-krzk/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging mailbox/for-next (5378bdf6a611 mailbox/pcc: support mailbox management of the shared buffer)
Merging spi/for-next (6a97e12e6a06 Merge remote-tracking branch 'spi/for-6.18' into spi-next)
Merging tip/master (39acec1db255 Merge branch into tip/master: 'x86/tdx')
Merging clockevents/timers/drivers/next (461f124656e6 clocksource/drivers/arm_arch_timer_mmio: Add MMIO clocksource)
Merging edac/edac-for-next (6d3763dce2c6 Merge ras/edac-drivers into for-next)
Merging ftrace/for-next (b0e6cd7d1c90 Merge probes/for-next)
Merging rcu/next (97caae2d1494 Merge branch 'torture.2025.08.14a' into HEAD)
Merging paulmck/non-rcu/next (b706eec9304f Merge branches 'lkmm.2025.07.09a', 'ratelimit.2025.06.24a' and 'stop-machine.2025.07.17a' into HEAD)
Merging kvm/next (196d9e72c4b0 Merge tag 'kvm-s390-next-6.17-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (7b8346bd9fce KVM: arm64: Don't attempt vLPI mappings when vPE allocation is disabled)
Merging kvms390/next (efe54612bdb6 improve interrupt cpu)
Merging kvm-ppc/topic/ppc-kvm (c17b750b3ad9 Linux 6.17-rc2)
Merging kvm-riscv/riscv_kvm_next (07a289a03140 RISC-V: KVM: Avoid re-acquiring memslot in kvm_riscv_gstage_map())
Merging kvm-x86/next (ecbcc2461839 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
Merging xen-tip/linux-next (efdaa61d73a1 drivers/xen/xenbus: remove quirk for Xen 3.x)
Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging workqueues/for-next (324cee0c272c Merge branch 'for-6.17' into for-next)
Merging sched-ext/for-next (4b3570b49067 Merge branch 'for-6.17-fixes' into for-next)
Merging drivers-x86/for-next (30359c239ba8 platform/x86: int3472: Increase ov08x40 handshake GPIO delay to 45 ms)
Merging chrome-platform/for-next (f7439a723e5a platform/chrome: wilco_ec: Remove redundant semicolons)
Merging chrome-platform-firmware/for-firmware-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging hsi/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging leds-lj/for-leds-next (7d5c3cac1f39 leds: flash: leds-qcom-flash: Add a separate register map for PMI8998)
Merging ipmi/for-next (44c942f84d3b ipmi:si: Gracefully handle if the BMC is non-functional)
Merging driver-core/driver-core-next (b71763a0a330 Merge 6.17-rc3 into driver-core-next)
Merging usb/usb-next (3474a19736f3 Merge 6.17-rc3 into usb-next)
Merging thunderbolt/next (b06578497e6f thunderbolt: Use string choices helpers)
Merging usb-serial/usb-next (b3a333f8ac16 USB: serial: oti6858: remove extranenous ; after comment)
Merging tty/tty-next (706c3c02eecd tty: serial: Modify the use of dev_err_probe())
Merging char-misc/char-misc-next (5b9057cfafaa Merge 6.17-rc3 into char-misc-next)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (a80198ba650f coresight: fix indentation error in cscfg_remove_owned_csdev_configs())
Merging fastrpc/for-next (b52ebc078bb6 misc: fastrpc: add support for gdsp remoteproc)
Merging fpga/for-next (4f156ee58bb8 fpga: zynq_fpga: Fix the wrong usage of dma_map_sgtable())
Merging icc/icc-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging iio/togreg (788c57f4766b docs: iio: ad3552r: Fix malformed code-block directive)
Merging phy-next/next (38404274bbee phy: ingenic: use core driver model helper to handle probe errors)
Merging soundwire/next (8b63fee9f623 soundwire: debugfs: add SCP_SDCA_IntStatX and SCP_SDCA_IntMaskX registers)
Merging extcon/extcon-next (a373ef789d65 extcon: fsa9480: Avoid buffer overflow in fsa9480_handle_change())
Merging gnss/gnss-next (1b237f190eb3 Linux 6.17-rc3)
Merging vfio/next (b1779e4f209c vfio/type1: conditional rescheduling while pinning)
Merging w1/for-next (411053cb6657 dt-bindings: w1: imx: Add an entry for the interrupts property)
Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15)
Merging staging/staging-next (5141ae32d4b8 staging: rtl8723bs: fix coding style issues in core/rtw_mlme.c)
Merging counter-next/counter-next (51548c36b37d counter: ti-ecap-capture: Use devm_pm_runtime_enable())
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (59b723cd2adb Linux 6.12-rc6)
Merging dmaengine/next (1daede86fef9 dmaengine: ppc4xx: Remove space before newline)
Merging cgroup/for-next (04a4d6c24eef Merge branch 'for-6.18' into for-next)
Merging scsi/for-next (e14a67a7a7cf Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (d6477ee38ccf scsi: pm80xx: Fix race condition caused by static variables)
Merging vhost/linux-next (c67e16d30dca tools headers: Sync uapi/linux/vhost.h with the kernel source)
  c67e16d30dca ("tools headers: Sync uapi/linux/vhost.h with the kernel source")
Merging rpmsg/for-next (3aeaea38e95d Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio-brgl/gpio/for-next (604642fc148b dt-bindings: gpio: Minor whitespace cleanup in example)
Merging gpio-intel/for-next (16c07342b542 gpiolib: acpi: Program debounce when finding GPIO)
Merging pinctrl/for-next (6b1569f93167 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging pinctrl-renesas/renesas-pinctrl (d1d31e2739ff pinctrl: renesas: rzt2h: Add support for RZ/N2H)
Applying: fix up for "pinctrl: renesas: Add support for RZ/T2H"
Merging pinctrl-samsung/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging pwm/pwm/for-next (cd9d4e5029c0 dt-bindings: pwm: nxp,lpc1850-sct-pwm: Minor whitespace cleanup in example)
Merging ktest/for-next (a5e71638ddd7 ktest.pl: Add new PATCHCHECK_SKIP option to skip testing individual commits)
Merging kselftest/next (8f5ae30d69d7 Linux 6.17-rc1)
Merging kunit/test (8f5ae30d69d7 Linux 6.17-rc1)
Merging kunit-next/kunit (e520219adc99 kunit: tool: Accept --raw_output=full as an alias of 'all')
$ git reset --hard HEAD^
Merging next-20250815 version of kunit-next
Merging livepatching/for-next (dcf9f31c62b3 Merge tag 'livepatching-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching)
Merging rtc/rtc-next (bb5b0b4317c9 rtc: ds1685: Update Joshua Kinard's email address.)
Merging nvdimm/libnvdimm-for-next (9f97e61bde6a cxl: Include range.h in cxl.h)
Merging at24/at24/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions)
Merging seccomp/for-next/seccomp (b0c9bfbab925 selftests/seccomp: Add a test for the WAIT_KILLABLE_RECV fast reply race)
Merging slimbus/for-next (e1aab955386f slimbus: qcom: remove unused qcom controller driver)
Merging nvmem/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (03ac62a57856 mshv: Add support for a new parent partition configuration)
Merging auxdisplay/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls)
Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1)
Merging cfi/cfi/next (19272b37aa4f Linux 6.16-rc1)
Merging mhi/mhi-next (00559ba3ae74 bus: mhi: host: pci_generic: Add Telit FN990B40 modem support)
Merging memblock/for-next (66e537433fac memblock: drop for_each_free_mem_pfn_range_in_zone_from())
Merging cxl/next (561c4e30bff9 Documentation/driver-api: Fix typo error in cxl)
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (02eb7a8eee20 efi: add API doc entry for ovmf_debug_log)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (8185696483dc MAINTAINERS: add missing files to slab section)
Merging random/master (3778dcb2dcc1 random: use offstack cpumask when necessary)
Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements)
Merging rust/rust-next (1b237f190eb3 Linux 6.17-rc3)
Merging rust-alloc/alloc-next (fe927defbb4f rust: alloc: remove `allocator_test`)
CONFLICT (content): Merge conflict in rust/kernel/alloc.rs
CONFLICT (modify/delete): rust/kernel/alloc/allocator_test.rs deleted in rust-alloc/alloc-next and modified in HEAD.  Version HEAD of rust/kernel/alloc/allocator_test.rs left in tree.
$ git rm -f rust/kernel/alloc/allocator_test.rs
Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3)
Merging rust-pin-init/pin-init-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging rust-timekeeping/timekeeping-next (d4b29ddf82a4 rust: time: Add wrapper for fsleep() function)
Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API)
Merging sysctl/sysctl-next (19272b37aa4f Linux 6.16-rc1)
Merging execve/for-next/execve (a728ce8ffbd2 binfmt_elf: Replace offsetof() with struct_size() in fill_note_info())
Merging bitmap/bitmap-for-next (89748acdf226 Merge tag 'drm-next-2025-08-01' of https://gitlab.freedesktop.org/drm/kernel)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (581200450bbf Merge branches 'for-linus/hardening', 'for-next/hardening' and 'for-next/v6.18-rc1/ffs-const' into for-next/kspp)
CONFLICT (content): Merge conflict in arch/s390/include/asm/bitops.h
Merging nolibc/for-next (59af21abe49a tools/nolibc: use tabs instead of spaces for indentation)
Merging iommufd/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
Merging pwrseq/pwrseq/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging capabilities-next/caps-next (cdd73b166607 uapi: fix broken link in linux/capability.h)
Merging ipe/next (038d61fd6422 Linux 6.16)
Merging kcsan/next (800348aa34b2 kcsan: test: Replace deprecated strcpy() with strscpy())
Merging crc/crc-next (136d029662cd Documentation/staging: Fix typo and incorrect citation in crc32.rst)
Merging fwctl/for-next (19272b37aa4f Linux 6.16-rc1)
Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into tsm-next)
Merging hisilicon/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)