Hi all, Please do not add any material destined for v6.12 to your linux-next included branches until after v6.11-rc1 has been released. Changes since 20240725: The vfs-brauner tree gained a build failure so I used the version from next-20240725. Non-merge commits (relative to Linus' tree): 910 1173 files changed, 53953 insertions(+), 15429 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 379 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 (1722389b0d86 Merge tag 'net-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (cdba37ac1920 nilfs2: handle inconsistent state in nilfs_btnode_create_block()) Merging vfs-brauner-fixes/vfs.fixes (f7c589ccd630 fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT) 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 (35b4ab14dd86 Merge branch 'misc-6.11' into next-fixes) Merging vfs-fixes/fixes (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file leak) 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 (ce99b1f5c2ae Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging kbuild-current/fixes (ba6c664081af kbuild: rpm-pkg: Fix C locale setup) 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 (ecc54006f158 arm64: Clear the initial ID map correctly before remapping) 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 (1613e604df0c Linux 6.10-rc1) Merging sophgo-fixes/fixes (90f6cc7f8e07 riscv: dts: sophgo: disable write-protection for milkv duo) 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 (b3a58f3b90f5 s390/dasd: Fix invalid dereferencing of indirect CCW data pointer) Merging net/main (1722389b0d86 Merge tag 'net-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (36e3b949e359 gve: Fix an edge case for TSO skb validity check) Merging ipsec/master (89a2aefe4b08 xfrm: call xfrm_dev_policy_delete when kill policy) Merging netfilter/main (a16909ae9982 netfilter: nft_set_pipapo_avx2: disable softinterrupts) Merging ipvs/main (cbd070a4ae62 ipvs: properly dereference pe in ip_vs_add_service) Merging wireless/for-next (4130c67cd123 wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (f2661062f16b Linux 6.10-rc5) Merging sound-current/for-linus (e8b96a66ae01 Merge tag 'asoc-fix-v6.11-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (ab53dfdcdd1e ASoC: fsl-asoc-card: Dynamically allocate memory for snd_soc_dai_link_components) Merging regmap-fixes/for-linus (ab9c61e047be Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) Merging regulator-fixes/for-linus (7164122e25b1 regulator: renesas-usb-vbus-regulator: Update the default) Merging spi-fixes/for-linus (67e899c7df7d Merge remote-tracking branch 'spi/for-6.10' into spi-linus) Merging pci-current/for-linus (3a81f0cb9fc9 PCI: pciehp: Retain Power Indicator bits for userspace indicators) Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-rc4) Merging tty.current/tty-linus (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) Merging usb.current/usb-linus (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) Merging usb-serial-fixes/usb-linus (c15a688e4998 USB: serial: mos7840: fix crash on resume) Merging phy/fixes (f2661062f16b Linux 6.10-rc5) Merging staging.current/staging-linus (c33ffdb70cc6 Merge tag 'phy-for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy) Merging iio-fixes/fixes-togreg (1d7cfde11d49 staging: iio: frequency: ad9834: Validate frequency parameter value) Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6) Merging char-misc.current/char-misc-linus (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) Merging soundwire-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging thunderbolt-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging input-current/for-linus (da897484557b Input: synaptics - enable SMBus for HP Elitebook 840 G2) 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 (66cde337fa1b selftests/vDSO: remove duplicate compiler invocations from Makefile) Merging dmaengine-fixes/fixes (f2661062f16b Linux 6.10-rc5) 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 (fd404435d44b media: ivsc: Depend on IPU_BRIDGE or not IPU_BRIDGE) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (0d5679a0aae2 mips: fix compat_sys_lseek syscall) 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 (6ba59ff42279 Linux 6.10-rc4) 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 (b6e02c6b0377 platform/x86: toshiba_acpi: Fix array out-of-bounds access) 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 (9722c3b66e21 of: remove internal arguments from of_property_for_each_u32()) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (7a6bbc2829d4 scsi: sd: Do not repeat the starting disk message) Merging drm-fixes/drm-fixes (8b68788bebd3 Merge tag 'amd-drm-fixes-6.10-2024-07-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (f36139c756a9 i915/perf: Remove code to update PWR_CLK_STATE for gen12) Merging mmc-fixes/fixes (16198eef11c1 mmc: davinci_mmc: Prevent transmitted data size from exceeding sgm's length) Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) Merging gnss-fixes/gnss-linus (6ba59ff42279 Linux 6.10-rc4) 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 (c562ba719df5 riscv: kexec: Avoid deadlock in kexec crash path) Merging riscv-dt-fixes/riscv-dt-fixes (e21de658f8e8 MAINTAINERS: thead: update Maintainer) 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 (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 (3ae08e47742e gpio: virtuser: avoid non-constant format string) 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 (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 (92717bc07789 perf dso: Fix build when libunwind is enabled) 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 (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 (ddab91f4b2de pmdomain: qcom: rpmhpd: Skip retention level for Power Domains) Merging i2c-host-fixes/i2c/i2c-host-fixes (8e5c0abfa02d Merge tag 'input-for-v6.11-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (10f84de27bd0 Merge tag 'qcom-clk-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes) Merging pwrseq-fixes/pwrseq/for-current (1a8c67a8b21e arm64: qcom: don't select HAVE_PWRCTL when PCI=n) Merging thead-dt-fixes/thead-dt-fixes (0c3836482481 Linux 6.10) Merging drm-misc-fixes/for-linux-next-fixes (cb372a505a99 drm/vmwgfx: Fix overlay when using Screen Targets) Merging mm-stable/mm-stable (66ebbdfdeb09 Merge tag 'irq-msi-2024-07-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging mm-nonmm-stable/mm-nonmm-stable (66ebbdfdeb09 Merge tag 'irq-msi-2024-07-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild/for-next (5ad7ff8738b8 Merge tag 'f2fs-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (7a2fb5619cc1 perf trace: Fix iteration of syscall ids in syscalltbl->entries) Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) Merging dma-mapping/for-next (28e8b7406d3a dma: fix call order in dmam_free_coherent) Merging asm-generic/master (1a7b7326d587 vmlinux.lds.h: catch .bss..L* sections into BSS")) 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 (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 (4caff16b6e00 Merge branch 'devicetree-arm64/next' into next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (815cc7715ab1 dt-bindings: memory: fsl: replace maintainer) Merging imx-mxs/for-next (145b73c51732 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1) Merging mvebu/for-next (ffd0d7df6bdb Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (c4799d2f4856 Merge branch 'omap-for-v6.11/soc' into for-next) Merging qcom/for-next (6fd4da15c334 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', 'drivers-fixes-for-6.10' and 'drivers-for-6.11' into for-next) Merging renesas/next (5c91aa40e630 Merge branches 'renesas-arm-defconfig-for-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) Merging reset/reset/next (c1267e1afae6 arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS) Merging rockchip/for-next (d02701b77967 Merge branch 'v6.11-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (ac4932a01cdd Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (eaaeef9e62f9 Merge tags 'scmi-updates-6.11', 'ffa-updates-6.11', 'vexpress-updates-6.11' and 'juno-updates-6.11' 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 (1eafc48af859 arm64: stm32: enable scmi regulator for stm32) Merging sunxi/sunxi/for-next (181755017a8b Merge branch 'sunxi/drivers-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 (5211d93c551f Merge branch for-6.11/arm64/defconfig into for-next) Merging thead-dt/thead-dt-for-next (0c3836482481 Linux 6.10) Merging ti/ti-next (fd1d9729723b Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (41aa58501753 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (f99b3feb3b0e clk: samsung: fix getting Exynos4 fin_pll rate from external clocks) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0) Merging clk-renesas/renesas-clk (c7e58843d1e4 clk: renesas: r9a08g045: Add clock, reset and power domain support for I2C) 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 (256abd8e550c Linux 6.10-rc7) Merging microblaze/next (1613e604df0c Linux 6.10-rc1) Merging mips/mips-next (2c716cf17ede mips: sibyte: add missing MODULE_DESCRIPTION() macro) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (cbade823342c parisc: Add support for CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN) 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 (32c4df3f3c5a Merge patch series "riscv: Add support for xtheadvector") Merging riscv-dt/riscv-dt-for-next (2904244a8c46 riscv: dts: starfive: add PCIe dts configuration for JH7110) Merging riscv-soc/riscv-soc-for-next (c813ef3c5f6c MAINTAINERS: drop riscv list from cache controllers) Merging s390/for-next (6dc2e98d5f1d s390: Remove protvirt and kvm config guards for uv code) 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 (d509ae6c458e Merge branch 'for-next-next-v6.11-20240719' into for-next-20240719) 26222b620296 ("btrfs: tree-checker: validate dref root and objectid") 51fa404bd419 ("btrfs: fix corrupt read due to bad offset of a compressed extent map") Merging ceph/master (3ceccb14f557 rbd: don't assume rbd_is_lock_owner() for exclusive mappings) Merging cifs/for-next (66bf82cc583c smb3: add four dynamic tracepoints for copy_file_range and reflink) 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 (227ed3562a9a erofs: convert comma to semicolon) Merging exfat/dev (89fc548767a2 exfat: fix potential deadlock on __exfat_get_dentry_set) Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (66ebbdfdeb09 Merge tag 'irq-msi-2024-07-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging f2fs/dev (c2a96b7f187f Merge tag 'driver-core-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) 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 (0c3836482481 Linux 6.10) Merging nfs-anna/linux-next (b9fae9f06d84 SUNRPC: Fixup gss_status tracepoint error output) Merging nfsd/nfsd-next (0e12f2735a0f NFS: trace: show TIMEDOUT instead of 0x6e) Merging ntfs3/master (911daf695a74 fs/ntfs3: Fix formatting, change comments, renaming) 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 (054fd1598445 ubifs: add check for crypto_shash_tfm_digest) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (0c3836482481 Linux 6.10) Merging xfs/for-next (2bf6e353542d xfs: fix rtalloc rotoring when delalloc is in use) 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 (a507c691ef6d Merge branch 'vfs.mount' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) $ git reset --hard HEAD^ Merging next-20240725 version of vfs-brauner CONFLICT (content): Merge conflict in fs/inode.c [fs-next 23d05df056ad] next-20240725/vfs-brauner Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (23d05df056ad next-20240725/vfs-brauner) Merging printk/for-next (b18703ea7157 Merge branch 'rework/write-atomic' into for-next) Merging pci/next (3f386cb8ee9f Merge tag 'pci-v6.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing MODULE_DESCRIPTION() macro) Merging hid/for-next (65e1dc0a7ae4 Merge branch 'for-6.11/upstream-fixes' into for-next) Merging i2c/i2c/for-next (786c8248dbd3 Merge tag 'perf-tools-fixes-for-v6.11-2024-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools) Merging i2c-host/i2c/i2c-host (de4f2f52f932 i2c: piix4: Register SPDs) Merging i3c/i3c/next (3564d9eb607d 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 (1ea3fd1eb986 hwmon: (max6697) Fix swapped temp{1,8} critical alarms) Merging jc_docs/docs-next (98b953637a42 Merge branch 'docs-mw' into docs-next) 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 (f7c1b0e4ae47 thermal: core: Back off when polling thermal zones on errors) Merging cpufreq-arm/cpufreq/arm/linux-next (d992f881764c cpufreq: sti: fix build warning) Merging cpupower/cpupower (3a5bb5066f4c cpupower: fix lib default installation path) 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 (e3943f00afdb OPP: Introduce an OF helper function to inform if required-opps is used) Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: convert hisilicon-thermal.txt to dt-schema) Merging rdma/for-next (887cd308fd46 IB/hfi1: Constify struct flag_table) Merging net-next/main (1722389b0d86 Merge tag 'net-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (51835949dda3 Merge tag 'net-next-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging ipsec-next/master (d5b60c6517d2 Merge branch 'Support IPsec crypto offload for IPv6 ESP and IPv4 UDP-encapsulated ESP data paths') Merging mlx5-next/mlx5-next (b339e0a39dc3 RDMA/mlx5: Add Qcounters req_transport_retries_exceeded/req_rnr_retries_exceeded) 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 (c707097a446c Bluetooth: btintel: Allow configuring drive strength of BRI) Merging wireless-next/for-next (338a93cf4a18 net: mctp-i2c: invalidate flows immediately on TX errors) 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 (d35df77707bf mtd: spi-nor: winbond: fix w25q128 regression) Merging crypto/master (df1e9791998a hwrng: core - remove (un)register_miscdev()) Merging drm/drm-next (627a24f5f25d Merge tag 'amd-drm-fixes-6.11-2024-07-18' of https://gitlab.freedesktop.org/agd5f/linux 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 (b6f7d984ebf8 dt-bindings: display: panel: samsung,atna33xc20: Document ATNA45AF01) Merging amdgpu/drm-next (644e49d582fd drm/radeon/evergreen_cs: fix int overflow errors in cs track offsets) Merging drm-intel/for-linux-next (26720dd2b5a1 drm/i915: Allow NULL memory region) 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 (be8f9f4c866f drm/xe/mmio: Use single logic for waiting functions) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (0c3836482481 Linux 6.10) Merging regmap/for-next (ab9c61e047be Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) Merging sound/for-next (e8b96a66ae01 Merge tag 'asoc-fix-v6.11-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging ieee1394/for-next (06dcc4c9baa9 firewire: core: move copy_port_status() helper function to TP_fast_assign() block) Merging sound-asoc/for-next (ab53dfdcdd1e ASoC: fsl-asoc-card: Dynamically allocate memory for snd_soc_dai_link_components) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (740ff03d7238 Input: Add driver for PixArt PS/2 touchpad) Merging block/for-next (e2516401f805 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 (c84750d06ea8 dt-bindings: ata: qcom,apq8064-ahci: add to dtschema) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (b85e02185397 MAINTAINERS: add 's32@xxxxxxx' as relevant mailing list for 'sdhci-esdhc-imx' driver) Merging mfd/for-mfd-next (c298391abf65 mfd: timberdale: Attach device properties to TSC2007 board info) Merging backlight/for-backlight-next (1df5aa3754ca backlight: sky81452-backlight: Use backlight power constants) Merging battery/for-next (be6299c6e55e power: supply: sysfs: use power_supply_property_is_writeable()) Merging regulator/for-next (7164122e25b1 regulator: renesas-usb-vbus-regulator: Update the default) Merging security/next (08b377b86c0c 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 (e123134b39dc selinux: Use 1UL for EBITMAP_BIT to match maps type) Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket label) Merging tomoyo/master (b96342141183 rtnetlink: print rtnl_mutex holder/waiter for debug purpose) Merging tpmdd/next (a9c7da2f8ab7 KEYS: trusted: dcp: fix leak of blob encryption key) 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 (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (76be2f9823b1 dt-bindings: timer: sprd-timer: convert to YAML) Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-next) Merging mailbox/for-next (a8bd68e4329f mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()) Merging spi/for-next (67e899c7df7d Merge remote-tracking branch 'spi/for-6.10' into spi-linus) Merging tip/master (e0cb1177c5f7 Merge branch into tip/master: 'x86/mm') 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 (9a1c5fe0f0a8 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 (aa8684755a28 workqueue: Remove unneeded lockdep_assert_cpus_held()) Merging sched-ext/for-next (8bb30798fd6e sched_ext: Fixes incorrect type in bpf_scx_init()) CONFLICT (content): Merge conflict in MAINTAINERS Merging drivers-x86/for-next (d8b17a364ec4 platform/x86: asus-wmi: fix TUF laptop RGB variant) Merging chrome-platform/for-next (4baf1cc54433 power: supply: cros_charge-control: Fix signedness bug in charge_behaviour_store()) 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 (b0eed397623f leds: leds-lp5569: Enable chip after chip configuration) Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging driver-core/driver-core-next (b57d5ffc3ab5 ARM: sa1100: make match function take a const pointer) Merging usb/usb-next (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET()) Merging usb-serial/usb-next (df8c0b8a03e8 USB: serial: garmin_gps: use struct_size() to allocate pkt) Merging tty/tty-next (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) Merging char-misc/char-misc-next (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) 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 (1613e604df0c Linux 6.10-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 (1ebab783647a Merge tag 'mhi-for-v6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next) Merging phy-next/next (2a011c3c12e8 phy: airoha: Add dtime and Rx AEQ IO registers) Merging soundwire/next (fdd3d14ca3c8 soundwire: debugfs: simplify with cleanup.h) Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB switch driver) Merging gnss/gnss-next (6ba59ff42279 Linux 6.10-rc4) Merging vfio/next (0756bec2e45b vfio-mdev: add missing MODULE_DESCRIPTION() macros) Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) Merging spmi/spmi-next (a8f4aa75f885 spmi: pmic-arb: add missing newline in dev_err format strings) Merging staging/staging-next (c33ffdb70cc6 Merge tag 'phy-for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy) Merging counter-next/counter-next (7b47e79eac4c Merge tag 'ib-mfd-counter-v5.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/lee/mfd into counter-next) 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 (b8ec9dba02a7 dt-bindings: fsl-qdma: fix interrupts 'if' check logic) Merging cgroup/for-next (acd2e2b11907 Merge branch 'for-6.11' into for-next) Merging scsi/for-next (27d250521bb2 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (47398f49dab8 scsi: ufs: exynos: Don't resume FMP when crypto support is disabled) Merging vhost/linux-next (6b6e7f117bd9 net: virtio: unify code to init stats) Merging rpmsg/for-next (d87dbfd31796 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (dfda97e37de4 gpio: mc33880: Convert comma to semicolon) 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 (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (2453e858e945 pinctrl: renesas: rzg2l: Support output enable on RZ/G2L) Merging pinctrl-samsung/for-next (1613e604df0c Linux 6.10-rc1) Merging pwm/pwm/for-next (240b129d597c pwm: axi-pwmgen: add .max_register to regmap) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (bb408dae9e73 selftests: ifs: verify IFS ARRAY BIST functionality) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (ebf51e460e48 kunit: Introduce KUNIT_ASSERT_MEMEQ and KUNIT_ASSERT_MEMNEQ macros) 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 (3a9ba4e32230 dt-bindings: eeprom: at24: Add compatible for ONSemi N24S64B) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) 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 (1613e604df0c Linux 6.10-rc1) Merging nvmem/for-next (1613e604df0c Linux 6.10-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) Merging auxdisplay/for-next (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 (9364a7e40d54 memblock tests: fix implicit declaration of function 'numa_valid_node') 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 (436381eaf2a4 Merge branch 'slab/for-6.11/buckets' into slab/for-next) Merging random/master (ad8070cb1b4b MAINTAINERS: add random.h headers to RNG subsection) Merging landlock/next (f4b89d8ce5a8 landlock: Various documentation improvements) Merging rust/rust-next (b12634111123 docs: rust: quick-start: add section on Linux distributions) CONFLICT (content): Merge conflict in rust/bindings/bindings_helper.h 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()) CONFLICT (content): Merge conflict in include/linux/cpumask.h 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 (1613e604df0c Linux 6.10-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (136a8066676e iommufd: Put constants for all the uAPI enums) Merging turbostat/next (478a01016c08 tools/power turbostat: Fix typo in turbostat.8) Merging pwrseq/pwrseq/for-next (50b040ef3732 PCI/pwrctl: only call of_platform_populate() if CONFIG_OF is enabled) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgp5Rg_jxsjjr.pgp
Description: OpenPGP digital signature
