Hi all, Changes since 20240603: The vfs-brauner tree gained a conflict against the nfs tree. The net-next tree still had its build failure for which I reverted a commit. Non-merge commits (relative to Linus' tree): 2879 3075 files changed, 406674 insertions(+), 50660 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 105 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 (2ab795141095 Merge tag 'cxl-fixes-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (07a7fae658d4 mm: fix xyz_noprof functions calling profiled functions) Merging vfs-brauner-fixes/vfs.fixes (5ea71848f7b2 cachefiles: remove unneeded include of <linux/fdtable.h>) 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 (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file leak) Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode) Merging nfsd-fixes/nfsd-fixes (4a77c3dead97 SUNRPC: Fix loop termination condition in gss_free_in_token_pages()) 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 (7805dc23f674 Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging kbuild-current/fixes (1b1c9f0fd3fb dt-bindings: kbuild: Fix dt_binding_check on unconfigured build) 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 (be2fc65d66e0 powerpc: Limit ARCH_HAS_KERNEL_FPU_SUPPORT to PPC64) Merging s390-fixes/fixes (c3f38fa61af7 Linux 6.10-rc2) Merging net/main (6149db4997f5 net: phy: micrel: fix KSZ9477 PHY issues after suspend/resume) Merging bpf/master (2317dc2c22cc bpf, devmap: Remove unnecessary if check in for loop) Merging ipsec/master (96f887a612e4 net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP) Merging netfilter/main (13c7c941e729 netdev: add qstat for csum complete) Merging ipvs/main (13c7c941e729 netdev: add qstat for csum complete) Merging wireless/for-next (819bda58e77b wifi: rtlwifi: Ignore IEEE80211_CONF_CHANGE_RETRY_LIMITS) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (05301cb42a55 RDMA/rxe: Fix responder length checking for UD request packets) Merging sound-current/for-linus (55fac50ea46f ALSA: seq: ump: Fix missing System Reset message handling) Merging sound-asoc-fixes/for-linus (c3f38fa61af7 Linux 6.10-rc2) Merging regmap-fixes/for-linus (c3f38fa61af7 Linux 6.10-rc2) Merging regulator-fixes/for-linus (c3f38fa61af7 Linux 6.10-rc2) Merging spi-fixes/for-linus (95d7c452a265 spi: stm32: Don't warn about spurious interrupts) Merging pci-current/for-linus (a5add86a233e PCI: Revert the cfg_access_lock lockdep mechanism) Merging driver-core.current/driver-core-linus (c3f38fa61af7 Linux 6.10-rc2) Merging tty.current/tty-linus (c3f38fa61af7 Linux 6.10-rc2) Merging usb.current/usb-linus (c3f38fa61af7 Linux 6.10-rc2) Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7) Merging phy/fixes (163c1a356a84 phy: qcom: qmp-combo: Switch from V6 to V6 N4 register offsets) Merging staging.current/staging-linus (c3f38fa61af7 Linux 6.10-rc2) Merging iio-fixes/fixes-togreg (78f0dfa64cbd iio: inkern: fix channel read regression) Merging counter-current/counter-current (1613e604df0c Linux 6.10-rc1) Merging char-misc.current/char-misc-linus (c3f38fa61af7 Linux 6.10-rc2) Merging soundwire-fixes/fixes (e2d8ea0a066a soundwire: fix usages of device_get_named_child_node()) Merging thunderbolt-fixes/fixes (985cfe501b74 thunderbolt: debugfs: Fix margin debugfs node creation condition) Merging input-current/for-linus (955af6355ddf Input: i8042 - add Ayaneo Kun to i8042 quirk table) Merging crypto-current/master (67ec8cdf2997 hwrng: core - Remove add_early_randomness) Merging vfio-fixes/for-linus (aac6db75a9fc vfio/pci: Use unmap_mapping_range()) Merging kselftest-fixes/fixes (4bf15b1c657d selftests/futex: don't pass a const char* to asprintf(3)) 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 (ffb9072bce20 media: intel/ipu6: add csi2 port sanity check in notifier bound) 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 (b50788f7cd31 Merge tag 'kvm-riscv-fixes-6.10-1' of https://github.com/kvm-riscv/linux into HEAD) Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M) Merging hwmon-fixes/hwmon (52a2c70c3ec5 hwmon: (shtc1) Fix property misspelling) 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 (77f1972bdcf7 platform/x86/amd/hsmp: Check HSMP support on AMD family of processors) 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 (e7985f43609c of: property: Fix fw_devlink handling of interrupt-map) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (d53b681ce9ca scsi: ufs: mcq: Fix error output and clean up ufshcd_mcq_abort()) Merging drm-fixes/drm-fixes (c3f38fa61af7 Linux 6.10-rc2) Merging drm-intel-fixes/for-linux-next-fixes (75800e2e4203 drm/i915: Fix audio component initialization) 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 (7932b172ac7e Revert "riscv: mm: accelerate pagefault when badaccess") 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 (c3f38fa61af7 Linux 6.10-rc2) Merging gpio-brgl-fixes/gpio/for-current (90dd7de4ef7b gpio: tqmx86: fix broken IRQ_TYPE_EDGE_BOTH interrupt type) 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 (e0eec24e2e19 memblock: make memblock_set_node() also warn about use of MAX_NUMNODES) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (d6283b160a12 tools headers uapi: Sync linux/stat.h with the kernel sources to pick STATX_SUBVOL) 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 (c3f38fa61af7 Linux 6.10-rc2) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (2607133196c3 clk: sifive: Do not register clkdevs for PRCI clocks) Merging drm-misc-fixes/for-linux-next-fixes (bb1953588068 drm/msm: remove python 3.9 dependency for compiling msm) 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 (306dde9ce5c9 foo) Merging kbuild/for-next (1b1c9f0fd3fb dt-bindings: kbuild: Fix dt_binding_check on unconfigured build) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (af7520163400 perf top: Allow filters on events) 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 (95968f411042 Merge branch 'clkdev' 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 (59689727034b Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (07d7e57ea9d9 arm64: dts: mediatek: Add mt7986 based Bananapi R3 Mini) 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 (95f497286713 Merge branches 'arm32-for-6.11', 'arm64-defconfig-for-6.11', 'arm64-fixes-for-6.10', 'arm64-for-6.11', 'clk-fixes-for-6.10', 'clk-for-6.11' and 'drivers-for-6.11' into for-next) Merging renesas/next (f86b864474e4 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 (5a50243ac44c Merge branch 'sunxi/dt-for-6.11' into sunxi/for-next) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next) Merging ti/ti-next (1613e604df0c Linux 6.10-rc1) Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (e1c1038e7387 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void) Merging clk-renesas/renesas-clk (b86c2b1ce7a3 clk: renesas: rcar-gen2: Use DEFINE_SPINLOCK() for static spinlock) 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 (eb36e520f4f1 LoongArch: Fix GMAC's phy-mode definitions in dts) Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1) Merging m68knommu/for-next (c3f38fa61af7 Linux 6.10-rc2) 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 (1613e604df0c Linux 6.10-rc1) 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 (8e675c37e066 riscv: dts: thead: th1520: Add PMU event node) 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 (a0e9f2505a4a bcachefs: Eytzinger accumulation for accounting keys) 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 (8f1288f0a015 Merge branch 'for-next-next-v6.10-20240603' into for-next-20240603) Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to get CephFS metadata) Merging cifs/for-next (c3f38fa61af7 Linux 6.10-rc2) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging erofs/dev (1613e604df0c Linux 6.10-rc1) Merging exfat/dev (0daa52fbc7ac exfat: fix potential deadlock on __exfat_get_dentry_set) 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 (713f8834389f gfs2: Get rid of demote_ok checks) Merging jfs/jfs-next (ee6817e72d4e jfs: Remove use of folio error flag) Merging ksmbd/ksmbd-for-next (c3f38fa61af7 Linux 6.10-rc2) Merging nfs/linux-next (99bc9f2eb3f7 NFS: add barriers when testing for NFS_FSDATA_BLOCKED) Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) Merging nfsd/nfsd-next (fec4124bac55 svcrdma: Handle ADDR_CHANGE CM event properly) 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 (b0c6bcd58d44 xfs: Add cond_resched to block unmap range and reflink remap path) 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 (03985f9e469e Merge branch 'vfs.mount.api' into vfs.all) CONFLICT (content): Merge conflict in fs/nfs/symlink.c [fs-next 1c2d705247ca] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (1c2d705247ca 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 (3f7563262863 Merge branch 'pci/controller/tegra194') CONFLICT (content): Merge conflict in drivers/pci/pci.c 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) Merging i2c-host/i2c/i2c-host (5fb9780aa910 i2c: Remove I2C_CLASS_SPD) 5fb9780aa910 ("i2c: Remove I2C_CLASS_SPD") fe69f7d19df7 ("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 (f1de23611316 hwmon: (max31827) Add PEC support) Merging jc_docs/docs-next (cd706ca28a0a 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 (81a727d37e25 Merge branch 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (64e018d7a899 cpufreq: dt-platdev: add missing MODULE_DESCRIPTION() macro) 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 (fa0b54f17afe dlm: move recover idr to xarray datastructure) Merging rdma/for-next (2d0e7ba468ea RDMA/efa: Properly handle unexpected AQ completions) Merging net-next/main (83042ce9b7c3 Merge branch 'Felix-DSA-probing-cleanup') Applying: Revert "ethernet: octeontx2: avoid linking objects into multiple modules" Merging bpf-next/for-next (49784c797932 selftests/bpf: Drop duplicate bpf_map_lookup_elem in test_sockmap) 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 (d33224ba26e5 Bluetooth: Add vendor-specific packet classification for ISO data) Merging wireless-next/for-next (5bcd9a0a5995 wifi: brcm80211: remove unused structs) CONFLICT (content): Merge conflict in drivers/net/wireless/microchip/wilc1000/netdev.c CONFLICT (content): Merge conflict in net/mac80211/cfg.c 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 (aabbf2135f9a crypto: atmel-sha204a - fix negated return value) Merging drm/drm-next (c3f38fa61af7 Linux 6.10-rc2) 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 (539d33b57838 drm/komeda: remove unused struct 'gamma_curve_segment') Merging amdgpu/drm-next (f8718c482572 drm/amd/display: Move 'struct scaler_data' off stack) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c Merging drm-intel/for-linux-next (cef26c248110 MAINTAINERS: update i915 and xe entries for include/drm/intel) 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 (877517f2dcba drm/xe: Add kernel-doc to some xe_lrc interfaces) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_devcoredump.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c 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 (c3f38fa61af7 Linux 6.10-rc2) Merging sound/for-next (55fac50ea46f ALSA: seq: ump: Fix missing System Reset message handling) Merging ieee1394/for-next (a38297e3fb01 Linux 6.9) Merging sound-asoc/for-next (c3f38fa61af7 Linux 6.10-rc2) Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of) Merging input/next (2960d4c8e77a Input: tablet - use sizeof(*pointer) instead of sizeof(type)) 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 (a4e5862b1bf8 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 (ebcd1453f15e mfd: intel-lpss: Rename SPI intel_lpss_platform_info structs) Merging backlight/for-backlight-next (b72755f5b577 backlight: Add new lm3509 backlight driver) Merging battery/for-next (ebacfa1f09c1 power: supply: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging regulator/for-next (c3f38fa61af7 Linux 6.10-rc2) Merging security/next (61df7b828204 lsm: fixup the inode xattr capability handling) Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference) Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignment during securityfs dentry remove) Merging selinux/next (1613e604df0c Linux 6.10-rc1) Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) Merging tomoyo/master (c6144a21169f tomoyo: update project links) 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 (c3f38fa61af7 Linux 6.10-rc2) 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 (596c29f3c8de of/fdt: avoid re-parsing '#{address,size}-cells' in of_fdt_limit_memory) 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 (95d7c452a265 spi: stm32: Don't warn about spurious interrupts) Merging tip/master (309ad53b7f31 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 (123b15863550 EDAC, i10nm: make skx_common.o a separate module) Merging ftrace/for-next (fde0aeca5926 Merge user-events/for-next) Merging rcu/next (8dbd92a1950e rcu: Fix rcu_barrier() VS post CPUHP_TEARDOWN_CPU invocation) Merging paulmck/non-rcu/next (aa451ad3bd81 Merge branches 'cmpxchg.2024.05.30b', 'kcsan.2024.05.30b', 'lkmm.2024.05.30b', 'torture.2024.05.30b' and 'tsc.2024.05.27a' into HEAD) Merging kvm/next (ab978c62e72d Merge branch 'kvm-6.11-sev-snp' into HEAD) 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 (c6482eb8d937 KVM: PPC: Book3S HV nestedv2: Add support for reading VPA counters for pseries guests) Merging kvm-riscv/riscv_kvm_next (c66f3b40b17d RISC-V: KVM: Fix incorrect reg_subtype labels in kvm_riscv_vcpu_set_reg_isa_ext function) 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 (0da7a954480c doc: TPMI: Add entry for Performance Limit Reasons) Merging chrome-platform/for-next (bc3e45258096 hwmon: add ChromeOS EC driver) 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 (005408af25d5 leds: trigger: Add new LED Input events trigger) Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void) Merging driver-core/driver-core-next (c3f38fa61af7 Linux 6.10-rc2) Merging usb/usb-next (c3f38fa61af7 Linux 6.10-rc2) Merging thunderbolt/next (3c34a29159df thunderbolt: Mention Thunderbolt/USB4 debugging tools in Kconfig) Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2) Merging tty/tty-next (c3f38fa61af7 Linux 6.10-rc2) Merging char-misc/char-misc-next (c3f38fa61af7 Linux 6.10-rc2) 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 (15895709c7dc iio: imu: bmi323: Use iio read_acpi_mount_matrix() helper) CONFLICT (content): Merge conflict in drivers/iio/pressure/bmp280-core.c Merging phy-next/next (2f2f5c13cc5e phy: qcom-qmp-pcie: Add support for IPQ9574 g3x1 and g3x2 PCIEs) Merging soundwire/next (9b5fd115e7d5 soundwire: intel_ace2.x: add AC timing extensions for PantherLake) 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 (c3f38fa61af7 Linux 6.10-rc2) 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 (1805c1729f52 cgroup/cpuset: Optimize isolated partition only generate_sched_domains() calls) Merging scsi/for-next (d53b681ce9ca scsi: ufs: mcq: Fix error output and clean up ufshcd_mcq_abort()) Merging scsi-mkp/for-next (e8a1d87b7983 scsi: ufs: mcq: Convert MCQ_CFG_n to an inline function) Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) Merging rpmsg/for-next (d7faf9a16886 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (ea95bd851068 gpiolib: make gpiochip_set_desc_names() return void) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (32335efff386 Merge branch 'devel' into for-next) 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 (5628b6db0071 dt-bindings: pwm: fsl-ftm: Convert to yaml format) 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 (8031042cc531 list: test: remove unused struct 'klist_test_struct') 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 (dbd60276de58 auxdisplay: Use sizeof(*pointer) instead of sizeof(type)) 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 (1613e604df0c Linux 6.10-rc1) 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()) CONFLICT (content): Merge conflict in lib/fortify_kunit.c Merging random/master (1613e604df0c Linux 6.10-rc1) Merging landlock/next (0055f53aac80 selftests/landlock: Add layout1.refer_mount_root) Merging rust/rust-next (1613e604df0c Linux 6.10-rc1) Merging sysctl/sysctl-next (c819e252c287 sysctl: Add module description to sysctl-testing) Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size) Merging bitmap/bitmap-for-next (3d053947e400 lib: bitmap: add missing MODULE_DESCRIPTION() macros) Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void) Merging kspp/for-next/kspp (99a6087dfdc6 kunit/fortify: Remove __kmalloc_node() test) 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:
pgpkFNAlr8XAq.pgp
Description: OpenPGP digital signature
