Message-ID: <20251104202310.3407ec02@canb.auug.org.au>
Date: Tue, 4 Nov 2025 20:23:10 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Linux Next Mailing List <linux-next@...r.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: Tree for Nov 4

Hi all,

Changes since 20251103:

The drm-misc tree lost its build failures, but gained some more so I
used the version from next-20251031.

The pwm tree gained a conflict against the modules tree.

The rust tree gained a conflict against the modules tree.

The modules tree gained a build failure due to an interaction with the
rust tree so I used the version from next-20251103.

Non-merge commits (relative to Linus' tree): 5319
 6041 files changed, 233495 insertions(+), 73193 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 406 trees (counting Linus' and 405 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 (6146a0f1dfae Linux 6.18-rc4)
Merging fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging vfs-brauner-fixes/vfs.fixes (a20432b6571d virtio-fs: fix incorrect check for fsvq->kobj)
Merging fscrypt-current/for-current (4eb587830a12 fscrypt: fix left shift underflow when inode->i_blkbits > PAGE_SHIFT)
Merging fsverity-current/for-current (211ddde0823f Linux 6.18-rc2)
Merging btrfs-fixes/next-fixes (1892dd18856e Merge branch 'misc-6.18' into next-fixes)
Merging vfs-fixes/fixes (00e782110428 nfs4_setup_readdir(): insufficient locking for ->d_parent->d_inode dereferencing)
Merging erofs-fixes/fixes (bb163a399747 erofs: avoid infinite loop due to incomplete zstd-compressed data)
Merging nfsd-fixes/nfsd-fixes (3e7f011c2555 Revert "NFSD: Remove the cap on number of operations per NFSv4 COMPOUND")
Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
Merging overlayfs-fixes/ovl-fixes (e8bd877fb76b ovl: fix possible double unlink)
Merging fscrypt/for-next (211ddde0823f Linux 6.18-rc2)
Merging btrfs/for-next (8b39dcc552df Merge branch 'for-next-next-v6.18-20251030' into for-next-20251030)
Merging ceph/master (d74d6c0e9895 ceph: add bug tracking system info to MAINTAINERS)
Merging cifs/for-next (c24059424a07 smb: client: show smb lease key in open_dirs output)
Merging configfs/configfs-next (462272dd734b configfs: use PTR_ERR_OR_ZERO() to simplify code)
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 (e2d3af0d64e5 erofs: drop redundant sanity check for ztailpacking inline)
Merging exfat/dev (cf77a65e954d exfat: zero out post-EOF page cache on file extension)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (25554ea0b42b Pull udf extent block verification.)
Merging ext4/dev (c065b6046b34 Use CONFIG_EXT4_FS instead of CONFIG_EXT3_FS in all of the defconfigs)
Merging f2fs/dev (e4384545e220 f2fs: use folio_nr_pages() instead of shift operation)
Merging fsverity/for-next (211ddde0823f Linux 6.18-rc2)
Merging fuse/for-next (cb403594701c fuse: move CREATE_TRACE_POINTS to a separate file)
Merging gfs2/for-next (9f336dedd209 Revert "gfs2: Add GL_NOBLOCK flag")
Merging jfs/jfs-next (cafc6679824a jfs: replace hardcoded magic number with DTPAGEMAXSLOT constant)
Merging ksmbd/ksmbd-for-next (6146a0f1dfae Linux 6.18-rc4)
Merging nfs/linux-next (6146a0f1dfae Linux 6.18-rc4)
Merging nfs-anna/linux-next (9bb3baa9d160 NFS4: Fix state renewals missing after boot)
Merging nfsd/nfsd-next (738ac6af2c3d NFSD/blocklayout: Support multiple extents per LAYOUTGET)
Merging ntfs3/master (58bcc175c4c4 ntfs3: avoid memcpy size warning)
Merging orangefs/for-next (11f6bce77e27 fs/orangefs: Replace kzalloc + copy_from_user with memdup_user_nul)
Merging overlayfs/overlayfs-next (ad1423922781 ovl: make sure that ovl_create_real() returns a hashed dentry)
Merging ubifs/next (99dbb2a1bd66 ubifs: stop using write_cache_pages)
Merging v9fs/9p-next (1f3e4142c0eb 9p: convert to the new mount API)
Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
Merging xfs/for-next (0db22d7ee462 xfs: document another racy GC case in xfs_zoned_map_extent)
Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes)
Merging vfs-brauner/vfs.all (7b1a88998ce2 Merge branch 'kernel-6.19.cred' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Merging vfs/for-next (15f5e46385aa Merge branches 'work.fs_context', 'work.f_path', 'work.qstr', 'work.misc', 'work.nfsctl' and 'work.finish_no_open' into for-next)
Merging mm-hotfixes/mm-hotfixes-unstable (968964975445 mm/secretmem: fix use-after-free race in fault handler)
Merging fs-current (263a4b30ae37 Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git)
Merging kbuild-current/kbuild-fixes (43c2931a95e6 kconfig/nconf: Initialize the default locale at startup)
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 (b98c94eed4a9 arm64: mte: Do not warn if the page is already tagged in copy_highpage())
Merging arm-soc-fixes/arm/fixes (b2a578f3127a soc: officially expand maintainership team)
Merging davinci-current/davinci/for-current (3a8660878839 Linux 6.18-rc1)
Merging drivers-memory-fixes/fixes (6f37469a9330 memory: tegra210: Fix incorrect client ids)
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 (695f2c0c25f3 m68k: defconfig: Update defconfigs for v6.17-rc1)
Merging powerpc-fixes/fixes (0843ba458439 powerpc/fadump: skip parameter area allocation when fadump is disabled)
Merging s390-fixes/fixes (64e2f60f355e s390: Disable ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP)
Merging net/main (d7d2fcf7ae31 netconsole: Acquire su_mutex before navigating configs hierarchy)
Merging bpf/master (ba36dd5ee6fd Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipsec/master (59630e2ccd72 xfrm: Prevent locally generated packets from direct output in tunnel mode)
Merging netfilter/main (6a2108c78069 net: devmem: refresh devmem TX dst in case of route invalidation)
Merging ipvs/main (6a2108c78069 net: devmem: refresh devmem TX dst in case of route invalidation)
Merging wireless/for-next (b7904323e76b Merge tag 'wireless-2025-10-30' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless)
Merging ath/for-current (9222582ec524 Revert "wifi: ath12k: Fix missing station power save configuration")
Merging iwlwifi/fixes (3802f25a6b5d wifi: iwlwifi: fix aux ROC time event iterator usage)
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (b8126205dbe0 MAINTAINERS: Update irdma maintainers)
Merging sound-current/for-linus (390db60f8e2b Merge tag 'asoc-fix-v6.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (5e5c8aa73d99 ASoC: dt-bindings: pm4125-sdw: correct number of soundwire ports)
Merging regmap-fixes/for-linus (48cbf50531d8 regmap: irq: Correct documentation of wake_invert flag)
Merging regulator-fixes/for-linus (47a0925ee4bd regulator: bd718x7: Fix voltages scaled by resistor divider)
Merging spi-fixes/for-linus (e7dbfe6f15b4 spi: intel: Add support for Oak Stream SPI serial flash)
Merging pci-current/for-linus (3a8660878839 Linux 6.18-rc1)
Merging driver-core.current/driver-core-linus (dcb6fa37fd7b Linux 6.18-rc3)
Merging tty.current/tty-linus (eb4917f557d4 serial: amba-pl011: prefer dma_mapping_error() over explicit address checking)
Merging usb.current/usb-linus (ad8415a85703 Merge tag 'thunderbolt-for-v6.18-rc4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-serial-fixes/usb-linus (2d8ab771d531 USB: serial: ftdi_sio: add support for u-blox EVK-M101)
Merging phy/fixes (3a8660878839 Linux 6.18-rc1)
Merging staging.current/staging-linus (dcb6fa37fd7b Linux 6.18-rc3)
Merging iio-fixes/fixes-togreg (22e625565c17 iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver)
Merging counter-current/counter-current (109ff654934a counter: microchip-tcb-capture: Allow shared IRQ for multi-channel TCBs)
Merging char-misc.current/char-misc-linus (1ebc180d2b90 mei: fix error flow in probe)
Merging soundwire-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging thunderbolt-fixes/fixes (3575254546a2 thunderbolt: Add support for Intel Wildcat Lake)
Merging input-current/for-linus (69aeb5073123 Input: pegasus-notetaker - fix potential out-of-bounds access)
Merging crypto-current/master (3c9bf72cc1ce crypto: aspeed - fix double free caused by devm)
Merging libcrypto-fixes/libcrypto-fixes (1af424b15401 lib/crypto: poly1305: Restore dependency of arch code on !KMSAN)
Merging vfio-fixes/for-linus (de8d1f2fd5a5 vfio: selftests: add end of address space DMA map/unmap tests)
Merging kselftest-fixes/fixes (920aa3a7705a selftests: cachestat: Fix warning on declaration under label)
Merging dmaengine-fixes/fixes (81935b90b6fc dmaengine: xilinx: xdma: Fix regmap max_register)
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (97315e7c901a mtd: onenand: Pass correct pointer to IRQ handler)
Merging mfd-fixes/for-mfd-fixes (91a3e1f5453a mfd: ls2kbmc: Check for devm_mfd_add_devices() failure)
Merging v4l-dvb-fixes/fixes (27afd6e066cf media: videobuf2: forbid remove_bufs when legacy fileio is active)
Merging reset-fixes/reset/fixes (9a52827a9bbb reset: eyeq: fix OF node leak)
Merging mips-fixes/mips-fixes (3a8660878839 Linux 6.18-rc1)
Merging at91-fixes/at91-fixes (3a8660878839 Linux 6.18-rc1)
Merging omap-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging kvm-fixes/master (4361f5aa8bfc Merge tag 'kvm-x86-fixes-6.18-rc2' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (5f9df945d4e8 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion)
Merging hwmon-fixes/hwmon (8746b9ce4180 hwmon: (gpd-fan) initialize EC on driver load for Win 4)
Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging cxl-fixes/fixes (7c3643f204ed acpi,srat: Fix incorrect device handle check for Generic Initiator)
Merging dma-mapping-fixes/dma-mapping-fixes (23ee8a2563a0 dma-mapping: benchmark: Restore padding to ensure uABI remained consistent)
Merging drivers-x86-fixes/fixes (bd34bf518a5f platform: x86: Kconfig: fix minor typo in help for WIRELESS_HOTKEY)
Merging samsung-krzk-fixes/fixes (0dac0b74c32a MAINTAINERS: Update Krzysztof Kozlowski's email)
Merging pinctrl-samsung-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging devicetree-fixes/dt/linus (7209ff310083 of/irq: Export of_msi_xlate() for module usage)
Merging dt-krzk-fixes/fixes (8f5ae30d69d7 Linux 6.17-rc1)
Merging scsi-fixes/fixes (a2b32bc1d9e3 scsi: ufs: core: Fix invalid probe error return value)
Merging drm-fixes/drm-fixes (6146a0f1dfae Linux 6.18-rc4)
Merging drm-intel-fixes/for-linux-next-fixes (7d44ad6b43d0 drm/i915: Fix conversion between clock ticks and nanoseconds)
Merging mmc-fixes/fixes (a28352cf2d2f mmc: sdhci-of-dwcmshc: Change DLL_STRBIN_TAPNUM_DEFAULT to 0x4)
Merging rtc-fixes/rtc-fixes (0d510778c2f4 Revert "rtc: cpcap: Fix initial enable_irq/disable_irq balance")
Merging gnss-fixes/gnss-linus (dcb6fa37fd7b Linux 6.18-rc3)
Merging hyperv-fixes/hyperv-fixes (852bfe55e211 mshv: Fix deposit memory in MSHV_ROOT_HVCALL)
Merging risc-v-fixes/fixes (2e448567839c cpuidle: riscv-sbi: Replace deprecated strcpy in sbi_cpuidle_init_cpu)
Merging riscv-dt-fixes/riscv-dt-fixes (5ef13c363640 riscv: dts: microchip: remove BeagleV Fire fabric.dtsi)
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 (89373f5695dc LICENSES: Add modern form of the LGPL-2.1 tags to the usage guide section)
Merging gpio-brgl-fixes/gpio/for-current (2f6115ad8864 gpiolib: fix invalid pointer access in debugfs)
Merging gpio-intel-fixes/fixes (b1055678a016 gpiolib: acpi: Use %pe when passing an error pointer to dev_err())
Merging pinctrl-intel-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging auxdisplay-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging kunit-fixes/kunit-fixes (f3903ec76ae6 MAINTAINERS: Update KUnit email address for Rae Moar)
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 (ccaba800e78f tools headers x86 cpufeatures: Sync with the kernel sources)
Merging efi-fixes/urgent (e5f0a698b34e Linux 6.17)
Merging battery-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging iommufd-fixes/for-rc (b09ed52db1e6 iommufd/selftest: Fix ioctl return value in _test_cmd_trigger_vevents())
Merging rust-fixes/rust-fixes (09b1704f5b02 rust: condvar: fix broken intra-doc link)
Merging w1-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging pmdomain-fixes/fixes (7458f72cc28f pmdomain: arm: scmi: Fix genpd leak on provider registration failure)
Merging i2c-host-fixes/i2c/i2c-host-fixes (8738d626030f i2c: fix reference leak in MP2 PCI device)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (3a8660878839 Linux 6.18-rc1)
Merging thead-clk-fixes/thead-clk-fixes (3a8660878839 Linux 6.18-rc1)
Merging pwrseq-fixes/pwrseq/for-current (3a8660878839 Linux 6.18-rc1)
Merging thead-dt-fixes/thead-dt-fixes (3a8660878839 Linux 6.18-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 (54b91e54b113 tracing: Stop fortify-string from warning in tracing_mark_raw_write())
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
Merging spacemit-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging tip-fixes/tip/urgent (e18d8f91f2c0 Merge branch into tip/master: 'perf/urgent')
Merging slab-fixes/slab/for-next-fixes (7f434e1d9a17 slab: Fix obj_ext mistakenly considered NULL due to race condition)
Merging drm-msm-fixes/msm-fixes (f5d079564c44 drm/msm/dpu: Fix adjusted mode clock check for 3d merge)
Merging uml-fixes/fixes (df447a3b4a4b um: Fix FD copy size in os_rcv_fd_msg())
Merging fwctl-fixes/for-rc (211ddde0823f Linux 6.18-rc2)
Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops)
Merging drm-rust-fixes/drm-rust-fixes (211ddde0823f Linux 6.18-rc2)
Merging drm-misc-fixes/for-linux-next-fixes (b4cd8f94ae7e drm/imagination: Optionally depend on POWER_SEQUENCING)
Merging mm-stable/mm-stable (dcb6fa37fd7b Linux 6.18-rc3)
Merging mm-nonmm-stable/mm-nonmm-stable (dcb6fa37fd7b Linux 6.18-rc3)
Merging mm-unstable/mm-unstable (9ef7b0341163 mm: change type of parameter for memory_notify)
Merging mm-nonmm-unstable/mm-nonmm-unstable (97751db460a7 ceph: replace local base64 helpers with lib/base64)
Merging kbuild/kbuild-next (934cd53e1669 Merge branch 'kbuild-ms-extensions' into kbuild-next)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (01bc5d2f0d7d perf tools: Cache counter names for raw samples on s390)
Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
Merging dma-mapping/dma-mapping-for-next (131971f67e25 dma-mapping: remove unused map_page callback)
Merging asm-generic/master (edcc8a38b5ac once: fix race by moving DO_ONCE to separate section)
Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
Merging arm/for-next (eca2ec8c85ae Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (3a8660878839 Linux 6.18-rc1)
Merging arm-perf/for-next/perf (989b40b7578a perf: arm_pmuv3: Add new Cortex and C1 CPU PMUs)
Merging arm-soc/for-next (b8e5a95fb5f5 Merge branch 'arm/fixes' into for-next)
Merging amlogic/for-next (cb718411c4c0 Merge branch 'v6.19/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (5d21b7ca05c8 Merge branch 'apple-soc/drivers-6.19' into asahi-soc/for-next)
Merging at91/at91-next (3a8660878839 Linux 6.18-rc1)
Merging bmc/for-next (39f0ed9219df Merge branches 'aspeed/arm/dt' and 'aspeed/fixes' into for-next)
Merging broadcom/next (378243ed2375 Merge branch 'devicetree-arm64/next' into next)
Merging cix/for-next (011004af5d12 Merge remote-tracking branch 'cix/dt' into for-next)
Merging davinci/davinci/for-next (3a8660878839 Linux 6.18-rc1)
Merging drivers-memory/for-next (8712a048f1de Merge branch 'mem-ctrl-next' into for-next)
Merging fsl/soc_fsl (5498f07842cb soc/fsl/qbman: Use for_each_online_cpu() instead of for_each_cpu())
Merging imx-mxs/for-next (8b5f72630660 Merge branch 'imx/dt64' into for-next)
Merging mediatek/for-next (860a0efbb95d Merge branch 'v6.18-next/soc' into for-next)
Merging mvebu/for-next (86a99e9f5394 Merge branch 'mvebu/fixes' into mvebu/for-next)
Merging omap/for-next (462bfcbe8834 Merge branch 'omap-for-v6.18/soc' into tmp/omap-next-20250915.162436)
Merging qcom/for-next (bfc13ed9cce5 Merge branches 'arm32-for-6.19', 'arm64-defconfig-for-6.19', 'arm64-for-6.19', 'clk-for-6.19' and 'drivers-for-6.19' into for-next)
Merging renesas/next (afade6fa8f17 Merge branch 'renesas-dts-for-v6.19' into renesas-next)
Merging reset/reset/next (f5da5084e282 reset: th1520: Support reset controllers in more subsystems)
Merging rockchip/for-next (3c0431ad3284 Merge branch 'v6.19-armsoc/dts32' into for-next)
Merging samsung-krzk/for-next (78f25f2fc732 Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (e5db90f4c044 Merge branch 'for-next/ffa/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (8eff9c7a129e 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 (981339507835 riscv: dts: spacemit: add Ethernet and PDMA to OrangePi RV2)
Merging stm32/stm32-next (53c18dc078bb arm64: dts: st: fix memory region size on stm32mp235f-dk)
Merging sunxi/sunxi/for-next (28493fd26fd6 Merge branches 'sunxi/dt-for-6.19' and 'sunxi/drivers-for-6.19' into sunxi/for-next)
Merging tee/next (e2c2e95934ea Merge branch 'tee_qcomtee_fixes_for_v6.18' into next)
Merging tegra/for-next (02f9977e97fa Merge branch for-6.19/arm64/dt into for-next)
Merging thead-dt/thead-dt-for-next (d8a174babf64 riscv: dts: thead: Add reset controllers of more subsystems for TH1520)
Merging ti/ti-next (98510fdf29c5 Merge branch 'ti-drivers-soc-next' into ti-next)
Merging xilinx/for-next (a35dc981c5d8 Merge branch 'zynqmp/defconfig' into for-next)
Merging clk/clk-next (3a8660878839 Linux 6.18-rc1)
Merging clk-imx/for-next (14be8b7b6cbc clk: imx95-blk-ctl: Save/restore registers when RPM routines are called)
Merging clk-renesas/renesas-clk (07525a693a5f clk: renesas: r9a09g056: Add clock and reset entries for ISP)
Merging thead-clk/thead-clk-for-next (3a8660878839 Linux 6.18-rc1)
Merging csky/linux-next (817d21578d51 csky: Remove compile warning for CONFIG_SMP)
Merging loongarch/loongarch-next (032676ff8217 LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (695f2c0c25f3 m68k: defconfig: Update defconfigs for v6.17-rc1)
Merging m68knommu/for-next (6146a0f1dfae Linux 6.18-rc4)
Merging microblaze/next (7f7072574127 Merge tag 'kbuild-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux)
Merging mips/mips-next (3a8660878839 Linux 6.18-rc1)
Merging openrisc/for-next (8c30b0018f9d openrisc: Add jump label support)
Merging parisc-hd/for-next (b5da286abcef parisc: Avoid crash due to unaligned access in unwinder)
Merging powerpc/next (ef104054a312 powerpc/pseries: Define __u{8,32} types in papr_hvpipe_hdr struct)
Merging risc-v/for-next (3a8660878839 Linux 6.18-rc1)
Merging riscv-dt/riscv-dt-for-next (fa939a287224 dts: starfive: jh7110-common: split out mmc0 reset pins from common into boards)
Merging riscv-soc/riscv-soc-for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging s390/for-next (c23f812adcb9 Merge branch 'features' into for-next)
CONFLICT (content): Merge conflict in include/linux/memory.h
Merging sh/for-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging sparc/for-next (fe0126702a40 sparc: Replace deprecated strcpy() with strscpy() in handle_nextprop_quirks())
Merging uml/next (8e03c195cc4d um: Avoid circular dependency on asm-offsets in pgtable.h)
Merging xtensa/xtensa-for-next (4c8bad3ed035 xtensa: use HZ_PER_MHZ in platform_calibrate_ccount)
Merging fs-next (0b9f7a3deda8 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
Merging printk/for-next (2ab239648f24 Merge branch 'for-6.19' into for-next)
Merging pci/next (7efa17553b66 Merge branch 'pci/controller/sg2042')
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vram.c
Merging pstore/for-next/pstore (b69255357368 pstore/ram: Update module parameters from platform data)
Merging hid/for-next (be0be4b1da64 Merge branch 'for-6.19/nintendo' into for-next)
Merging i2c/i2c/for-next (6a0dddc53f6f i2c: muxes: pca954x: Fix broken reset-gpio usage)
Merging i2c-host/i2c/i2c-host (eeaaf5bc1c5b dt-bindings: i2c: qcom-cci: Document Kaanapali compatible)
Merging i3c/i3c/next (3a36273e5a07 i3c: master: svc: Prevent incomplete IBI transaction)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (68c2a8b59d23 hwmon: (sy7636a) Fix sensor description)
Merging jc_docs/docs-next (e5e7ca66a7fc docs: kdoc: fix duplicate section warning message)
Merging v4l-dvb/next (e7dfb7a46201 media: dvb-usb: pctv452e: move snd/rcv len check before kmalloc)
Merging v4l-dvb-next/master (adc218676eef Linux 6.12)
Merging pm/linux-next (f192c17ae9dc Merge branch 'fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (1971b18785d1 cpufreq: CPPC: Don't warn if FIE init fails to read counters)
Merging cpupower/cpupower (3a8660878839 Linux 6.18-rc1)
Merging devfreq/devfreq-next (eddb5ba91b28 PM / devfreq: rockchip-dfi: add support for LPDDR5)
Merging pmdomain/next (1ff1f0db6aec pmdomain: mediatek: Add support for MFlexGraphics)
Merging opp/opp/linux-next (33ffb0aa8ce8 rust: opp: simplify callers of `to_c_str_array`)
Merging thermal/thermal/linux-next (dc67521c20b7 thermal/drivers/renesas/rzg3e: Fix add thermal driver for the Renesas RZ/G3E SoC)
Merging rdma/for-next (503a5e4690ae RDMA/rxe: Fix null deref on srq->rq.queue after resize failure)
Merging net-next/main (01cc760632b8 Documentation: ARCnet: Update obsolete contact info)
Merging bpf-next/for-next (65ada09f577a Merge branch 'bpf-next/net' into for-next)
Merging ipsec-next/master (6b3b6e59c4f8 pfkey: Deprecate pfkey)
Merging mlx5-next/mlx5-next (eea31f21dce1 {rdma,net}/mlx5: Query vports mac address from device)
Merging netfilter-next/main (0d0eb186421d cxgb4: flower: add support for fragmentation)
Merging ipvs-next/main (0d0eb186421d cxgb4: flower: add support for fragmentation)
Merging bluetooth/master (2747d9296177 Bluetooth: MGMT: cancel mesh send timer when hdev removed)
Merging wireless-next/for-next (dcbc94c1f044 Merge tag 'iwlwifi-next-2025-10-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging ath-next/for-next (059ca8fd692b wifi: ath10k: use = {} to initialize bmi_target_info instead of memset)
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mac.c
Merging iwlwifi-next/next (3df28496673b wifi: iwlwifi: mld: add null check for kzalloc() in iwl_mld_send_proto_offload())
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 (c95de73da12b mtd: spear_smi: fix kernel-doc warnings <linux/mtd/spear_smi.h>)
Merging nand/nand/next (88fd4e4deae8 mtd: rawnand: sunxi: Add support for H616 nand controller)
Merging spi-nor/spi-nor/next (17926cd770ec mtd: spi-nor: core: avoid odd length/address writes in 8D-8D-8D mode)
Merging crypto/master (d5b59ec33c5b crypto: qat - use simple_strtoull to improve qat_uclo_parse_num)
Merging libcrypto/libcrypto-next (e046e1d2a90d Merge remote-tracking branch 'ebiggers/libcrypto-aes-gcm' into libcrypto-next)
Merging drm/drm-next (f67d54e96bc9 Merge tag 'amd-drm-next-6.19-2025-10-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
  2ada9cb1df3f ("drm/i915: Fix conversion between clock ticks and nanoseconds")
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt.c
Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1)
Merging drm-misc/for-linux-next (71829d7f2f70 accel/amdxdna: Use MSG_OP_CHAIN_EXEC_NPU when supported)
$ git reset --hard HEAD^
Merging next-20251031 version of drm-misc
Merging amdgpu/drm-next (1bc9d39275e0 drm/radeon: Remove redundant pm_runtime_mark_last_busy() calls)
Merging drm-intel/for-linux-next (44fde50912b8 drm/xe/display: Use display parent interface for xe runtime pm)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fb.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c
Merging drm-msm/msm-next (227ec96232ba drm/msm: fix allocation of dumb buffers for non-RGB formats)
Merging drm-msm-lumag/msm-next-lumag (a643abb67379 drm/msm/mdp4: remove the use of dev_err_probe())
Merging drm-rust/drm-rust-next (9a3c2f8a4f84 gpu: nova-core: replace `as` with `from` conversions where possible)
Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant)
Merging drm-xe/drm-xe-next (492671339114 drm/xe/guc: Synchronize Dead CT worker with unbind)
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (53be794e182f fbdev: vesafb: Use dev_* fn's instead printk)
Merging regmap/for-next (fc9cda149ea0 Merge remote-tracking branch 'regmap/for-6.19' into regmap-next)
Merging sound/for-next (4e5a0a0ae83f ALSA: line6: add support for POD HD Pro X)
Merging ieee1394/for-next (fa2dc2710076 firewire: core: code refactoring to find and pop transaction entry)
Merging sound-asoc/for-next (b2cb3cd68042 Merge remote-tracking branch 'asoc/for-6.19' into asoc-next)
Merging modules/modules-next (913359754ea8 module: Add compile-time check for embedded NUL characters)
$ git reset --hard HEAD^
Merging next-20251103 version of modules
Merging input/next (e8ec34ed4616 dt-bindings: input: ti,twl4030-keypad: convert to DT schema)
Merging block/for-next (359212b8a23d Merge branch 'for-6.19/io_uring' into for-next)
Merging device-mapper/for-next (17069d6bd3aa dm: Don't warn if IMA_DISABLE_HTABLE is not enabled)
Merging libata/for-next (095d495cb897 dt-bindings: ata: snps,dwc-ahci: Allow 'iommus' property)
Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem())
Merging mmc/next (c2afdd73e5ba mmc: core: Skip to set the default 200mA SD current limit)
Merging mfd/for-mfd-next (f17f1b16e905 dt-bindings: mfd: dlg,da9063: Allow wakeup-source property)
Merging backlight/for-backlight-next (243ce64b2b37 backlight: Do not include <linux/fb.h> in header file)
Merging battery/for-next (8e8856396b54 Revert "power: supply: qcom_battmgr: support disabling charge control")
Merging regulator/for-next (b382f3687ded Merge remote-tracking branch 'regulator/for-6.19' into regulator-next)
Merging security/next (dfa024bc3f67 lsm: add a LSM_STARTED_ALL notification event)
Merging apparmor/apparmor-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging integrity/next-integrity (43369273518f ima: add fs_subtype condition for distinguishing FUSE instances)
Merging selinux/next (20d387d7ceab selinux: improve bucket distribution uniformity of avc_hash())
Merging smack/next (6ddd169d0288 smack: fix kernel-doc warnings for smk_import_valid_label())
Merging tomoyo/master (4cfad6d7da01 net/can/j1939: add j1939_priv debugging)
Merging tpmdd/next (dbfdaeb381a4 tpm_crb: Add idle support for the Arm FF-A start method)
Merging watchdog/master (c64c2a50cdd4 watchdog/hpwdt New maintianer)
Merging iommu/next (8f650600a37e Merge branches 'mediatek', 'nvidia/tegra' and 'core' into next)
Merging audit/next (4f7b54e17edd audit: fix comment misindentation in audit.h)
Merging devicetree/for-next (3b1728b74a52 of: overlay: Avoid spurious error messages in of_overlay_remove())
Merging dt-krzk/for-next (7ee0f223cabe arm64: dts: toshiba: tmpv7708: Add default GIC address cells)
Merging mailbox/for-next (3f39f5652037 mailbox: mtk-cmdq: Remove pm_runtime APIs from cmdq_mbox_send_data())
Merging spi/for-next (4fffc9c8c2e8 Merge remote-tracking branch 'spi/for-6.19' into spi-next)
Merging tip/master (7a0fcb37e71f Merge branch into tip/master: 'x86/sgx')
Merging clockevents/timers/drivers/next (45d78cd0bf2c dt-bindings: timer: exynos4210-mct: Add compatible for ARTPEC-9 SoC)
Merging edac/edac-for-next (be8145e8a77d Merge ras/edac-amd-atl into for-next)
Merging ftrace/for-next (7281582a91c6 Merge unused-tracepoints/for-next)
Merging rcu/next (1d289fc5691c 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 (6b36119b94d0 KVM: x86: Export KVM-internal symbols for sub-modules only)
Merging kvm-arm/next (dcb6fa37fd7b Linux 6.18-rc3)
Merging kvms390/next (182a258b5ec4 Documentation: kvm: Fix ordering)
Merging kvm-ppc/topic/ppc-kvm (c17b750b3ad9 Linux 6.17-rc2)
Merging kvm-riscv/riscv_kvm_next (8c5fa3764fac RISC-V: KVM: Remove automatic I/O mapping for VM_PFNMAP)
Merging kvm-x86/next (4cc167c50eb1 Merge branches 'generic', 'gmem', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h
Merging xen-tip/linux-next (9d52b0b41be5 xen: take system_transition_mutex on suspend)
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 (8b8cfc05ada8 Merge branch 'for-6.18' into for-next)
Merging sched-ext/for-next (181209925d23 Merge branch 'for-6.19' into for-next)
CONFLICT (content): Merge conflict in kernel/sched/ext.c
Merging drivers-x86/for-next (1c72d9c3e0c6 platform/x86:intel/pmc: Remove redundant has_die_c6 variable)
Merging chrome-platform/for-next (c862381bd03a platform/chrome: cros_ec_lightbar: Check if ec supports suspend commands)
Merging chrome-platform-firmware/for-firmware-next (3a8660878839 Linux 6.18-rc1)
Merging hsi/for-next (3a8660878839 Linux 6.18-rc1)
Merging leds-lj/for-leds-next (c06a01743911 leds: upboard: Fix module alias)
Merging ipmi/for-next (35bcedc1a793 MAINTAINERS: Add entry on Loongson-2K IPMI driver)
Merging driver-core/driver-core-next (fde40a558dbd rust: usb: fix broken call to T::disconnect())
Merging usb/usb-next (18514fd70ea4 usb: typec: ucsi: Add support for orientation)
Merging thunderbolt/next (8ab64d711b93 thunderbolt: Update deprecated firmware update site in icm.c)
Merging usb-serial/usb-next (53002803832b USB: serial: kobil_sct: drop unnecessary initialisations)
Merging tty/tty-next (719f3df3e113 serial: sh-sci: Merge sh-sci.h into sh-sci.c)
Merging char-misc/char-misc-next (c428900703aa Merge 6.18-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 (dcb6fa37fd7b Linux 6.18-rc3)
Merging fastrpc/for-next (3a8660878839 Linux 6.18-rc1)
Merging fpga/for-next (3ff616a014a1 dt-bindings: fpga: update link for Altera's and AMD partial recon)
Merging icc/icc-next (41aa8dd5b19c Merge branch 'icc-kaanapali' into icc-next)
Merging iio/togreg (59420a56a457 iio: adc: ad7124: fix possible OOB array access)
Merging phy-next/next (3a8660878839 Linux 6.18-rc1)
Merging soundwire/next (3a8660878839 Linux 6.18-rc1)
Merging extcon/extcon-next (94d885eb8ffe dt-bindings: extcon: linux,extcon-usb-gpio: GPIO must be provided)
Merging gnss/gnss-next (dcb6fa37fd7b Linux 6.18-rc3)
Merging vfio/next (451bb9632898 vfio: Dump migration features under debugfs)
Merging w1/for-next (f3c6353d801a w1: ds28e17: Replace deprecated strcpy + strcat in w1_f19_add_slave)
Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15)
Merging staging/staging-next (d68eb9096fb0 Merge 6.18-rc3 into staging-next)
Merging counter-next/counter-next (b462fcd08dd5 MAINTAINERS: Update Intel Quadrature Encoder Peripheral maintainer)
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 (398035178503 i2c: i2c-qcom-geni: Add Block event interrupt support)
Merging cgroup/for-next (dbdfa16e5c4c Merge branch 'for-6.19' into for-next)
Merging scsi/for-next (558e705e922a Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (bb8222b6f358 Merge patch series "target: RW/num_cmds stats improvements")
Merging vhost/linux-next (c6f3b304eb54 virtio_vdpa: fix misleading return in void function)
Merging rpmsg/for-next (5f4d69f0ef4f Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio-brgl/gpio/for-next (bac88be0d2a8 gpio: mm-lantiq: update kernel docs)
Merging gpio-intel/for-next (3a8660878839 Linux 6.18-rc1)
Merging pinctrl/for-next (2aea4b47e7a5 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (3a8660878839 Linux 6.18-rc1)
Merging pinctrl-renesas/renesas-pinctrl (a5fad3aeff41 pinctrl: renesas: rzg2l: Remove useless wrappers)
Merging pinctrl-samsung/for-next (3cfc60e09bdc pinctrl: samsung: Add ARTPEC-9 SoC specific configuration)
Merging pwm/pwm/for-next (0c3a76eb000f pwm: th1520: Use module_pwm_platform_driver! macro)
Applying: fix up for "pwm: Add Rust driver for T-HEAD TH1520 SoC"
Merging ktest/for-next (a5e71638ddd7 ktest.pl: Add new PATCHCHECK_SKIP option to skip testing individual commits)
Merging kselftest/next (3a8660878839 Linux 6.18-rc1)
Merging kunit/test (3a8660878839 Linux 6.18-rc1)
Merging kunit-next/kunit (9de5f847ef8f Documentation: kunit: add description of kunit.enable parameter)
Merging livepatching/for-next (5cb5575308bc selftests: livepatch: use canonical ftrace path)
Merging rtc/rtc-next (d034c9ca6a47 rtc: renesas-rtca3: Add support for multiple reset lines)
Merging nvdimm/libnvdimm-for-next (43bc0aa19a21 nvdimm: allow exposing RAM carveouts as NVDIMM DIMM devices)
Merging at24/at24/for-next (aef72ebe9c86 dt-bindings: eeprom: at24: Add compatible for Belling BL24S64)
Merging ntb/ntb-next (68113d260674 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 (4bb909aa44ed dt-bindings: slimbus: fix warning from example)
Merging nvmem/for-next (3a8660878839 Linux 6.18-rc1)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (31a365f1ea6b Drivers: hv: Resolve ambiguity in hypervisor version log)
Merging auxdisplay/for-next (00de283c53c9 Merge patch series "auxdisplay: linedisp: support attribute attachment to auxdisplay devices")
Merging kgdb/kgdb/for-next (fdbdd0ccb30a kdb: remove redundant check for scancode 0xe0)
Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1)
Merging cfi/cfi/next (3a8660878839 Linux 6.18-rc1)
Merging mhi/mhi-next (6eaee77923dd bus: mhi: host: pci_generic: Add Telit FE990B40 modem support)
Merging memblock/for-next (e68f150bc11d memblock: drop for_each_free_mem_pfn_range_in_zone_from())
Merging cxl/next (c692f5a947ad Merge branch 'for-6.19/cxl-elc' into cxl-for-next)
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (fa84cb3add1d efistub/x86: Add fallback for SMBIOS record lookup)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (8ad018dbd344 slab: use new API for remaining command line parameters)
Merging random/master (933ecf591275 random: remove unused get_random_var_wait functions)
Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements)
Merging rust/rust-next (3b83f5d5e78a rust: replace `CStr` with `core::ffi::CStr`)
CONFLICT (content): Merge conflict in rust/kernel/opp.rs
Merging rust-alloc/alloc-next (3a8660878839 Linux 6.18-rc1)
Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3)
Merging rust-pin-init/pin-init-next (42415d163e5d rust: pin-init: add references to previously initialized fields)
Merging rust-timekeeping/timekeeping-next (4521438fb076 rust: time: Implement basic arithmetic operations for Delta)
Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API)
Merging sysctl/sysctl-next (9586c6c2d44a sysctl: Make ctl_table structure visible in jiffies.h)
Merging execve/for-next/execve (8c94db0ae97c binfmt_elf: preserve original ELF e_flags for core dumps)
Merging bitmap/bitmap-for-next (7e85ac9da1ac PM / devfreq: rockchip-dfi: switch to FIELD_PREP_WM16 macro)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (c57f5fee54df libeth: xdp: Disable generic kCFI pass for libeth_xdp_tx_xmit_bulk())
Merging nolibc/for-next (7534b9bfe691 tools/nolibc: clean up outdated comments in generic arch.h)
Merging iommufd/for-next (211ddde0823f Linux 6.18-rc2)
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 (3a8660878839 Linux 6.18-rc1)
Merging capabilities-next/caps-next (211ddde0823f Linux 6.18-rc2)
Merging ipe/next (c88788fe31a5 ipe: Drop a duplicated CONFIG_ prefix in the ifdeffery)
Merging kcsan/next (dcb6fa37fd7b Linux 6.18-rc3)
Merging crc/crc-next (dcb6fa37fd7b Linux 6.18-rc3)
Merging fwctl/for-next (211ddde0823f Linux 6.18-rc2)
Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into tsm-next)
Merging hisilicon/for-next (6c177775dcc5 Merge branch 'next/drivers' into for-next)
Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists