Hi all, Changes since 20240801: The qcom tree gained a build failure so I used the version from next-20240801. The cpufreq-arm tree gained a build failure so I used the version from next-20240801. My powerpc_le_defconfig boot test lost its runtime warning. Non-merge commits (relative to Linus' tree): 2321 2793 files changed, 101343 insertions(+), 49933 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 380 trees (counting Linus' and 107 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 (c0ecd6388360 Merge tag 'pci-v6.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (cc87997e1da5 mm: shmem: fix incorrect aligned index when checking conflicts) Merging vfs-brauner-fixes/vfs.fixes (fa0e22eb97a5 pidfd: prevent creation of pidfds for kthreads) Merging fscrypt-current/for-current (256abd8e550c Linux 6.10-rc7) Merging fsverity-current/for-current (256abd8e550c Linux 6.10-rc7) Merging btrfs-fixes/next-fixes (aaae89f5d49b Merge branch 'misc-6.11' into next-fixes) Merging vfs-fixes/fixes (8aa37bde1a7b protect the fetch of ->fd[fd] in do_dup2() from mispredictions) Merging erofs-fixes/fixes (0c3836482481 Linux 6.10) Merging nfsd-fixes/nfsd-fixes (91da337e5d50 nfsd: don't set SVC_SOCK_ANONYMOUS when creating nfsd sockets) Merging v9fs-fixes/fixes/next (0c3836482481 Linux 6.10) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) Merging fs-current (2f1187ed9a81 Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging kbuild-current/fixes (8400291e289e Linux 6.11-rc1) 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 (f126745da817 rust: SHADOW_CALL_STACK is incompatible with Rust) Merging arm-soc-fixes/arm/fixes (6fba5cbd323e MAINTAINERS: Update FREESCALE SOC DRIVERS and QUICC ENGINE LIBRARY) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging sophgo-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging m68k-current/for-linus (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg()) Merging powerpc-fixes/fixes (8b7f59de92ac selftests/powerpc: Fix build with USERCFLAGS set) Merging s390-fixes/fixes (33bd8d153c33 s390: Keep inittext section writable) Merging net/main (183d46ff422e Merge tag 'net-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (b9e7fc0aeda7 igc: Fix double reset adapter triggered from a single taprio cmd) Merging ipsec/master (89a2aefe4b08 xfrm: call xfrm_dev_policy_delete when kill policy) Merging netfilter/main (c22921df777d netfilter: iptables: Fix potential null-ptr-deref in ip6table_nat_table_init().) Merging ipvs/main (9415d375d852 rtnetlink: Don't ignore IFLA_TARGET_NETNSID when ifname is specified in rtnl_dellink().) Merging wireless/for-next (a47f3320bb4b wifi: ath12k: fix soft lockup on suspend) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (8400291e289e Linux 6.11-rc1) Merging sound-current/for-linus (478689b5990d ALSA: hda: Conditionally use snooping for AMD HDMI) Merging sound-asoc-fixes/for-linus (7354eb7f1558 ASoC: SOF: Remove libraries from topology lookups) Merging regmap-fixes/for-linus (c2429cc2c731 Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) Merging regulator-fixes/for-linus (8400291e289e Linux 6.11-rc1) Merging spi-fixes/for-linus (e4c4638b6a10 spi: spidev: Add missing spi_device_id for bh2228fv) Merging pci-current/for-linus (5560a612c20d PCI: pciehp: Retain Power Indicator bits for userspace indicators) Merging driver-core.current/driver-core-linus (15fffc6a5624 driver core: Fix uevent_show() vs driver detach race) Merging tty.current/tty-linus (6e20753da6bc tty: vt: conmakehash: cope with abs_srctree no longer in env) Merging usb.current/usb-linus (b1dad2f09138 usb: typec: tipd: Delete extra semi-colon) Merging usb-serial-fixes/usb-linus (00af4f3dda14 USB: serial: debug: do not echo input by default) Merging phy/fixes (8400291e289e Linux 6.11-rc1) Merging staging.current/staging-linus (8400291e289e Linux 6.11-rc1) Merging iio-fixes/fixes-togreg (70eac5c3c491 iio: adc: ad7173: Fix incorrect compatible string) Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1) Merging char-misc.current/char-misc-linus (ffcf2eb4bfa2 spmi: pmic-arb: add missing newline in dev_err format strings) Merging soundwire-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging thunderbolt-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging input-current/for-linus (684890a0185d Input: adc-joystick - fix optional value handling) Merging crypto-current/master (df1e9791998a hwrng: core - remove (un)register_miscdev()) Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) Merging kselftest-fixes/fixes (170c966cbe27 selftests: ksft: Fix finished() helper exit code on skipped tests) Merging dmaengine-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NVDDR timings are rejected) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (914f8961879d media: v4l: Fix missing tabular column hint for Y14P format) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (8400291e289e Linux 6.11-rc1) Merging at91-fixes/at91-fixes (1613e604df0c Linux 6.10-rc1) Merging omap-fixes/fixes (0c3836482481 Linux 6.10) Merging kvm-fixes/master (332d2c1d713e crypto: ccp: Add the SNP_VLEK_LOAD command) Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) Merging hwmon-fixes/hwmon (bd907ec07c7c hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files to cxl driver-api) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging samsung-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pinctrl-samsung-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging devicetree-fixes/dt/linus (e1cf752ede8e dt-bindings: eeprom: at25: add fujitsu,mb85rs256 compatible) Merging dt-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging scsi-fixes/fixes (7c632fc3ce64 Merge branch '6.11/scsi-queue' into 6.11/scsi-fixes) Merging drm-fixes/drm-fixes (8400291e289e Linux 6.11-rc1) Merging drm-intel-fixes/for-linux-next-fixes (5b5115726601 drm/i915: Fix possible int overflow in skl_ddi_calculate_wrpll()) Merging mmc-fixes/fixes (9374ae912dbb mmc: mtk-sd: receive cmd8 data when hs400 tuning fail) Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) Merging gnss-fixes/gnss-linus (8400291e289e Linux 6.11-rc1) Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add overview of Confidential Computing VM support) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (3b6564427aea riscv: Fix linear mapping checks for non-contiguous memory regions) Merging riscv-dt-fixes/riscv-dt-fixes (8400291e289e Linux 6.11-rc1) Merging riscv-soc-fixes/riscv-soc-fixes (8400291e289e Linux 6.11-rc1) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging gpio-brgl-fixes/gpio/for-current (8400291e289e Linux 6.11-rc1) Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-intel-fixes/fixes (a366e46da10d pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID) Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging kunit-fixes/kunit-fixes (8400291e289e Linux 6.11-rc1) Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() helper to check for invalid node ID) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (d27087c76e3c perf docs: Document cross compilation) Merging efi-fixes/urgent (ae835a96d72c x86/efistub: Revert to heap allocated boot_params for PE entrypoint) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (d6cca7631a4b power: supply: qcom_battmgr: Ignore extra __le32 in info payload) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (8400291e289e Linux 6.11-rc1) Merging rust-fixes/rust-fixes (0ba521d6948e rust: macros: indent list item in `module!`'s docs) Merging w1-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pmdomain-fixes/fixes (ddab91f4b2de pmdomain: qcom: rpmhpd: Skip retention level for Power Domains) Merging i2c-host-fixes/i2c/i2c-host-fixes (8400291e289e Linux 6.11-rc1) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (39a3396558fb clk: thead: fix dependency on clk_ignore_unused) Merging pwrseq-fixes/pwrseq/for-current (8400291e289e Linux 6.11-rc1) Merging thead-dt-fixes/thead-dt-fixes (8400291e289e Linux 6.11-rc1) Merging drm-misc-fixes/for-linux-next-fixes (9c685f61722d nouveau: set placement to original placement on uvmm validate.) Merging mm-stable/mm-stable (8400291e289e Linux 6.11-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (8400291e289e Linux 6.11-rc1) Merging mm/mm-everything (61005e651b17 foo) Merging kbuild/for-next (1099ea6f4263 kbuild: clean up code duplication in cmd_fdtoverlay) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (616ebac7ee2b perf mem: Add -T/--data-type option to report subcommand) Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) Merging dma-mapping/for-next (94ede2a3e913 profiling: remove stale percpu flip buffer variables) Merging asm-generic/master (a73df08ebb5a syscalls: fix syscall macros for newfstat/newfstatat) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (ba954cad0ce7 Merge branches 'clkdev', 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (36639013b346 arm64: mm: Fix lockless walks with static and dynamic page-table folding) Merging arm-perf/for-next/perf (42bebc7cca79 perf: add missing MODULE_DESCRIPTION() macros) Merging arm-soc/for-next (285d9f79f0e5 Merge branch 'soc/arm' into for-next) Merging amlogic/for-next (0c6580c514ec Merge branch 'v6.11/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to BMC board) Merging at91/at91-next (1cdb1c9626a4 Merge branch 'at91-defconfig' into at91-next) Merging broadcom/next (350006650b29 Merge branch 'soc/next' into next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (ddb869ea237e memory: tegra: Rework update_clock_tree_delay()) Merging imx-mxs/for-next (145b73c51732 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (5920acd88b52 Merge branch 'v6.11-next/dts64' into for-next) Merging mvebu/for-next (ffd0d7df6bdb Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (2a693870ef0d Merge branch 'omap-for-v6.12/soc' into omap-reset) Merging qcom/for-next (335ac87eb2f6 Merge branches 'arm32-for-6.12', 'arm64-defconfig-fixes-for-6.11', 'arm64-fixes-for-6.11', 'arm64-for-6.12', 'clk-fixes-for-6.11', 'clk-for-6.12', 'drivers-fixes-for-6.11' and 'drivers-for-6.12' into for-next) $ git reset --hard HEAD^ Merging next-20240801 version of qcom Merging renesas/next (4853d9a42635 Merge branches 'renesas-arm-defconfig-for-v6.12', 'renesas-dt-bindings-for-v6.12' and 'renesas-dts-for-v6.12' into renesas-next) Merging reset/reset/next (c1267e1afae6 arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS) Merging rockchip/for-next (140f87999691 Merge branch 'v6.11-armsoc/dtsfixes' into for-next) Merging samsung-krzk/for-next (853bb140473b Merge branch 'next/clk' into for-next) Merging scmi/for-linux-next (94ede2a3e913 profiling: remove stale percpu flip buffer variables) Merging sophgo/for-next (d9773e09addd riscv: dts: sophgo: Add i2c device support for sg2042) Merging stm32/stm32-next (1eafc48af859 arm64: stm32: enable scmi regulator for stm32) Merging sunxi/sunxi/for-next (2873085a8cd5 arm64: dts: allwinner: h700: Add Anbernic RG35XX-SP) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig into for-next) Merging thead-dt/thead-dt-for-next (32121e158449 riscv: dts: thead: add basic spi node) Merging ti/ti-next (137d9e76ae0b Merge tag 'ti-k3-dt-for-v6.11-part2' into ti-k3-dts-next) Merging xilinx/for-next (0c559f8a91de drivers: soc: xilinx: add the missing kfree in xlnx_add_cb_for_suspend()) Merging clk/clk-next (1bfc59d9f5ba Merge branch 'clk-bindings' into clk-next) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0) Merging clk-renesas/renesas-clk (983ffab6f13c clk: renesas: r8a779h0: Add PWM clock) 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 (c0438fbbedb6 Merge branch 'loongarch-kvm' into loongarch-next) Merging m68k/for-next (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg()) Merging m68knommu/for-next (8400291e289e Linux 6.11-rc1) Merging microblaze/next (d829e7ee6354 microblaze: Export xmb_manager functions) Merging mips/mips-next (8400291e289e Linux 6.11-rc1) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (b8db38274b21 parisc: Enable GENERIC_CLOCKEVENTS_BROADCAST) Merging powerpc/next (9ff0251b2eb5 Merge branch 'topic/ppc-kvm' into next) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) Merging riscv-dt/riscv-dt-for-next (8400291e289e Linux 6.11-rc1) Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1) Merging s390/for-next (f24ef6ed4928 Merge branch 'fixes' into for-next) Merging sh/for-next (8fe76a1c2264 sh: push-switch: Add missing MODULE_DESCRIPTION() macro) Merging sparc/for-next (a3da15389112 sparc64: Fix prototype warnings in hibernate.c) Merging uml/next (98ff534ec2cd um: vector: always reset vp->opened) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging bcachefs/for-next (c84469634e82 bcachefs: quota_reserve_range() -> for_each_btree_key_in_subvolume_upto) 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 (256abd8e550c Linux 6.10-rc7) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (d7e5b08965f7 Merge branch 'for-next-next-v6.11-20240801' into for-next-20240801) Merging ceph/master (31634d7597d8 ceph: force sending a cap update msg back to MDS for revoke op) Merging cifs/for-next (2b55a435bd80 cifs: update internal version number) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging dlm/next (89b01913dc73 dlm: add rcu_barrier before destroy kmem cache) Merging erofs/dev (14e9283fb22d erofs: convert comma to semicolon) Merging exfat/dev (89fc548767a2 exfat: fix potential deadlock on __exfat_get_dentry_set) Merging exportfs/exportfs-next (0c3836482481 Linux 6.10) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (8400291e289e Linux 6.11-rc1) Merging f2fs/dev (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) Merging gfs2/for-next (6706415bf9f3 Merge tag 'gfs2-v6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) Merging ksmbd/ksmbd-for-next (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (8400291e289e Linux 6.11-rc1) Merging nfs-anna/linux-next (b9fae9f06d84 SUNRPC: Fixup gss_status tracepoint error output) Merging nfsd/nfsd-next (d6b33c9f944d svcrdma: Handle device removal outside of the CM event handler) Merging ntfs3/master (8400291e289e Linux 6.11-rc1) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lower only root) Merging ubifs/next (92a286e90203 ubi: Fix ubi_init() ubiblock_exit() section mismatch) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (0c3836482481 Linux 6.10) Merging xfs/for-next (7bf888fa26e8 xfs: convert comma to semicolon) 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 (cb0433302c1e Merge branch 'vfs.netfs' into vfs.all) Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (812e4c94fe32 Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) Merging printk/for-next (b18703ea7157 Merge branch 'rework/write-atomic' into for-next) Merging pci/next (79b01efa89b2 Merge branch 'pci/controller/affinity') Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing MODULE_DESCRIPTION() macro) Merging hid/for-next (99ebdb2003a2 Merge branch 'for-6.11/upstream-fixes' into for-next) Merging i2c/i2c/for-next (37c526f00bc1 i2c: smbus: Improve handling of stuck alerts) Merging i2c-host/i2c/i2c-host (8400291e289e Linux 6.11-rc1) Merging i3c/i3c/next (24168c5e6dfb dt-bindings: i3c: add header for generic I3C flags) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (ee12fb26a5eb hwmon: vexpress: Use of_property_present()) Merging jc_docs/docs-next (8663dd38a7ba docs/zh_CN: fix a broken reference) Merging v4l-dvb/master (68a72104cbcf media: raspberrypi: Switch to remove_new) Merging v4l-dvb-next/master (68a72104cbcf media: raspberrypi: Switch to remove_new) Merging pm/linux-next (d8a0699248b2 Merge branch 'thermal-fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (e960bbac0af4 cpufreq: spear: Use of_property_for_each_u32() instead of open coding) $ git reset --hard HEAD^ Merging next-20240801 version of cpufreq-arm Merging cpupower/cpupower (8400291e289e Linux 6.11-rc1) Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers) Merging pmdomain/next (67ce905f5f72 mdomain: Merge branch fixes into next) Merging opp/opp/linux-next (8400291e289e Linux 6.11-rc1) Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: convert hisilicon-thermal.txt to dt-schema) Merging rdma/for-next (60dc7fcafea8 RDMA/siw: Remove NETDEV_GOING_DOWN event handler) Merging net-next/main (5fa35bd39ce1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (b7ea631b9a79 Merge branch 'selftests/bpf: convert test_dev_cgroup to test_progs') Merging ipsec-next/master (8e0c0ec9b7dc Merge branch 'ethernet-convert-from-tasklet-to-bh-workqueue') Merging mlx5-next/mlx5-next (8400291e289e Linux 6.11-rc1) Merging netfilter-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe') Merging ipvs-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe') Merging bluetooth/master (2360f368524b Bluetooth: hci_sync: avoid dup filtering when passive scanning with adv monitor) Merging wireless-next/for-next (8400291e289e Linux 6.11-rc1) 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 (78a0b13f5744 Merge tag 'nand/for-6.11' into mtd/next) Merging nand/nand/next (a503f91a3645 mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks) Merging spi-nor/spi-nor/next (95b9c9a7777d mtd: spi-nor: micron-st: Add n25q064a WP support) Merging crypto/master (df1e9791998a hwrng: core - remove (un)register_miscdev()) Merging drm/drm-next (8400291e289e Linux 6.11-rc1) Merging drm-exynos/for-linux-next (627a24f5f25d Merge tag 'amd-drm-fixes-6.11-2024-07-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) Merging drm-misc/for-linux-next (d97e71e44937 drm/bridge: synopsys: dw-mipi-dsi: enable EoTp by default) CONFLICT (content): Merge conflict in drivers/gpu/drm/ast/ast_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/v3d/v3d_sched.c CONFLICT (content): Merge conflict in drivers/gpu/drm/v3d/v3d_submit.c Merging amdgpu/drm-next (c9bfc37f085a drm/amd/display: Add new enable and disable functions for DCN35) Merging drm-intel/for-linux-next (c0e0bde2c7e6 drm/i915: Use backlight power constants) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (fe34394ecdad dt-bindings: display/msm: dsi-controller-main: Add SM7150) Merging drm-msm-lumag/msm-next-lumag (399af57ccca2 dt-bindings: display/msm/gpu: fix the schema being not applied) Merging drm-xe/drm-xe-next (4f04d07c0a94 drm/xe: Faster devcoredump) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (8b05b12e86ff fbdev/hpfb: Fix an error handling path in hpfb_dio_probe()) Merging regmap/for-next (b18d17d1a97b Merge branch 'regmap-linus' into regmap-next) Merging sound/for-next (a48fee68a8fa ALSA: pcm_timer: use snd_pcm_direction_name()) Merging ieee1394/for-next (06c03ffbcb73 firewire: core: utilize kref to maintain fw_node with reference counting) c2f9fd3d6ad7 ("Revert "ALSA: firewire-lib: operate for period elapse event in process context"") e29ed9a81fd4 ("Revert "ALSA: firewire-lib: obsolete workqueue for period update"") Merging sound-asoc/for-next (73f68a327e23 Merge remote-tracking branch 'asoc/for-6.12' into asoc-next) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (8bd2aa8529ac Input: tc3589x - use of_property_present()) Merging block/for-next (dfcaf38adba1 Merge branch 'for-6.12/io_uring' into for-next) Merging device-mapper/for-next (7f1c4909a821 dm vdo: fix a minor formatting issue in vdo.rst) Merging libata/for-next (b40824500eaa ata: libata: Remove ata_noop_qc_prep()) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (538076ce6b8d mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (d94fc0f04121 dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC) Merging backlight/for-backlight-next (fea88a13a5d1 backlight: l4f00242t03: Add check for spi_setup) Merging battery/for-next (be6299c6e55e power: supply: sysfs: use power_supply_property_is_writeable()) Merging regulator/for-next (b03695d95213 regulator: Use of_property_read_bool()) Merging security/next (924e19c39e8f lsm: Refactor return value of LSM hook inode_copy_up_xattr) Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1) Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignment during securityfs dentry remove) Merging selinux/next (fc328c869c41 selinux: refactor code to return ERR_PTR in selinux_netlbl_sock_genattr) Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket label) Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) Merging tpmdd/next (f6554cbf56be KEYS: Remove unused declarations) Merging watchdog/master (63d097d46799 dt-bindings: watchdog: dlg,da9062-watchdog: Drop blank space) Merging iommu/next (726d4f528dbc iommu: arm-smmu: Fix Tegra workaround for PAGE_SIZE mappings) Merging audit/next (8400291e289e Linux 6.11-rc1) Merging devicetree/for-next (b31b9fb57878 dt-bindings: hwmon: Document TI TPS546D24) Merging dt-krzk/for-next (8400291e289e Linux 6.11-rc1) Merging mailbox/for-next (a8bd68e4329f mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()) Merging spi/for-next (000a177c340d Merge remote-tracking branch 'spi/for-6.12' into spi-next) Merging tip/master (a2767e7f31ad Merge branch into tip/master: 'x86/timers') Merging clockevents/timers/drivers/next (b7625d67eb1a Merge tag 'timers-v6.11-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core) Merging edac/edac-for-next (090786479325 Merge ras/edac-misc into for-next) Merging ftrace/for-next (656a95786db8 Merge ring-buffer/for-next) Merging rcu/next (02219caa92b5 Merge branches 'doc.2024.06.06a', 'fixes.2024.07.04a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', 'rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) Merging paulmck/non-rcu/next (8122d6e11bd8 Merge branches 'cmpxchg.2024.07.04a', 'kcsan.2024.06.06a', 'lkmm.2024.06.06a', 'nolibc.2024.06.30a' and 'torture.2024.05.30b' into HEAD) Merging kvm/next (332d2c1d713e crypto: ccp: Add the SNP_VLEK_LOAD command) Merging kvm-arm/next (bb032b2352c3 Merge branch kvm-arm64/docs into kvmarm/next) Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs) Merging kvm-ppc/topic/ppc-kvm (ca8dad041516 KVM: PPC: add missing MODULE_DESCRIPTION() macros) Merging kvm-riscv/riscv_kvm_next (e325618349cd RISC-V: KVM: Redirect AMO load/store access fault traps to guest) Merging kvm-x86/next (332d2c1d713e crypto: ccp: Add the SNP_VLEK_LOAD command) Merging xen-tip/linux-next (4c006734898a x86/xen: fix memblock_reserve() usage on PVH) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) Merging workqueues/for-next (bc1d825a3334 workqueue: Remove incorrect "WARN_ON_ONCE(!list_empty(&worker->entry));" from dying worker) Merging sched-ext/for-next (958b1891846e scx/selftests: Verify we can call create_dsq from prog_run) CONFLICT (content): Merge conflict in kernel/sched/core.c CONFLICT (content): Merge conflict in kernel/sched/fair.c CONFLICT (content): Merge conflict in kernel/sched/idle.c Merging drivers-x86/for-next (8400291e289e Linux 6.11-rc1) Merging chrome-platform/for-next (8400291e289e Linux 6.11-rc1) Merging chrome-platform-firmware/for-firmware-next (8400291e289e Linux 6.11-rc1) Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/gpio.h) Merging leds-lj/for-leds-next (a0864cf32044 leds: flash: leds-qcom-flash: Limit LED current based on thermal condition) Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging driver-core/driver-core-next (8400291e289e Linux 6.11-rc1) Merging usb/usb-next (8400291e289e Linux 6.11-rc1) Merging thunderbolt/next (8400291e289e Linux 6.11-rc1) Merging usb-serial/usb-next (da74a5100a2b USB: serial: drop driver owner initialization) Merging tty/tty-next (8400291e289e Linux 6.11-rc1) Merging char-misc/char-misc-next (8400291e289e Linux 6.11-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 (2e5657aa5966 hwtracing: use for_each_endpoint_of_node()) Merging fastrpc/for-next (8400291e289e Linux 6.11-rc1) Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused struct 'prop_map') Merging icc/icc-next (226e58b20975 Merge branch 'icc-rpmh-qos' into icc-next) Merging iio/togreg (bf829a98bc4b iio: adc: ti-tsc2046: use devm_regulator_get_enable_read_voltage()) Merging phy-next/next (4e92d504475e phy: qcom: qmp: Add debug prints for register writes) Merging soundwire/next (663229e24255 soundwire: bus: clean up probe warnings) Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB switch driver) Merging gnss/gnss-next (8400291e289e Linux 6.11-rc1) Merging vfio/next (0756bec2e45b vfio-mdev: add missing MODULE_DESCRIPTION() macros) Merging w1/for-next (e940ff286ec4 w1: ds2482: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging spmi/spmi-next (a8f4aa75f885 spmi: pmic-arb: add missing newline in dev_err format strings) Merging staging/staging-next (2501b491993f staging: rtl8712: Fix move '{' to previous line) Merging counter-next/counter-next (8400291e289e Linux 6.11-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 (8400291e289e Linux 6.11-rc1) Merging cgroup/for-next (ab0312526867 cgroup: Show # of subsystem CSSes in cgroup.stat) Merging scsi/for-next (7c632fc3ce64 Merge branch '6.11/scsi-queue' into 6.11/scsi-fixes) Merging scsi-mkp/for-next (8400291e289e Linux 6.11-rc1) Merging vhost/linux-next (d820e8fcea38 net: virtio: unify code to init stats) Merging rpmsg/for-next (8749919defb8 remoteproc: imx_rproc: Merge TCML/U) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (b034a90b2745 gpio: Use of_property_present()) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (11eaac6e8e72 Merge tag 'renesas-pinctrl-for-v6.11-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel) Merging pinctrl-intel/for-next (8400291e289e Linux 6.11-rc1) Merging pinctrl-renesas/renesas-pinctrl (a3cbbd94c24a dt-bindings: pinctrl: renesas: Document RZ/G2M v3.0 (r8a774a3) PFC support) Merging pinctrl-samsung/for-next (8400291e289e Linux 6.11-rc1) Merging pwm/pwm/for-next (d6a56f3bb650 pwm: lp3943: Use of_property_count_u32_elems() to get property length) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (f0a1ffa6f977 selftest: acct: Add selftest for the acct() syscall) Merging kunit/test (8400291e289e Linux 6.11-rc1) Merging kunit-next/kunit (8400291e289e Linux 6.11-rc1) Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-patch-replace' into for-next) Merging rtc/rtc-next (efa9c5be2cae rtc: stm32: add new st,stm32mp25-rtc compatible and check RIF configuration) Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros) Merging at24/at24/for-next (8400291e289e Linux 6.11-rc1) Merging ntb/ntb-next (92aee2f6d156 NTB: ntb_transport: fix all kernel-doc warnings) Merging seccomp/for-next/seccomp (f0c508faea64 selftests/seccomp: check that a zombie leader doesn't affect others) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (9b6e704955fa slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE()) Merging nvmem/for-next (8400291e289e Linux 6.11-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 (2ccfe94bc3ac auxdisplay: ht16k33: Drop reference after LED registration) Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr_task()) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (65bc58c3dcad net: wwan: mhi: make default data link id configurable) Merging memblock/for-next (f56de2214554 tools/testing: abstract two init.h into common include directory) CONFLICT (rename/delete): tools/testing/radix-tree/linux/init.h renamed to tools/testing/shared/linux/init.h in HEAD, but deleted in memblock/for-next. $ git rm -f tools/testing/shared/linux/init.h Merging cxl/next (a0328b397f33 cxl/core/pci: Move reading of control register to immediately before usage) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (4a2ebb082297 efi: Replace efi_memory_attributes_table_t 0-sized array with flexible array) Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros) Merging slab/slab/for-next (a371d558e6f3 mm, slub: do not call do_slab_free for kfence object) Merging random/master (c86927f528a8 selftests/vDSO: don't #include sodium header in chacha test) Merging landlock/next (8400291e289e Linux 6.11-rc1) Merging rust/rust-next (8400291e289e Linux 6.11-rc1) Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname element) Merging execve/for-next/execve (b6f5ee4d5301 execve: Move KUnit tests to tests/ subdirectory) Merging bitmap/bitmap-for-next (fb9086e95ad8 riscv: Remove unnecessary int cast in variable_fls()) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (cd1351051f43 Merge branch 'for-linus/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (8400291e289e Linux 6.11-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (8400291e289e Linux 6.11-rc1) Merging turbostat/next (75879bd898ee tools/power turbostat: fix GCC9 build regression) Merging pwrseq/pwrseq/for-next (8400291e289e Linux 6.11-rc1) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgpC83rBpQipT.pgp
Description: OpenPGP digital signature
