Subject: linux-next: Tree for Jan 6

From: Stephen Rothwell <[email-masked]>
Date: Mon, 6 Jan 2025 18:27:31 +1100

Hi all,

Changes since 20241220:

New tree:	linus

The vfs-brauner-fixes tree gained a conflict against Linus' tree.

The mm tree lost its build failure.

The jc_docs tree gained a conflict against the mm tree.

The rdma tree gained conflicts against Linus' tree.

The nand tree gained a build failure so I used the version from
next-20241220.

The drm-intel tree gained a conflict against the mm tree.

The block tree lost its build failure.

The kvm-arm tree gained conflicts against the arm64 tree.

The kvm-x86 tree gained a conflict against the tip tree.

The driver-core tree gained semantic conflicts against the i2c and
leds-lj trees.

The usb tree gained a conflict against the qcom tree.

The iio tree gained a conflict against the char-misc.current tree.

The scsi-mkp tree gained a conflict against the scsi-fixes tree.

The pinctrl tree gained a build failure so I used the version from
next-20241220.

Non-merge commits (relative to Linus' tree): 5816
 6237 files changed, 274359 insertions(+), 98122 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 392 trees (counting Linus' and 150 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 (9244696b34f2 Merge tag 'kbuild-fixes-v6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2)
Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
Merging vfs-brauner-fixes/vfs.fixes (03f275adb8fb fuse: respect FOPEN_KEEP_CACHE on opendir)
CONFLICT (content): Merge conflict in fs/smb/client/smb2pdu.c
[fs-current 44f5f91f4e0e] Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
Merging fscrypt-current/for-current (8e929cb546ee Linux 6.12-rc3)
Merging fsverity-current/for-current (8e929cb546ee Linux 6.12-rc3)
Merging btrfs-fixes/next-fixes (d969d10fa064 Merge branch 'misc-6.13' into next-fixes)
Merging vfs-fixes/fixes (678379e1d4f7 close_range(): fix the logics in descriptor table trimming)
Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-backed mounts by default)
Merging nfsd-fixes/nfsd-fixes (7917f01a286c nfsd: restore callback functionality for NFSv4.0)
Merging v9fs-fixes/fixes/next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs)
Merging overlayfs-fixes/ovl-fixes (228a1157fb9f Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging bcachefs/for-next (432522786827 bcachefs: check_unreachable_inodes is not actually PASS_ONLINE yet)
Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (6034a359cbeb Merge branch 'for-next-next-v6.13-20250102' into for-next-20250102)
Merging ceph/master (18d44c5d062b ceph: allocate sparse_ext map only for sparse reads)
Merging cifs/for-next (fc033cf25e61 Linux 6.13-rc5)
Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance)
Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
Merging dlm/next (6784ed98fde5 dlm: return -ENOENT if no comm was found)
Merging erofs/dev (a80f578554b7 erofs: micro-optimize superblock checksum)
Merging exfat/dev (a5324b3a488d exfat: fix the infinite loop in __exfat_free_cluster())
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (71358f64c41b Merge inotify strcpy hardening.)
Merging ext4/dev (4bbf9020becb Linux 6.13-rc4)
Merging f2fs/dev (76f01376df39 f2fs: ensure that node info flags are always initialized)
Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3)
Merging fuse/for-next (78f2560fc9fa fuse: Set *nbytesp=0 in fuse_get_user_pages on allocation failure)
Merging gfs2/for-next (ead64b20f16e gfs2: reorder capability check last)
Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree)
Merging ksmbd/ksmbd-for-next (8ca03b74d2f7 ksmbd: Remove unneeded if check in ksmbd_rdma_capable_netdev())
Merging nfs/linux-next (4bbf9020becb Linux 6.13-rc4)
Merging nfs-anna/linux-next (867da60d463b nfs: avoid i_lock contention in nfs_clear_invalid_mapping)
Merging nfsd/nfsd-next (684ebeadf7a6 nfsd: implement OPEN_ARGS_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION)
Merging ntfs3/master (55ad333de0f8 fs/ntfs3: Unify inode corruption marking with _ntfs_bad_inode())
Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type)
Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function)
Merging ubifs/next (b29bf7119d6b jffs2: Fix rtime decompressor)
Merging v9fs/9p-next (e0260d530b73 net/9p/usbg: allow building as standalone module)
Merging v9fs-ericvh/ericvh/for-next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs)
Merging xfs/for-next (bf354410af83 Merge tag 'xfs-6.13-fixes_2024-12-12' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into next-rc)
Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (2d1a3e6a54e3 Merge branch 'vfs-6.14.libfs' into vfs.all)
Merging vfs/for-next (5cc68af412a9 fs/overlayfs/namei.c: get rid of include ../internal.h)
Merging mm-hotfixes/mm-hotfixes-unstable (b3078d126f29 mm: fix div by zero in bdi_ratio_from_pages)
Merging fs-current (f66a0bf4e753 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git)
Merging kbuild-current/fixes (385443057f47 kbuild: pacman-pkg: provide versioned linux-api-headers package)
Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3)
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 (926e86205897 arm64/signal: Silence sparse warning storing GCSPR_EL0)
Merging arm-soc-fixes/arm/fixes (a31ffd6ed5ee Merge tag 'arm-soc/for-6.13/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes)
Merging davinci-current/davinci/for-current (9852d85ec9d4 Linux 6.12-rc1)
Merging drivers-memory-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging sophgo-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging m68k-current/for-linus (647619b6bd27 m68k: defconfig: Update defconfigs for v6.12-rc1)
Merging powerpc-fixes/fixes (05aa156e156e powerpc/pseries/vas: Add close() callback in vas_vm_ops struct)
Merging s390-fixes/fixes (282da38b4653 s390/mm: Consider KMSAN modules metadata for paging levels)
Merging net/main (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging bpf/master (ccb98ccef0e5 Merge tag 'platform-drivers-x86-v6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86)
Merging ipsec/master (e952837f3ddb xfrm: state: fix out-of-bounds read during lookup)
Merging netfilter/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT)
Merging ipvs/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT)
Merging wireless/for-next (146b6057e1fd wifi: cw1200: Fix potential NULL dereference)
Merging ath/for-current (f1d3334d604c wifi: cfg80211: sme: init n_channels before channels[] access)
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (45d339fefaa3 RDMA/mlx5: Enable multiplane mode only when it is supported)
Merging sound-current/for-linus (8765429279e7 ALSA: seq: Check UMP support for midi_version change)
Merging sound-asoc-fixes/for-linus (32c9c06adb5b ASoC: mediatek: disable buffer pre-allocation)
Merging regmap-fixes/for-linus (fac04efc5c79 Linux 6.13-rc2)
Merging regulator-fixes/for-linus (13221496065f regulator: rename regulator-uv-survival-time-ms according to DT binding)
Merging spi-fixes/for-linus (7f9a1eed1ad8 spi: rockchip-sfc: Fix error in remove progress)
Merging pci-current/for-linus (bbefc2ff28b8 PCI/bwctrl: Fix NULL pointer deref on unbind and bind)
Merging driver-core.current/driver-core-linus (78d4f34e2115 Linux 6.13-rc3)
Merging tty.current/tty-linus (0cfc36ea5168 serial: stm32: use port lock wrappers for break control)
Merging usb.current/usb-linus (dfc51e48bca4 usb: gadget: f_fs: Remove WARN_ON in functionfs_bind)
Merging usb-serial-fixes/usb-linus (4bbf9020becb Linux 6.13-rc4)
Merging phy/fixes (17194c2998d3 phy: mediatek: phy-mtk-hdmi: add regulator dependency)
Merging staging.current/staging-linus (669bf56cb2a1 mailmap: update Bingwu Zhang's email address)
Merging iio-fixes/fixes-togreg (f248a1066cf0 iio: light: as73211: fix channel handling in only-color triggered buffer)
Merging counter-current/counter-current (fac04efc5c79 Linux 6.13-rc2)
Merging char-misc.current/char-misc-linus (997bb2d75646 Merge tag 'icc-6.13-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next)
Merging soundwire-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging thunderbolt-fixes/fixes (fc033cf25e61 Linux 6.13-rc5)
Merging input-current/for-linus (1863f213d3e8 Input: mma8450 - add chip ID check in probe)
Merging crypto-current/master (cd26cd654767 crypto: hisilicon/debugfs - fix the struct pointer incorrectly offset problem)
Merging vfio-fixes/for-linus (09dfc8a5f2ce vfio/pci: Fallback huge faults for unaligned pfn)
Merging kselftest-fixes/fixes (777f290ab328 selftests/ftrace: adjust offset for kprobe syntax error test)
Merging dmaengine-fixes/fixes (ebc008699fd9 dmaengine: tegra: Return correct DMA status when paused)
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (140054a25f85 mtd: rawnand: omap2: Fix build warnings with W=1)
Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
Merging v4l-dvb-fixes/fixes (8b55f8818900 media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef noinline)
Merging reset-fixes/reset/fixes (1f8af9712413 reset: rzg2l-usbphy-ctrl: Assign proper of node to the allocated device)
Merging mips-fixes/mips-fixes (40384c840ea1 Linux 6.13-rc1)
Merging at91-fixes/at91-fixes (40384c840ea1 Linux 6.13-rc1)
Merging omap-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging kvm-fixes/master (8afa5b10af9d Merge tag 'kvm-x86-fixes-6.13-rcN' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (5d450fc8360d selftests: kvm: s390: Add has device attr check to uc_attr_mem_limit selftest)
Merging hwmon-fixes/hwmon (4bbf9020becb Linux 6.13-rc4)
Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl)
Merging cxl-fixes/fixes (fc033cf25e61 Linux 6.13-rc5)
Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory)
Merging drivers-x86-fixes/fixes (7e16ae558a87 platform/x86: thinkpad-acpi: Add support for hotkey 0x1401)
Merging samsung-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging pinctrl-samsung-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging devicetree-fixes/dt/linus (8600058ba28a of: Add coreboot firmware to excluded default cells list)
Merging dt-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging scsi-fixes/fixes (3b2f56860b05 scsi: ufs: qcom: Power down the controller/device during system suspend for SM8550/SM8650 SoCs)
Merging drm-fixes/drm-fixes (273b3eb60071 Merge tag 'drm-xe-fixes-2025-01-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (20e7c5313ffb drm/i915/dg1: Fix power gate sequence.)
Merging mmc-fixes/fixes (8d90a86ed053 mmc: sdhci-msm: fix crypto key eviction)
Merging rtc-fixes/rtc-fixes (9852d85ec9d4 Linux 6.12-rc1)
Merging gnss-fixes/gnss-linus (40384c840ea1 Linux 6.13-rc1)
Merging hyperv-fixes/hyperv-fixes (175c71c2acee tools/hv: reduce resource usage in hv_kvp_daemon)
Merging risc-v-fixes/fixes (21f1b85c8912 riscv: mm: Do not call pmd dtor on vmemmap page table teardown)
Merging riscv-dt-fixes/riscv-dt-fixes (8d19d5a76bf6 riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions)
Merging riscv-soc-fixes/riscv-soc-fixes (48808b55b07c firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state())
Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1)
Merging spdx/spdx-linus (e70140ba0d2b Get rid of 'remove_new' relic from platform driver struct)
Merging gpio-brgl-fixes/gpio/for-current (8bd76b3d3f3a gpio: sim: lock up configfs that an instantiated device depends on)
Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1)
Merging pinctrl-intel-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging auxdisplay-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1)
Merging kunit-fixes/kunit-fixes (40384c840ea1 Linux 6.13-rc1)
Merging memblock-fixes/fixes (180bbad69864 arch_numa: Restore nid checks before registering a memblock with a node)
Merging renesas-fixes/fixes (124f4f1a1869 MAINTAINERS: Re-add cancelled Renesas driver sections)
Merging perf-current/perf-tools (434fffa926b1 perf probe: Fix uninitialized variable)
Merging efi-fixes/urgent (145ac100b637 efi/esrt: remove esre_attribute::store())
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (b3ded6072c56 power: supply: bq24190: Fix BQ24296 Vbus regulator support)
Merging iommufd-fixes/for-rc (2ca704f55e22 iommu/arm-smmu-v3: Improve uAPI comment for IOMMU_HW_INFO_TYPE_ARM_SMMUV3)
Merging rust-fixes/rust-fixes (78d4f34e2115 Linux 6.13-rc3)
Merging w1-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
Merging pmdomain-fixes/fixes (f64f610ec6ab pmdomain: core: add dummy release function to genpd device)
Merging i2c-host-fixes/i2c/i2c-host-fixes (fc033cf25e61 Linux 6.13-rc5)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (c38448100647 clk: clk-imx8mp-audiomix: fix function signature)
Merging pwrseq-fixes/pwrseq/for-current (40384c840ea1 Linux 6.13-rc1)
Merging thead-dt-fixes/thead-dt-fixes (40384c840ea1 Linux 6.13-rc1)
Merging ftrace-fixes/ftrace/fixes (ab9d98250259 ftrace: Fix function profiler's filtering functionality)
Merging ring-buffer-fixes/ring-buffer/fixes (8cd63406d081 trace/ring-buffer: Do not use TP_printk() formatting for boot mapped buffers)
Merging trace-fixes/trace/fixes (98feccbf32cf tracing: Prevent bad count for tracing_cpumask_write)
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
Merging spacemit-fixes/fixes (819837584309 Linux 6.12-rc5)
Merging tip-fixes/tip/urgent (ee68a3902eec Merge branch into tip/master: 'x86/urgent')
Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnreclaim for post charged objects)
Merging drm-msm-fixes/msm-fixes (789384eb1437 drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp)
Merging drm-misc-fixes/for-linux-next-fixes (79d67c499c3f drm: adv7511: Drop dsi single lane support)
Merging linus/for-next (4c538044ee2d vsprintf: don't make the 'binary' version pack small integer arguments)
Merging mm-stable/mm-stable (4bbf9020becb Linux 6.13-rc4)
Merging mm-nonmm-stable/mm-nonmm-stable (4bbf9020becb Linux 6.13-rc4)
Merging mm/mm-everything (447d70dd19fd foo)
Merging kbuild/for-next (b925599c78bc modpost: zero-pad CRC values in modversion_info array)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (ed60738a9b7e perf stat: Document and clarify outstate members)
Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
Merging dma-mapping/for-next (aef7ee7649e0 dma-debug: fix physical address calculation for struct dma_debug_entry)
Merging asm-generic/master (0af8e32343f8 empty include/asm-generic/vga.h)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (6139f7913689 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (41a262ab1ba4 Merge branches 'for-next/cpufeature', 'for-next/docs', 'for-next/misc' and 'for-next/mm' into for-next/core)
Merging arm-perf/for-next/perf (f3edf03a4c59 perf: imx9_perf: Introduce AXI filter version to refactor the driver and better extension)
Merging arm-soc/for-next (b5d57dcb2146 soc: document merges)
Merging amlogic/for-next (953913df9c3a Merge branch 'v6.15/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (2eff056a229e ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names)
Merging at91/at91-next (d4f7b84287de Merge branch 'at91-defconfig' into at91-next)
Merging broadcom/next (ed54a84051c6 Merge branch 'devicetree/next' into devicetree-arm64/next)
Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-rc1)
Merging drivers-memory/for-next (af995eea227f Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (f89ee1bb86d7 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (46ee8eaadb64 Merge branch 'v6.13-next/defconfig' into for-next)
Merging mvebu/for-next (5f55ff35bfaa Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (2179717e0b0c Merge branch 'omap-for-v6.14/drivers' into tmp/omap-next-20241213.091057)
Merging qcom/for-next (7511f8fd5520 Merge branches 'arm32-for-6.14', 'arm64-defconfig-for-6.14', 'arm64-fixes-for-6.13', 'arm64-for-6.14', 'clk-for-6.14' and 'drivers-for-6.14' into for-next)
Merging renesas/next (42263f922654 Merge branch 'renesas-dts-for-v6.14' into renesas-next)
Merging reset/reset/next (3d99f9231bed reset: amlogic: add support for A1 SoC in auxiliary reset driver)
Merging rockchip/for-next (af349ca4d3f8 Merge branch 'v6.14-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b25a097810df Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (b81ada150448 Merge tag 'scmi-updates-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (40384c840ea1 Linux 6.13-rc1)
Merging spacemit/for-next (6be78731556d riscv: defconfig: enable SpacemiT SoC)
Merging stm32/stm32-next (b7ebfb84a09d arm64: dts: st: enable imx335/csi/dcmipp pipeline on stm32mp257f-ev1)
  47d9d3c1d424 ("ARM: dts: stm32: add counter subnodes on stm32mp135f-dk")
  7db93f0277d9 ("arm64: dts: st: add csi & dcmipp node in stm32mp25")
  abf9b56d5dc5 ("ARM: dts: stm32: Swap USART3 and UART8 alias on STM32MP15xx DHCOM SoM")
  ae281e200680 ("ARM: dts: stm32: populate all timer counter nodes on stm32mp13")
  b7ebfb84a09d ("arm64: dts: st: enable imx335/csi/dcmipp pipeline on stm32mp257f-ev1")
  ba8ff583891a ("ARM: dts: stm32: populate all timer counter nodes on stm32mp15")
  db10d90e8f16 ("ARM: dts: stm32: add counter subnodes on stm32mp157c-ev1")
  ee843399b312 ("ARM: dts: stm32: add counter subnodes on stm32mp157 dk boards")
Merging sunxi/sunxi/for-next (cc47f07a40d6 Merge branches 'sunxi/clk-fixes-for-6.13', 'sunxi/dt-for-6.14' and 'sunxi/clk-for-6.14' into sunxi/for-next)
Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' into next)
Merging tegra/for-next (ca398b41b0a3 Merge branch for-6.14/arm/dt into for-next)
Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node)
Merging ti/ti-next (4ec85d2d13f1 Merge branches 'ti-drivers-soc-next' and 'ti-k3-maintainer-next' into ti-next)
Merging xilinx/for-next (18b1e1ae30c7 arm64: zynqmp: add clock-output-names property in clock nodes)
Merging clk/clk-next (b24529d75a73 Merge branch 'clk-samsung' into clk-next)
Merging clk-imx/for-next (48806be08636 clk: imx: Apply some clks only for i.MX93)
Merging clk-renesas/renesas-clk (75e050951f4f clk: renesas: r9a09g057: Add clock and reset entries for GIC)
Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
Merging loongarch/loongarch-next (7f71507851fc LoongArch: KVM: Protect kvm_io_bus_{read,write}() with SRCU)
Merging m68k/for-next (e419ddeabe7e m68k: Use kernel's generic muldi3 libgcc function)
Merging m68knommu/for-next (d02c39f0368b m68k: coldfire: Use proper clock rate for timers)
Merging microblaze/next (40384c840ea1 Linux 6.13-rc1)
Merging mips/mips-next (40384c840ea1 Linux 6.13-rc1)
Merging openrisc/for-next (252b06459e7a openrisc: migrate to the generic rule for built-in DTB)
Merging parisc-hd/for-next (df195d931a33 parisc: Remove memcpy_toio and memset_io)
Merging powerpc/next (26bef359bc4f powerpc: Use str_on_off() helper in check_cache_coherency())
Merging risc-v/for-next (fac04efc5c79 Linux 6.13-rc2)
Merging riscv-dt/riscv-dt-for-next (708d55db3edb riscv: dts: starfive: jh7110-milkv-mars: enable usb0 host function)
Merging riscv-soc/riscv-soc-for-next (a5362510bafc Merge branch 'riscv-config-for-next' into riscv-soc-for-next)
Merging s390/for-next (ef01cc10f319 Merge branch 'features' into for-next)
Merging sh/for-next (63e72e551942 sh: intc: Fix use-after-free bug in register_intc_controller())
Merging sparc/for-next (b6370b338e71 sparc/vdso: Add helper function for 64-bit right shift on 32-bit target)
Merging uml/next (bed2cc482600 hostfs: Fix the NULL vs IS_ERR() bug for __filemap_get_folio())
Merging xtensa/xtensa-for-next (d14b9a713b34 xtensa/simdisk: Use str_write_read() helper in simdisk_transfer())
Merging fs-next (8239d77b3fdd Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
  15858da53542 ("selftests: coredump: Add stackdump test")
  ab251dacfbae ("fs/proc: do_task_stat: Fix ESP not readable during coredump")
Merging printk/for-next (9022df7f5e05 Merge branch 'for-6.14-cpu_sync-fixup' into for-next)
Merging pci/next (95227799c87f Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9852d85ec9d4 Linux 6.12-rc1)
Merging hid/for-next (2f18ba6583d1 Merge branch 'for-6.13/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (3cfe39b3a845 i2c: Replace list-based mechanism for handling userspace-created clients)
Merging i2c-host/i2c/i2c-host (5b3114631def i2c: amd756: Fix endianness handling for word data)
Merging i3c/i3c/next (6cf7b65f7029 i3c: Use i3cdev->desc->info instead of calling i3c_device_get_info() to avoid deadlock)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (6071d10413ff hwmon: (lm75) add I3C support for P3T1755)
Merging jc_docs/docs-next (9339d3587cff Merge branch 'docs-mw' into docs-next)
CONFLICT (content): Merge conflict in scripts/checkpatch.pl
Merging v4l-dvb/next (2762eab6d414 media: uvcvideo: Add Kurokesu C1 PRO camera)
Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
Merging pm/linux-next (84dd70b4c33d Merge branch 'thermal-intel' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (af6cc45af3db cpufreq: sparc: change kzalloc to kcalloc)
Merging cpupower/cpupower (8d097444982d pm: cpupower: Add header changes for cpufreq.h to SWIG bindings)
Merging devfreq/devfreq-next (1f8ac4b95fee PM / devfreq: Switch back to struct platform_driver::remove())
CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-nocp.c
CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-ppmu.c
CONFLICT (content): Merge conflict in drivers/devfreq/mtk-cci-devfreq.c
CONFLICT (content): Merge conflict in drivers/devfreq/rk3399_dmc.c
CONFLICT (content): Merge conflict in drivers/devfreq/sun8i-a33-mbus.c
Merging pmdomain/next (094041b17654 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (b44b9bc7cab2 OPP: fix dev_pm_opp_find_bw_*() when bandwidth table not initialized)
Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe)
Merging rdma/for-next (220043b06fde RDMA/mlx5: Fix link status down event for MPV)
CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_net.c
CONFLICT (content): Merge conflict in drivers/infiniband/sw/siw/siw_main.c
CONFLICT (content): Merge conflict in drivers/infiniband/sw/siw/siw_verbs.c
Applying: fix up for "RDMA/rxe: Remove deliver net device event"
Merging net-next/main (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
Merging bpf-next/for-next (69f0f830dad8 Merge branch 'bpf-next/master' into for-next)
Merging ipsec-next/master (59af653a6998 Merge branch 'Add IP-TFS mode to xfrm')
Merging mlx5-next/mlx5-next (aeb3ec990269 net/mlx5: Add device cap abs_native_port_num)
Merging netfilter-next/main (4b252f2dab2e Merge branch 'selftests-net-packetdrill-import-multiple-tests')
Merging ipvs-next/main (f3674384709b Merge branch 'net-smc-two-features-for-smc-r')
Merging bluetooth/master (514e14b1a7c3 Bluetooth: MGMT: Mark LL Privacy as stable)
Merging wireless-next/for-next (b73e56f16250 Merge branch 'xdp-a-fistful-of-generic-changes-pt-iii')
Merging ath-next/for-next (578f6fc55c2c wifi: ath12k: Fix spelling mistake "requestted" -> "requested")
Merging wpan-next/master (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
Merging wpan-staging/staging (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
Merging mtd/mtd/next (02ba194feacb mtd: mchp48l640: add support for Fujitsu MB85RS128TY FRAM)
Merging nand/nand/next (8d3cd6b87557 Merge tag 'mtd/qcom-reorg-for-spi-6.14' into nand/next)
$ git reset --hard HEAD^
Merging next-20241220 version of nand
Merging spi-nor/spi-nor/next (93e00ccab5f7 mtd: spi-nor: macronix: remove mx25u25635f from parts list to enable SFDP)
Merging crypto/master (7fa481734016 crypto: ahash - make hash walk functions private to ahash.c)
Merging drm/drm-next (d678c63534ed Merge tag 'drm-misc-next-2024-12-19' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
Merging drm-exynos/for-linux-next (31b2be07afd0 drm/exynos: Remove unnecessary checking)
Merging drm-misc/for-linux-next (938fbb16aba8 drm/rockchip: vop2: Support 32x8 superblock afbc)
Merging amdgpu/drm-next (a317017f47f6 drm/amd/display: Reapply fdedd77b0eb3)
Merging drm-intel/for-linux-next (60a43ecbd59d drm/i915/ddi: only call shutdown hooks for valid encoders)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_driver.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dsb.c
Merging drm-msm/msm-next (a5463629299b drm/msm/dpu: Add RM support for allocating CWB)
Merging drm-msm-lumag/msm-next-lumag (a5463629299b drm/msm/dpu: Add RM support for allocating CWB)
Merging drm-xe/drm-xe-next (6acea03f98f5 drm/xe: Remove "graphics tile" from kernel doc)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec_queue.c
Applying: fix up for "drm/xe/ptl: Add another PTL PCI ID"
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (bec73681d492 fbdev: omapfb: Remove unused hdmi5_core_handle_irqs)
Merging regmap/for-next (eb708cd631a8 regmap: regmap_multi_reg_read(): make register list const)
Merging sound/for-next (9001d5154435 ALSA: seq: Make dependency on UMP clearer)
Merging ieee1394/for-next (ce4339d021c4 firewire: ohci: use generic power management)
Merging sound-asoc/for-next (f03669d2cd2d Merge remote-tracking branch 'asoc/for-6.14' into asoc-next)
Merging modules/modules-next (8a231a18ec79 module: Constify 'struct module_attribute')
Merging input/next (21d8dd0daf4c Input: use guard notation in input core)
Merging block/for-next (0188c28352ed Merge branch 'for-6.14/block' into for-next)
Merging device-mapper/for-next (bab4d7a18e2a dm: change kzalloc to kcalloc)
Merging libata/for-next (7b64859fde26 ata: sata_gemini: Remove remaining reset glue)
Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
Merging mmc/next (741521fa273f mmc: sdhci-msm: convert to use custom crypto profile)
Merging mfd/for-mfd-next (c2b148f3bc94 mfd: Add support for AAEON UP board FPGA)
CONFLICT (content): Merge conflict in drivers/mfd/cs42l43.c
Merging backlight/for-backlight-next (40384c840ea1 Linux 6.13-rc1)
Merging battery/for-next (a3a8799165ff platform/x86: dell-laptop: Use power_supply_charge_types_show/_parse() helpers)
Merging regulator/for-next (8100d74e2ea1 Merge remote-tracking branch 'regulator/for-6.14' into regulator-next)
Merging security/next (714d87c90a76 lockdown: initialize local array before use to quiet static analysis)
Merging apparmor/apparmor-next (40384c840ea1 Linux 6.13-rc1)
Merging integrity/next-integrity (4785ed362a24 ima: ignore suffixed policy rule comments)
Merging selinux/next (bfbf0ee6c84f Automated merge of 'dev' into 'next')
Merging smack/next (6f71ad02aae8 smack: deduplicate access to string conversion)
Merging tomoyo/master (dc46fafd6ecb tomoyo: automatically use patterns for several situations in learning mode)
Merging tpmdd/next (2ba9f676d0a2 Merge tag 'drm-next-2024-11-29' of https://gitlab.freedesktop.org/drm/kernel)
Merging watchdog/master (cc0dc9e871a9 watchdog: stm32_iwdg: fix error message during driver probe)
Merging iommu/next (d270bf624181 Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'riscv', 'core' and 'amd/amd-vi' into next)
Merging audit/next (8bea8f86f7a1 Automated merge of 'dev' into 'next')
Merging devicetree/for-next (5b0417b8bb1b dt-bindings: mfd: mediatek: mt6397: Add bindings for MT6328)
Merging dt-krzk/for-next (dcdd69c1e196 Merge branch 'next/dt' into for-next)
Merging mailbox/for-next (7f9e19f207be mailbox: pcc: Check before sending MCTP PCC response ACK)
Merging spi/for-next (36e011f3e1b0 Merge remote-tracking branch 'spi/for-6.14' into spi-next)
Merging tip/master (af2c8596bd2e Merge branch into tip/master: 'x86/tdx')
CONFLICT (content): Merge conflict in include/linux/mm.h
CONFLICT (content): Merge conflict in include/linux/mm_types.h
CONFLICT (content): Merge conflict in include/linux/mmap_lock.h
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in mm/init-mm.c
CONFLICT (content): Merge conflict in tools/testing/vma/vma_internal.h
Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties)
Merging edac/edac-for-next (36e45ffa7e61 Merge ras/edac-drivers into for-next)
CONFLICT (content): Merge conflict in drivers/edac/i10nm_base.c
Merging ftrace/for-next (23c931b4d61d Merge tools/for-next)
Merging rcu/next (4b5c2205526c Merge branches 'fixes.2024.12.14a', 'rcutorture.2024.12.14a', 'srcu.2024.12.14a' and 'torture-test.2024.12.14a' into rcu-merge.2024.12.14a)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging paulmck/non-rcu/next (b6f62437f431 Merge branches 'csd-lock.2024.10.11a', 'lkmm.2024.11.09a' and 'scftorture.2024.11.09a', tag 'nolibc.2024.11.01a' into HEAD)
Merging kvm/next (10b2c8a67c4b Merge tag 'kvm-x86-fixes-6.13-rcN' of https://github.com/kvm-x86/linux into HEAD)
Merging kvm-arm/next (00163be8bb59 Merge branch kvm-arm64/nv-timers into kvmarm-master/next)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_emulate.h
CONFLICT (content): Merge conflict in arch/arm64/kvm/fpsimd.c
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/nvhe/pkvm.c
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/nvhe/switch.c
Merging kvms390/next (7a1f3143377a KVM: s390: selftests: Add regression tests for PFCR subfunctions)
Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2)
Merging kvm-riscv/riscv_kvm_next (af79caa83f6a RISC-V: KVM: Add new exit statstics for redirected traps)
Merging kvm-x86/next (13e98294d7ce Merge branches 'fixes', 'misc', 'mmu', 'svm', 'vcpu_array' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
Merging xen-tip/linux-next (fac04efc5c79 Linux 6.13-rc2)
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 (d57212f281fd workqueue: add printf attribute to __alloc_workqueue())
Merging sched-ext/for-next (37e6cc1c0c68 Merge branch 'for-6.14' into for-next)
Merging drivers-x86/for-next (6b228cfc52a6 alienware-wmi: Use devm_platform_profile_register())
Merging chrome-platform/for-next (df78050d1a13 platform/chrome: Update ChromeOS EC command tracing)
Merging chrome-platform-firmware/for-firmware-next (7543d5702c2c firmware: google: vpd: Use const 'struct bin_attribute' callback)
Merging hsi/for-next (40384c840ea1 Linux 6.13-rc1)
Merging leds-lj/for-leds-next (29df7025cff0 leds: pwm-multicolor: Disable PWM when going to suspend)
Merging ipmi/for-next (fb26183667d3 ipmi: ssif_bmc: Move smbus_cmd assignment after cleanup)
Merging driver-core/driver-core-next (7687c66c18c6 kunit: platform: Resolve 'struct completion' warning)
Applying: fix up for "driver core: Constify API device_find_child() and adapt for various usages"
Applying: fix up 2 for "driver core: Constify API device_find_child() and adapt for various usages"
Merging usb/usb-next (f1a2241778d9 usb: typec: ucsi: Implement ChromeOS UCSI driver)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
Merging thunderbolt/next (43d84701d2aa thunderbolt: Expose router DROM through debugfs)
Merging usb-serial/usb-next (4bbf9020becb Linux 6.13-rc4)
Merging tty/tty-next (2c1fd53af21b serial: amba-pl011: Fix RTS handling in RS485 mode)
Merging char-misc/char-misc-next (148b88be249a MAINTAINERS: add slimbus documentation)
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 (56e14a21cee4 coresight-tpda: Optimize the function of reading element size)
Merging fastrpc/for-next (652631fe700a Merge branch 'fastrpc-for-6.14' into fastrpc-for-next)
Merging fpga/for-next (46b155acbf4e fpga: dfl: destroy/recreate feature platform device on port release/assign)
Merging icc/icc-next (e20f7bfcd21e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (627f3c41ca00 iio: light: veml3235: extend regmap to add cache)
CONFLICT (content): Merge conflict in drivers/iio/adc/ti-ads1119.c
Merging phy-next/next (af1bc0ebe743 dt-bindings: phy: qcom,qmp-pcie: document the SM8350 two lanes PCIe PHY)
Merging soundwire/next (74148bb59e20 soundwire: amd: clear wake enable register for power off mode)
Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging gnss/gnss-next (40384c840ea1 Linux 6.13-rc1)
Merging vfio/next (fe4bf8d0b671 vfio/pci: Properly hide first-in-list PCIe extended capability)
Merging w1/for-next (419a40cc2bdd w1: core: use sysfs_emit() instead of sprintf())
Merging spmi/spmi-next (a45e4aa263d6 spmi: Set fwnode for spmi devices)
Merging staging/staging-next (33bd6465275a staging: vme_user: vme_tsi148.c: avoid parenthesis line ending)
Merging counter-next/counter-next (fac04efc5c79 Linux 6.13-rc2)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (49a9b01803e4 mux: constify mux class)
Merging dmaengine/next (98d187a98903 dmaengine: idxd: Enable Function Level Reset (FLR) for halt)
Merging cgroup/for-next (9b496a8bbed9 cgroup/cpuset: Prevent leakage of isolated CPUs into sched domains)
Merging scsi/for-next (1fb3855b8a12 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (9673c075d8ee scsi: documentation: Corrections for struct updates)
CONFLICT (content): Merge conflict in drivers/ufs/host/ufs-qcom.c
Merging vhost/linux-next (6a39bb15b3d1 virtio_vdpa: remove redundant check on desc)
Merging rpmsg/for-next (dbb9c372555c remoteproc: mtk_scp: Only populate devices for SCP cores)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (b97263d14cd6 dt-bindings: gpio: fairchild,74hc595: Document chip select vs. latch clock)
Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped())
Merging pinctrl/for-next (e5fc03a0d7c6 Merge branch 'devel' into for-next)
$ git reset --hard HEAD^
Merging next-20241220 version of pinctrl
Merging pinctrl-intel/for-next (40384c840ea1 Linux 6.13-rc1)
Merging pinctrl-renesas/renesas-pinctrl (829356da700b pinctrl: renesas: rzg2l: Add support for RZ/G3E SoC)
Merging pinctrl-samsung/for-next (0ebb1e9e1b12 pinctrl: samsung: update child reference drop comment)
Merging pwm/pwm/for-next (cce16e7f6216 pwm: stm32-lp: Add check for clk_enable())
Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex)
Merging kselftest/next (2f32bdc4bbcd selftests/ring-buffer: Add test for out-of-bound pgoff mapping)
Merging kunit/test (40384c840ea1 Linux 6.13-rc1)
Merging kunit-next/kunit (40384c840ea1 Linux 6.13-rc1)
Merging livepatching/for-next (7e17e80c3a7e Merge branch 'for-6.14/stack-order' into for-next)
Merging rtc/rtc-next (e0779a0dcf41 rtc: ab-eoz9: don't fail temperature reads on undervoltage notification)
Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations)
Merging at24/at24/for-next (40384c840ea1 Linux 6.13-rc1)
Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers)
Merging seccomp/for-next/seccomp (8cf8dfceebda seccomp: Stub for !HAVE_ARCH_SECCOMP_FILTER)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (40384c840ea1 Linux 6.13-rc1)
Merging nvmem/for-next (40384c840ea1 Linux 6.13-rc1)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (26e1b813fcd0 iommu/hyper-v: Don't assume cpu_possible_mask is dense)
Merging auxdisplay/for-next (93b216cb312d auxdisplay: img-ascii-lcd: Constify struct img_ascii_lcd_config)
Merging kgdb/kgdb/for-next (24b2455fe8fc kdb: fix ctrl+e/a/f/b/d/p/n broken in keyboard mode)
Merging hmm/hmm (40384c840ea1 Linux 6.13-rc1)
Merging cfi/cfi/next (40384c840ea1 Linux 6.13-rc1)
Merging mhi/mhi-next (9241459b3cc2 bus: mhi: host: pci_generic: Add support for QDU100 device)
Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE)
Merging cxl/next (2f84d072bdcb cxl/pci: Add CXL Type 1/2 support to cxl_dvsec_rr_decode())
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (7f0158f3ee12 efi/libstub: Avoid legacy decompressor zlib/zstd wrappers)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (c44d336ad5ba mm/slab: Move kvfree_rcu() into SLAB)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: fix up for "mm/slab: Move kvfree_rcu() into SLAB"
Merging random/master (d18c13697b4d prandom: Include <linux/percpu.h> in <linux/prandom.h>)
Merging landlock/next (78d4f34e2115 Linux 6.13-rc3)
Merging rust/rust-next (0c5928deada1 rust: block: fix formatting in GenDisk doc)
CONFLICT (content): Merge conflict in rust/kernel/miscdevice.rs
CONFLICT (content): Merge conflict in rust/kernel/security.rs
Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache())
Merging execve/for-next/execve (c7c1167fcbbd Merge branch 'for-next/topic/execve/core' into for-next/execve)
Merging bitmap/bitmap-for-next (7f15d4abf925 cpu: Remove unused init_cpu_online)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (d9a67659846f Merge branch 'for-linus/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (40384c840ea1 Linux 6.13-rc1)
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (11534b4de2a1 iommufd: Deal with IOMMU_HWPT_FAULT_ID_VALID in iommufd core)
Merging turbostat/next (75de0ab82fb4 tools/power turbostat: Add an NMI column)
Merging pwrseq/pwrseq/for-next (93e3c990fcd9 power: sequencing: qcom-wcn: add support for the WCN6750 PMU)
Merging capabilities-next/caps-next (d48da4d5ed7b security: add trace event for cap_capable)
Merging ipe/next (d881f0eb6f23 scripts: ipe: polgen: remove redundant close and error exit path)
Merging kcsan/next (b86f7c9fad06 kcsan: Remove redundant call of kallsyms_lookup_name())
Merging crc/crc-next (72914faebaab MAINTAINERS: add entry for CRC library)
Merging kthread/for-next (8c33e5711a2d rcu: Use kthread preferred affinity for RCU exp kworkers)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)