Message-ID: <20250512202126.23f3805a@canb.auug.org.au>
Date: Mon, 12 May 2025 20:21:26 +1000
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 May 12

Hi all,

Changes since 20250509:

I reverted a commit from the powerpc tree that is causing build failures
with some configurations.

I applied a supplied patch to the pci tree for a build problem.

The devfreq tree gained a build failure so I used the version from
next-20250509.

The tip tree gained a conflict against the pm tree.

The rust tree gaind a build failure most likely to needing a better
merge resolution.  I have used the version from next-20250509.

Non-merge commits (relative to Linus' tree): 9475
 9495 files changed, 406607 insertions(+), 201201 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 399 trees (counting Linus' and 152 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 (82f2b0b97b36 Linux 6.15-rc6)
Merging fixes/fixes (b3c623b9a94f Merge tag 'thermal-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
Merging vfs-brauner-fixes/vfs.fixes (04679f3c27e1 fs: Remove redundant errseq_set call in mark_buffer_write_io_error.)
Merging fscrypt-current/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging fsverity-current/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging btrfs-fixes/next-fixes (076ca6e90d5a Merge branch 'misc-6.15' into next-fixes)
Merging vfs-fixes/fixes (d1ddc6f1d9f0 fix IS_MNT_PROPAGATING uses)
Merging erofs-fixes/fixes (35076d2223c7 erofs: ensure the extra temporary copy is valid for shortened bvecs)
Merging nfsd-fixes/nfsd-fixes (831e3f545b07 Revert "sunrpc: clean cache_detail immediately when flush is written frequently")
Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
Merging overlayfs-fixes/ovl-fixes (924577e4f6ca ovl: Fix nested backing file paths)
Merging bcachefs/for-next (1ca3c920df73 bcachefs: Don't rewind recovery if not in recovery)
Merging fscrypt/for-next (c07d3aede2b2 fscrypt: add support for hardware-wrapped keys)
Merging btrfs/for-next (f235d2ae8de7 Merge branch 'for-next-next-v6.15-20250507' into for-next-20250507)
Merging ceph/master (f452a2204614 ceph: Fix incorrect flush end position calculation)
Merging cifs/for-next (d198153ae687 smb: client: fix delay on concurrent opens)
Merging configfs/configfs-next (bbb67d4f85fd configfs: Correct error value returned by API config_item_set_name())
Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
Merging dlm/next (6f8b4788266c dlm: drop SCTP Kconfig dependency)
Merging erofs/dev (0f24e3c05afe erofs: enable 48-bit layout support)
Merging exfat/dev (7819f9549ec0 exfat: do not clear volume dirty flag during sync)
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
Merging ext3/for_next (119ad4e53787 Merge UDF warning fix)
Merging ext4/dev (94824ac9a8aa ext4: fix off-by-one error in do_split)
Merging f2fs/dev (80f31d2a7e5f f2fs: return bool from __write_node_folio)
Merging fsverity/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging fuse/for-next (d83a1e80bf7d fs/fuse: fix race between concurrent setattr from multiple nodes)
Merging gfs2/for-next (4b6f23f4cf26 gfs2: Don't call gfs2_jdata_writepages during journal flush)
Merging jfs/jfs-next (5dff41a86377 jfs: fix array-index-out-of-bounds read in add_missing_indices)
Merging ksmbd/ksmbd-for-next (0f0730b5c43f ksmbd: fix stream write failure)
Merging nfs/linux-next (fa7ab64f1e2f NFS/localio: Fix a race in nfs_local_open_fh())
Merging nfs-anna/linux-next (9084ed79ddaa lsm,nfs: fix memory leak of lsm_context)
Merging nfsd/nfsd-next (049432a58492 nfsd: remove legacy dprintks from GETATTR and STATFS codepaths)
Merging ntfs3/master (8b26c8c376b2 fs/ntfs3: Add missing direct_IO in ntfs_aops_cmpr)
Merging orangefs/for-next (121a83ce6fe6 orangefs: Bufmap deadcoding)
Merging overlayfs/overlayfs-next (b87e2318cdaa vfs: change 'struct file *' argument to 'const struct file *' where possible)
Merging ubifs/next (69146a8c893f ubi: ubi_get_ec_info: Fix compiling error 'cast specifies array type')
Merging v9fs/9p-next (4210030d8bc4 docs: fs/9p: Add missing "not" in cache documentation)
Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
Merging xfs/for-next (c1f3d281226a Merge branch 'deprecated_bufd-6.16' into for-next)
Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
Merging vfs-brauner/vfs.all (267880e908bd Merge branch 'vfs-6.16.iomap' into vfs.all)
Merging vfs/for-next (2e72b1e0aac2 Merge branch 'work.d_revalidate' into for-next)
Merging mm-hotfixes/mm-hotfixes-unstable (653503b444c2 mm: userfaultfd: correct dirty flags set for both present and swap pte)
Merging fs-current (80fefc4da738 Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git)
Merging kbuild-current/fixes (80e54e84911a Linux 6.14-rc6)
Merging arc-current/for-curr (6ab657d8d2a4 ARC: unwind: Use built-in sort swap to reduce code size and improve performance)
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 (363cd2b81cfd arm64: cpufeature: Move arm64_use_ng_mappings to the .data section to prevent wrong idmap generation)
Merging arm-soc-fixes/arm/fixes (15eaaa71e8ef Merge tag 'imx-fixes-6.15-2' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes)
Merging davinci-current/davinci/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging drivers-memory-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging sophgo-fixes/fixes (3e6244429ba3 riscv: dts: sophgo: fix DMA data-width configuration for CV18xx)
Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging m68k-current/for-linus (c94cf023dce3 m68k: defconfig: Update defconfigs for v6.14-rc1)
Merging powerpc-fixes/fixes (e3f506b78d92 powerpc/boot: Fix dash warning)
Merging s390-fixes/fixes (05a2538f2b48 s390/pci: Fix duplicate pci_dev_put() in disable_slot() when PF has child VFs)
Merging net/main (4d64321c4f6f Merge tag 'batadv-net-pullrequest-20250509' of git://git.open-mesh.org/linux-merge)
Merging bpf/master (b4432656b36e Linux 6.15-rc4)
Merging ipsec/master (417fae2c4089 xfrm: ipcomp: fix truesize computation on receive)
Merging netfilter/main (3c44b2d615e6 Merge branch 'virtio-net-fix-total-qstat-values')
Merging ipvs/main (491ef1117c56 net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration)
Merging wireless/for-next (2c89c1b655c0 Merge tag 'net-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ath/for-current (9540984da649 Merge tag 'wireless-2025-05-06' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless)
Merging iwlwifi/fixes (30763f1adf69 Merge tag 'wireless-2025-04-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless)
Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
Merging rdma-fixes/for-rc (d0706bfd3ee4 RDMA/core: Fix "KASAN: slab-use-after-free Read in ib_register_device" problem)
Merging sound-current/for-linus (dd33993a9721 ALSA: ump: Fix a typo of snd_ump_stream_msg_device_info)
Merging sound-asoc-fixes/for-linus (6052f05254b4 ASoc: SOF: topology: connect DAI to a single DAI link)
Merging regmap-fixes/for-linus (433a06b68324 Merge remote-tracking branch 'regmap/for-6.14' into regmap-linus)
Merging regulator-fixes/for-linus (92a09c47464d Linux 6.15-rc5)
Merging spi-fixes/for-linus (e979a7c79fbc spi: tegra114: Use value to check for invalid delays)
Merging pci-current/for-linus (69dcbfec5f02 MAINTAINERS: Update Krzysztof Wilczyński email address)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging driver-core.current/driver-core-linus (95deee37a123 platform: Fix race condition during DMA configure at IOMMU probe time)
Merging tty.current/tty-linus (b4432656b36e Linux 6.15-rc4)
Merging usb.current/usb-linus (cab63934c33b xhci: dbc: Avoid event polling busyloop if pending rx transfers are inactive.)
Merging usb-serial-fixes/usb-linus (b4432656b36e Linux 6.15-rc4)
Merging phy/fixes (9cf118aafd66 phy: rockchip-samsung-dcphy: Add missing assignment)
Merging staging.current/staging-linus (c6e8d85fafa7 staging: axis-fifo: Remove hardware resets for user errors)
Merging iio-fixes/fixes-togreg (e2f820014239 iio: imu: inv_icm42600: Fix temperature calculation)
Merging counter-current/counter-current (7351312632e8 counter: interrupt-cnt: Protect enable/disable OPs with mutex)
Merging char-misc.current/char-misc-linus (65995e97a1ca Drivers: hv: Make the sysfs node size for the ring buffer dynamic)
Merging soundwire-fixes/fixes (fd15594ba7d5 soundwire: bus: Fix race on the creation of the IRQ domain)
Merging thunderbolt-fixes/fixes (0f73628e9da1 thunderbolt: Do not double dequeue a configuration request)
Merging input-current/for-linus (93406e9d0240 Input: xpad - fix xpad_device sorting)
Merging crypto-current/master (a32f1923c6d6 crypto: scompress - increment scomp_scratch_users when already allocated)
Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to order)
Merging kselftest-fixes/fixes (07be53cfa81a selftests/ftrace: Differentiate bash and dash in dynevent_limitations.tc)
Merging dmaengine-fixes/fixes (305245a2e1d6 dmaengine: ptdma: Move variable condition check to the first place and remove redundancy)
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
Merging mtd-fixes/mtd/fixes (1c1fd374a2fe mtd: spinand: Fix build with gcc < 7.5)
Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
Merging v4l-dvb-fixes/fixes (d51adf038ebe media: cec: tda9950: add back i2c dependency)
Merging reset-fixes/reset/fixes (38fec10eb60d Linux 6.14)
Merging mips-fixes/mips-fixes (c44572e0cc13 MIPS: Fix MAX_REG_OFFSET)
Merging at91-fixes/at91-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging omap-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging kvm-fixes/master (add20321af2f Merge tag 'kvm-x86-fixes-6.15-rcN' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure)
Merging hwmon-fixes/hwmon (9c32cda43eb7 Linux 6.15-rc3)
Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl)
Merging cxl-fixes/fixes (078d3ee7c162 cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports)
Merging dma-mapping-fixes/dma-mapping-fixes (89461db349cc dma-coherent: Warn if OF reserved memory is beyond current coherent DMA mask)
Merging drivers-x86-fixes/fixes (bfcfe6d335a9 platform/x86: asus-wmi: Fix wlan_ctrl_by_user detection)
Merging samsung-krzk-fixes/fixes (dd303e021996 soc: samsung: usi: prevent wrong bits inversion during unconfiguring)
Merging pinctrl-samsung-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging devicetree-fixes/dt/linus (d5f49921707c dt-bindings: soc: fsl: fsl,ls1028a-reset: Fix maintainer entry)
Merging dt-krzk-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging scsi-fixes/fixes (0e9693b97a0e scsi: ufs: core: Remove redundant query_complete trace)
Merging drm-fixes/drm-fixes (c2c64ed09c7b Merge tag 'drm-intel-fixes-2025-05-09' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (732b87a40966 drm/i915/dp: Fix determining SST/MST mode during MTP TU state computation)
Merging mmc-fixes/fixes (77183db6b8db mmc: renesas_sdhi: disable clocks if registering regulator failed)
Merging rtc-fixes/rtc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging gnss-fixes/gnss-linus (9c32cda43eb7 Linux 6.15-rc3)
Merging hyperv-fixes/hyperv-fixes (14ae3003e73e Drivers: hv: Fix bad ref to hv_synic_eventring_tail when CPU goes offline)
Merging risc-v-fixes/fixes (01534f3e0dd7 Merge tag 'riscv-fixes-6.15-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux into fixes)
Merging riscv-dt-fixes/riscv-dt-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1)
Merging spdx/spdx-linus (0af2f6be1b42 Linux 6.15-rc1)
Merging gpio-brgl-fixes/gpio/for-current (b4432656b36e Linux 6.15-rc4)
Merging gpio-intel-fixes/fixes (2014c95afece Linux 6.14-rc1)
Merging pinctrl-intel-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging auxdisplay-fixes/fixes (2014c95afece Linux 6.14-rc1)
Merging kunit-fixes/kunit-fixes (b26c1a85f3fc kunit: qemu_configs: SH: Respect kunit cmdline)
Merging memblock-fixes/fixes (da8bf5daa5e5 memblock: Accept allocated memory before use in memblock_double_array())
Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
Merging perf-current/perf-tools (8988c4b91945 perf tools: Fix in-source libperf build)
Merging efi-fixes/urgent (11092db5b573 efivarfs: fix NULL dereference on resume)
Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging iommufd-fixes/for-rc (0af2f6be1b42 Linux 6.15-rc1)
Merging rust-fixes/rust-fixes (82f2b0b97b36 Linux 6.15-rc6)
Merging w1-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging pmdomain-fixes/fixes (13a6d4265665 pmdomain: renesas: rcar: Remove obsolete nullify checks)
Merging i2c-host-fixes/i2c/i2c-host-fixes (10aba126bc86 MAINTAINERS: Remove entry for Seth Heasley)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (2bc3ada0906f Merge tag 'v6.15-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-fixes)
Merging thead-clk-fixes/thead-clk-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging pwrseq-fixes/pwrseq/for-current (0af2f6be1b42 Linux 6.15-rc1)
Merging thead-dt-fixes/thead-dt-fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging ftrace-fixes/ftrace/fixes (2fa6a01345b5 tracing: Fix memory leak when reading set_event file)
Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio())
Merging trace-fixes/trace/fixes (0a8f11f8569e tracing: Do not take trace_event_sem in print_event_fields())
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
Merging spacemit-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
Merging tip-fixes/tip/urgent (132e896f0ee5 Merge branch into tip/master: 'x86/urgent')
Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up slab->obj_exts always)
Merging drm-msm-fixes/msm-fixes (9d78f0250322 drm/msm/a6xx+: Don't let IB_SIZE overflow)
Merging uml-fixes/fixes (01f95500a162 Merge tag 'uml-for-linux-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux)
Merging fwctl-fixes/for-rc (c92ae5d4f53e fwctl: Fix repeated device word in log message)
Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops)
Merging drm-misc-fixes/for-linux-next-fixes (eb0851e14432 drm/meson: Use 1000ULL when operating with mode->clock)
Merging linus/for-next (ffd294d346d1 Linux 6.13)
Merging mm-stable/mm-stable (92a09c47464d Linux 6.15-rc5)
Merging mm-nonmm-stable/mm-nonmm-stable (92a09c47464d Linux 6.15-rc5)
Merging mm-unstable/mm-unstable (c68cfbc5048e sched/numa: add statistics of numa balance task migration)
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging mm-nonmm-unstable/mm-nonmm-unstable (e4edaa6377fd fork: define a local GFP_VMAP_STACK)
Merging kbuild/for-next (188d818d66b7 init: remove unused CONFIG_CC_CAN_LINK_STATIC)
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
Merging perf/perf-tools-next (cd17a9b1a779 perf test demangle-ocaml: Switch to using dso__demangle_sym())
Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
Merging dma-mapping/dma-mapping-for-next (3ee7d9496342 docs: core-api: document the IOVA-based API)
Merging asm-generic/master (852faf805539 gcc-plugins: remove SANCOV gcc plugin)
Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
Merging arm/for-next (96e0b3558830 ARM: 9447/1: arm/memremap: fix arch_memremap_can_ram_remap())
Merging arm64/for-next/core (1774071d974d Merge branches 'for-next/acpi', 'for-next/cpufeature', 'for-next/efi', 'for-next/entry', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/psci', 'for-next/selftests', 'for-next/sme-fixes' and 'for-next/vdso' into for-next/core)
Merging arm-perf/for-next/perf (097469a2b0f1 perf/amlogic: Replace smp_processor_id() with raw_smp_processor_id() in meson_ddr_pmu_create())
Merging arm-soc/for-next (c0553d3f346d Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (a2ce7e3f919e Merge branch 'v6.16/arm-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (fb84b3df3515 Merge remote-tracking branch 'origin/asahi-soc/dt' into asahi-soc/for-next)
Merging aspeed/for-next (34c87a24e268 Merge branches 'aspeed/dt', 'aspeed/fixes', 'aspeed/drivers', 'nuvoton/arm/dt' and 'nuvoton/arm64/dt' into for-next)
Merging at91/at91-next (a9c0a43cb22d Merge branch 'at91-dt' into at91-next)
Merging broadcom/next (87b8fa3195af Merge branch 'devicetree-arm64/next' into next)
Merging davinci/davinci/for-next (78e6b545e558 ARM: davinci: remove support for da830)
Merging drivers-memory/for-next (201e39673c13 Merge branch 'for-v6.16/renesas-rpc-if' into for-next)
Merging imx-mxs/for-next (68087d05675e Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (6df944d2cf58 Merge branch 'v6.15-next/dts64' into for-next)
Merging mvebu/for-next (e85dce9d1b78 Merge branch 'mvebu/dt64' into mvebu/for-next)
  a3a0b8b23108 ("ARM: dts: marvell: use correct ohci/ehci node names")
Merging omap/for-next (6d658392b3f0 Merge branch 'omap-for-v6.16/drivers' into tmp/omap-next-20250508.062442)
Merging qcom/for-next (f8d04825b12f Merge branches 'arm32-for-6.16', 'arm64-defconfig-for-6.16', 'arm64-for-6.16', 'clk-for-6.16' and 'drivers-for-6.16' into for-next)
Merging renesas/next (73c8af6a66fb Merge branches 'renesas-arm-defconfig-for-v6.16', 'renesas-drivers-for-v6.16', 'renesas-dt-bindings-for-v6.16' and 'renesas-dts-for-v6.16' into renesas-next)
Merging reset/reset/next (1c64de886b88 dt-bindings: reset: sophgo: Add SG2044 bindings.)
Merging rockchip/for-next (40deb5d474c7 Merge branch 'v6.16-clk/next' into for-next)
Merging samsung-krzk/for-next (e1bb40de6bd3 Merge branch 'for-v6.16/mux-various' into for-next)
Merging scmi/for-linux-next (e34f2c312b67 Merge branch 'for-next/juno/updates', tag 'scmi-updates-6.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (ae246f5c0ce4 riscv: sophgo: dts: Add spi controller for SG2042)
Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only))
Merging spacemit/for-next (3f7ca1633883 riscv: dts: spacemit: add gpio LED for system heartbeat)
Merging stm32/stm32-next (7b6bbef62485 ARM: dts: stm32: support STM32h747i-disco board)
Merging sunxi/sunxi/for-next (91232310fa32 Merge branches 'sunxi/dt-for-6.16' and 'sunxi/clk-for-6.16' into sunxi/for-next)
Merging tee/next (40cfb51a6e93 Merge branch 'tee_for_v6_16' into next)
Merging tegra/for-next (5e98350146c3 Merge branch for-6.16/arm64/dt into for-next)
Merging thead-dt/thead-dt-for-next (a4c95b924d51 riscv: dts: thead: Add device tree VO clock controller)
Merging ti/ti-next (2332d042e9b2 Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next)
Merging xilinx/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging clk/clk-next (da0d5e233780 Merge branch 'clk-cleanup' into clk-next)
Merging clk-imx/for-next (6a55647af333 dt-bindings: clock: imx8m-clock: add PLLs)
Merging clk-renesas/renesas-clk (28548f3f7994 clk: renesas: r9a09g047: Add XSPI clock/reset)
Merging thead-clk/thead-clk-for-next (50d4b157fa96 clk: thead: Add clock support for VO subsystem in T-HEAD TH1520 SoC)
Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
Merging loongarch/loongarch-next (0a08a7ddff7e LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (52ae3f5da7e5 m68k: mac: Fix macintosh_config for Mac II)
Merging m68knommu/for-next (ee4d637cf705 m68k: Replace memcpy() + manual NUL-termination with strscpy())
Merging microblaze/next (920354d7818b microblaze: Use of_property_present() for non-boolean properties)
Merging mips/mips-next (3b3704261e85 MIPS: Replace strcpy() with strscpy() in vpe_elfload())
Merging openrisc/for-next (f698ee1f4003 dt-bindings: interrupt-controller: Convert openrisc,ompic to DT schema)
Merging parisc-hd/for-next (cccaea1d66e9 parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
Merging powerpc/next (03c9d1a5a30d Documentation: Fix description format for powerpc RTAS ioctls)
Applying: Revert "powerpc: do not build ppc_save_regs.o always"
Merging risc-v/for-next (1a3f6980889d Merge patch series "riscv: Add vendor extensions support for SiFive")
Merging riscv-dt/riscv-dt-for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging riscv-soc/riscv-soc-for-next (403e87ff0613 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next)
Merging s390/for-next (e94a9f451445 Merge branch 'features' into for-next)
Merging sh/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
Merging uml/next (e619e18ed462 um: Remove legacy network transport infrastructure)
Merging xtensa/xtensa-for-next (3d6d238851df arch: xtensa: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX)
Merging fs-next (725068979280 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
CONFLICT (content): Merge conflict in fs/fuse/file.c
Merging printk/for-next (9827cd0d6498 Merge branch 'for-6.15-printf-attribute' into for-next)
Merging pci/next (1fa7eab22df3 Merge branch 'pci/misc')
Applying: PCI/bwctrl: Remove unused pcie_bwctrl_lbms_rwsem
Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comments for better understanding)
Merging hid/for-next (f843dbd14f03 Merge branch 'for-6.15/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (8930ef557c4d Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (785eb0bca34b dt-bindings: i2c: i2c-wmt: Convert to YAML)
Merging i3c/i3c/next (0af2f6be1b42 Linux 6.15-rc1)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (0c0c84e48698 hwmon: (ausus-ec-sensors) add MAXIMUS VI HERO.)
Merging jc_docs/docs-next (fea017a99ba5 docs: dmaengine: add explanation for DMA_ASYNC_TX capability)
Merging v4l-dvb/next (1b83a9f41bd1 media: amlogic: c3-mipi-csi2: Handle 64-bits division)
  5bc68bd3826e ("media: dt-bindings: Document Tegra186 and Tegra194 cec")
CONFLICT (content): Merge conflict in drivers/media/i2c/ds90ub960.c
Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
Merging pm/linux-next (901ac26739d0 Merge branch 'fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (0a89b0dc417d Merge branch 'rust/cpufreq-dt' into cpufreq/arm/linux-next)
Merging cpupower/cpupower (99d2fce9b44d cpupower: change binding's makefile to use -lcpupower)
Merging devfreq/devfreq-next (bc253b28a365 PM / devfreq: sun8i-a33-mbus: Simplify by using more devm functions)
$ git reset --hard HEAD^
Merging next-20250509 version of devfreq
Merging pmdomain/next (36114344675d pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (ee3de3cf7035 OPP: Add dev_pm_opp_set_level())
Merging thermal/thermal/linux-next (50085e27fe47 thermal/drivers/mediatek/lvts: Remove unused lvts_debugfs_exit)
Merging rdma/for-next (e56b4eab9cde RDMA/siw: Remove unused siw_mem_add)
CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_mr.c
CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_resp.c
Merging net-next/main (0b28182c73a3 Merge branch 'refactoring-designware-vlan-code')
CONFLICT (content): Merge conflict in MAINTAINERS
Merging bpf-next/for-next (c667d55a2bac Merge branch 'bpf-next/master' into for-next)
Merging ipsec-next/master (86e530c84c97 Merge branch 'Update offload configuration with SA')
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
Merging mlx5-next/mlx5-next (f550694e88b7 net/mlx5: Add IFC bits for PPCNT recovery counters group)
Merging netfilter-next/main (3e52667a9c32 Merge branch 'lan78xx-phylink-prep')
Merging ipvs-next/main (88922fe78540 Merge branch 'bridge-mc-per-vlan-qquery')
Merging bluetooth/master (259a6d602310 Bluetooth: btusb: use skb_pull to avoid unsafe access in QCA dump handling)
  a1afd438e713 ("Bluetooth: MGMT: Fix MGMT_OP_ADD_DEVICE invalid device flags")
CONFLICT (content): Merge conflict in drivers/bluetooth/btusb.c
CONFLICT (content): Merge conflict in include/net/bluetooth/hci_core.h
CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_sync.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging wireless-next/for-next (63a9a727d373 wireless: purelifi: plfxlc: fix memory leak in plfxlc_usb_wreq_asyn())
Merging ath-next/for-next (9daaf1978600 Merge tag 'wireless-next-2025-05-06' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next)
Merging iwlwifi-next/next (2d31285ffbcb wifi: iwlwifi: cfg: remove MAC type/step matching)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/cfg/sc.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-config.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-trans.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-trans.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mld/agg.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
Applying: iwlwifi: remove the left over bits of 2 commits from Linus' tree
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 (843ce6ed4689 mtd: core: always create master device)
Merging nand/nand/next (e6031b11544b mtd: rawnand: qcom: Fix read len for onfi param page)
Merging spi-nor/spi-nor/next (594c8df92b94 mtd: spi-nor: macronix: Add fixups for MX25L3255E)
Merging crypto/master (7916eddc5332 crypto: powerpc/poly1305 - Add poly1305_emit_arch wrapper)
Merging drm/drm-next (1faeeb315fdb Merge tag 'amd-drm-next-6.16-2025-05-09' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_svm.h
Merging drm-exynos/for-linux-next (81a50378559b drm/exynos: Remove unnecessary checking)
Merging drm-misc/for-linux-next (84953fc58a33 drm/i915/display: Indexed 8bit format does not support async flip)
Merging amdgpu/drm-next (afc6053d4c4b Reapply: drm/amdgpu: Use generic hdp flush function)
Merging drm-intel/for-linux-next (0f45696ddb2b drm/i915/dp: Fix determining SST/MST mode during MTP TU state computation)
Merging drm-msm/msm-next (8f5264d302e8 drm/msm/adreno: Remove MODULE_FIRMWARE()'s)
Merging drm-msm-lumag/msm-next-lumag (860b5dfcecae dt-bindings: display: msm: correct example in SM8350 MDSS schema)
Merging drm-nova/nova-next (b75a99e1077b samples: rust: pci: take advantage of Devres::access())
CONFLICT (content): Merge conflict in rust/helpers/helpers.c
Merging drm-xe/drm-xe-next (243bf99e2fe7 drm/xe: Fix the gem shrinker name)
Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
Merging fbdev/for-next (cbe82d46f7a5 vgacon: Add check for vc_origin address range in vgacon_scroll())
Merging regmap/for-next (631f2288a412 Merge remote-tracking branch 'regmap/for-6.16' into regmap-next)
Merging sound/for-next (b95a1e89c755 ALSA: intel-hdmi-audio: Replace deprecated strcpy() with strscpy())
Merging ieee1394/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging sound-asoc/for-next (38308aeef08e Merge remote-tracking branch 'asoc/for-6.16' into asoc-next)
Merging modules/modules-next (20b3cad07f3c module: Remove outdated comment about text_size)
Merging input/next (74d3da135f69 MAINTAINERS: update dlg,da72??.txt to yaml)
Merging block/for-next (996bbd0e62a8 Merge branch 'for-6.16/io_uring' into for-next)
CONFLICT (content): Merge conflict in fs/gfs2/ops_fstype.c
Merging device-mapper/for-next (e93912786e50 dm: pass through operations on wrapped inline crypto keys)
Merging libata/for-next (b8ed9475384f dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible)
Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
Merging mmc/next (9e12816f9a61 mmc: rename mmc_boot_partition_access() to mmc_host_can_access_boot())
Merging mfd/for-mfd-next (bb58a2132b76 dt-bindings: mfd: syscon: Add mediatek,mt8365-infracfg-nao)
Merging backlight/for-backlight-next (e12d3e1624a0 backlight: pm8941: Add NULL check in wled_configure())
Merging battery/for-next (b1d8766052eb power: supply: rt9471: Simplify definition of some struct linear_range)
Merging regulator/for-next (6598de594daa Merge remote-tracking branch 'regulator/for-6.16' into regulator-next)
Merging security/next (74e5b13a1b0f lsm: Move security_netlink_send to under CONFIG_SECURITY_NETWORK)
Merging apparmor/apparmor-next (3e45553acb14 apparmor: Remove unused variable 'sock' in __file_sock_perm())
Merging integrity/next-integrity (591683d3944c ima: measure kexec load and exec events as critical data)
CONFLICT (content): Merge conflict in kernel/kexec_file.c
Merging selinux/next (05f1a939225e selinux: fix the kdoc header for task_avdcache_update)
Merging smack/next (a158a937d864 smack: recognize ipv4 CIPSO w/o categories)
Merging tomoyo/master (e9ddb37834eb tomoyo: update mailing lists)
Merging tpmdd/next (552c4ec0bf4b tpm_crb: ffa_tpm: fix/update comments describing the CRB over FFA ABI)
Merging watchdog/master (9bc64d338b0b watchdog: sunxi_wdt: Add support for Allwinner A523)
Merging iommu/next (e5609ec5d325 Merge branches 'fixes', 'apple/dart', 'mediatek', 'renesas/ipmmu', 's390', 'amd/amd-vi' and 'core' into next)
Merging audit/next (654d61b8e0e2 audit: record AUDIT_ANOM_* events regardless of presence of rules)
Merging devicetree/for-next (1b765f8bdac2 devres: Export devm_ioremap_resource_wc())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging dt-krzk/for-next (00969e1fecbd Merge branch 'next/soc-drivers' into for-next)
  b112d9ffaa65 ("ARM: dts: vt8500: use correct ohci/ehci node names")
CONFLICT (content): Merge conflict in MAINTAINERS
Merging mailbox/for-next (1ec12fd31ecc mailbox: Remove unneeded semicolon)
Merging spi/for-next (956c189dbda6 Merge remote-tracking branch 'spi/for-6.16' into spi-next)
Merging tip/master (8e3f38516462 Merge branch into tip/master: 'x86/sgx')
CONFLICT (content): Merge conflict in arch/loongarch/kernel/entry.S
CONFLICT (content): Merge conflict in arch/x86/Kconfig.assembler
CONFLICT (content): Merge conflict in drivers/cpufreq/amd-pstate.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
Merging edac/edac-for-next (4521b86e4a6e Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7b382efd5e8a tracing: Allow the top level trace_marker to write into another instances)
Merging rcu/next (725b2e0241a8 Merge branches 'rcu/misc-for-6.16', 'rcu/seq-counters-for-6.16' and 'rcu/torture-for-6.16' into rcu/for-next)
Merging paulmck/non-rcu/next (e55dc2e5b2e3 Merge branches 'lkmm.2025.04.22a' and 'ratelimit.2025.05.08a' into HEAD)
Merging kvm/next (45eb29140e68 Merge branch 'kvm-fixes-6.15-rc4' into HEAD)
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.c
Merging kvm-arm/next (c4e91ea0cc7e Merge branch kvm-arm64/misc-6.16 into kvmarm-master/next)
Merging kvms390/next (0c7fbae5bc78 KVM: s390: Don't use %pK through debug printing)
Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2)
Merging kvm-riscv/riscv_kvm_next (87ec7d5249bb KVM: RISC-V: reset smstateen CSRs)
Merging kvm-x86/next (19040824931b Merge branches 'fixes', 'misc', 'mmu', 'pir', 'selftests', 'svm' and 'vmx')
Merging xen-tip/linux-next (1f0304dfd9d2 xenbus: Use kref to track req lifetime)
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 (23227e71b69a workqueue: fix typo in comment)
Merging sched-ext/for-next (92e91bb0495f Merge branch 'for-6.16' into for-next)
Merging drivers-x86/for-next (3c415b1df95c platform/x86: thinkpad-acpi: Add support for new hotkey for camera shutter switch)
CONFLICT (content): Merge conflict in drivers/platform/x86/asus-wmi.c
CONFLICT (content): Merge conflict in drivers/platform/x86/dell/alienware-wmi-wmax.c
CONFLICT (content): Merge conflict in drivers/platform/x86/intel/speed_select_if/isst_if_common.c
Merging chrome-platform/for-next (3e552ccf405c platform/chrome: kunit: Avoid -Wflex-array-member-not-at-end)
Merging chrome-platform-firmware/for-firmware-next (0af2f6be1b42 Linux 6.15-rc1)
Merging hsi/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging leds-lj/for-leds-next (4e055c846de4 leds: rgb: leds-mt6370-rgb: Improve definition of some struct linear_range)
Merging ipmi/for-next (fa332f5dc6fc ipmi:msghandler: Fix potential memory corruption in ipmi_create_user())
Merging driver-core/driver-core-next (4f894483c902 firmware_loader: use SHA-256 library API instead of crypto_shash API)
Merging usb/usb-next (588d032e9e56 usb: misc: onboard_usb_dev: Add Parade PS5511 hub support)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging thunderbolt/next (36f6f7e2d4d0 Documentation/admin-guide: Document Thunderbolt/USB4 tunneling events)
Merging usb-serial/usb-next (692a497eb748 USB: serial: ti_usb_3410_5052: drop bogus read urb check)
Merging tty/tty-next (5ee558c5d9e9 vt: add new dynamically generated files to .gitignore)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
Merging char-misc/char-misc-next (73ed6faed58e comedi: drivers: adl_pci9118.c: Edit file so that checkpatch.pl has 0 typo errors)
Applying: uio_hv_generic: constify bin_attribute definitions
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 (aad548a95393 coresight: cti: Replace inclusion by struct fwnode_handle forward declaration)
Merging fastrpc/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging fpga/for-next (6ebf1982038a fpga: fix potential null pointer deref in fpga_mgr_test_img_load_sgt())
Merging icc/icc-next (a0a532d59b8f Merge branch 'icc-sa8775p' into icc-next)
Merging iio/togreg (d820bea88e27 iio: pressure: zpa2326_spi: remove bits_per_word = 8)
CONFLICT (content): Merge conflict in drivers/iio/adc/ad7606.c
Merging phy-next/next (9d0ec51d7c22 phy: rockchip: samsung-hdptx: Add high color depth management)
Merging soundwire/next (0af2f6be1b42 Linux 6.15-rc1)
Merging extcon/extcon-next (c2aeb8647e53 extcon: Add basic support for Maxim MAX14526 MUIC)
Merging gnss/gnss-next (9c32cda43eb7 Linux 6.15-rc3)
Merging vfio/next (860be250fc32 vfio/pci: Handle INTx IRQ_NOTCONNECTED)
Merging w1/for-next (a9b3ecc7bcf6 w1: Avoid -Wflex-array-member-not-at-end warnings)
Merging spmi/spmi-next (02a0fd9c0c40 irqdomain: spmi: Switch to irq_domain_create_tree())
Merging staging/staging-next (417ce77ef466 staging: gpib: Avoid unused variable warnings)
Merging counter-next/counter-next (08e2a660b160 counter: interrupt-cnt: Convert atomic_t -> atomic_long_t)
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 (d175222f5e90 dmaegnine: fsl-edma: add edma error interrupt handler)
Merging cgroup/for-next (5dff7c48efa2 Merge branch 'for-6.15-fixes' into for-next)
  c8e7e056366a ("include/cgroup: separate {get,put}_cgroup_ns no-op case")
Merging scsi/for-next (1b014517d12a Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (6d600a8c2a94 scsi: docs: Clean up some style in scsi_mid_low_api)
Merging vhost/linux-next (1f69fe75a328 vhost-scsi: log event queue write descriptors)
Merging rpmsg/for-next (849dbc64790f Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio-brgl/gpio/for-next (3a1e07184d78 gpio: blzp1600: remove incorrect pf_match_ptr())
Merging gpio-intel/for-next (a02af05f41c7 Merge patch series "gpiolib: acpi: Fix missing info filling")
Merging pinctrl/for-next (50289b1930be Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging pinctrl-renesas/renesas-pinctrl (5488aa013e9e pinctrl: renesas: rzg2l: Add support for RZ/V2N SoC)
Merging pinctrl-samsung/for-next (a30692b4f81b pinctrl: samsung: Add filter selection support for alive bank on gs101)
Merging pwm/pwm/for-next (84e351d8a575 pwm: Restore alphabetic ordering in Kconfig and Makefile)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging ktest/for-next (5a1bed232781 ktest: Fix Test Failures Due to Missing LOG_FILE Directories)
Merging kselftest/next (1efe2022286d selftests/timens: timerfd: Use correct clockid type in tclock_gettime())
Merging kunit/test (0af2f6be1b42 Linux 6.15-rc1)
Merging kunit-next/kunit (c2493384e811 kunit: executor: Remove const from kunit_filter_suites() allocation type)
Merging livepatching/for-next (a8e905a819fd Merge branch 'for-6.15/ftrace-test' into for-next)
Merging rtc/rtc-next (d37058674646 rtc: da9063: simplify irq management)
Merging nvdimm/libnvdimm-for-next (ef1d3455bbc1 libnvdimm/labels: Fix divide error in nd_label_data_init())
Merging at24/at24/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions)
Merging seccomp/for-next/seccomp (73989c998814 selftests/seccomp: fix negative_ENOSYS tracer tests on arm32)
Merging slimbus/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging nvmem/for-next (a5d9b82ff4ed Merge branch 'nvmem-for-6.16' into nvmem-for-next)
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
Merging hyperv/hyperv-next (9b0844d87b14 PCI: hv: Get vPCI MSI IRQ domain from DeviceTree)
Merging auxdisplay/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls)
Merging hmm/hmm (c92ae5d4f53e fwctl: Fix repeated device word in log message)
Merging cfi/cfi/next (0af2f6be1b42 Linux 6.15-rc1)
Merging mhi/mhi-next (ee593991be26 bus: mhi: host: pci_generic: Add Telit FN920C04 modem support)
Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblock_set_node)
Merging cxl/next (a223ce195741 cxl/hdm: Clean up a debug printk)
Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7)
Merging efi/next (c8e1927e7f7d efi/libstub: Describe missing 'out' parameter in efi_load_initrd)
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
Merging slab/slab/for-next (1cabeb548de6 Merge branch 'slab/for-6.16/testing' into slab/for-next)
Merging random/master (602c988b7827 prandom: remove next_pseudo_random32)
Merging landlock/next (f76e144b8e20 landlock: Use bitops macros in audit code)
Merging rust/rust-next (dd21715de3df rust: check type of `$ptr` in `container_of!`)
$ git reset --hard HEAD^
Merging next-20250509 version of rust
Merging rust-alloc/alloc-next (771c5a7d9843 rust: alloc: add Vec::insert_within_capacity)
Merging rust-pin-init/pin-init-next (9de1a293c8ec rust: pin-init: improve documentation for `Zeroable` derive macros)
Merging rust-timekeeping/timekeeping-next (679185904972 MAINTAINERS: rust: Add a new section for all of the time stuff)
Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API)
CONFLICT (content): Merge conflict in rust/bindings/bindings_helper.h
Applying: fix up for conflict against drm-nova
Applying: fixup for conflict with the mm-unstable tree
Applying: fix up for conflict with cpufreq-arm tree
Merging sysctl/sysctl-next (23b8bacf1547 sysctl: Close test ctl_headers with a for loop)
Merging execve/for-next/execve (11854fe263eb binfmt_elf: Move brk for static PIE even if ASLR disabled)
Merging bitmap/bitmap-for-next (a256ae22570e bitfield: Add FIELD_MODIFY() helper)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
Merging kspp/for-next/kspp (f0cd6012c40d Revert "hardening: Disable GCC randstruct for COMPILE_TEST")
Merging nolibc/for-next (a57883235a88 tools/nolibc: implement wait() in terms of waitpid())
Merging iommufd/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
Merging pwrseq/pwrseq/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging capabilities-next/caps-next (4ae89b1fe7c2 capability: Remove unused has_capability)
Merging ipe/next (925df32541da ipe: add errno field to IPE policy load auditing)
Merging kcsan/next (9d89551994a4 Linux 6.13-rc6)
Merging crc/crc-next (2009b6c301bf MAINTAINERS: add crc_kunit.c back to CRC LIBRARY)
Merging fwctl/for-next (0af2f6be1b42 Linux 6.15-rc1)
Merging devsec-tsm/next (9994dc6b1051 Merge branch 'for-6.16/tsm-mr' into tsm-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