Hi all, Changes since 20240828: The mm tree lost its boot warning. The scmi tree lost its build failure. The drm tree gained a conflict against the drm-intel-fixes tree. The tip tree still had its build failure for which I reverted a commit. The kspp tree gained a conflict against the mm tree. Non-merge commits (relative to Linus' tree): 6856 7200 files changed, 265180 insertions(+), 139591 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 375 trees (counting Linus' and 140 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 (928f79a188aa Merge tag 'loongarch-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson) Merging vfs-brauner-fixes/vfs.fixes (e00e99ba6c6b netfs: Fix interaction of streaming writes with zero-point tracker) 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 (fe82e85a25f0 Merge branch 'misc-6.11' into next-fixes) Merging vfs-fixes/fixes (8c86f1a45749 close_range(): fix the logics in descriptor table trimming) Merging erofs-fixes/fixes (5be63fc19fca Linux 6.11-rc5) Merging nfsd-fixes/nfsd-fixes (7e8ae8486e44 fs/nfsd: fix update of inode attrs in CB_GETATTR) Merging v9fs-fixes/fixes/next (0c3836482481 Linux 6.10) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) Merging bcachefs/for-next (b0e4d11e0214 bcachefs: Annotate bch_replicas_entry_{v0,v1} with __counted_by()) 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 (9215f7004816 Merge branch 'for-next-next-v6.11-20240827' into for-next-20240827) Merging ceph/master (ede0b1d30b82 libceph: use min() to simplify code in ceph_dns_resolve_name()) Merging cifs/for-next (c3a0c4909836 netfs, cifs: Improve some debugging bits) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging dlm/next (652b0ae675fe dlm: add missing -ENOMEM if alloc_workqueue() fails) Merging erofs/dev (7c626ce4bae1 Linux 6.11-rc3) Merging exfat/dev (98ad7b9012b5 exfat: Implement sops->shutdown and ioctl) Merging exportfs/exportfs-next (0c3836482481 Linux 6.10) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (dda898d7ffe8 ext4: dax: fix overflowing extents beyond inode size when partially writing) Merging f2fs/dev (d33ebd57b987 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 (6cb9df81a2c4 gfs2: fix double destroy_workqueue error) Merging jfs/jfs-next (d64ff0d23067 jfs: check if leafidx greater than num leaves per dmap tree) Merging ksmbd/ksmbd-for-next (780bdc1ba776 Merge tag '6.11-rc5-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (47ac09b91bef Linux 6.11-rc4) Merging nfs-anna/linux-next (f92214e4c312 NFS: Avoid unnecessary rescanning of the per-server delegation list) Merging nfsd/nfsd-next (ada7d1ab3aa1 nfsd: call cache_put if xdr_reserve_space returns NULL) Merging ntfs3/master (7529036a025a fs/ntfs3: Rename ntfs3_setattr into ntfs_setattr) 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 (a24cae8fc1f1 xfs: reset rootdir extent size hint after growfsrt) Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH) 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 (70f023a608ea Merge branch 'vfs.fallocate' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) CONFLICT (content): Merge conflict in fs/exfat/inode.c Applying: fixup for "fs: Convert aops->write_end to take a folio" Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (8bd9445ee511 codetag: debug: mark codetags for poisoned page as empty) Merging fs-current (6af5dfc5dfa3 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (d2bafcf224f3 Merge tag 'cgroup-for-6.11-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) 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 (75c8f387dd16 Merge tag 'kvmarm-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into for-next/fixes) Merging arm-soc-fixes/arm/fixes (3536c01d6577 Merge tag 'riscv-soc-fixes-for-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/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 (3b1f7a46977f powerpc/mm: Fix return type of pgd_val()) Merging s390-fixes/fixes (1642285e511c s390/boot: Fix KASLR base offset off by __START_KERNEL bytes) Merging net/main (3a0504d54b3b sctp: fix association labeling in the duplicate COOKIE-ECHO case) Merging bpf/master (872cf28b8df9 Merge tag 'platform-drivers-x86-v6.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) Merging ipsec/master (89a2aefe4b08 xfrm: call xfrm_dev_policy_delete when kill policy) Merging netfilter/main (70c261d50095 netfilter: nf_tables_ipv6: consider network offset in netdev/egress validation) Merging ipvs/main (6ea14ccb60c8 netfilter: flowtable: validate vlan header) Merging wireless/for-next (094513f8a2fb wifi: iwlwifi: clear trans->state earlier upon error) Merging ath/for-current (9abf199943a6 wifi: ath11k: fix NULL pointer dereference in ath11k_mac_get_eirp_power()) 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 (28b329f431ce ALSA: hda: hda_component: Fix mutex crash if nothing ever binds) Merging sound-asoc-fixes/for-linus (e0be875c5bf0 ASoc: SOF: topology: Clear SOF link platform name upon unload) Merging regmap-fixes/for-linus (60f90cdf816c Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) Merging regulator-fixes/for-linus (7c626ce4bae1 Linux 6.11-rc3) Merging spi-fixes/for-linus (e17465f78eb9 spi: pxa2xx: Move PM runtime handling to the glue drivers) Merging pci-current/for-linus (db1ec60fba4a PCI: qcom: Use OPP only if the platform supports it) Merging driver-core.current/driver-core-linus (47ac09b91bef Linux 6.11-rc4) Merging tty.current/tty-linus (47ac09b91bef Linux 6.11-rc4) Merging usb.current/usb-linus (740f2e2791b9 usb: cdnsp: fix for Link TRB with TC) Merging usb-serial-fixes/usb-linus (9a471de516c3 USB: serial: option: add MeiG Smart SRM825L) 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 (0a3b517c8089 iio: imu: inv_mpu6050: fix interrupt status read for old buggy chips) Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1) Merging char-misc.current/char-misc-linus (47ac09b91bef Linux 6.11-rc4) Merging soundwire-fixes/fixes (ab8d66d132bc soundwire: stream: fix programming slave ports for non-continous port maps) Merging thunderbolt-fixes/fixes (5be63fc19fca Linux 6.11-rc5) Merging input-current/for-linus (4e870e6bbec5 Input: himax_hx83112b - fix incorrect size when reading product ID) 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 (9f646ff25c09 dmaengine: dw-edma: Do not enable watermark interrupts for HDMA) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (bd92c1e07beb mtd: hyperbus: rpc-if: Add missing MODULE_DEVICE_TABLE) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (63de936b513f media: atomisp: Fix streaming no longer working on BYT / ISP2400 devices) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (50f2b98dc83d MIPS: cevt-r4k: Don't call get_c0_compare_int if timer irq is installed) Merging at91-fixes/at91-fixes (e9408fa234fb MAINTAINERS: Update DTS path for ARM/Microchip (AT91) SoC) Merging omap-fixes/fixes (5062d9c0cbbc ARM: dts: omap3-n900: correct the accelerometer orientation) Merging kvm-fixes/master (1c0e5881691a KVM: SEV: uapi: fix typo in SEV_RET_INVALID_CONFIG) Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) Merging hwmon-fixes/hwmon (7bbc079531fc hwmon: (pt5161l) Fix invalid temperature reading) Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases) Merging cxl-fixes/fixes (2c402bd2e85b cxl/test: Skip cxl_setup_parent_dport() for emulated dports) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (a3379eca24a7 platform/x86: x86-android-tablets: Make Lenovo Yoga Tab 3 X90F DMI match less strict) 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 (b739dffa5d57 of/irq: Prevent device address out-of-bounds read in interrupt map walk) Merging dt-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging scsi-fixes/fixes (4f9eedfa27ae scsi: sd: Ignore command SYNCHRONIZE CACHE error if format in progress) Merging drm-fixes/drm-fixes (5be63fc19fca Linux 6.11-rc5) Merging drm-intel-fixes/for-linux-next-fixes (a2ccc33b88e2 drm/i915/dp_mst: Fix MST state after a sink reset) Merging mmc-fixes/fixes (8396c793ffdf mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K) Merging rtc-fixes/rtc-fixes (8400291e289e Linux 6.11-rc1) Merging gnss-fixes/gnss-linus (8400291e289e Linux 6.11-rc1) Merging hyperv-fixes/hyperv-fixes (4430556935db Drivers: hv: vmbus: Fix the misplaced function description) Merging risc-v-fixes/fixes (32d5f7add080 Merge patch series "RISC-V: hwprobe: Misaligned scalar perf fix and rename") Merging riscv-dt-fixes/riscv-dt-fixes (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) Merging riscv-soc-fixes/riscv-soc-fixes (591940e22e28 firmware: microchip: fix incorrect error report of programming:timeout on success) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (47ac09b91bef Linux 6.11-rc4) Merging gpio-brgl-fixes/gpio/for-current (47ac09b91bef Linux 6.11-rc4) Merging gpio-intel-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pinctrl-intel-fixes/fixes (a366e46da10d pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID) Merging auxdisplay-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging kunit-fixes/kunit-fixes (f2c6dbd22017 kunit: Device wrappers should also manage driver name) 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 (4bbe60029319 perf daemon: Fix the build on 32-bit architectures) 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 (7c626ce4bae1 Linux 6.11-rc3) Merging iommufd-fixes/for-rc (cf1e515c9a40 iommufd/selftest: Make dirty_ops static) Merging rust-fixes/rust-fixes (8e95e53ca379 rust: allow `stable_features` lint) Merging w1-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pmdomain-fixes/fixes (9ec87c5957ea OPP: Fix support for required OPPs for multiple PM domains) Merging i2c-host-fixes/i2c/i2c-host-fixes (5be63fc19fca Linux 6.11-rc5) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (0f6eaf125e73 Merge tag 'qcom-clk-fixes-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes) Merging pwrseq-fixes/pwrseq/for-current (06802616488c power: sequencing: qcom-wcn: set the wlan-enable GPIO to output) Merging thead-dt-fixes/thead-dt-fixes (8400291e289e Linux 6.11-rc1) Merging drm-misc-fixes/for-linux-next-fixes (9d824c7fce58 drm/v3d: Disable preemption while updating GPU stats) Merging mm-stable/mm-stable (47ac09b91bef Linux 6.11-rc4) Merging mm-nonmm-stable/mm-nonmm-stable (47ac09b91bef Linux 6.11-rc4) Merging mm/mm-everything (647f44b0a12b foo) Merging kbuild/for-next (184a282d540c kbuild: remove *.symversions left-over) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (e25ebda78e23 perf cap: Tidy up and improve capability testing) Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-rc1) Merging dma-mapping/for-next (b5c58b2fdc42 dma-mapping: direct calls for dma-iommu) 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 (3cbbf97c8ea7 Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (92b0d033c80c Merge branches 'for-next/acpi', 'for-next/misc', 'for-next/perf', 'for-next/selftests' and 'for-next/timers' into for-next/core) Merging arm-perf/for-next/perf (7c626ce4bae1 Linux 6.11-rc3) Merging arm-soc/for-next (3536c01d6577 Merge tag 'riscv-soc-fixes-for-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes) Merging amlogic/for-next (dff71e5c6076 Merge branch 'v6.12/drivers' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (b4c322c2783a ARM: dts: aspeed: catalina: Update io expander line names) Merging at91/at91-next (6e487f54cc03 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (7eff0651abbb Merge branch 'soc/next' into next) Merging davinci/davinci/for-next (973d248c43f2 ARM: davinci: remove unused cpuidle code) Merging drivers-memory/for-next (ff390189b7f2 memory: mtk-smi: Use devm_clk_get_enabled()) Merging imx-mxs/for-next (1d43464566cd Merge branch 'imx/defconfig' 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 (d7b69f6e9e1c Merge branches 'arm32-for-6.12', 'arm64-defconfig-fixes-for-6.11', 'arm64-defconfig-for-6.12', '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 (66001d1d5cde Merge branch '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 (a1bccba154c5 Merge branch 'v6.12-clk/next' into for-next) Merging samsung-krzk/for-next (6a8afff2166f Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (639facfa87ef Merge branches 'for-next/juno/updates', 'for-next/scmi/updates' and 'for-next/ffa/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (02cb71ec38bd riscv: dts: sophgo: Add LicheeRV Nano board device tree) 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 (99aac2e58234 Merge branch for-6.12/arm64/dt into for-next) Merging thead-dt/thead-dt-for-next (2d98fea7491a riscv: dts: thead: change TH1520 SPI node to use clock controller) Merging ti/ti-next (a5701819198f Merge branches 'ti-drivers-soc-next', 'ti-k3-config-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 (1ebfd0bf0625 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 (0dec2d0c8a7e dt-bindings: clock: renesas,cpg-clocks: Add top-level constraints) 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 (4956e07f05e2 LoongArch: KVM: Invalidate guest steal time address on vCPU reset) Merging m68k/for-next (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) Merging m68knommu/for-next (5be63fc19fca Linux 6.11-rc5) 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 (b7d47339d00d powerpc/code-patching: Add boot selftest for data patching) Merging risc-v/for-next (0e3f3649d44b riscv: Enable generic CPU vulnerabilites support) 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 (7471c8b3ae05 Merge branch 'features' into for-next) Applying: fixup for "s390/mm/ptdump: Generate address marker array dynamically" 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 fs-next (e7034c173d91 Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) Merging printk/for-next (59cd94ef8009 lockdep: Mark emergency sections in lockdep splats) Merging pci/next (ac716a2a3d2f Merge branch 'pci/misc') Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) Merging hid/for-next (9e99f83107bc Merge branch 'for-6.12/constify-rdesc' into for-next) Merging i2c/i2c/for-next (e3310fb8dede Merge branch 'i2c/for-current' into i2c/for-next) Merging i2c-host/i2c/i2c-host (0bcd5edc7ef6 dt-bindings: i2c: aspeed: drop redundant multi-master) 20b9b216daf8 ("dt-bindings: i2c: nvidia,tegra20-i2c: restrict also clocks in if:then:") 6302d41b3f7a ("dt-bindings: i2c: nvidia,tegra20-i2c: define power-domains top-level") cd07e699cea9 ("dt-bindings: i2c: nvidia,tegra20-i2c: combine same if:then: clauses") Merging i3c/i3c/next (8400291e289e Linux 6.11-rc1) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (98845e775390 hwmon: (oxp-sensors) Add missing breaks to fix -Wimplicit-fallthrough with clang) Merging jc_docs/docs-next (f92a24ae7c95 Documentation/fs/9p: Expand goo.gl link) CONFLICT (content): Merge conflict in Documentation/admin-guide/device-mapper/dm-crypt.rst Merging v4l-dvb/master (31aaa7d95e09 media: cec: cec-adap.c: improve CEC_MSG_FL_REPLY_VENDOR_ID check) Merging v4l-dvb-next/master (a043ea54bbb9 Merge tag 'next-media-rkisp1-20240814' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) Merging pm/linux-next (e5be0a6c0a37 Merge branch 'pm-cpufreq-fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (ea24b529e345 cpufreq: Add SM7325 to cpufreq-dt-platdev blocklist) Merging cpupower/cpupower (76fb981ad677 tools/cpupower: display residency value in idle-info) Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers) Merging pmdomain/next (208e0280f776 OPP: Drop redundant _opp_attach|detach_genpd()) 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 (04e36fd27a2a RDMA/efa: Add support for node guid) Merging net-next/main (e5899b60f52a Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/core_thermal.c CONFLICT (content): Merge conflict in net/ipv4/tcp.c Merging bpf-next/for-next (44810f81fbf3 Merge branch 'bpf-next/master' into for-next) CONFLICT (content): Merge conflict in fs/coda/inode.c Applying: fixup for "introduce fd_file(), convert all accessors to it." Applying: fixup2 for "introduce fd_file(), convert all accessors to it." Merging ipsec-next/master (17163f23678c xfrm: minor update to sdb and xfrm_policy comments) Merging mlx5-next/mlx5-next (c772a2c69018 net/mlx5: Add IFC related stuff for data direct) Merging netfilter-next/main (d2ab3bb890f6 net: ag71xx: move clk_eth out of struct) Merging ipvs-next/main (c88baabf16d1 netfilter: nf_tables: don't initialize registers in nft_do_chain()) Merging bluetooth/master (5785ffa39009 Bluetooth: MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT) Merging wireless-next/for-next (203617128803 wifi: cfg80211: Set correct chandef when starting CAC) CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/hw.c Merging ath-next/for-next (94745807f3eb wifi: ath9k_htc: Use __skb_set_length() for resetting urb before resubmit) 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 (175086cf4acd mtd: concat: Use kmemdup_array instead of kmemdup for multiple allocation) Merging nand/nand/next (ccce71013406 mtd: rawnand: davinci: make platform_data private) Merging spi-nor/spi-nor/next (b6491eb021e4 mtd: spi-nor: winbond: add Zetta ZD25Q128C support) Merging crypto/master (3c44d31cb34c crypto: simd - Do not call crypto_alloc_tfm during registration) Merging drm/drm-next (e55ef65510a4 Merge tag 'amd-drm-next-6.12-2024-08-26' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.h CONFLICT (content): Merge conflict in fs/pstore/platform.c 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 (b290af0500f0 drm/tegra: hub: Use fn parameter directly to fix Coccinelle warning) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gr3d.c Merging amdgpu/drm-next (c50fe289ed72 drm/amdgpu/swsmu: always force a state reprogram on init) Merging drm-intel/for-linux-next (c66f4711f79c drm/xe: Align all VRAM scanout buffers to 64k physical pages when needed.) Applying: fix up for "drm/i915/dp_mst: Fix MST state after a sink reset" Merging drm-msm/msm-next (624ab9cde26a drm/msm/adreno: Fix error return if missing firmware-name) 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 (87d8ecf01544 drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_pagefault.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_mmio.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_sync.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa.c Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (c3830f793236 fbdev: omapfb: Use sysfs_emit_at() to simplify code) Merging regmap/for-next (f4985b5500d2 Merge remote-tracking branch 'regmap/for-6.12' into regmap-next) Merging sound/for-next (5e1c5c5a687b ALSA: pcm: Drop PCM vmalloc buffer helpers) Merging ieee1394/for-next (c652a6d7e10a firewire: core: update fw_device outside of device_find_child()) Merging sound-asoc/for-next (ab1441e8ac95 Merge remote-tracking branch 'asoc/for-6.12' into asoc-next) Merging modules/modules-next (907fa79d787f MAINTAINERS: scale modules with more reviewers) Merging input/next (6994d8b84bfd Input: evdev - limit amount of data for writes) CONFLICT (modify/delete): drivers/input/touchscreen/cyttsp4_core.c deleted in input/next and modified in HEAD. Version HEAD of drivers/input/touchscreen/cyttsp4_core.c left in tree. $ git rm -f drivers/input/touchscreen/cyttsp4_core.c Merging block/for-next (dd596ed342be Merge branch 'for-6.12/block' into for-next) Merging device-mapper/for-next (02c0207ecdcc dm bufio: Remove NULL check of list_entry()) Merging libata/for-next (9526dec226f0 ata: libata: Add helper ata_eh_decide_disposition()) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (eea2b5d9bc41 mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (630d7615539a mfd: cros_ec: Update module description) Merging backlight/for-backlight-next (fea88a13a5d1 backlight: l4f00242t03: Add check for spi_setup) Merging battery/for-next (9dad0127ad73 power: supply: core: constify psy_tzd_ops) Merging regulator/for-next (5ba58cdc9589 Merge remote-tracking branch 'regulator/for-6.12' into regulator-next) Merging security/next (9f4906be89ad Automated merge of 'dev' into 'next') Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1) Merging integrity/next-integrity (fa8a4ce432e8 ima: fix buffer overrun in ima_eventdigest_init_common) Merging selinux/next (dc1927111923 Automated merge of 'dev' into 'next') Merging smack/next (eabc10e60dac security: smack: Fix indentation in smack_netfilter.c) Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) Merging tpmdd/next (86987d84b968 Merge tag 'v6.11-rc5-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging watchdog/master (7c626ce4bae1 Linux 6.11-rc3) Merging iommu/next (0e922e0fecff Merge branches 'fixes', 'amd/amd-vi' and 'core' into next) Merging audit/next (61c60977926e audit: use task_tgid_nr() instead of task_pid_nr()) Merging devicetree/for-next (6abe0e4c3a14 dt-bindings: input: qcom,pm8xxx-vib: Document PM6150 compatible) Merging dt-krzk/for-next (08fd3b6e0df4 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 (486ccdbc42e6 Merge remote-tracking branch 'spi/for-6.12' into spi-next) Merging tip/master (a85536e1bce7 Merge branch into tip/master: 'x86/timers') Applying: Revert "timekeeping: Use time_after() in timekeeping_check_update()" 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 (2a07e30c19f3 Merge ring-buffer/for-next) Merging rcu/next (8ec15757954f srcu: Replace WARN_ON_ONCE() with BUILD_BUG_ON() if possible) 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 (15e1c3d65975 KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id())) Merging kvm-arm/next (1093a3758142 Merge branch kvm-arm64/vgic-sre-traps into kvmarm-master/next) Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs) Merging kvm-ppc/topic/ppc-kvm (9739ff4887c7 KVM: PPC: Book3S HV: Refactor HFSCR emulation for KVM guests) Merging kvm-riscv/riscv_kvm_next (dd4a799bcc13 KVM: riscv: selftests: Fix compile error) Merging kvm-x86/next (a1206bc992c3 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'pat_vmx_msrs', 'selftests', 'svm' and 'vmx') 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 (82e29ca33e36 Merge branch 'for-6.12' into for-next) Merging sched-ext/for-next (bf934bed5e2f sched_ext: Add missing cfi stub for ops.tick) Merging drivers-x86/for-next (1e701372d7ac platform/x86/intel/ifs: Fix SBAF title underline length) CONFLICT (content): Merge conflict in drivers/platform/surface/surface_aggregator_registry.c Merging chrome-platform/for-next (d1b35e6d34e9 platform/chrome: chromeos_laptop: Use kmemdup_array) Merging chrome-platform-firmware/for-firmware-next (8400291e289e Linux 6.11-rc1) Merging hsi/for-next (c3eddf5e8c30 HSI: omap-ssi: Remove unnecessary debugfs_create_dir() error check) Merging leds-lj/for-leds-next (e5ae4083d32d dt-bindings: leds: Convert leds-lm3692x to YAML format) Merging ipmi/for-next (0108b7be2a18 Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd) Merging driver-core/driver-core-next (888f67e621dd driver core: Use 2-argument strscpy()) Merging usb/usb-next (fc88bb116179 usb: roles: add lockdep class key to struct usb_role_switch) Merging thunderbolt/next (10904df3f20c thunderbolt: Improve software receiver lane margining) Merging usb-serial/usb-next (4c0d9477ba69 USB: serial: kobil_sct: restore initial terminal settings) Merging tty/tty-next (ebbe30f4bba1 Merge 6.11-rc4 into tty-next) Merging char-misc/char-misc-next (10c8d1bd7865 Merge 6.11-rc4 into char-misc-next) 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 (988d40a4d4e7 coresight: Make trace ID map spinlock local to the map) Merging fastrpc/for-next (590c42d9e278 misc: fastrpc: Add support for cdsp1 remoteproc) Merging fpga/for-next (8de36789bd03 fpga: zynq-fpga: Rename 'timeout' variable as 'time_left') Merging icc/icc-next (a5733950fe35 Merge branch 'icc-sm8350' into icc-next) Merging iio/togreg (c4b43d8336e5 drivers:iio:Fix the NULL vs IS_ERR() bug for debugfs_create_dir()) Merging phy-next/next (c4b09c562086 phy: phy-rockchip-samsung-hdptx: Add clock provider support) Merging soundwire/next (5aedb8d8336b soundwire: intel_bus_common: enable interrupts before exiting reset) Merging extcon/extcon-next (8daf1c28478d dt-bindings: extcon: convert extcon-usb-gpio.txt to yaml format) 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 (7c626ce4bae1 Linux 6.11-rc3) Merging staging/staging-next (b0b79119cea2 staging: rtl8192e: remove set but otherwise unused local variable iv16) 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 (5be63fc19fca Linux 6.11-rc5) Merging dmaengine/next (4bb59323450d dmaengine: ti: k3-udma: Remove unused declarations) Merging cgroup/for-next (9d7165c343d0 Merge branch 'for-6.12' into for-next) Merging scsi/for-next (f682c0f62af8 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (cff06a799dbe Merge patch series "smartpqi updates") Merging vhost/linux-next (d820e8fcea38 net: virtio: unify code to init stats) Merging rpmsg/for-next (057e5c17e29f Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (b41a9bf2c64e gpio: pca953x: Print the error code on read/write failures) Merging gpio-intel/for-next (8400291e289e Linux 6.11-rc1) Merging pinctrl/for-next (00367afae6bd Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (5be63fc19fca Linux 6.11-rc5) Merging pinctrl-renesas/renesas-pinctrl (5e633f572bba pinctrl: renesas: Switch to use kmemdup_array()) Merging pinctrl-samsung/for-next (39dbbd4e6778 pinctrl: samsung: Use kmemdup_array instead of kmemdup for multiple allocation) Merging pwm/pwm/for-next (861a4272660a pwm: lp3943: Fix an incorrect type in lp3943_pwm_parse_dt()) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (611fbeb44a77 selftests:core: test coverage for dup_fd() failure handling in unshare_fd()) Merging kunit/test (8400291e289e Linux 6.11-rc1) Merging kunit-next/kunit (1757cc292ad4 Documentation: KUnit: Update filename best practices) Merging livepatching/for-next (57b421369dd7 Merge branch 'for-6.11/selftests-fixup' into for-next) Merging rtc/rtc-next (04dcadb87da6 rtc: stm32: add alarm A out feature) Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros) Merging at24/at24/for-next (36e071d2a152 dt-bindings: eeprom: at24: Add compatible for Giantec GT24C04A) 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 (a94699fa406d MAINTAINERS: Update path for U-Boot environment variables YAML) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (0b5530861eec x86/hyperv: use helpers to read control registers in hv_snp_boot_ap()) Merging auxdisplay/for-next (8400291e289e Linux 6.11-rc1) 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 (8400291e289e Linux 6.11-rc1) Merging mhi/mhi-next (969db85b4f63 bus: mhi: host: pci_generic: Add support for Netprisma LCUR57 and FCUN69) Merging memblock/for-next (cb088e38aab4 s390/mm: get estimated free pages by memblock api) 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 (d7171eb49435 efi/cper: Print correctable AER information) Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros) Merging slab/slab/for-next (056c925c0766 Merge branch 'slab/for-6.12/rcu_barriers' into slab/for-next) CONFLICT (content): Merge conflict in kernel/rcu/tree.c Merging random/master (ec309dd12628 random: vDSO: minimize and simplify header includes) CONFLICT (content): Merge conflict in tools/include/linux/linkage.h Merging landlock/next (ad1b27fc9877 Landlock: Document LANDLOCK_SCOPED_ABSTRACT_UNIX_SOCKET and ABI versioning) Merging rust/rust-next (6e6efc5fef4a rust: enable rustdoc's `--generate-link-to-definition`) Merging sysctl/sysctl-next (ed674ae9a6e6 sysctl: avoid spurious permanent empty tables) Merging execve/for-next/execve (6da1cdef7907 Merge branch 'for-linus/execve' into for-next/execve) CONFLICT (content): Merge conflict in fs/binfmt_elf.c Merging bitmap/bitmap-for-next (d7bcc37436c7 lib/test_bits.c: Add tests for GENMASK_U128()) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (7c26646068f5 Merge branches 'for-linus/hardening' and 'for-next/hardening' into for-next/kspp) CONFLICT (content): Merge conflict in include/linux/string_choices.h Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (248f6b935bbd Merge tag 'nolibc-20240824-for-6.12-1' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc into nolibc) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (76889bbaabf5 Merge branch 'nesting_reserved_regions' into iommufd.git for-next) CONFLICT (content): Merge conflict in drivers/iommu/iommufd/selftest.c Merging turbostat/next (d401eda21f33 tools/power turbostat: Allow using cpu device in perf counters on hybrid platforms) Merging pwrseq/pwrseq/for-next (8b7e0a6c443e Documentation: add a driver API doc for the power sequencing subsystem) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgpgHCl_Fpqn8.pgp
Description: OpenPGP digital signature
