Hi all, Changes since 20240807: The s390 tree gained a semantic conflict against the mm tree. The ath-next tree gained a conflict against the ath tree. The kspp tree lost its build failure. Non-merge commits (relative to Linus' tree): 3084 3497 files changed, 125512 insertions(+), 61355 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 382 trees (counting Linus' and 108 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 (6a0e38264012 Merge tag 'for-6.11-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (ff4440b02821 mm: keep nid around during hot-remove) 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 (8d8ce2d7a07f Merge branch 'misc-6.11' into next-fixes) Merging vfs-fixes/fixes (9a2fa1472083 fix bitmap corruption on close_range() with CLOSE_RANGE_UNSHARE) 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 (72a9936cc9b7 Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging kbuild-current/fixes (33330bcf0318 scripts: kconfig: merge_config: config files: add a trailing newline) 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 (cfb00a357864 arm64: jump_label: Ensure patched jump_labels are visible to all CPUs) Merging arm-soc-fixes/arm/fixes (6b1124c4526f Merge tag 'ti-k3-dt-fixes-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes) 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 (2dca436ca7e3 s390/iucv: Fix vargs handling in iucv_alloc_device()) Merging net/main (1ca645a2f74a net: usb: qmi_wwan: add MeiG Smart SRM825L) Merging bpf/master (92c4ee25208d net: bridge: mcast: wait for previous gc cycles when removing port) Merging ipsec/master (89a2aefe4b08 xfrm: call xfrm_dev_policy_delete when kill policy) Merging netfilter/main (14ab4792ee12 net/tcp: Disable TCP-AO static key after RCU grace period) Merging ipvs/main (14ab4792ee12 net/tcp: Disable TCP-AO static key after RCU grace period) Merging wireless/for-next (f1cb9d5aefba wifi: rtlwifi: rtl8192du: Initialise value32 in _rtl92du_init_queue_reserved_page) Merging ath/for-current (38055789d151 wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850) 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 (eb91c456f371 ALSA: hda/realtek: Add Framework Laptop 13 (Intel Core Ultra) to quirks) Merging sound-asoc-fixes/for-linus (a44b7b57ef14 ASoC: Extend wm_adsp so cs35l56 can suppress controls) 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 (65ba8cef0416 usb: typec: ucsi: Fix a deadlock in ucsi_send_command_common()) Merging usb-serial-fixes/usb-linus (00af4f3dda14 USB: serial: debug: do not echo input by default) Merging phy/fixes (5af9b304bc60 phy: xilinx: phy-zynqmp: Fix SGMII linkup failure on resume) Merging staging.current/staging-linus (8400291e289e Linux 6.11-rc1) Merging iio-fixes/fixes-togreg (61cbfb5368dd iio: adc: ad7124: fix DT configuration parsing) 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 (e2006140ad2e thunderbolt: Mark XDomain as unplugged when router is removed) Merging input-current/for-linus (206f533a0a7c Input: uinput - reject requests with unreasonable number of slots) 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 (b53b831919a0 dmaengine: stm32-dma3: Set lli_size after allocation) 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 (e2ed53694e53 Merge tag 'tags/fixes-media-uvc-20230722' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) 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 (8400291e289e Linux 6.11-rc1) Merging omap-fixes/fixes (5062d9c0cbbc ARM: dts: omap3-n900: correct the accelerometer orientation) Merging kvm-fixes/master (1773014a9759 Merge branch 'kvm-fixes' into HEAD) Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) 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 (3114f77e9453 platform/x86/intel/ifs: Initialize union ifs_status to zero) 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 (f874d7210d88 scsi: sd: Keep the discard mode stable) Merging drm-fixes/drm-fixes (27ce65f65258 Revert "nouveau: rip out busy fence waits") Merging drm-intel-fixes/for-linux-next-fixes (787db3bb6ed5 drm/i915: Attempt to get pages without eviction first) 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 (ee9a68394b4b riscv: Re-introduce global icache flush in patch_text_XXX()) Merging riscv-dt-fixes/riscv-dt-fixes (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) 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 (de9c2c66ad8e Linux 6.11-rc2) 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 (fe992163575b rust: Support latest version of `rust-analyzer`) Merging w1-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pmdomain-fixes/fixes (50359c9c3cb3 pmdomain: imx: scu-pd: Remove duplicated clocks) Merging i2c-host-fixes/i2c/i2c-host-fixes (9ba48db9f77c i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume) 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 (929725bd7eb4 drm/atomic: allow no-op FB_ID updates for async flips) 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 (29af5309c7ff foo) Merging kbuild/for-next (7809144639f6 kbuild: modinst: remove the multithread option from zstd compression) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (43b49c16302f perf hist: Fix reference counting of branch_info) Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-rc1) Merging dma-mapping/for-next (bd44ca3de49c dma-debug: avoid deadlock between dma debug vs printk and netconsole) Merging asm-generic/master (b82c1d235a30 syscalls: add back legacy __NR_nfsservctl macro) 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 (6b1124c4526f Merge tag 'ti-k3-dt-fixes-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes) 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 (8400291e289e Linux 6.11-rc1) 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 (23d22b0fe6a1 memory: emif: Use of_property_read_bool()) Merging imx-mxs/for-next (7dd10acc08ab Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (9dd04bf6bf1c 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 (6cb1ac2b11b2 Merge branch 'omap-for-v6.12/drivers' into omap-reset) Merging qcom/for-next (8f2662ff28a1 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) Merging renesas/next (3f3b7f43c49a Merge branches 'renesas-arm-defconfig-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 (b93783546159 Merge branch 'v6.12-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (166203ab290c Merge branch 'next/soc' into for-next) Merging scmi/for-linux-next (cd0e0714e5ac Merge branches 'for-next/juno/updates' and 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) 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 (140b0b1e6e77 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (0c559f8a91de drivers: soc: xilinx: add the missing kfree in xlnx_add_cb_for_suspend()) Merging clk/clk-next (69bec17d2896 Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0) Merging clk-renesas/renesas-clk (42b54d52ecb7 clk: renesas: Add RZ/V2H(P) CPG driver) 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 (494b0792d962 LoongArch: KVM: Remove undefined a6 argument comment for kvm_hypercall()) Merging m68k/for-next (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg()) Merging m68knommu/for-next (de9c2c66ad8e Linux 6.11-rc2) 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 (d173d4d9e831 parisc: Improve monotonic clock_gettime() resolution on SMP machines) Merging powerpc/next (fa740ca82277 powerpc: Remove useless config comment in asm/percpu.h) 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 (a538e81b1eec Merge branch 'features' 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 (787822ab0887 Merge branch 'for-next-next-v6.11-20240802' into for-next-20240802) Merging ceph/master (31634d7597d8 ceph: force sending a cap update msg back to MDS for revoke op) Merging cifs/for-next (02f09a73af14 Fix spelling errors in Server Message Block) 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 (cb890c4388d3 erofs: get rid of check_layout_compatibility()) 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 (a6c12809975b f2fs: fix to use per-inode maxbytes and cleanup) 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 (de9c2c66ad8e Linux 6.11-rc2) Merging nfs-anna/linux-next (b9fae9f06d84 SUNRPC: Fixup gss_status tracepoint error output) Merging nfsd/nfsd-next (75af9e7b67a6 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 (191138965490 Merge branch 'vfs.folio' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) CONFLICT (content): Merge conflict in tools/testing/selftests/core/close_range_test.c [fs-next 0e8817dae75a] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git Applying: fixup for "fs: Convert aops->write_end to take a folio" [fs-next ff87cfde02fe] 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 (ff87cfde02fe 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 (08043b1dabf8 pstore/ramoops: Fix typo as there is no "reserver") Merging hid/for-next (047c6a90b836 Merge branch 'for-6.12/elan' into for-next) Merging i2c/i2c/for-next (f17c06c6608a i2c: Fix conditional for substituting empty ACPI functions) Merging i2c-host/i2c/i2c-host (3f7aed28e1de i2c: mt65xx: Avoid double initialization of restart_flag in isr) 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 (9a7ad7611852 hwmon: (lm92) Update documentation) Merging jc_docs/docs-next (8663dd38a7ba docs/zh_CN: fix a broken reference) Merging v4l-dvb/master (8400291e289e Linux 6.11-rc1) Merging v4l-dvb-next/master (812765cd6954 media: vivid: add <Vendor Command With ID> support) Merging pm/linux-next (5a4e6abbb58a Merge branch 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (c7582ec85342 cpufreq: Drop CONFIG_ARM and CONFIG_ARM64 dependency on Arm drivers) 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 (8287e9e2c7d2 pmdomain: 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 (2a777679b8cc RDMA/mad: Improve handling of timed out WRs of mad agent) Merging net-next/main (e66f33bdf0c3 Merge branch 'tcp-active-reset') Merging bpf-next/for-next (f63ea3e07562 Merge branch 'add-bpf_get_dentry_xattr') 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 (bd0b4dae74b0 Bluetooth: btusb: Add MediaTek MT7925-B22M support ID 0x13d3:0x3604) Merging wireless-next/for-next (4ab9f870a633 wifi: b43: Constify struct lpphy_tx_gain_table_entry) Merging ath-next/for-next (a66de2d0f22b wifi: ath12k: fix invalid AMPDU factor calculation in ath12k_peer_assoc_h_he()) CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/hw.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 (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 (b0cd6f4c3f19 Revert "crypto: arm64/poly1305 - move data to rodata section") Merging drm/drm-next (a4172af3040c Merge tag 'drm-xe-next-2024-07-30' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) 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 (f7f3ddb6e5c8 gpu: drm: use for_each_endpoint_of_node()) 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 CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c Merging amdgpu/drm-next (46142cc1b927 drm/amdgpu: Add DCC GFX12 flag to enable address alignment) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c Merging drm-intel/for-linux-next (34d0472ce108 drm/i915: Remove DSC register dump) 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 (e102b5ed6e28 drm/xe: Fix access_ok check in user_fence_create) 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 (b977831342ec ALSA: seq: Fix missing seq port info bit return for MIDI 1.0 block) Merging ieee1394/for-next (56cc34a8c179 firewire: ohci: use guard macro to serialize operations for isochronous contexts) Merging sound-asoc/for-next (80edd74d9129 Merge remote-tracking branch 'asoc/for-6.12' into asoc-next) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (63f92f11385d Input: tsc2004/5 - use guard notation when acquiring mutexes/locks) Merging block/for-next (168f25d97311 Merge branch 'for-6.12/block' into for-next) Merging device-mapper/for-next (7f1c4909a821 dm vdo: fix a minor formatting issue in vdo.rst) Merging libata/for-next (bf1807c6ee1f ata: libata: Print device quirks only once) 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 (08b856b38c25 regulator: bd9576: Constify struct linear_range) 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 (6d9ebb8d3d1a Automated merge of 'dev' into 'next') 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 (b4c635360613 KEYS: Remove unused declarations) Merging watchdog/master (63d097d46799 dt-bindings: watchdog: dlg,da9062-watchdog: Drop blank space) Merging iommu/next (fca5b78511e9 iommu: Restore lost return in iommu_report_device_fault()) Merging audit/next (8400291e289e Linux 6.11-rc1) Merging devicetree/for-next (4e354cce395f dt-bindings: soc: fsl: add missed compatible string fsl,ls*-isc) 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 (51181a73934f Merge remote-tracking branch 'spi/for-6.12' into spi-next) Merging tip/master (532361ba3a0e 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 (f01f18f2ed7d Merge branches 'cmpxchg.2024.08.06a', 'lkmm.2024.08.02a', 'kcsan.2024.08.01a' and 'misc.2024.08.02a' into HEAD) Merging kvm/next (1773014a9759 Merge branch 'kvm-fixes' into HEAD) 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 (dd4a799bcc13 KVM: riscv: selftests: Fix compile error) 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 (3b47e19ebc52 Merge branch 'for-6.12' into for-next) Merging sched-ext/for-next (2c390dda9e03 sched_ext: Make task_can_run_on_remote_rq() use common task_allowed_on_cpu()) Merging drivers-x86/for-next (8400291e289e Linux 6.11-rc1) Merging chrome-platform/for-next (62be134abf42 platform/chrome: cros_ec_lpc: switch primary DMI data for Framework Laptop) 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 (6eefd65ba6ae leds: pca995x: Use device_for_each_child_node() to access device child nodes) Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging driver-core/driver-core-next (bfa54a793ba7 driver core: bus: Fix double free in driver API bus_register()) Merging usb/usb-next (d483f034f032 usb: dwc2: Skip clock gating on Broadcom SoCs) Merging thunderbolt/next (de9c2c66ad8e Linux 6.11-rc2) Merging usb-serial/usb-next (da74a5100a2b USB: serial: drop driver owner initialization) Merging tty/tty-next (2108aa2a01d8 dt-bindings: serial: renesas: Document RZ/G2M v3.0 (r8a774a3) scif) Merging char-misc/char-misc-next (5c4efc60551c cxl: Use of_property_ accessor functions) 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 (593737c18ae7 iio: remove unneeded assignment in __iio_format_value) Merging phy-next/next (c4b09c562086 phy: phy-rockchip-samsung-hdptx: Add clock provider support) 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 (5aa0018a93bf staging: rtl8192e: remove duplicate macros from rtllib.h) 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 (0204485c5a1e dt-bindings: fsl-qdma: allow compatible string fallback to fsl,ls1021a-qdma) Merging cgroup/for-next (33ed8884df3d Merge branch 'for-6.12' into for-next) Merging scsi/for-next (5cadf9bb8103 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (5f36bd89a994 Merge patch series "smartpqi updates") 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 (26b95b7b588d gpio: vf610: add get_direction() support) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (6fb214cdf7df Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (de9c2c66ad8e Linux 6.11-rc2) Merging pinctrl-renesas/renesas-pinctrl (f73f63b24491 pinctrl: renesas: rzg2l: Use dev_err_probe()) Merging pinctrl-samsung/for-next (d59c2396e066 pinctrl: samsung: Use scope based of_node_put() cleanups) Merging pwm/pwm/for-next (2e8b1b881a36 pwm: Simplify pwm_capture()) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (53af1a4b6a55 tracing/selftests: Run the ownership test twice) 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 (de9c2c66ad8e Linux 6.11-rc2) 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 (641d6abbe15f nvmem: layouts: add U-Boot env layout) 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 (9e3d665384fc memblock test: fix implicit declaration of function 'strscpy') 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 (de9c2c66ad8e Linux 6.11-rc2) Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname element) Merging execve/for-next/execve (9c531dfdc1bc binfmt_elf: Dump smaller VMAs first in ELF cores) CONFLICT (content): Merge conflict in fs/binfmt_elf.c Merging bitmap/bitmap-for-next (7e516a1ef3f4 nodemask: Switch from inline to __always_inline) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (e103a9836069 coccinelle: Add rules to find str_up_down() replacements) 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) Applying: fixup for "s390/mm/ptdump: Generate address marker array dynamically"
Attachment:
pgpJNSV1NAy0f.pgp
Description: OpenPGP digital signature
