Message-ID: <20251125011302.32b9e4c8@canb.auug.org.au>
Date: Tue, 25 Nov 2025 01:13:02 +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 24

Hi all,

Changes since 20251121:

This kernel produces a warning at boot time.

The vfs-brauner tree still had its build failure so I used a supplied
patch.
The vfs_brauner tree gained a semantic conflict against the btrfs tree.

The reset tree lost its build failure.

The risc-v tree gained a conflict against the mm-unstable tree.

The pm tree gained a conflict against Linus' tree.

The rdma tree gained a build failure so I used the version from
next-20251121.

The net-next tree gained a conflict against the mm-nonmm-unstable tree.

The libcrypto tree gained a conflict against the crypto tree.

The tip tree gained a build failure so I used the version from
next-20251121.

The vfio tree gained a conflict against the drm tree.

The gpio-brgl tree lost its build failure.

Non-merge commits (relative to Linus' tree): 10458
 10572 files changed, 498383 insertions(+), 173803 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 (d0e88704d96c Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
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 (62f1c85f62b3 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 (45ecc1c46e44 Merge branch 'for-next-next-v6.18-20251121' into for-next-20251121)
Merging ceph/master (87ab14795a89 libceph: drop started parameter of __ceph_open_session())
Merging cifs/for-next (e4ae65e198a7 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 (ea2972e1c789 erofs: correct FSDAX detection)
Merging exfat/dev (3577231895ec exfat: fix divide-by-zero in exfat_allocate_bitmap)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (25554ea0b42b Pull udf extent block verification.)
Merging ext4/dev (103ce01cd045 ext4: add i_data_sem protection in ext4_destroy_inline_data_nolock())
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 (45c733b47f9b gfs2: Clean up SDF_JOURNAL_LIVE flag handling)
Merging jfs/jfs-next (cafc6679824a jfs: replace hardcoded magic number with DTPAGEMAXSLOT constant)
Merging ksmbd/ksmbd-for-next (0a26f936e35c ksmbd: Replace strcpy + strcat to improve convert_to_nt_pathname)
Merging nfs/linux-next (6a23ae0a96a6 Linux 6.18-rc6)
Merging nfs-anna/linux-next (b623390045a8 NFS: Fix LTP test failures when timestamps are delegated)
Merging nfsd/nfsd-next (898f94465205 lockd: don't allow locking on reexported NFSv2/3)
Merging ntfs3/master (2469f2e78d07 fs/ntfs3: Fix spelling mistake "recommened" -> "recommended")
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 (4bfaed64a12c Merge branch 'xfs-6.18-fixes' into for-next)
Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes)
Merging vfs-brauner/vfs.all (e72adadba24a Merge branch 'vfs-6.19.autofs' 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
Applying: fix up for "btrfs: Use folio_next_pos()"
Merging vfs/for-next (eb028c33451a d_make_discardable(): warn if given a non-persistent dentry)
CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst
CONFLICT (content): Merge conflict in fs/dcache.c
CONFLICT (content): Merge conflict in fs/debugfs/inode.c
CONFLICT (content): Merge conflict in security/apparmor/apparmorfs.c
Merging mm-hotfixes/mm-hotfixes-unstable (195aa963ff3a mm/filemap: fix logic around SIGBUS in filemap_map_pages())
Merging fs-current (5aac18af5efc 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 (fe7cdcd1bace Merge tag 'qcomtee-fixes2-for-6.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 (8a4dfa8fa6b5 Merge tag 'for-net-2025-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging bpf/master (22d70d400556 bpf: Fix exclusive map memory leak)
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 (2eba5e05d9bc Merge tag 'loongarch-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson)
Merging sound-current/for-linus (be4c9abdf04b ALSA: hda/realtek: add quirk for HP pavilion aero laptop 13z-be200)
Merging sound-asoc-fixes/for-linus (a3d8f733d453 ASoC: codecs: wcd934x: add explicit soundwire depenency)
Merging regmap-fixes/for-linus (6146a0f1dfae Linux 6.18-rc4)
Merging regulator-fixes/for-linus (6a23ae0a96a6 Linux 6.18-rc6)
Merging spi-fixes/for-linus (9f0c21bac5a8 spi: spi-fsl-lpspi: fix watermark truncation caused by type cast)
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 (df5fde297e61 USB: storage: Remove subclass and protocol overrides from Novatek quirk)
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 (ae8966b7b5bd Input: rename INPUT_PROP_HAPTIC_TOUCHPAD to INPUT_PROP_PRESSUREPAD)
Merging crypto-current/master (59b0afd01b2c crypto: hisilicon/qm - Fix device reference leak in qm_get_qos_value)
Merging libcrypto-fixes/libcrypto-fixes (141fbbecec0e lib/crypto: tests: Fix KMSAN warning in test_sha256_finup_2x())
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 (f52c6c5eb159 dmaengine: ti: k3-udma: fix device leak on udma lookup)
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 (3a8660878839 Linux 6.18-rc1)
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 (14b46ba92bf5 MIPS: kernel: Fix random segmentation faults)
Merging at91-fixes/at91-fixes (3a8660878839 Linux 6.18-rc1)
Merging omap-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging kvm-fixes/master (3fa05f96fc08 KVM: SVM: Fix redundant updates of LBR MSR intercepts)
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 (db30233361f9 platform/x86: intel-uncore-freq: fix all header kernel-doc warnings)
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 (76841259ac09 of: dynamic: Fix overlayed devices not probing because of fw_devlink)
Merging dt-krzk-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging scsi-fixes/fixes (90449f2d1e1f scsi: sg: Do not sleep in atomic context)
Merging drm-fixes/drm-fixes (40b53db87c99 Merge tag 'drm-xe-fixes-2025-11-21' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (547456038177 drm/i915/xe3: Restrict PTL intel_encoder_is_c10phy() to only PHY A)
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 (e2285bd4a467 riscv: fix KUnit test_kprobes crash when building with Clang)
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 (2b6d546ba83e MAINTAINERS: update my email address)
Merging gpio-intel-fixes/fixes (6a23ae0a96a6 Linux 6.18-rc6)
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 (6a23ae0a96a6 Linux 6.18-rc6)
Merging efi-fixes/urgent (e5f0a698b34e Linux 6.17)
Merging battery-fixes/fixes (3a8660878839 Linux 6.18-rc1)
Merging iommufd-fixes/for-rc (b07bf253ef8e iommufd/iommufd_private.h: Avoid -Wflex-array-member-not-at-end warning)
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 (6a23ae0a96a6 Linux 6.18-rc6)
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 (3c493b524ffd Merge tag 'sunxi-clk-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes)
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 (85ccd62a0408 Merge branch into tip/master: 'timers/urgent')
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 (83c53f1a2d6c drm/imagination: Document pvr_device.power member)
Merging mm-stable/mm-stable (c5c67c1de357 tools/testing/vma: eliminate dependency on vma->__vm_flags)
Merging mm-nonmm-stable/mm-nonmm-stable (58b6fcd2ab34 ocfs2: mark inode bad upon validation failure during read)
Merging mm-unstable/mm-unstable (1f1edd95f923 pagemap: update BUDDY flag documentation)
Merging mm-nonmm-unstable/mm-nonmm-unstable (5b8dc8b45ebd init: replace simple_strtoul with kstrtoul to improve lpj_setup)
Merging kbuild/kbuild-next (deab487e0f9b kbuild: allow architectures to override CC_CAN_LINK)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (9bef5cead63d perf: replace strcpy() with strncpy() in util/jitdump.c)
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 (5d8d48764484 Merge branches 'for-next/misc', 'for-next/kselftest', 'for-next/efi-preempt', 'for-next/assembler-macro', 'for-next/typos', 'for-next/sysreg', 'for-next/sme-ptrace-disable', 'for-next/local-tlbi-page-reused', 'for-next/mpam' and 'for-next/defconfig' 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
CONFLICT (content): Merge conflict in mm/memory.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 (9cb0ebd6fef2 Merge branch 'soc/dt' into for-next)
  04392a1e8145 ("arm64: defconfig: Remove the redundant SCHED_MC/SCHED_SMT")
Merging amlogic/for-next (677efa12e8f9 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 (4889f68b824d Merge remote-tracking branch 'cix/dt' into for-next)
Merging davinci/davinci/for-next (3a8660878839 Linux 6.18-rc1)
Merging drivers-memory/for-next (84ac371ee4b3 Merge branch 'mem-ctrl-next' into for-next)
Merging fsl/soc_fsl (4ee2a8883d9c soc: fsl: qbman: use kmalloc_array() instead of kmalloc())
Merging imx-mxs/for-next (89d95dbad2a3 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 (f0e6bc0c3ef4 clk: mvebu: cp110 add CLK_IGNORE_UNUSED to pcie_x10, pcie_x11 & pcie_x4)
Merging omap/for-next (2c85858e7c68 Merge branch 'omap-for-v6.19/drivers' into tmp/omap-next-20251117.085514)
Merging qcom/for-next (c17e270dfb34 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 (7822734b80fb Merge tag 'reset-gpio-for-v6.19-2' into reset/next)
Merging rockchip/for-next (8e0b927d5848 Merge branch 'v6.19-clk/next' into for-next)
Merging samsung-krzk/for-next (62f9c9186bbe Merge branch 'next/drivers' into for-next)
  2e646b21df4c ("arm64: defconfig: enable Exynos ACPM clocks")
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 (8edc486bb38b 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 (ef541cc2e208 Merge branch 'sunxi/fixes-for-6.18' into sunxi/for-next)
Merging tee/next (eb4bb32c8117 Merge branch 'qcomtee_fixes_for_6.18' into next)
Merging tegra/for-next (e016a50e00e6 Merge branch for-6.19/arm64/defconfig into for-next)
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 (34729c8b27fd Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (a35dc981c5d8 Merge branch 'zynqmp/defconfig' into for-next)
Merging clk/clk-next (e1132ddd5d4c Merge branch 'clk-imx' 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 (94744e102106 KVM: LoongArch: selftests: Add time counter test case)
Merging m68k/for-next (695f2c0c25f3 m68k: defconfig: Update defconfigs for v6.17-rc1)
Merging m68knommu/for-next (6a23ae0a96a6 Linux 6.18-rc6)
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 (5b3a426affbd powerpc/64s/slb: Add no_slb_preload early cmdline param)
Merging risc-v/for-next (36313cea1273 riscv: mm: use xchg() on non-atomic_long_t variables, not atomic_long_xchg())
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h
Merging riscv-dt/riscv-dt-for-next (123b5eb726fd riscv: dts: sifive: unmatched: Add PWM controlled fans)
Merging riscv-soc/riscv-soc-for-next (719362b8a972 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging s390/for-next (103e62c60298 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 (bad328e4adc0 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl
Merging printk/for-next (6658c46ba23c Merge branch 'rework/suspend-fixes' into for-next)
Merging pci/next (ea837d44d23e Merge branch 'pci/controller/stm32')
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 (bc5de60998ad Merge branch 'for-6.19/core' 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 (edbce49ea653 hwmon: (aspeed-g6-pwm-tach): Add AST2700 compatible string)
Merging jc_docs/docs-next (d879c2e0195b Merge branch 'mauro' into docs-mw)
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 (a2544ac20ad9 Merge branch 'thermal-intel' into linux-next)
CONFLICT (content): Merge conflict in kernel/power/hibernate.c
Merging cpufreq-arm/cpufreq/arm/linux-next (c3852d2ca465 cpufreq: qcom-nvmem: fix compilation warning for qcom_cpufreq_ipq806x_match_list)
Merging cpupower/cpupower (059835bbfa28 tools/power/cpupower: Support building libcpupower statically)
Merging devfreq/devfreq-next (9d1876aa0845 PM: devfreq: Fix typo in DFSO_DOWNDIFFERENTIAL macro name)
  a5aca75b173e ("dt-bindings: devfreq: tegra30-actmon: Add Tegra124 fallback for Tegra210")
Merging pmdomain/next (0346625cd7f1 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 (6641fb4af3d0 RDMA/bng_re: Initialize the Firmware and Hardware)
$ git reset --hard HEAD^
Merging next-20251121 version of rdma
Merging net-next/main (e05021a829b8 Merge branch 'net-stmmac-qcon-ethqos-rgmii-accessor-cleanups')
CONFLICT (content): Merge conflict in tools/testing/selftests/drivers/net/gro.c
CONFLICT (content): Merge conflict in tools/testing/selftests/drivers/net/hw/toeplitz.c
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 (c9dfb92de073 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux)
Merging bluetooth/master (74d9900f3087 Bluetooth: SMP: Fix not generating mackey and ltk when repairing)
CONFLICT (content): Merge conflict in include/net/bluetooth/hci.h
CONFLICT (content): Merge conflict in net/bluetooth/iso.c
Merging wireless-next/for-next (b688a9447be3 wifi: mac80211: refactor CMAC packet handlers)
Merging ath-next/for-next (c99ebb613259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging iwlwifi-next/next (85d002b2ac56 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 (64ef5f454e16 mtd: mtdpart: ignore error -ENOENT from parsers on subpartitions)
Merging nand/nand/next (b98994cb9bc2 mtd: spinand: esmt: add support for F50L1G41LC)
Merging spi-nor/spi-nor/next (5008c3ec3f89 mtd: spi-nor: core: Check read CR support)
Merging crypto/master (20d868a77f11 Revert "crypto: scatterwalk - Move skcipher walk and use it for memcpy_sglist")
Merging libcrypto/libcrypto-next (c0127f3ad65e Merge remote-tracking branches 'ebiggers/libcrypto-tests', 'ebiggers/libcrypto-aes-gcm', 'ebiggers/libcrypto-fpsimd-on-stack' and 'ebiggers/libcrypto-at-least' into libcrypto-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging drm/drm-next (611d4d160616 Merge tag 'mediatek-drm-next-20251120' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c
Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1)
Merging drm-misc/for-linux-next (f3a1d69f9b38 Merge tag 'amd-drm-next-6.19-2025-11-14' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging amdgpu/drm-next (ee9b603ad43f drm/amdgpu: Add sriov vf check for VCN per queue reset support.)
Merging drm-intel/for-linux-next (f32df9e94d95 drm/i915/cx0: Read out power-down state of both PHY lanes for reversed lanes)
Merging drm-msm/msm-next (7bc29d5fb6fa dt-bindings: display/msm/gmu: Add Adreno X2-85 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 (57dc2ea0b7bd rust: slice: fix broken intra-doc links)
Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant)
Merging drm-xe/drm-xe-next (96b93ac214f9 drm/xe: Fix conversion from clock ticks to milliseconds)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/tests/xe_mocs.c
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 (9ef1203fc735 ALSA: pcm: Harden the spk_alloc assumption check)
Merging ieee1394/for-next (036176d9dba7 firewire: core: abort pending transactions at card removal)
Merging sound-asoc/for-next (0d94ab04ea5f 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 (fd196ceb0bfe Merge branch 'io_uring-6.18' into for-next)
CONFLICT (content): Merge conflict in io_uring/rw.c
Merging device-mapper/for-next (55206ce98c71 dm-bufio: align write boundary on physical block size)
Merging libata/for-next (1d779fa9962f ata: pata_pcmcia: Add Iomega Clik! PCMCIA ATA/ATAPI Adapter)
Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem())
Merging mmc/next (dcbce328d3a2 mmc: renesas_sdhi: Add suspend/resume hooks)
Merging mfd/for-mfd-next (0e056211b8c9 mfd: qnap-mcu: Hook up the EEPROM sub-device)
Merging backlight/for-backlight-next (1704e206cb98 backlight: lp855x: Fix lp855x.h kernel-doc warnings)
Merging battery/for-next (8e8856396b54 Revert "power: supply: qcom_battmgr: support disabling charge control")
Merging regulator/for-next (fba27fe5aaf1 regulator: Add FP9931/JD9930)
Merging security/next (9a948eefad59 lsm: use unrcu_pointer() for current->cred in security_init())
Merging apparmor/apparmor-next (8f5ae30d69d7 Linux 6.17-rc1)
Merging integrity/next-integrity (738c9738e690 ima: Handle error code returned by ima_filter_rule_match())
Merging selinux/next (cdcf0b369d40 Automated merge of 'dev' into 'next')
Merging smack/next (29c701f90b93 Smack: function parameter 'gfp' not described)
Merging tomoyo/master (b24e217157fd net/can/j1939: add j1939_session 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 (4c1dea32a97c Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'nvidia/tegra', 'intel/vt-d', 'amd/amd-vi' and 'core' into next)
Merging audit/next (c8a3dfe73159 audit: merge loops in __audit_inode_child())
Merging devicetree/for-next (df2602e1c68a dt-bindings: eeprom: at25: Add Anvo ANV32C81W)
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 (00652711e248 Merge remote-tracking branch 'spi/for-6.19' into spi-next)
Merging tip/master (f1337ea8a67e Merge branch 'core/rseq')
CONFLICT (content): Merge conflict in kernel/bpf/stackmap.c
Applying: fix up for "sched/mmcid: Use proper data structures"
$ git reset --hard HEAD^
Merging next-20251121 version of tip
CONFLICT (content): Merge conflict in kernel/bpf/stackmap.c
[master 6fa3f1277de0] next-20251121/tip
Applying: fix up for "sched/mmcid: Use proper data structures"
[master 9ff24253d1d2] next-20251121/tip
Merging clockevents/timers/drivers/next (534633aa8b7b Merge branch 'timers/drivers/fixes' into timers/drivers/next)
Merging edac/edac-for-next (d6262530d638 Merge branch 'edac-drivers' into edac-for-next)
Merging ftrace/for-next (b668bb6dfc3a Merge unused-tracepoints/for-next)
CONFLICT (content): Merge conflict in Documentation/tools/rtla/common_options.txt
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 (c9155843cbbc Merge branch 'kvm-arm64/misc' into kvmarm/next)
CONFLICT (content): Merge conflict in arch/arm64/kvm/vgic/vgic-v3.c
Merging kvms390/next (8e8678e740ec KVM: s390: Add capability that forwards operation exceptions)
CONFLICT (content): Merge conflict in Documentation/virt/kvm/api.rst
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
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 (115d5de2eef3 Merge branch 'vmx')
CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/bugs.c
Merging xen-tip/linux-next (a73d4a055622 drivers/xen/xenbus: Replace deprecated strcpy in xenbus_transaction_end)
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 (6d90215dc015 workqueue: Don't rely on wq->rescuer to stop rescuer)
Merging sched-ext/for-next (e090182ceee2 Merge branch 'for-6.19' into for-next)
CONFLICT (content): Merge conflict in kernel/sched/ext.c
Merging drivers-x86/for-next (e2c1b56f3dfa platform/x86: wmi: Move WMI core code into a separate directory)
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 (072cd5f458d7 leds: rgb: leds-qcom-lpg: Don't enable TRILED when configuring PWM)
Merging ipmi/for-next (35bcedc1a793 MAINTAINERS: Add entry on Loongson-2K IPMI driver)
Merging driver-core/driver-core-next (a762f883ecf6 rust: i2c: prepare for `core::ffi::CStr`)
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 (955a48a5353f usb: usb-storage: No additional quirks need to be added to the EL-R12 optical drive.)
Merging thunderbolt/next (479d186fc946 thunderbolt: Fix typos in xdomain.c)
Merging usb-serial/usb-next (4d822b0a4a27 USB: serial: ftdi_sio: drop NDI quirk module parameter)
Merging tty/tty-next (da218406dd50 serial: 8250_platform: simplify IRQF_SHARED handling)
Merging char-misc/char-misc-next (fb64bf480691 Merge tag 'mhi-for-v6.19' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi 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 (60b52af082b1 Merge branch 'icc-sm6350' into icc-next)
Merging iio/togreg (f9e057916428 staging: iio: adt7316: replace sprintf() with sysfs_emit())
Merging phy-next/next (3b64ea4768e7 phy: fsl-imx8mq-usb: support alternate reference clock)
Merging soundwire/next (96e539b24be5 soundwire: send multi sections in one BPT stream)
Merging extcon/extcon-next (b4338338aa3d extcon: usbc-tusb320: Make typec-power-opmode optional)
Merging gnss/gnss-next (f5ef3f722d76 dt-bindings: gnss: fix timepulse description)
Merging vfio/next (fa804aa4ac1b Merge tag 'vfio-v6.19-dma-buf-v9+' into v6.19/vfio/next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/kvmgt.c
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)
CONFLICT (content): Merge conflict in drivers/platform/Kconfig
CONFLICT (content): Merge conflict in drivers/platform/Makefile
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 (2b11e7403a8e dt-bindings: dma: xilinx: Simplify dma-coherent property)
Merging cgroup/for-next (004d6fbaf4fc Merge branch 'for-6.19' into for-next)
Merging scsi/for-next (87ff3a759db2 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (38725491e766 scsi: MAINTAINERS: Add the UFS include directory)
Merging vhost/linux-next (d4077573349a virtio_pci: drop kernel.h)
Merging rpmsg/for-next (5109461bc5c7 Merge branch 'rproc-next' into for-next)
Merging gpio-brgl/gpio/for-next (72eb5b1f5d7c Merge tag 'reset-gpio-for-v6.19-2' of https://git.pengutronix.de/git/pza/linux into gpio/for-next)
Merging gpio-intel/for-next (b2a186cced11 gpiolib: acpi: use min() instead of min_t())
Merging pinctrl/for-next (130eff6df1e4 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (8daf70e6aa41 Merge patch series "pinctrl: intel: Export intel_gpio_add_pin_ranges() and use it")
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 (cda323dbda76 pwm: bcm2835: Make sure the channel is enabled after pwm_request())
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 (a2f7990d3309 selftests: tracing: Update fprobe selftest for ftrace based fprobe)
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 (6e15364204db dax: add PROBE_PREFER_ASYNCHRONOUS to the hmem drivers)
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 (a45a80914e51 mshv: Add ioctl for self targeted passthrough hvcalls)
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 (ac35e04f8000 bus: mhi: host: pci_generic: Add Foxconn T99W760 modem)
Merging memblock/for-next (e68f150bc11d memblock: drop for_each_free_mem_pfn_range_in_zone_from())
Merging cxl/next (ea5514e30056 Merge branch 'for-6.19/cxl-misc' into cxl-for-next)
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (7a2ff00c3b5e docs: efi: add CPER functions to driver-api)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (1306f7457fb8 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 (1d80ca4ab4b2 selftests/landlock: Fix makefile header list)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging rust/rust-next (bc197e24a3ac rust: num: bounded: Always inline fits_within and from_expr)
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 3 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 (d1cadd4bfc28 nodemask: use min() instead of min_t())
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (07347b250fc9 kbuild: Enable GCC diagnostic context for value-tracking warnings)
Merging nolibc/for-next (1d573464749c selftests/nolibc: error out on linker warnings)
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 (9891d2f79a9f Clarify the rootid_owns_currentns)
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)

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists