Hi all, Changes since 20240904: The vfs-brauner tree still has its build failure so I used a supplied patch. The arm-soc tree gained a build failure so I used the version from next-20240903. The drm-misc tree lost its build failure. The tip tree gained a conflict against the mm tree. The rcu tree gained a conflict against the kvm-fixes tree. The kvm-arm tree gained a conflict against the arm64 tree. The random tree gained a build failure so I used the version from next-20240904. Non-merge commits (relative to Linus' tree): 8708 8880 files changed, 340805 insertions(+), 163561 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 (c763c4339688 Merge tag 'bcachefs-2024-09-04' of git://evilpiepirate.org/bcachefs) Merging vfs-brauner-fixes/vfs.fixes (72a6e22c604c fscache: delete fscache_cookie_lru_timer when fscache exits to avoid UAF) 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 (5220cec1e073 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 (40927f3d0972 nfsd: fix nfsd4_deleg_getattr_conflict in presence of third party lease) 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 (da6e6a70084d bcachefs: Fix compilation error for bch2_sb_member_alloc) 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 (d74e6dc87cc3 Merge branch 'for-next-next-v6.11-20240902' into for-next-20240902) CONFLICT (content): Merge conflict in fs/btrfs/file.c Merging ceph/master (ede0b1d30b82 libceph: use min() to simplify code in ceph_dns_resolve_name()) Merging cifs/for-next (b0447d16c59f smb3: mark compression as CONFIG_EXPERIMENTAL and fix missing compression operation) 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 (e96d85720f1f erofs: handle overlapped pclusters out of crafted images properly) Merging exfat/dev (98ad7b9012b5 exfat: Implement sops->shutdown and ioctl) Merging exportfs/exportfs-next (0c3836482481 Linux 6.10) Merging ext3/for_next (702e9da7376b Merge isofs __counted_by annotation.) Merging ext4/dev (ff2beee206d2 ext4: convert EXT4_B2C(sbi->s_stripe) users to EXT4_NUM_B2C) Merging f2fs/dev (c6f1758f7a68 f2fs: get rid of page->index) Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) Merging fuse/for-next (9dc504f24489 virtio_fs: allow idmapped mounts) Merging gfs2/for-next (6888c1e85f5d gfs2: Remove gfs2_aspace_writepage()) Merging jfs/jfs-next (2b59ffad47db jfs: Fix uninit-value access of new_ea in ea_buffer) Merging ksmbd/ksmbd-for-next (d8abb73f5847 Merge tag 'v6.11-rc6-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (67784a74e258 Merge tag 'ata-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux) Merging nfs-anna/linux-next (f92214e4c312 NFS: Avoid unnecessary rescanning of the per-server delegation list) Merging nfsd/nfsd-next (89e543d483e8 NFSD: Add initial generated XDR definitions and functions for NFSv4) Merging ntfs3/master (689ecd06ef8d fs/ntfs3: Rename ntfs3_setattr into ntfs_setattr) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) Merging overlayfs/overlayfs-next (de122603d515 Update metacopy section in overlayfs documentation) 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 (ed141fd02d8b Merge branch 'vfs.procfs' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) CONFLICT (content): Merge conflict in fs/exfat/inode.c CONFLICT (content): Merge conflict in fs/ext4/inline.c CONFLICT (content): Merge conflict in fs/ext4/inode.c CONFLICT (content): Merge conflict in fs/f2fs/data.c Applying: fix up for "uapi: explain how per-syscall AT_* flags should be allocated" Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (5ba1528df57d ocfs2: cancel dqi_sync_work before freeing oinfo) Merging fs-current (d271b80b74aa Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (431c1646e1f8 Linux 6.11-rc6) 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 (9cc7b1705141 Merge tag 'at91-fixes-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/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 (734ad0af3609 powerpc/qspinlock: Fix deadlock in MCS queue) Merging s390-fixes/fixes (1642285e511c s390/boot: Fix KASLR base offset off by __START_KERNEL bytes) Merging net/main (2603d3152b1f Merge tag 'wireless-2024-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) Merging bpf/master (5390f315fc8c Merge branch 'bpf-fix-incorrect-name-check-pass-logic-in-btf_name_valid_section') Merging ipsec/master (9b0874286768 Merge branch 'mctp-serial-tx-escapes') Merging netfilter/main (febccb39255f nfc: pn533: Add poll mod list filling check) Merging ipvs/main (febccb39255f nfc: pn533: Add poll mod list filling check) Merging wireless/for-next (5872b47ce18e MAINTAINERS: wifi: cw1200: add net-cw1200.h) Merging ath/for-current (2f833e8948d6 Revert "wifi: ath11k: support hibernation") Merging wpan/master (3682c302e72d ieee802154: Correct spelling in nl802154.h) Merging rdma-fixes/for-rc (8400291e289e Linux 6.11-rc1) Merging sound-current/for-linus (47a9e8dbb8d4 ALSA: hda/realtek: Support mute LED on HP Laptop 14-dq2xxx) Merging sound-asoc-fixes/for-linus (77212f300bfd ASoC: codecs: lpass-va-macro: set the default codec version for sm8250) Merging regmap-fixes/for-linus (10a650193899 Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) Merging regulator-fixes/for-linus (1a5caec7f80c regulator: core: Stub devm_regulator_bulk_get_const() if !CONFIG_REGULATOR) Merging spi-fixes/for-linus (5478a4f7b944 spi: spidev: Add missing spi_device_id for jg10309-01) Merging pci-current/for-linus (8f62819aaace PCI/pwrctl: Rescan bus on a separate thread) 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 (87eb3cb4ec61 usb: typec: ucsi: Fix cable registration) Merging usb-serial-fixes/usb-linus (9a471de516c3 USB: serial: option: add MeiG Smart SRM825L) Merging phy/fixes (431c1646e1f8 Linux 6.11-rc6) Merging staging.current/staging-linus (8400291e289e Linux 6.11-rc1) Merging iio-fixes/fixes-togreg (48b9a8dabcc3 VMCI: Fix use-after-free when removing resource in vmci_resource_remove()) Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1) Merging char-misc.current/char-misc-linus (48b9a8dabcc3 VMCI: Fix use-after-free when removing resource in vmci_resource_remove()) Merging soundwire-fixes/fixes (431c1646e1f8 Linux 6.11-rc6) Merging thunderbolt-fixes/fixes (431c1646e1f8 Linux 6.11-rc6) Merging input-current/for-linus (c472d33bcbf7 Input: cypress_ps2 - fix waiting for command response) 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 (431c1646e1f8 Linux 6.11-rc6) 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 (5be63fc19fca Linux 6.11-rc5) 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 (593377036e50 kvm: Note an RCU quiescent state on guest exit) Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) Merging hwmon-fixes/hwmon (a54da9df75cd hwmon: (hp-wmi-sensors) Check if WMI event data exists) Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases) Merging cxl-fixes/fixes (5be63fc19fca Linux 6.11-rc5) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (d34af755a533 platform/x86/amd: pmf: Make ASUS GA403 quirk generic) 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 (0f9592ae26ff scsi: ufs: ufs-mediatek: Add UFSHCD_QUIRK_BROKEN_LSDBS_CAP) Merging drm-fixes/drm-fixes (431c1646e1f8 Linux 6.11-rc6) Merging drm-intel-fixes/for-linux-next-fixes (a13494de5325 drm/i915/display: Increase Fast Wake Sync length as a quirk) Merging mmc-fixes/fixes (aea62c744a9a mmc: cqhci: Fix checking of CQHCI_HALT state) 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 (1ff95eb2bebd riscv: Fix RISCV_ALTERNATIVE_EARLY) 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 (a5135526426d gpio: modepin: Enable module autoloading) 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 (e162cb25c410 perf daemon: Fix the build on more 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 (cff56ff737e2 MAINTAINERS: update Andreas Hindborg's email address) 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 (431c1646e1f8 Linux 6.11-rc6) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (71c03a8cb213 clk: qcom: gcc-sc8280xp: don't use parking clk_ops for QUPs) Merging pwrseq-fixes/pwrseq/for-current (431c1646e1f8 Linux 6.11-rc6) Merging thead-dt-fixes/thead-dt-fixes (8400291e289e Linux 6.11-rc1) Merging drm-misc-fixes/for-linux-next-fixes (9a71cf8b6fa4 drm/bridge-connector: reset the HDMI connector state) Merging mm-stable/mm-stable (6f1833b8208c mm: memory_hotplug: unify Huge/LRU/non-LRU movable folio isolation) Merging mm-nonmm-stable/mm-nonmm-stable (74b0099340e0 nilfs2: refactor nilfs_segctor_thread()) Merging mm/mm-everything (6241635b0b32 foo) Merging kbuild/for-next (a220efd26cd0 kbuild: compile constant module information only once) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (39c243411bdb perf sched timehist: Fixed timestamp error when unable to confirm event sched_in time) CONFLICT (content): Merge conflict in tools/perf/tests/pmu.c Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-rc1) Merging dma-mapping/for-next (ea0643527238 dma-direct: optimize page freeing when it is not addressable) 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 (9016915e3c5f Merge branches 'amba', 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (6a6243e3458c Merge branch 'for-next/poe' into for-next/core) Merging arm-perf/for-next/perf (7c626ce4bae1 Linux 6.11-rc3) Merging arm-soc/for-next (a6006968439f soc: document merges) $ git reset --hard HEAD^ Merging next-20240903 version of arm-soc Merging amlogic/for-next (7bf8845324d1 Merge branch 'v6.12/arm64-dt' 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 (ee735afc2dae Merge branch 'at91-soc' 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 (32960b4f25c2 memory: pl353-smc: simplify with scoped for each OF child loop) Merging imx-mxs/for-next (79e1b8171ca4 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 (dea56c781ed3 ARM: dove: Drop a write-only variable) Merging omap/for-next (6cb1ac2b11b2 Merge branch 'omap-for-v6.12/drivers' into omap-reset) Merging qcom/for-next (dd5d5a60ac5c 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 (5379c9e0a6ad Merge branch 'renesas-dts-for-v6.12' into renesas-next) Merging reset/reset/next (487b1b32e317 reset: eyeq: add platform driver) Merging rockchip/for-next (9e3f350857e4 Merge branch 'v6.12-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (6a8afff2166f Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (8aaf45bcb48e Merge branch '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 (47e5a8daf0b9 dt-bindings: riscv: Add Sipeed LicheeRV Nano board compatibles) Merging stm32/stm32-next (a15ad86d4b65 ARM: dts: stm32: Add MECIO1 and MECT1S board variants) Merging sunxi/sunxi/for-next (89f1a037e97c arm64: dts: allwinner: a64: Add GPU thermal trips to the SoC dtsi) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) Merging tegra/for-next (6726d2c6a157 Merge branch for-6.12/arm64/defconfig 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 (657b48ad4c7a Merge branches 'ti-drivers-soc-next', 'ti-k3-config-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (bc810ecbb30a Merge branch 'zynq/soc' into for-next) Merging clk/clk-next (8770b3d8eb83 Merge branch 'clk-renesas' into clk-next) Merging clk-imx/for-next (32c055ef563c clk: imx6ul: fix clock parent for IMX6UL_CLK_ENETx_REF_SEL) Merging clk-renesas/renesas-clk (3aeccbe08171 clk: renesas: r9a09g057: Add clock and reset entries for GTM/RIIC/SDHI/WDT) 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 (2e04cbed1278 m68k: remove trailing space after Merging microblaze/next (d829e7ee6354 microblaze: Export xmb_manager functions) Merging mips/mips-next (439667fb943c mips: Remove posix_types.h include from sigcontext.h) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (82e21cc3c2cb parisc: Convert to generic clockevents) Merging powerpc/next (65948b0e716a powerpc/vdso: Inconditionally use CFUNC macro) 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 (489753c1f7ae 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 (8d32ae66515d Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) CONFLICT (content): Merge conflict in include/linux/huge_mm.h Merging printk/for-next (daeed1595b4d printk: Avoid false positive lockdep report for legacy printing) Merging pci/next (4aefeda2a4fc Merge branch 'pci/misc') Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) Merging hid/for-next (ad5d71dcc1f6 Merge branch 'for-6.11/upstream-fixes' into for-next) Merging i2c/i2c/for-next (642e257c3ec3 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i2c-host/i2c/i2c-host (1eefdc3a9992 dt-bindings: i2c: i2c-rk3x: Add rk3576 compatible) 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 (3cd1ef26b01e hwmon: pmbus: pli12096bc: Add write delay) 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 (dba6a3923f74 Merge branch 'pm-cpufreq' into linux-next) CONFLICT (content): Merge conflict in arch/riscv/include/asm/irq.h Merging cpufreq-arm/cpufreq/arm/linux-next (6b612d1bac67 cpufreq: ti-cpufreq: Use socinfo to get revision in AM62 family) Merging cpupower/cpupower (76fb981ad677 tools/cpupower: display residency value in idle-info) Merging devfreq/devfreq-next (d47552124bb0 PM / devfreq: imx-bus: Use of_property_present()) Merging pmdomain/next (208e0280f776 OPP: Drop redundant _opp_attach|detach_genpd()) Merging opp/opp/linux-next (a84372012e93 dt-bindings: opp: operating-points-v2-ti-cpu: Update maintainers) Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) Merging rdma/for-next (dc116b7fddbd RDMA/bnxt_re: Add support for MR Relaxed Ordering) Merging net-next/main (43b772448710 Merge tag 'wireless-next-2024-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/core_thermal.c CONFLICT (content): Merge conflict in drivers/net/phy/phy_device.c Merging bpf-next/for-next (1dcc512c5011 Merge branch 'bpf-next/net' into bpf-next/for-next) CONFLICT (content): Merge conflict in drivers/net/netkit.c 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 (c362646b6fc1 netfilter: nf_tables: Add missing Kernel doc) Merging ipvs-next/main (d2ab3bb890f6 net: ag71xx: move clk_eth out of struct) Merging bluetooth/master (e278dcc0a237 Bluetooth: btrtl: Set msft ext address filter quirk for RTL8852B) Merging wireless-next/for-next (97b766f989bc wifi: mwifiex: Convert to use jiffies macro) 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 (2095e7da8049 mtd: spi-nor: spansion: Add support for S28HS256T) Merging crypto/master (b8fc70ab7b5f Revert "crypto: spacc - Add SPAcc Skcipher support") Merging drm/drm-next (e066e9aa4d9c MAINATINERS: update drm maintainer contacts) 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 drivers/gpu/drm/tegra/gr3d.c CONFLICT (content): Merge conflict in fs/pstore/platform.c Merging drm-exynos/for-linux-next (e066e9aa4d9c MAINATINERS: update drm maintainer contacts) Merging drm-misc/for-linux-next (c6430a8eb08d drm/nouveau/volt: use clamp() in nvkm_volt_map()) CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gr3d.c Merging amdgpu/drm-next (ead60e9c4e29 drm/amdgpu/gfx10: use rlc safe mode for soft recovery) Merging drm-intel/for-linux-next (c4d37c54c373 drm/i915/display: Fix BMG CCS modifiers) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_quirks.c Merging drm-msm/msm-next (15302579373e drm/msm/dpu: enable writeback on SM6350) Merging drm-msm-lumag/msm-next-lumag (15302579373e drm/msm/dpu: enable writeback on SM6350) Merging drm-xe/drm-xe-next (34bb7b813ab3 drm/xe: Use xe_pm_runtime_get in xe_bo_move() if reclaim-safe.) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (27f22f897095 fbdev: hyperv_fb: Convert comma to semicolon) Merging regmap/for-next (7da49f45bf04 Merge remote-tracking branch 'regmap/for-6.12' into regmap-next) Merging sound/for-next (2994586e2c48 Merge branch 'for-linus' into for-next) Merging ieee1394/for-next (bc47d6d6bbe5 firewire: ohci: obsolete direct usage of printk_ratelimit()) Merging sound-asoc/for-next (097a44db5747 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 (a790df272a20 Input: synaptics-rmi4 - fix crash when DPM query is not supported) 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 (712720ef2d8f Merge branch 'for-6.12/block' into for-next) Merging device-mapper/for-next (a8fa6483b409 dm integrity: fix gcc 5 warning) Merging libata/for-next (0f3e1eaaf7f9 ata: sata_gemini: Enable module autoloading) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (5854809b51f4 rpmb: fix error path in rpmb_dev_register()) Merging mfd/for-mfd-next (ae3239408c5b mfd: intel-lpss: Add Intel Panther Lake LPSS PCI IDs) 555fa39ba1fd ("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 (6625767049c2 power: supply: axp20x_battery: add support for AXP717) Merging regulator/for-next (fc92ed19b742 Merge remote-tracking branch 'regulator/for-6.12' into regulator-next) Merging security/next (cb8724948452 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 (2749749afa07 smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso) Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) Merging tpmdd/next (1016abf3e697 selftests: tpm2: test_smoke: Run only when TPM2 is avaialable.) Merging watchdog/master (7c626ce4bae1 Linux 6.11-rc3) Merging iommu/next (abc82afb6cdc Merge branches 'arm/smmu', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) Merging audit/next (8c1867a2f0fd audit: Make use of str_enabled_disabled() helper) Merging devicetree/for-next (1577a09c7b8a kselftest: dt: Ignore nodes that have ancestors disabled) 80cfdfeb8367 ("dt-bindings: PCI: layerscape-pci: Fix property 'fsl,pcie-scfg' type") 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 (d94b69e386c0 Merge remote-tracking branch 'spi/for-6.12' into spi-next) Merging tip/master (5f234c1241f5 Merge branch into tip/master: 'x86/timers') CONFLICT (content): Merge conflict in kernel/events/uprobes.c Merging clockevents/timers/drivers/next (727e8fcd969f platform/x86:intel/pmc: Fix comment for the pmc_core_acpi_pm_timer_suspend_resume function) Merging edac/edac-for-next (3a6fe32d7113 Merge branch 'edac-drivers' into edac-for-next) Merging ftrace/for-next (2a07e30c19f3 Merge ring-buffer/for-next) Merging rcu/next (a54a47fa82d1 rcu: Defer printing stall-warning backtrace when holding rcu_node lock) CONFLICT (content): Merge conflict in include/linux/context_tracking.h 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 (6ed84689cbda Merge branch kvm-arm64/nv-at-pan into kvmarm-master/next) CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs) Merging kvm-ppc/topic/ppc-kvm (46765aaec4d7 KVM: PPC: Book3S HV: remove unused varible) Merging kvm-riscv/riscv_kvm_next (5aa09297a3dc RISC-V: KVM: Fix to allow hpmcounter31 from the guest) Merging kvm-x86/next (642613182efa 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 (649e980dadee Merge branch 'bpf/master' into for-6.12) Merging drivers-x86/for-next (c34068c8edad platform/x86: intel-hid: Use string_choices API instead of ternary operator) 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 (64c38866500b leds: turris-omnia: Fix module autoloading with MODULE_DEVICE_TABLE()) Merging ipmi/for-next (64dce81f8c37 ipmi: docs: don't advertise deprecated sysfs entries) Merging driver-core/driver-core-next (fea64fa04c31 devres: Correclty strip percpu address space of devm_free_percpu() argument) Merging usb/usb-next (d40ae4cdd9a4 dt-bindings: phy: mxs-usb-phy: add nxp,sim property) CONFLICT (content): Merge conflict in drivers/usb/typec/ucsi/ucsi.c 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 (f1ec92a066b2 tty: hvc: convert comma to semicolon) Merging char-misc/char-misc-next (072e18d63b91 misc: tsl2550: replace simple_strtoul to kstrtoul) 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 (8400291e289e Linux 6.11-rc1) 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 (3c2ea12a625d phy: renesas: rcar-gen3-usb2: Add support for the RZ/G3S SoC) Merging soundwire/next (5aedb8d8336b soundwire: intel_bus_common: enable interrupts before exiting reset) Merging extcon/extcon-next (2e01ac83c1c7 extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE) Merging gnss/gnss-next (8400291e289e Linux 6.11-rc1) Merging vfio/next (7555c7d2cfc4 vfio: mdev: Remove unused function declarations) 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 (cd0920ebab6b staging: rtl8723bs: Remove an unused struct in rtw_cmd.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 (5be63fc19fca Linux 6.11-rc5) Merging dmaengine/next (e0bee4bcdc32 dmaengine: loongson1-apb-dma: Fix the build warning caused by the size of pdev_irqname) Merging cgroup/for-next (68d2fca079c8 Merge branch 'for-6.12' into for-next) Merging scsi/for-next (8a1f405ed3bd 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 (ccaf84694ce7 gpio: mpc8xxx: order headers alphabetically) Merging gpio-intel/for-next (8400291e289e Linux 6.11-rc1) Merging pinctrl/for-next (77923daebaf8 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (bda2f1c2d8c0 pinctrl: baytrail: Drop duplicate return statement) Merging pinctrl-renesas/renesas-pinctrl (1325820dd085 pinctrl: renesas: rzg2l: Move pinconf_to_config_argument() call outside of switch cases) Merging pinctrl-samsung/for-next (39dbbd4e6778 pinctrl: samsung: Use kmemdup_array instead of kmemdup for multiple allocation) Merging pwm/pwm/for-next (25422cef98d6 pwm: atmel-hlcdc: Drop trailing comma) Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) Merging kselftest/next (f0a6ecebd858 selftests/ftrace: Fix eventfs ownership testcase to find mount point) Merging kunit/test (8400291e289e Linux 6.11-rc1) Merging kunit-next/kunit (1757cc292ad4 Documentation: KUnit: Update filename best practices) Merging livepatching/for-next (9fbf78b6d6ce Merge branch 'for-6.12/trivial' into for-next) Merging rtc/rtc-next (04dcadb87da6 rtc: stm32: add alarm A out feature) Merging nvdimm/libnvdimm-for-next (447b167bb60d nvdimm: Remove dead code for ENODEV checking in scan_labels()) 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 (8400291e289e Linux 6.11-rc1) Merging nvmem/for-next (8400291e289e Linux 6.11-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (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 (30a7e9df309f bus: mhi: host: pci_generic: Enable EDL trigger for Foxconn modems) 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 (156bb2c569cd unicode: Fix utf8_load() error path) Merging slab/slab/for-next (3ac40cd1a6fb Merge branch 'slab/for-6.12/rcu_barriers' into slab/for-next) CONFLICT (content): Merge conflict in kernel/rcu/tree.c Merging random/master (e87734831e87 selftests: vDSO: don't include generated headers for chacha test) CONFLICT (content): Merge conflict in tools/include/linux/linkage.h $ git reset --hard HEAD^ Merging next-20240904 version of random CONFLICT (content): Merge conflict in tools/include/linux/linkage.h [master d10934b1f3b5] next-20240904/random Merging landlock/next (ad1b27fc9877 Landlock: Document LANDLOCK_SCOPED_ABSTRACT_UNIX_SOCKET and ABI versioning) Merging rust/rust-next (77e1dd1d0f91 docs: rust: include other expressions in conditional compilation section) CONFLICT (content): Merge conflict in rust/kernel/lib.rs Merging sysctl/sysctl-next (559d4c6a9d3b 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 (f7f33633ebe9 cpumask: Implement cpumask_{first,next}_{nor,andnot}) 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 (1dd10efc87e8 tools/power turbostat: Fix trailing ' 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:
pgp9HqNiJmqPj.pgp
Description: OpenPGP digital signature
