Hi all, News: I will not be doing any linnux-next releases between June 14 and June 30, inclusive. Changes since 20240612: The drm-intel tree still had its build failure for which I reverted a commit. The ftrace tree gained a conflict against the vfs-brauner tree. Non-merge commits (relative to Linus' tree): 4851 5271 files changed, 470132 insertions(+), 94964 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 377 trees (counting Linus' and 106 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 (cea2a26553ac mailmap: Add my outdated addresses to the map file) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (b6fd1a10ec22 selftests: mm: make map_fixed_noreplace test names stable) Merging vfs-brauner-fixes/vfs.fixes (f5ceb1bbc98c iomap: Fix iomap_adjust_read_range for plen calculation) 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 (9696c6c6c5b0 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 (210cc5d3759f Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (9185afeac2a3 modpost: do not warn about missing MODULE_DESCRIPTION() for vmlinux.o) 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 (5c40e428aea6 arm64/io: add constant-argument check) 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 (2b85b7fb1376 powerpc/crypto: Add generated P8 asm to .gitignore) Merging s390-fixes/fixes (693d41f7c938 s390/mm: Restore mapping of kernel image using large pages) Merging net/main (be27b8965297 net: stmmac: replace priv->speed with the portTransmitRate from the tc-cbs parameters) Merging bpf/master (36534d3c5453 tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()) Merging ipsec/master (96f887a612e4 net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP) Merging netfilter/main (6f8f132cc7ba netfilter: Use flowlabel flow key when re-routing mangled packets) Merging ipvs/main (f8f0de9d58d9 Merge branch 'mlx5-fixes') Merging wireless/for-next (7d09e17c0415 wifi: mac80211: Recalc offload when monitor stop) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (542bb08ab014 RDMA/mana_ib: Ignore optional access flags for MRs) Merging sound-current/for-linus (55fac50ea46f ALSA: seq: ump: Fix missing System Reset message handling) Merging sound-asoc-fixes/for-linus (37a2c94c68ce Fixes for McASP and dmaengine_pcm) Merging regmap-fixes/for-linus (76f19626bd35 regmap: add missing MODULE_DESCRIPTION() macros) Merging regulator-fixes/for-linus (4cac29b846f3 regulator: bd71815: fix ramp values) Merging spi-fixes/for-linus (60980cf5b8c8 spi: cs42l43: Drop cs35l56 SPI speed down to 11MHz) Merging pci-current/for-linus (419d57d429f6 CREDITS: Add Synopsys DesignWare eDMA driver for Gustavo Pimentel) Merging driver-core.current/driver-core-linus (c0a40097f0bc drivers: core: synchronize really_probe() and dev_uevent()) Merging tty.current/tty-linus (ae01e52da244 serial: drop debugging WARN_ON_ONCE() from uart_write()) Merging usb.current/usb-linus (5ceac4402f5d xhci: Handle TD clearing for multiple streams case) 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 (c3552ab19aeb staging: vchiq_debugfs: Fix NPD in vchiq_dump_state) Merging iio-fixes/fixes-togreg (4241665e6ea0 iio: chemical: bme680: Fix sensor data read operation) Merging counter-current/counter-current (1613e604df0c Linux 6.10-rc1) Merging char-misc.current/char-misc-linus (8f40af31971c Merge tag 'iio-fixes-for-6.10a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus) 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 (cee77149ebe9 Input: xpad - add support for ASUS ROG RAIKIRI PRO) Merging crypto-current/master (67ec8cdf2997 hwrng: core - Remove add_early_randomness) Merging vfio-fixes/for-linus (d71a989cf5d9 vfio/pci: Insert full vma on mmap'd MMIO fault) Merging kselftest-fixes/fixes (ed3994ac847e selftests/fchmodat2: fix clang build failure due to -static-libasan) Merging dmaengine-fixes/fixes (5422145d0b74 dmaengine: ioatdma: Fix missing kmem_cache_destroy()) 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 (ce5cdd3b0521 mips: bmips: BCM6358: make sure CBR is correctly set) Merging at91-fixes/at91-fixes (1613e604df0c Linux 6.10-rc1) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) Merging kvm-fixes/master (db574f2f96d0 KVM: x86/mmu: Don't save mmu_invalidate_seq after checking private attr) 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 (90e6f08915ec scsi: mpi3mr: Fix ATA NCQ priority support) Merging drm-fixes/drm-fixes (83a7eefedc9b Linux 6.10-rc3) Merging drm-intel-fixes/for-linux-next-fixes (83a7eefedc9b Linux 6.10-rc3) Merging mmc-fixes/fixes (a7c08b0ccc52 Revert "mmc: moxart-mmc: Use sg_miter for PIO") 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 (831bcbcead66 Drivers: hv: Cosmetic changes for hv.c and balloon.c) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (83a7eefedc9b Linux 6.10-rc3) 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 (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (c3f38fa61af7 Linux 6.10-rc2) Merging gpio-brgl-fixes/gpio/for-current (83a7eefedc9b Linux 6.10-rc3) 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 (3ac36aa73073 x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node()) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (83a7eefedc9b Linux 6.10-rc3) Merging efi-fixes/urgent (8e411b665c04 efi/arm: Disable LPAE PAN when calling EFI runtime services) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (d3911f1639e6 power: supply: rt5033: Bring back i2c_set_clientdata) 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 (a126eca84435 rust: avoid unused import warning in `rusttest`) Merging w1-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pmdomain-fixes/fixes (c3f38fa61af7 Linux 6.10-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (cbf3fb5b29e9 i2c: designware: Fix the functionality flags of the slave-only interface) 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 pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3) Merging drm-misc-fixes/for-linux-next-fixes (c38896ca6318 drm/mediatek: Call drm_atomic_helper_shutdown() at shutdown time) Merging mm-stable/mm-stable (83a7eefedc9b Linux 6.10-rc3) Merging mm-nonmm-stable/mm-nonmm-stable (83a7eefedc9b Linux 6.10-rc3) Merging mm/mm-everything (18fbdd0c3587 foo) Merging kbuild/for-next (6e5cd25b08c2 kbuild: merge temporary vmlinux for BTF and kallsyms) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (6828d6929b76 perf evsel: Refactor tool 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 (b5e352609497 Merge branches 'clkdev', 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (71a096f1ec28 Merge branches 'for-next/cpufeature', 'for-next/misc', 'for-next/kselftest', 'for-next/mte' and 'for-next/errata' into for-next/core) 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 (937a293bad3f 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 (1cdb1c9626a4 Merge branch 'at91-defconfig' 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 (9ba0cae3cac0 memory: fsl_ifc: Make FSL_IFC config visible and selectable) Merging imx-mxs/for-next (59689727034b Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (85ccbe8afbb4 arm64: dts: mediatek: mt7981: add I2C controller) 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 (48a261373302 Merge branches 'arm32-for-6.11', 'arm64-defconfig-fixes-for-6.10', '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 (d1ef2e3bcb03 Merge branch '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 (fa4f8e54a5b1 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 (3824f841f0bc Merge branch 'for-next/ffa/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) Merging stm32/stm32-next (4732b1ffb466 ARM: dts: stm32: Fix STM32MP13xx DHCOR DHSBC Makefile entry) Merging sunxi/sunxi/for-next (bab57a244b51 Merge branch 'sunxi/clk-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 (d524a4960826 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (a1ebcd60bf4e Merge remote-tracking branch 'git/zynqmp/dt' into for-next) Merging clk/clk-next (5029c56be4ba Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void) Merging clk-renesas/renesas-clk (f92d44a00bd5 clk: renesas: r8a779h0: Add VIN clocks) 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 (1d8491d3e726 m68k: amiga: Turn off Warp1260 interrupts during boot) Merging m68knommu/for-next (83a7eefedc9b Linux 6.10-rc3) Merging microblaze/next (1613e604df0c Linux 6.10-rc1) Merging mips/mips-next (3ee1167a16df MIPS: ip22-gio: Make ip22_gio_set_64bit() and ip22_gio_init() static) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (72d95924ee35 parisc: Try to fix random segmentation faults in package builds) Merging powerpc/next (11e6e6d8bf8f powerpc/mm/drmem: Silence drmem_init() early return) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (6d8e604c9502 Merge patch series "Support Zve32[xf] and Zve64[xfd] Vector subextensions") Merging riscv-dt/riscv-dt-for-next (1dc5f8f6ea73 riscv: dts: starfive: Update flash partition layout) Merging riscv-soc/riscv-soc-for-next (3ab910a7e979 Merge branch 'riscv-config-for-next' into riscv-soc-for-next) Merging s390/for-next (47542b30c8fb Merge branch 'features' into for-next) 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 (4c28fbebd24c bcachefs: Coalesce accounting keys before journal replay) 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 (db1c31045e6a Merge branch 'for-next-next-v6.10-20240607' into for-next-20240607) Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to get CephFS metadata) Merging cifs/for-next (83a7eefedc9b Linux 6.10-rc3) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging dlm/next (79ced51e2e56 dlm: remove DLM_LSFL_SOFTIRQ from exflags) Merging erofs/dev (83a7eefedc9b Linux 6.10-rc3) 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 (a66c186557cb Pull fsnotify softlockup fix.) Merging ext4/dev (83a7eefedc9b Linux 6.10-rc3) Merging f2fs/dev (298b1e4182d6 f2fs: fix to truncate preallocated blocks in f2fs_file_open()) 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 (2bfc4214c69c ksmbd: fix missing use of get_write in in smb2_set_ea()) 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 (50f73efbc1da NFSD: Support write delegations in LAYOUTGET) Merging ntfs3/master (fea1432b36ca fs/ntfs3: Drop stray '\' (backslash) in formatting string) 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 (58f880711f2b xfs: make sure sb_fdblocks is non-negative) Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large folios) 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 (22c963c98065 Merge branch 'vfs.fixes' into vfs.all) CONFLICT (content): Merge conflict in fs/nfs/symlink.c [fs-next 3c94454b6852] 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 (3c94454b6852 Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) 08ce6f724ce9 ("proc: Remove usage of the deprecated ida_simple_xx() API") Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' into for-next) Merging pci/next (3bf9044d4666 Merge branch 'pci/misc') 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 (c412e40267dd Merge branch 'for-6.10/upstream-fixes' into for-next) Merging i2c/i2c/for-next (83a7eefedc9b Linux 6.10-rc3) Merging i2c-host/i2c/i2c-host (1131179f9f4d i2c: add missing MODULE_DESCRIPTION() macros) 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 (c16fa6967781 hwmon: add MP9941 driver) Merging jc_docs/docs-next (68f1174e2a8d Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) Merging v4l-dvb-next/master (1aea3d1d4a21 media: av7110: coding style fixes: avoid_externs) Merging pm/linux-next (0a2c035b1e6d Merge branch 'pm-cpufreq-fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (3a1ac6b8f603 OPP: ti: Fix ti_opp_supply_probe wrong return values) 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 (cc647e931a24 pmdomain: amlogic: add missing MODULE_DESCRIPTION() macros) 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 rdma/for-next (c8683b995d8a RDMA/mana_ib: extend query device) Merging net-next/main (32b06603f879 net: xilinx: axienet: Use NL_SET_ERR_MSG instead of netdev_err) Merging bpf-next/for-next (4ff5747158f3 Merge branch 'bpf-support-dumping-kfunc-prototypes-from-btf') 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 (d2118673f3ae Bluetooth: qca: Fix BT enable failure again for QCA6390 after warm reboot) 04ac7662d391 ("Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ") 5fe0be8868aa ("Bluetooth: fix connection setup in l2cap_connect") 9dff76b7f8bc ("Bluetooth: hci_sync: Fix not using correct handle") Merging wireless-next/for-next (a2ead3445a63 wifi: zd1211rw: use 'time_left' variable with wait_for_completion_timeout()) 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 (6d4e1993a305 hwrng: omap - add missing MODULE_DESCRIPTION() macro) Merging drm/drm-next (1ddaaa244021 Merge tag 'amd-drm-next-6.11-2024-06-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) Merging drm-exynos/for-linux-next (9347028bfcfc drm/exynos/vidi: convert to struct drm_edid) Merging drm-misc/for-linux-next (dfc1209ed5a3 arm/komeda: Remove all CONFIG_DEBUG_FS conditional compilations) Merging amdgpu/drm-next (b95fa494d6b7 drm/amdgpu: add RAS is_rma flag) Merging drm-intel/for-linux-next (da8c3cdb016c drm/i915: Rename bigjoiner master/slave to bigjoiner primary/secondary) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h 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 Applying: Revert "drm/i915: Compute CMRR and calculate vtotal" Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (aeacc39e2088 drm/msm/dp: fix runtime_pm handling in dp_wait_hpd_asserted) Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane) Merging drm-xe/drm-xe-next (e54700f7d6aa drm/xe/bmg: Add PCI IDs) 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 (8a4562cc2a47 Merge remote-tracking branch 'regmap/for-6.11' into regmap-next) Merging sound/for-next (55fac50ea46f ALSA: seq: ump: Fix missing System Reset message handling) Merging ieee1394/for-next (87c8540aceda firewire: core: use inline helper functions to serialize phy config packet) Merging sound-asoc/for-next (65f6c8a9c63e Merge remote-tracking branch 'asoc/for-6.11' into asoc-next) Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of) Merging input/next (9b9247397e2e Input: adxl34x - switch to using "guard" notation) CONFLICT (content): Merge conflict in include/linux/interrupt.h Merging block/for-next (90beb03cc7bb Merge branch 'for-6.11/block' 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 (d6cd1206ffaa dt-bindings: mmc: meson-gx: add optional power-domains) 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 (ad175de1f8da power: supply: hwmon: Add support for power sensors) Merging regulator/for-next (c1cbbacb112a Merge remote-tracking branch 'regulator/for-6.11' into regulator-next) Merging security/next (087a57d68f61 Automated merge of 'dev' into 'next') 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 (2fe209d0ad2e smack: tcp: ipv4, fix incorrect labeling) Merging tomoyo/master (35a1fb207602 net/sched: Sleep before rechecking index at tcf_idr_check_alloc()) Merging tpmdd/next (83a7eefedc9b Linux 6.10-rc3) Merging watchdog/master (c3f38fa61af7 Linux 6.10-rc2) Merging iommu/next (526606b0a199 iommu/amd: Fix Invalid wait context issue) Merging audit/next (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (4f42882bb9e4 PCI: of_property: Add interrupt-controller property in PCI device nodes) Merging dt-krzk/for-next (88ae85dc70fe Merge branch 'next/dt' into for-next) Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Document the SDX75 IPCC) Merging spi/for-next (8d2f27b08706 Merge remote-tracking branch 'spi/for-6.11' into spi-next) Merging tip/master (f87c20c019e2 Merge branch into tip/master: 'x86/percpu') CONFLICT (content): Merge conflict in include/linux/cacheinfo.h Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const) Merging edac/edac-for-next (e0ae905eed85 Merge ras/edac-amd-atl into for-next) Merging ftrace/for-next (b7967ac6b815 Merge probes/for-next) CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Merging rcu/next (4ac721883991 Merge branches 'doc.2024.06.03a', 'fixes.2024.06.03a', 'mb.2024.06.03a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.03a' and 'rcutorture.2024.06.03a' into HEAD) Merging paulmck/non-rcu/next (e78511732bbd Merge branches 'cmpxchg.2024.06.06a', 'kcsan.2024.06.06a', 'lkmm.2024.06.06a', 'torture.2024.05.30b' and 'tsc.2024.05.27a' into HEAD) Merging kvm/next (f99b052256f1 KVM: SNP: Fix LBR Virtualization for SNP guest) 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 (c3f38fa61af7 Linux 6.10-rc2) Merging kvm-riscv/riscv_kvm_next (0fc670d07d5d KVM: selftests: Fix RISC-V compilation) Merging kvm-x86/next (e4e9e1067138 Merge branch 'svm') 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 (c10b245e1a5c Merge branch 'for-6.11' into for-next) Merging drivers-x86/for-next (dd637f5cd5f3 platform/x86: dell-pc: avoid double free and invalid unregistration) Merging chrome-platform/for-next (c2a28647bbb4 platform/chrome: cros_ec_debugfs: fix wrong EC message version) Merging chrome-platform-firmware/for-firmware-next (fc2c1d716d4a firmware: google: add missing MODULE_DESCRIPTION() macros) 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 (d7d3ae441e29 dca: make dca_class a static const structure) CONFLICT (content): Merge conflict in drivers/fsi/fsi-occ.c Merging usb/usb-next (5821bf2dffbe usb: typec: ucsi: Enable UCSI v2.0 notifications) 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 (ffd8e8bd26e9 serial: 8250: Extract platform driver) Merging char-misc/char-misc-next (a774c5d1f9c4 mcb: mcb-pci: detect IO mapped devices before requesting resources) 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 (b9b25c849601 coresight: tmc: Remove duplicated include in coresight-tmc-core.c) Merging fastrpc/for-next (0ff3de430627 misc: fastrpc: use coherent pool for untranslated Compute Banks) Merging fpga/for-next (c107697c82af Revert "fpga: disable KUnit test suites when module support is enabled") Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment) Merging iio/togreg (823c485ffd06 iio: adc: ti-adc161s626: make use of iio_device_claim_direct_scoped()) Merging phy-next/next (8e97ddd58614 dt-bindings: phy: g12a-usb2-phy: add optional power-domains) 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 (240a3a167468 staging: vc04_services: Fix kernel-doc param for vchiq_register_chrdev) Merging counter-next/counter-next (b84dba784fcb counter: ftm-quaddec: add missing MODULE_DESCRIPTION() macro) 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 (f8f530ba429a dmaengine: qcom: gpi: clean up the IRQ disable/enable in gpi_reset_chan()) Merging cgroup/for-next (1805c1729f52 cgroup/cpuset: Optimize isolated partition only generate_sched_domains() calls) Merging scsi/for-next (626b8d03266f Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (95f8bf932b46 scsi: Add missing MODULE_DESCRIPTION() macros) Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) Merging rpmsg/for-next (a3b7033bbf72 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (08d94c742868 Documentation: gpio: Clarify effect of active low flag on line edges) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (cef56291a5de Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (9bd95ac86e70 pinctrl: renesas: rzg2l: Add support for RZ/V2H SoC) Merging pinctrl-samsung/for-next (1613e604df0c Linux 6.10-rc1) Merging pwm/pwm/for-next (240be5841c2c pwm: add missing MODULE_DESCRIPTION() macros) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (64f5bc57b24e selftests/sched: fix code format issues) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (425ae3ab5a1f list: test: add the missing MODULE_DESCRIPTION() macro) 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 (139eb4bb33a2 nvmem: rmem: Fix return value of rmem_read()) 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 (2ccfe94bc3ac auxdisplay: ht16k33: Drop reference after LED registration) 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 (0e9899feed9c mm/mm_init.c: don't initialize page->lru again) Merging cxl/next (1613e604df0c Linux 6.10-rc1) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (83a7eefedc9b Linux 6.10-rc3) Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static) Merging slab/slab/for-next (f10d55c75472 slab: delete useless RED_INACTIVE and RED_ACTIVE) 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 (354793766835 bitops: Add a comment explaining the double underscore macros) Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void) Merging kspp/for-next/kspp (8e051327a29c kunit/overflow: Adjust for __counted_by with DEFINE_RAW_FLEX()) 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 pwrseq/pwrseq/for-next (6140d185a43d PCI/pwrctl: Add a PCI power control driver for power sequenced devices) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgp6ZM3yoWjtb.pgp
Description: OpenPGP digital signature
