Message-ID: <20251117194924.162dd2bd@canb.auug.org.au>
Date: Mon, 17 Nov 2025 19:49:24 +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 17

Hi all,

Changes since 20251114:

This kernel produces a warning at boot time.

The vfs-brauner tree gained a conflict against the nfsd tree.
The vfs-brauner tree gained a build failure so I used a supplied patch.

The mm-nonmm-unstable tree gained 2 build failures for which I applied
a patch and reverted 2 commits.

The tegra tree lost its build failure.
The tegra tree gained a conflict against Linus' tree.

The block tree gained a conflict against the vfs-brauner tree.

The devicetree tree gained a build failure so I used the version from
next-20251114.

The driver-core tree gained conflicts against the drm-rust and tip trees.

The vhost tree gained a conflict against Linus' tree.

The rust tree gained build failures due to an interaction with the
drm-rust tree for which I applied 2 hack fixes.

Non-merge commits (relative to Linus' tree): 8518
 9029 files changed, 402457 insertions(+), 132514 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 408 trees (counting Linus' and 122 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 (6a23ae0a96a6 Linux 6.18-rc6)
Merging fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging vfs-brauner-fixes/vfs.fixes (e9d50b78fdfe Merge patch series "fs: add iput_not_last()")
Merging fscrypt-current/for-current (1e39da974ce6 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 (6b512fe9e216 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 (f2a12cc3b97f erofs: avoid infinite loop due to incomplete zstd-compressed data)
Merging nfsd-fixes/nfsd-fixes (324be6dcbf09 Revert "SUNRPC: Make RPCSEC_GSS_KRB5 select CRYPTO instead of depending on it")
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 (596fd0bbc028 Merge branch 'for-next-next-v6.18-20251114' into for-next-20251114)
Merging ceph/master (87ab14795a89 libceph: drop started parameter of __ceph_open_session())
Merging cifs/for-next (30158616cee7 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 (85d297e7452b exfat: validate the cluster bitmap bits of directory)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (25554ea0b42b Pull udf extent block verification.)
Merging ext4/dev (9dbf945320b1 ext4: add two trace points for moving extents)
Merging f2fs/dev (ca244e9242a1 f2fs: fix to detect recoverable inode during dryrun of find_fsync_dnodes())
Merging fsverity/for-next (211ddde0823f Linux 6.18-rc2)
Merging fuse/for-next (b4909ae8d4e9 fuse: refactor fuse_conn_put() to remove negative logic.)
Merging gfs2/for-next (105063e98b8d Revert "gfs2: Add GL_NOBLOCK flag")
Merging jfs/jfs-next (cafc6679824a jfs: replace hardcoded magic number with DTPAGEMAXSLOT constant)
Merging ksmbd/ksmbd-for-next (967a72fa7f6b Merge tag 'v6.18-rc5-smb-server-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (e9a6fb0bcdd7 Linux 6.18-rc5)
Merging nfs-anna/linux-next (b623390045a8 NFS: Fix LTP test failures when timestamps are delegated)
Merging nfsd/nfsd-next (377c0011055d nfsd: Use MD5 library instead of crypto_shash)
Merging ntfs3/master (f35590ee26f5 fs/ntfs3: remove ntfs_bio_pages and use page cache for compressed I/O)
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 (bf3b8e915215 xfs: remove xarray mark for reclaimable zones)
Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes)
Merging vfs-brauner/vfs.all (f28c9935f78b Merge branch 'vfs-6.19.directory.locking' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/nfs/localio.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
Applying: vfs: add needed headers for new struct delegation definition
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 (c76424db9f54 selftests/mm: fix division-by-zero in uffd-unit-tests)
Merging fs-current (ee1fcb297d41 Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
Merging kbuild-current/kbuild-fixes (4ab2ee307983 kbuild: install-extmod-build: Properly fix CC expansion when ccache is used)
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 (8e8ae788964a arm64: Reject modules with internal alternative callbacks)
Merging arm-soc-fixes/arm/fixes (124c98b10001 Merge tag 'tee-fix-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into arm/fixes)
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 (31475b88110c s390/mm: Fix __ptep_rdp() inline assembly)
Merging net/main (5442a9da6978 veth: more robust handing of race to avoid txq getting stuck)
Merging bpf/master (7a0892d2836e Merge tag 'pci-v6.18-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci)
Merging ipsec/master (a55ef3bff84f xfrm: fix memory leak in xfrm_add_acquire())
Merging netfilter/main (de0337d641bf net: ionic: map SKB after pseudo-header checksum prep)
Merging ipvs/main (de0337d641bf net: ionic: map SKB after pseudo-header checksum prep)
Merging wireless/for-next (d0309c054362 Merge tag 'net-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ath/for-current (d0309c054362 Merge tag 'net-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging iwlwifi/fixes (1a222625b468 wifi: iwlwifi: mld: always take beacon ies in link grading)
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (da32d155f4a8 Merge tag 'gpio-fixes-for-v6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux)
Merging sound-current/for-linus (21a9ab5b90b3 ALSA: usb-audio: Add native DSD quirks for PureAudio DAC series)
Merging sound-asoc-fixes/for-linus (360b3730f8ea ASoC: rsnd: fix OF node reference leak in rsnd_ssiu_probe())
Merging regmap-fixes/for-linus (6146a0f1dfae Linux 6.18-rc4)
Merging regulator-fixes/for-linus (636f4618b1cd regulator: fixed: fix GPIO descriptor leak on register failure)
Merging spi-fixes/for-linus (10eaa4c4a257 spi: spi-cadence-quadspi: Remove duplicate pm_runtime_put_autosuspend() call)
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 (2e558d86e097 Merge tag 'usb-serial-6.18-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-serial-fixes/usb-linus (523bf0a59e67 USB: serial: option: add support for Rolling RW101R-GL)
Merging phy/fixes (3a8660878839 Linux 6.18-rc1)
Merging staging.current/staging-linus (dcb6fa37fd7b Linux 6.18-rc3)
Merging iio-fixes/fixes-togreg (74f97a468356 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 (d6b9ce75e87c Merge tag 'stratix10_svc_fix_v6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into char-misc-linus)
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 (e08969c4d65a Input: cros_ec_keyb - fix an invalid memory access)
Merging crypto-current/master (59b0afd01b2c crypto: hisilicon/qm - Fix device reference leak in qm_get_qos_value)
Merging libcrypto-fixes/libcrypto-fixes (44e8241c51f7 lib/crypto: arm/curve25519: Disable on CPU_BIG_ENDIAN)
Merging vfio-fixes/for-linus (d323ad739666 vfio: selftests: replace iova=vaddr with allocated iovas)
Merging kselftest-fixes/fixes (dd4adb986a86 selftests/tracing: Run sample events to clear page cache events)
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 (997c06330fd5 reset: imx8mp-audiomix: Fix bad mask values)
Merging mips-fixes/mips-fixes (09782e72eec4 mips: dts: econet: fix EN751221 core type)
Merging at91-fixes/at91-fixes (3a8660878839 Linux 6.18-rc1)
Merging omap-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging kvm-fixes/master (8a4821412cf2 KVM: nSVM: Fix and simplify LBR virtualization handling with nested)
Merging kvms390-fixes/master (5f9df945d4e8 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion)
Merging hwmon-fixes/hwmon (6a23ae0a96a6 Linux 6.18-rc6)
Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4)
Merging cxl-fixes/fixes (214291cbaace acpi/hmat: Fix lockdep warning for hmem_register_resource())
Merging dma-mapping-fixes/dma-mapping-fixes (a50f7456f853 dma-mapping: Allow use of DMA_BIT_MASK(64) in global scope)
Merging drivers-x86-fixes/fixes (fa0498f80475 platform/x86: hp-wmi: Add Omen MAX 16-ah0xx fan support and thermal profile)
Merging samsung-krzk-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging pinctrl-samsung-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging devicetree-fixes/dt/linus (11623998e325 of: Skip devicetree kunit tests when RISCV+ACPI doesn't populate root node)
Merging dt-krzk-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging scsi-fixes/fixes (e6965188f84a scsi: target: tcm_loop: Fix segfault in tcm_loop_tpg_address_show())
Merging drm-fixes/drm-fixes (362a7d4fd5c4 Merge tag 'drm-xe-fixes-2025-11-13' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (f2687d3cc9f9 drm/i915/dp_mst: Disable Panel Replay)
Merging mmc-fixes/fixes (739f04f4a462 mmc: dw_mmc-rockchip: Fix wrong internal phase calculate)
Merging rtc-fixes/rtc-fixes (162f24cbb0f6 rtc: rx8025: fix incorrect register reference)
Merging gnss-fixes/gnss-linus (dcb6fa37fd7b Linux 6.18-rc3)
Merging hyperv-fixes/hyperv-fixes (3a8660878839 Linux 6.18-rc1)
Merging risc-v-fixes/fixes (dc20452e6caf riscv: Fix CONFIG_AS_HAS_INSN for new .insn usage)
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 (e9a6fb0bcdd7 Linux 6.18-rc5)
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 (c42af83c59b6 memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory)
Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
Merging perf-current/perf-tools (b72b8132d8fd perf libbfd: Ensure libbfd is initialized prior to use)
Merging efi-fixes/urgent (e5f0a698b34e Linux 6.17)
Merging battery-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging iommufd-fixes/for-rc (afb47765f923 iommufd: Make vfio_compat's unmap succeed if the range is already empty)
Merging rust-fixes/rust-fixes (1c44c8ba8969 kallsyms: Fix wrong "big" kernel symbol type read from procfs)
Merging w1-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging pmdomain-fixes/fixes (bbde14682eba pmdomain: imx: Fix reference count leak in imx_gpc_remove)
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 (53afec2c8fb2 tracing/tools: Fix incorrcet short option in usage text for --threads)
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 (7254a2b52279 Merge tag 'firewire-fixes-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394)
Merging slab-fixes/slab/for-next-fixes (ec33b59542d9 mm/mempool: fix poisoning order>0 pages with HIGHMEM)
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 tenstorrent-dt-fixes/tenstorrent-dt-fixes (3a8660878839 Linux 6.18-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (660b299bed2a Revert "drm/tegra: dsi: Clear enable register if powered by bootloader")
Merging mm-stable/mm-stable (e9a6fb0bcdd7 Linux 6.18-rc5)
Merging mm-nonmm-stable/mm-nonmm-stable (3e4b89e97036 nilfs2: replace vmalloc + copy_from_user with vmemdup_user)
Merging mm-unstable/mm-unstable (ca42aa2fdd88 zram: drop wb_limit_lock)
Merging mm-nonmm-unstable/mm-nonmm-unstable (013e5819ec8b ceph: replace local base64 helpers with lib/base64)
Applying: fix up for "kho: introduce high-level memory allocation API"
Applying: Revert "rbtree: inline rb_last()"
Applying: Revert "rbtree: inline rb_first()"
Merging kbuild/kbuild-next (7bade3f7e919 scripts: headers_install.sh: Remove two outdated config leak ignore entries)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (c1932fb85af8 perf vendor metrics s390: Avoid has_event(INSTRUCTIONS))
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 (d58041d2c63e MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port)
Merging arm/for-next (eca2ec8c85ae Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (c464aa07b92e Merge branches 'for-next/misc' and 'for-next/sysreg' into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/el2_setup.h
CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c
Merging arm-perf/for-next/perf (7ab06ea41af5 arch_topology: Provide a stub topology_core_has_smt() for !CONFIG_GENERIC_ARCH_TOPOLOGY)
Merging arm-soc/for-next (a12dacb5d1ea Merge branch 'arm/fixes' into for-next)
Merging amlogic/for-next (8fd078f5b5fa 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 (fde90d654751 Merge branch 'at91-dt' into at91-next)
Merging bmc/for-next (0d53f2dab724 Merge branches 'aspeed/arm/dt' and 'aspeed/fixes' into for-next)
Merging broadcom/next (37c3a91e9730 arm64: dts: broadcom: bcm2712: Add watchdog DT node)
Merging cix/for-next (c73bd34623b8 Merge remote-tracking branch 'cix/dt' into for-next)
Merging davinci/davinci/for-next (3a8660878839 Linux 6.18-rc1)
Merging drivers-memory/for-next (4434602ef5a8 Merge branch 'mem-ctrl-next' into for-next)
Merging fsl/soc_fsl (bdedc7414642 soc: fsl: qbman: add WQ_PERCPU to alloc_workqueue users)
Merging imx-mxs/for-next (e127c2c20d96 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (67ed5843a67b Merge branch 'v6.18-next/dts64' into for-next)
Merging mvebu/for-next (86a99e9f5394 Merge branch 'mvebu/fixes' into mvebu/for-next)
Merging omap/for-next (cfb81046a57c Merge branch 'omap-for-v6.19/drivers' into tmp/omap-next-20251111.121837)
Merging qcom/for-next (a471bda8d169 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 (fbec5d4783d5 Merge branches 'renesas-drivers-for-v6.19' and 'renesas-dts-for-v6.19' into renesas-next)
Merging reset/reset/next (3754bc97926e reset: Remove unused variables)
Merging rockchip/for-next (6c1eee3fb218 Merge branch 'v6.19-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (9b23effed3a9 Merge branches 'next/clk', 'next/defconfig', 'next/drivers' and 'next/dt64' 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 (5a97a38c2279 riscv: dts: spacemit: define all missing I2C controller nodes)
Merging stm32/stm32-next (a6961e2ced51 arm64: dts: st: set RIFSC as an access controller on stm32mp21x platforms)
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 (8a6b5e90893d Merge branch 'qcomtee_fixes_for_6.18' into next)
Merging tegra/for-next (e016a50e00e6 Merge branch for-6.19/arm64/defconfig into for-next)
CONFLICT (content): Merge conflict in arch/arm/configs/tegra_defconfig
Merging tenstorrent-dt/tenstorrent-dt-for-next (a71e6e8eea8a riscv: defconfig: Enable Tenstorrent SoCs)
Merging thead-dt/thead-dt-for-next (d8a174babf64 riscv: dts: thead: Add reset controllers of more subsystems for TH1520)
Merging ti/ti-next (884de3538ffe 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 (0171f4cf98c1 Merge branch 'clk-samsung' into clk-next)
Merging clk-imx/for-next (fdc1dc7dd53b clk: imx: add driver for imx8ulp's sim lpav)
Merging clk-renesas/renesas-clk (5fb2f67341bd clk: renesas: r9a09g077: Add SPI module clocks)
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 (237e74bfa261 LoongArch: KVM: Fix max supported vCPUs set with EIOINTC)
Merging m68k/for-next (695f2c0c25f3 m68k: defconfig: Update defconfigs for v6.17-rc1)
Merging m68knommu/for-next (e9a6fb0bcdd7 Linux 6.18-rc5)
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 (e9a6fb0bcdd7 Linux 6.18-rc5)
Merging openrisc/for-next (8c30b0018f9d openrisc: Add jump label support)
Merging parisc-hd/for-next (75b51437a4ac parisc: Drop linux/kernel.h include from asm/bug.h header)
Merging powerpc/next (e9a6fb0bcdd7 Linux 6.18-rc5)
Merging risc-v/for-next (3a8660878839 Linux 6.18-rc1)
Merging riscv-dt/riscv-dt-for-next (1088d49b6264 riscv: dts: microchip: enable qspi adc/mmc-spi-slot on BeagleV Fire)
Merging riscv-soc/riscv-soc-for-next (01ad0927f243 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next)
Merging s390/for-next (81dd86d01eb6 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 (293f71435d14 um: Always set up AT_HWCAP and AT_PLATFORM)
Merging xtensa/xtensa-for-next (4c8bad3ed035 xtensa: use HZ_PER_MHZ in platform_calibrate_ccount)
Merging fs-next (bcc24deb7d5a Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
Merging printk/for-next (4482d5eb7817 Merge branch 'for-6.19' into for-next)
Merging pci/next (479e9f2c4799 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 (30a000de0b50 Merge branch 'for-6.19/nintendo' into for-next)
Merging i2c/i2c/for-next (e9a6fb0bcdd7 Linux 6.18-rc5)
Merging i2c-host/i2c/i2c-host (eeaaf5bc1c5b dt-bindings: i2c: qcom-cci: Document Kaanapali compatible)
Merging i3c/i3c/next (ddb37d5b130e i3c: mipi-i3c-hci-pci: Add support for Intel Nova Lake-S I3C)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (93a8cb5b69c9 MAINTAINERS: Add entry for ST TSC1641 driver)
Merging jc_docs/docs-next (68f3d40ea0ce docs: parse-headers.rst: remove uneeded parenthesis)
Merging v4l-dvb/next (1f2353f5a1af media: rockchip: rkcif: add support for rk3568 vicap mipi capture)
Merging v4l-dvb-next/master (adc218676eef Linux 6.12)
Merging pm/linux-next (ebe6873de1a2 Merge branch 'pm-cpuidle' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (47c303ba6e80 cpufreq: tegra194: add WQ_PERCPU to alloc_workqueue users)
Merging cpupower/cpupower (059835bbfa28 tools/power/cpupower: Support building libcpupower statically)
Merging devfreq/devfreq-next (6146a0f1dfae Linux 6.18-rc4)
Merging pmdomain/next (e0b972121a15 pmdomain: Extend the genpd governor for CPUs to account for IPIs)
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 (d056bc45b62b RDMA/core: Prevent soft lockup during large user memory region cleanup)
Merging net-next/main (c9dfb92de073 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux)
Merging bpf-next/for-next (34240f55a035 Merge branch 'bpf-next/master' into for-next)
Merging ipsec-next/master (939ba8c5b81c MAINTAINERS: Add entry for XFRM documentation)
Merging mlx5-next/mlx5-next (5422318e27d7 net/mlx5: Expose definition for 1600Gbps link mode)
Merging netfilter-next/main (c9dfb92de073 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux)
Merging ipvs-next/main (209ff7af79bf net: stmmac: rename devlink parameter ts_coarse into phc_coarse_adj)
Merging bluetooth/master (486a25d25a4b Bluetooth: hci_core: Fix triggering cmd_timer for HCI_OP_NOP)
CONFLICT (content): Merge conflict in include/net/bluetooth/hci.h
CONFLICT (content): Merge conflict in net/bluetooth/iso.c
Merging wireless-next/for-next (c99ebb613259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ath-next/for-next (c99ebb613259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging iwlwifi-next/next (ff3f4c52701d wifi: iwlwifi: mld: remove unused variable in d3.c)
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 (e8f288a115f4 mtd: spi-nor: spansion: SMPT fixups for S25FS-S)
Merging crypto/master (76ce17f6f7f7 crypto: iaa - Fix incorrect return value in save_iaa_wq())
Merging libcrypto/libcrypto-next (10a1140107e0 Merge remote-tracking branches 'ebiggers/libcrypto-tests', 'ebiggers/libcrypto-aes-gcm' and 'ebiggers/libcrypto-fpsimd-on-stack' into libcrypto-next)
Merging drm/drm-next (2a084f4ad727 Merge tag 'amd-drm-next-6.19-2025-11-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa.c
Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1)
Merging drm-misc/for-linux-next (92c49b3f4df8 drm/bridge: simple: add the Parade PS185HDM DP-to-HDMI bridge)
Merging amdgpu/drm-next (ccd3b4c7c37f drm/amdgpu: Use amdgpu by default on SI dedicated GPUs (v2))
Merging drm-intel/for-linux-next (b84befa31266 drm/i915/display: Add default case to mipi_exec_send_packet)
Merging drm-msm/msm-next (cfbb4c0c9c19 drm/msm: Wait for MMU devcoredump when waiting for GMU)
Merging drm-msm-lumag/msm-next-lumag (e2f085ab8636 dt-bindings: display: msm: sm6150-mdss: Fix example indentation and OPP values)
Merging drm-rust/drm-rust-next (ce89e3e019f1 gpu: nova-core: provide a clear error report for unsupported GPUs)
Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant)
Merging drm-xe/drm-xe-next (c34a14bce709 drm/xe/irq: Handle msix vector0 interrupt)
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (7ecb5c36b136 fbdev: gxt4500fb: Use dev_err instead of printk)
Merging regmap/for-next (d40e1d95246b Merge remote-tracking branch 'regmap/for-6.19' into regmap-next)
Merging sound/for-next (c0241d7180d3 ALSA: gus: Remove unused declarations)
Merging ieee1394/for-next (036176d9dba7 firewire: core: abort pending transactions at card removal)
Merging sound-asoc/for-next (ef86ca232318 Merge remote-tracking branch 'asoc/for-6.19' into asoc-next)
Merging modules/modules-next (1ddac5cd7f27 MAINTAINERS: Add myself as reviewer for module support)
Merging input/next (a311c777f298 dt-bindings: touchscreen: consolidate simple touch controller to trivial-touch.yaml)
Merging block/for-next (d6bf99202b7a Merge branch 'for-6.19/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/rw.c
Merging device-mapper/for-next (5fc2367120ce dm mpath: enable DM_TARGET_ATOMIC_WRITES)
Merging libata/for-next (13f4d99582c8 ata: libata-sff: add WQ_PERCPU to alloc_workqueue users)
Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem())
Merging mmc/next (989019c969a2 mmc: core: add WQ_PERCPU to alloc_workqueue users)
Merging mfd/for-mfd-next (30ed024fb076 mfd: bcm2835-pm: Add support for BCM2712)
Merging backlight/for-backlight-next (67d8eed26ead backlight: led-bl: Add devlink to supplier LEDs)
Merging battery/for-next (8e8856396b54 Revert "power: supply: qcom_battmgr: support disabling charge control")
Merging regulator/for-next (7db7d6de2738 Merge remote-tracking branch 'regulator/for-6.19' into regulator-next)
Merging security/next (0e6ebf877843 device_cgroup: Refactor devcgroup_seq_show to use seq_put* helpers)
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 (29c701f90b93 Smack: function parameter 'gfp' not described)
Merging tomoyo/master (4cfad6d7da01 net/can/j1939: add j1939_priv debugging)
Merging tpmdd/next (821e6e2a328b keys: Replace deprecated strncpy in ecryptfs_fill_auth_tok)
Merging watchdog/master (5bcc5786a0cf watchdog: starfive: Fix resource leak in probe error path)
Merging iommu/next (3ee8acab4e50 Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'nvidia/tegra', 'amd/amd-vi' and 'core' into next)
Merging audit/next (c8a3dfe73159 audit: merge loops in __audit_inode_child())
Merging devicetree/for-next (e0f5d8e3fe94 kbuild: Ensure .dtbo targets are applied to a base .dtb)
  5415ea2a70b4 ("dt-bindings: watchdog: Convert TI OMAP to DT schema")
  ed15cb1d21fd ("dt-bindings: watchdog: Convert marvell,orion-wdt to DT schema")
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/watchdog/ti,omap2-wdt.yaml
$ git reset --hard HEAD^
Merging next-20251114 version of devicetree
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/watchdog/ti,omap2-wdt.yaml
[master 567130900e44] next-20251114/devicetree
Merging dt-krzk/for-next (3a8660878839 Linux 6.18-rc1)
Merging mailbox/for-next (3f39f5652037 mailbox: mtk-cmdq: Remove pm_runtime APIs from cmdq_mbox_send_data())
Merging spi/for-next (33af0f00ac96 Merge remote-tracking branch 'spi/for-6.19' into spi-next)
Merging tip/master (0ae851efbc4e Merge branch into tip/master: 'x86/sgx')
CONFLICT (content): Merge conflict in kernel/bpf/stackmap.c
Merging clockevents/timers/drivers/next (534633aa8b7b Merge branch 'timers/drivers/fixes' into timers/drivers/next)
Merging edac/edac-for-next (6b7abee1cd25 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (23d03ad91f47 Merge unused-tracepoints/for-next)
Merging rcu/next (9bc9bbad3800 Merge branches 'rcu/misc', 'rcu/srcu' and 'rcu/refscale' into next)
Merging paulmck/non-rcu/next (7f8fcc6f09fb memory-barriers.txt: Sort wait_event* and wait_on_bit* list alphabetically)
Merging kvm/next (6b36119b94d0 KVM: x86: Export KVM-internal symbols for sub-modules only)
Merging kvm-arm/next (2ea7215187c5 Merge branch 'kvm-arm64/vgic-lr-overflow' into kvmarm/next)
CONFLICT (content): Merge conflict in arch/arm64/kvm/vgic/vgic-v3.c
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 (5309ee9bb3b8 Merge branch '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 (4457265c61f3 workqueue: Remove unused assert_rcu_or_wq_mutex_or_pool_mutex)
Merging sched-ext/for-next (dda380a14e39 Merge branch 'for-6.19' into for-next)
CONFLICT (content): Merge conflict in kernel/sched/ext.c
Merging drivers-x86/for-next (2806623efb16 platform/x86: asus-armoury: add ppt_* and nv_* tuning knobs)
Merging chrome-platform/for-next (52075d2c7595 platform/chrome: sensorhub: Support devices without FIFO_INT_ENABLE)
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 (ea1c4c7e648d leds: Drop duplicate LEDS_EXPRESSWIRE config)
Merging ipmi/for-next (35bcedc1a793 MAINTAINERS: Add entry on Loongson-2K IPMI driver)
Merging driver-core/driver-core-next (ededb7bcdfdb rust: dma: use NonNull<T> instead of *mut T)
CONFLICT (content): Merge conflict in drivers/gpu/nova-core/driver.rs
CONFLICT (content): Merge conflict in rust/kernel/debugfs/traits.rs
CONFLICT (content): Merge conflict in samples/rust/rust_debugfs.rs
CONFLICT (content): Merge conflict in samples/rust/rust_debugfs_scoped.rs
Merging usb/usb-next (18514fd70ea4 usb: typec: ucsi: Add support for orientation)
Merging thunderbolt/next (9393a3a4207f thunderbolt: Replace use of system_wq with system_percpu_wq)
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 (41289b4834c8 Merge tag 'socfpga_firmware_updates_for_v6.19' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into char-misc-next)
CONFLICT (content): Merge conflict in drivers/firmware/stratix10-svc.c
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 (9e9182cab5eb coresight: etm4x: Remove the state_needs_restore flag)
Merging fastrpc/for-next (3a8660878839 Linux 6.18-rc1)
Merging fpga/for-next (c9243d6df0d6 fpga: altera-cvp: Use pci_find_vsec_capability() when probing FPGA device)
Merging icc/icc-next (41aa8dd5b19c Merge branch 'icc-kaanapali' into icc-next)
Merging iio/togreg (d16d1c255324 iio: imu: inv_icm45600: Initializes inv_icm45600_buffer_postdisable() sleep)
Merging phy-next/next (3a8660878839 Linux 6.18-rc1)
Merging soundwire/next (96e539b24be5 soundwire: send multi sections in one BPT stream)
Merging extcon/extcon-next (dcb6fa37fd7b Linux 6.18-rc3)
Merging gnss/gnss-next (e738ca230702 gnss: ubx: add support for the safeboot gpio)
Merging vfio/next (0ed3a30fd996 hisi_acc_vfio_pci: Add .match_token_uuid callback in hisi_acc_vfio_pci_migrn_ops)
Merging w1/for-next (a5d908e0ec05 w1: omap-hdq: Remove redundant pm_runtime_mark_last_busy() calls)
Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15)
Merging staging/staging-next (bd10acae08ae platform/raspberrypi: Destage VCHIQ MMAL driver)
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 (7587adebe583 Merge branch 'for-6.19' into for-next)
Merging scsi/for-next (aec860a0d3d2 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (e360bb6dc843 Merge patch series "replace old wq(s), added WQ_PERCPU to alloc_workqueue")
CONFLICT (content): Merge conflict in drivers/ufs/core/ufshcd.c
Merging vhost/linux-next (ad9d909c0f9a ptr_ring: support peeking at last produced entry)
CONFLICT (content): Merge conflict in scripts/lib/kdoc/kdoc_parser.py
Merging rpmsg/for-next (f982fbb1a6ca Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio-brgl/gpio/for-next (b6d31cd41814 gpio: cdev: replace use of system_wq with system_percpu_wq)
Merging gpio-intel/for-next (3a8660878839 Linux 6.18-rc1)
Merging pinctrl/for-next (61cbe48d9d1f Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (885b92bad87a Merge patch series "pinctrl: intel: Convert the rest to use INTEL_GPP()")
Merging pinctrl-renesas/renesas-pinctrl (3b0cf6ab3590 pinctrl: renesas: rzg2l: Refactor OEN register PWPR handling)
Merging pinctrl-samsung/for-next (3cfc60e09bdc pinctrl: samsung: Add ARTPEC-9 SoC specific configuration)
Merging pwm/pwm/for-next (a5d51e02d6fa Merge branch 'pwm/th1520' into pwm/for-next)
CONFLICT (content): Merge conflict in rust/macros/module.rs
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 (37f46601383a selftests/tracing: Add basic test for trace_marker_raw file)
Merging kunit/test (3a8660878839 Linux 6.18-rc1)
Merging kunit-next/kunit (7bc16e72ddb9 kunit: Make filter parameters configurable via Kconfig)
Merging livepatching/for-next (5cb5575308bc selftests: livepatch: use canonical ftrace path)
Merging rtc/rtc-next (9d6d6b06933c rtc: nvvrs: add NVIDIA VRS RTC device driver)
Merging nvdimm/libnvdimm-for-next (acd9ea1714bb Documentation: btt: Unwrap bit 31-30 nested table)
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 (96a5d8a96c0f Merge branches 'nvmem-fixes' and 'nvmem-for-6.19' into nvmem-for-next)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (db7df69995ff Drivers: hv: Introduce mshv_vtl driver)
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 (9e24bdfecdb0 bus: mhi: ep: add WQ_PERCPU to alloc_workqueue users)
Merging memblock/for-next (e68f150bc11d memblock: drop for_each_free_mem_pfn_range_in_zone_from())
Merging cxl/next (33bedb92d26b Merge branch 'for-6.19/cxl-prm' into cxl-for-next)
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (cb46a58d77e5 efi/memattr: Convert efi_memattr_init() return type to void)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (38f35f5fc78f Merge branch 'slab/for-6.19/mempool_alloc_bulk' into slab/for-next)
Merging random/master (2db833312d7e random: drop check for static_key_initialized)
Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements)
Merging rust/rust-next (f56b13172382 rust: rbtree: add immutable cursor)
CONFLICT (content): Merge conflict in rust/kernel/debugfs/file_ops.rs
CONFLICT (content): Merge conflict in rust/kernel/debugfs/traits.rs
CONFLICT (content): Merge conflict in rust/kernel/opp.rs
CONFLICT (content): Merge conflict in rust/kernel/pci/id.rs
CONFLICT (content): Merge conflict in rust/kernel/str.rs
Applying: fix up for "rust: replace `CStr` with `core::ffi::CStr`"
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 (6f15c3d715f1 bitops: Update kernel-doc in hweight.c to fix the issues with it)
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 (2d8482959efe tools/nolibc: avoid using plain integer as NULL pointer)
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 (80bde9648247 ipe: Update documentation for script enforcement)
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 (f7ae6d4ec652 PCI/TSM: Add 'dsm' and 'bound' attributes for dependent functions)
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)
Applying: fix up for vhost tree merge
Applying: temp hack for "rust: support formatting of foreign types"
Applying: temp hack 2 for "rust: support formatting of foreign types"

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists