Hi all, Changes since 20240528: News: the fs related trees are now merged into their own branches (based on Linus' tree of the day) which are then merged into linux-next. New branches: fs-current, fs-next (see above) The vfs-brauner tree lost its build failure. The printk tree gained conflicts against Linus' tree. The i2c tree still has its build failure so I used the version of the i2c tree from next-20240523. The drm-misc tree gained 2 build failures so I used the version from next-20240528. Non-merge commits (relative to Linus' tree): 2075 2057 files changed, 378535 insertions(+), 39843 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 375 trees (counting Linus' and 104 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. 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 (e0cce98fe279 Merge tag 'tpmdd-next-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (8689e529ee87 mm: arm64: Fix the out-of-bounds issue in contpte_clear_young_dirty_ptes) Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1) Merging btrfs-fixes/next-fixes (150e675638f2 Merge branch 'misc-6.10' into next-fixes) Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak) Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode) Merging nfsd-fixes/nfsd-fixes (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous) Merging v9fs-fixes/fixes/next (1613e604df0c Linux 6.10-rc1) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) Merging fs-current (ffaf6d946055 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git) Merging kbuild-current/fixes (a16ecce68347 kbuild: remove a stale comment about cleaning in link-vmlinux.sh) Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) 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 (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save()) Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging sophgo-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1) Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE) Merging s390-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging net/main (56a5cf538c3f net: ti: icssg-prueth: Fix start counter for ft1 filter) Merging bpf/master (4b4647add7d3 sock_map: avoid race between sock_map_close and sk_psock_put) Merging ipsec/master (96f887a612e4 net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP) Merging netfilter/main (e8ded22ef0f4 netfilter: nft_fib: allow from forward/input without iif selector) Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init) Merging wireless/for-next (1613e604df0c Linux 6.10-rc1) Merging wpan/master (07aa33988ad9 mac802154: fix time calculation in ieee802154_configure_durations()) Merging rdma-fixes/for-rc (1613e604df0c Linux 6.10-rc1) Merging sound-current/for-linus (2be46155d792 ALSA: hda/realtek: Adjust G814JZR to use SPI init for amp) Merging sound-asoc-fixes/for-linus (47d09270d777 Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus) Merging regmap-fixes/for-linus (7ba822189e60 regmap: kunit: Fix array overflow in stride() test) Merging regulator-fixes/for-linus (1613e604df0c Linux 6.10-rc1) Merging spi-fixes/for-linus (3aac9f488592 soi: Don't call DMA sync API when not needed) Merging pci-current/for-linus (f941b9182c54 PCI: Fix missing lockdep annotation for pci_cfg_access_trylock()) Merging driver-core.current/driver-core-linus (1613e604df0c Linux 6.10-rc1) Merging tty.current/tty-linus (1613e604df0c Linux 6.10-rc1) Merging usb.current/usb-linus (1613e604df0c Linux 6.10-rc1) Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7) Merging phy/fixes (1613e604df0c Linux 6.10-rc1) Merging staging.current/staging-linus (1613e604df0c Linux 6.10-rc1) Merging iio-fixes/fixes-togreg (95444b9eeb8c iio: invensense: fix odr switching to same value) Merging counter-current/counter-current (1613e604df0c Linux 6.10-rc1) Merging char-misc.current/char-misc-linus (1613e604df0c Linux 6.10-rc1) Merging soundwire-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging thunderbolt-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging input-current/for-linus (a69ce592cbe0 Input: elantech - fix touchpad state on resume for Lenovo N24) Merging crypto-current/master (67ec8cdf2997 hwrng: core - Remove add_early_randomness) Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) Merging kselftest-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging dmaengine-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1) Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NVDDR timings are rejected) Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1) Merging v4l-dvb-fixes/fixes (c19fa08c1414 media: intel/ipu6: fix the buffer flags caused by wrong parentheses) Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) Merging mips-fixes/mips-fixes (1613e604df0c Linux 6.10-rc1) Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M) Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (49ba7b515c4c cxl/region: Fix memregion leaks in devm_cxl_add_region()) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (305005261379 platform/x86: touchscreen_dmi: Add info for the EZpad 6s Pro) Merging samsung-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-samsung-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging devicetree-fixes/dt/linus (987fe3d90d33 dt-bindings: arm: stm32: st,mlahb: Drop spurious "reg" property from example) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count) Merging drm-fixes/drm-fixes (3e049b6b8f32 Merge tag 'drm-misc-fixes-2024-05-23' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (1613e604df0c Linux 6.10-rc1) Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers) Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1) Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4) Merging hyperv-fixes/hyperv-fixes (a0b134032e6c Documentation: hyperv: Improve synic and interrupt handling description) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging riscv-dt-fixes/riscv-dt-fixes (2c917b55d665 riscv: dts: canaan: Disable I/O devices unless used) Merging riscv-soc-fixes/riscv-soc-fixes (1613e604df0c Linux 6.10-rc1) Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card) Merging spdx/spdx-linus (c760b3725e52 Merge tag 'mm-nonmm-stable-2024-05-22-17-30' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) Merging gpio-brgl-fixes/gpio/for-current (1613e604df0c Linux 6.10-rc1) Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging kunit-fixes/kunit-fixes (1613e604df0c Linux 6.10-rc1) Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT') Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (4f1b067359ac Revert "perf parse-events: Prefer sysfs/JSON hardware events over legacy") Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7) Merging rust-fixes/rust-fixes (1613e604df0c Linux 6.10-rc1) Merging w1-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pmdomain-fixes/fixes (e8dc41afca16 pmdomain: imx: gpcv2: Add delay after power up handshake) Merging i2c-host-fixes/i2c/i2c-host-fixes (6d69b6c12fce Merge tag 'nfs-for-6.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (1613e604df0c Linux 6.10-rc1) Merging drm-misc-fixes/for-linux-next-fixes (f73a058be5d7 Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes) Merging mm-stable/mm-stable (1613e604df0c Linux 6.10-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (1613e604df0c Linux 6.10-rc1) Merging mm/mm-everything (37cf28d6d58a foo) Merging kbuild/for-next (a16ecce68347 kbuild: remove a stale comment about cleaning in link-vmlinux.sh) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (29c73fc794c8 Merge tag 'perf-tools-for-v6.10-1-2024-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools) Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) Merging dma-mapping/for-next (82d71b53d7e7 Documentation/core-api: correct reference to SWIOTLB_DYNAMIC) Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (64ae2326dd77 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (e92bee9f861b arm64/fpsimd: Avoid erroneous elide of user state reload) Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support) Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next) Merging amlogic/for-next (456f4f5e6e6d Merge branch 'v6.11/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC) Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next) Merging broadcom/next (06902980d07a Merge branch 'devicetree/next' into next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (1613e604df0c Linux 6.10-rc1) Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (ca7309e48336 arm64: dts: mediatek: mt8192-asurada: Add off-on-delay-us for pp3300_mipibrdg) Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next) Merging qcom/for-next (81d58edf05c0 Merge branches 'arm32-for-6.11', 'arm64-fixes-for-6.10', 'arm64-for-6.11', 'clk-for-6.11' and 'drivers-for-6.11' into for-next) Merging renesas/next (852c50b833be Merge branches 'renesas-arm-defconfig-for-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void) Merging rockchip/for-next (55d3141714e4 Merge branch 'v6.11-clk/next' into for-next) Merging samsung-krzk/for-next (b363a45913d2 clk: samsung: exynos-clkout: Remove misleading of_match_table/MODULE_DEVICE_TABLE) Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi Merging sunxi/sunxi/for-next (0694e1cc40de Merge branches 'sunxi/fixes-for-6.10', 'sunxi/drivers-for-6.11' and 'sunxi/dt-for-6.11' into sunxi/for-next) Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next) Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next) Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (1613e604df0c Linux 6.10-rc1) Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void) Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains) Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging loongarch/loongarch-next (c768fc96978c LoongArch: Override higher address bits in JUMP_VIRT_ADDR) Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1) Merging m68knommu/for-next (1613e604df0c Linux 6.10-rc1) Merging microblaze/next (32cf1deb9c04 MICROBLAZE kc705 2017.4 full with cpu-reg fix NEW with reserved memory) Merging mips/mips-next (1613e604df0c Linux 6.10-rc1) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (bbf5c979011a Linux 5.9) Merging powerpc/next (61700f816e6f powerpc/fadump: Fix section mismatch warning) Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree()) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (1613e604df0c Linux 6.10-rc1) Merging riscv-dt/riscv-dt-for-next (12e791de7933 riscv: dts: starfive: add Star64 board devicetree) Merging riscv-soc/riscv-soc-for-next (1613e604df0c Linux 6.10-rc1) Merging s390/for-next (c1248638f8c3 s390/zcrypt: Use kvcalloc() instead of kvmalloc_array()) Merging sh/for-next (1613e604df0c Linux 6.10-rc1) Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var) Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging bcachefs/for-next (d38a2f59c623 bcachefs: metadata version bucket_stripe_sectors) Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (6469de00a21f Merge branch 'for-next-next-v6.10-20240527' into for-next-20240527) CONFLICT (content): Merge conflict in fs/btrfs/btrfs_inode.h CONFLICT (content): Merge conflict in fs/btrfs/file.c [fs-next 27d2b3c0e851] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to get CephFS metadata) Merging cifs/for-next (9ee267a29309 fs: smb: common: add missing MODULE_DESCRIPTION() macros) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging erofs/dev (1613e604df0c Linux 6.10-rc1) Merging exfat/dev (878387af4105 exfat: handle idmapped mounts) Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.) Merging ext4/dev (c6a6c9694aad ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp()) Merging f2fs/dev (72ece20127a3 Merge tag 'f2fs-for-6.10.rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning) Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) Merging gfs2/for-next (b0ede5c03434 gfs2: Get rid of demote_ok checks) Merging jfs/jfs-next (ee6817e72d4e jfs: Remove use of folio error flag) Merging ksmbd/ksmbd-for-next (6c8b1a2dca0b Merge tag '6.10-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (3c0a2e0b0ae6 nfs: fix undefined behavior in nfs_block_bits()) Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) Merging nfsd/nfsd-next (7c2e7f5cac61 NFSD: harden svcxdr_dupstr() and svcxdr_tmpalloc() against integer overflows) Merging ntfs3/master (1613e604df0c Linux 6.10-rc1) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) Merging overlayfs/overlayfs-next (db03d39053a9 ovl: fix copy-up in tmpfile) Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode) Merging v9fs/9p-next (c898afdc1564 9p: add missing locking around taking dentry fid list) Merging v9fs-ericvh/ericvh/for-next (1613e604df0c Linux 6.10-rc1) Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade) Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api) Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) 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 (b9fc9904efca Merge branch 'vfs.module.description' into vfs.all) Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (83d6561e9fcd Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) Merging printk/for-next (f3760c80d06a Merge branch 'rework/write-atomic' into for-next) CONFLICT (content): Merge conflict in include/linux/printk.h CONFLICT (content): Merge conflict in include/linux/serial_core.h Merging pci/next (e3fca3731289 Merge branch 'pci/controller/tegra194') Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy) Merging hid/for-next (719800478543 Merge branch 'for-6.9/upstream-fixes' into for-next) Merging i2c/i2c/for-next (ec23dafe4ed1 Merge tag 'i2c-host-6.10-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow) $ git reset --hard HEAD^ Merging next-20240523 version of i2c Merging i2c-host/i2c/i2c-host (a6b250149c79 i2c: synquacer: Remove a clk reference from struct synquacer_i2c) Merging i3c/i3c/next (1d08326020fb i3c: dw: Add hot-join support.) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants) Merging jc_docs/docs-next (4db68b85a9d9 Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) Merging pm/linux-next (edddc097b540 Merge branch 'thermal-core' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (10e0a8f83294 cpufreq: longhaul: Fix kernel-doc param for longhaul_setstate) Merging cpupower/cpupower (43cad521c6d2 tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs) Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions) Merging pmdomain/next (e8dc41afca16 pmdomain: imx: gpcv2: Add delay after power up handshake) Merging opp/opp/linux-next (d86a2f080068 OPP: Fix missing cleanup on error in _opp_attach_genpd()) Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF) Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails) Merging rdma/for-next (1613e604df0c Linux 6.10-rc1) Merging net-next/main (4b3529edbb8f Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) Merging bpf-next/for-next (eb4e7726279a libbpf: Configure log verbosity with env variable) Merging ipsec-next/master (5233a55a5254 mISDN: remove unused struct 'bf_ctx') Merging mlx5-next/mlx5-next (1613e604df0c Linux 6.10-rc1) Merging netfilter-next/main (5c1672705a1a net: revert partially applied PHY topology series) Merging ipvs-next/main (5c1672705a1a net: revert partially applied PHY topology series) Merging bluetooth/master (3c376f35eb13 Bluetooth: Use sizeof(*pointer) instead of sizeof(type)) Merging wireless-next/for-next (a92fd2d9327b wifi: mac80211: send DelBA with correct BSSID) Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mtd/mtd/next (cf4ccd1c029e mtd: physmap: Use *-y instead of *-objs in Makefile) Merging nand/nand/next (b9bf7737de32 mtd: rawnand: gpmi: add iMX8QXP support.) Merging spi-nor/spi-nor/next (2d95d1324844 mtd: spi-nor: get rid of SPI_NOR_NO_FR) Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content) Merging drm/drm-next (1613e604df0c Linux 6.10-rc1) Merging drm-exynos/for-linux-next (fb6e82e968ca drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found) Merging drm-misc/for-linux-next (336dca397dce drm/panel-edp: Add more panels with conservative timings) $ git reset --hard HEAD^ Merging next-20240528 version of drm-misc Merging amdgpu/drm-next (cfe34d6a4c0f drm/amd/display: Enable colorspace property for MST connectors) Merging drm-intel/for-linux-next (c34474b48cf1 drm/i915: pass dev_priv explicitly to ADL_TVIDEO_DIP_AS_SDP_DATA) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation) Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane) Merging drm-xe/drm-xe-next (fa171d49e49a drm/xe/guc: Fix uninitialised count in GuC load debug prints) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c Merging etnaviv/etnaviv/next (e843e87abb90 drm/etnaviv: Disable SH_EU clock gating on VIPNano-Si+) Merging fbdev/for-next (a38297e3fb01 Linux 6.9) Merging regmap/for-next (7ba822189e60 regmap: kunit: Fix array overflow in stride() test) Merging sound/for-next (2be46155d792 ALSA: hda/realtek: Adjust G814JZR to use SPI init for amp) Merging ieee1394/for-next (1613e604df0c Linux 6.10-rc1) Merging sound-asoc/for-next (47d09270d777 Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus) Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of) Merging input/next (6f47c7ae8c7a Merge tag 'v6.9' into next) Merging block/for-next (b5cca5417e5f Merge branch 'for-6.11/io_uring' into for-next) Merging device-mapper/for-next (825d8bbd2f32 dm: always manage discard support in terms of max_hw_discard_sectors) Merging libata/for-next (90b02eb1f060 Merge remote-tracking branch 'libata/for-6.11' into HEAD) Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant) Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs) Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas) Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get()) Merging battery/for-next (ebacfa1f09c1 power: supply: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging regulator/for-next (1613e604df0c Linux 6.10-rc1) Merging security/next (1613e604df0c Linux 6.10-rc1) Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference) Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm) Merging selinux/next (1613e604df0c Linux 6.10-rc1) Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (e0cce98fe279 Merge tag 'tpmdd-next-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd) Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI) Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next) Merging audit/next (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (b94d24c08ee1 of: property: Remove calls to of_node_put) Merging dt-krzk/for-next (1613e604df0c Linux 6.10-rc1) Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Document the SDX75 IPCC) Merging spi/for-next (3aac9f488592 soi: Don't call DMA sync API when not needed) Merging tip/master (e874df84d4a5 Merge branch into tip/master: 'x86/percpu') Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const) Merging edac/edac-for-next (c2c887e9f967 EDAC/skx: Switch to new Intel CPU model defines) Merging ftrace/for-next (fde0aeca5926 Merge user-events/for-next) Merging rcu/next (04f9bfcc0a8d rcu: Fix rcu_barrier() VS post CPUHP_TEARDOWN_CPU invocation) Merging paulmck/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD) Merging kvm/next (6f627b425378 KVM: SVM: Add module parameter to enable SEV-SNP) Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next) Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2) Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info()) Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test) Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx') Merging xen-tip/linux-next (a3607581cd49 drivers/xen: Improve the late XenStore init protocol) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) Merging workqueues/for-next (2a1b02bcba78 workqueue: Refactor worker ID formatting and make wq_worker_comm() use full ID string) Merging drivers-x86/for-next (46de513068f9 platform/x86/amd/pmf: Use memdup_user()) Merging chrome-platform/for-next (47ef58cdbd7f platform/chrome: cros_ec: let cros_ec_suspend() call cros_ec_suspend_*) Merging chrome-platform-firmware/for-firmware-next (1613e604df0c Linux 6.10-rc1) Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/gpio.h) Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv') Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void) Merging driver-core/driver-core-next (1613e604df0c Linux 6.10-rc1) Merging usb/usb-next (1613e604df0c Linux 6.10-rc1) Merging thunderbolt/next (1613e604df0c Linux 6.10-rc1) Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2) Merging tty/tty-next (1613e604df0c Linux 6.10-rc1) Merging char-misc/char-misc-next (1613e604df0c Linux 6.10-rc1) 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 (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device) Merging fastrpc/for-next (a16833330e2f misc: fastrpc: Use memdup_user()) Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount) Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment) Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values) Merging phy-next/next (1613e604df0c Linux 6.10-rc1) Merging soundwire/next (1613e604df0c Linux 6.10-rc1) Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members) Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4) Merging vfio/next (cbb325e77fbe vfio/pci: Restore zero affected bus reset devices warning) Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) Merging spmi/spmi-next (1613e604df0c Linux 6.10-rc1) Merging staging/staging-next (1613e604df0c Linux 6.10-rc1) Merging counter-next/counter-next (1613e604df0c Linux 6.10-rc1) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (1613e604df0c Linux 6.10-rc1) Merging cgroup/for-next (a8d55ff5f3ac kernel/cgroup: cleanup cgroup_base_files when fail to add cgroup_psi_files) Merging scsi/for-next (5621e21c7fd9 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (1613e604df0c Linux 6.10-rc1) Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) Merging rpmsg/for-next (d251d873db36 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (e4608bbccf2b dt-bindings: gpio: lsi,zevio-gpio: convert to dtschema) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (517b3757b780 pinctrl: core: reset gpio_device in loop in pinctrl_pins_show()) Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (c45c3f5f9593 pinctrl: renesas: Use scope based of_node_put() cleanups) Merging pinctrl-samsung/for-next (1613e604df0c Linux 6.10-rc1) Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (1613e604df0c Linux 6.10-rc1) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (1613e604df0c Linux 6.10-rc1) Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next) Merging rtc/rtc-next (4c9a91b94c12 pcf8563: add wakeup-source support) Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc) Merging at24/at24/for-next (1613e604df0c Linux 6.10-rc1) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (1613e604df0c Linux 6.10-rc1) Merging nvmem/for-next (1613e604df0c Linux 6.10-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) Merging auxdisplay/for-next (1bbf5a2156fa auxdisplay: charlcd: Provide a forward declaration) Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode) Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry) Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (7c23b186ab89 efi: pstore: Return proper errors on UEFI failures) Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static) Merging slab/slab/for-next (a0a44d9175b3 mm, slab: don't wrap internal functions with alloc_hooks()) Merging random/master (1613e604df0c Linux 6.10-rc1) Merging landlock/next (38a04f741569 selftests/landlock: Add layout1.refer_mount_root) Merging rust/rust-next (1613e604df0c Linux 6.10-rc1) Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check) Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size) Merging bitmap/bitmap-for-next (dedfd2838bad cpumask: introduce assign_cpu() macro) Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void) Merging kspp/for-next/kspp (ae1a863bcdbd kunit/fortify: Fix memcmp() test to be amplitude agnostic) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (1613e604df0c Linux 6.10-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1) Merging turbostat/next (256d218ec6ae tools/power turbostat: version 2024.05.10) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgpID9023vvRn.pgp
Description: OpenPGP digital signature
