Hi all, Changes since 20241015: New tree: kcsan The vfs-brauner tree gained a conflict against the btrfs tree. The bpf-next tree gained a build failure so I reverted a topic branch for today. The fbdev tree lost its build failure. The mfd tree lost its build failure. The tip tree still had its build failure for which I applied a patch. The staging tree still had its build failure for which I marked a driver BROKEN and gained a conflict against the v4l-dvb tree. Non-merge commits (relative to Linus' tree): 4363 5893 files changed, 186222 insertions(+), 149113 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 378 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 (2f87d0916ce0 Merge tag 'trace-ringbuffer-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) Merging fixes/fixes (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging vfs-brauner-fixes/vfs.fixes (f92f0a1b0569 openat2: explicitly return -E2BIG for (usize > PAGE_SIZE)) 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 (540df421f718 Merge branch 'misc-6.12' into next-fixes) Merging vfs-fixes/fixes (678379e1d4f7 close_range(): fix the logics in descriptor table trimming) Merging erofs-fixes/fixes (ae54567eaa87 erofs: get rid of kaddr in `struct z_erofs_maprecorder`) Merging nfsd-fixes/nfsd-fixes (c88c150a467f nfsd: fix possible badness in FREE_STATEID) Merging v9fs-fixes/fixes/next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) Merging bcachefs/for-next (18072677d4ae bcachefs: Fix warning about passing flex array member by value) 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 (40e66ce9b856 Merge branch 'for-next-next-v6.12-20241015' into for-next-20241015) Merging ceph/master (ccda9910d849 ceph: fix cap ref leak via netfs init_request) Merging cifs/for-next (b71b5f15b68a cifs: Fix parsing native symlinks directory/file type) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging dlm/next (dfe5a6cc4204 dlm: make add_to_waiters() that it can't fail) Merging erofs/dev (9852d85ec9d4 Linux 6.12-rc1) Merging exfat/dev (cb7d85014fb1 MAINTAINERS: exfat: add myself as reviewer) Merging exportfs/exportfs-next (98f7e32f20d2 Linux 6.11) Merging ext3/for_next (1cda52f1b461 fsnotify, lsm: Decouple fsnotify from lsm) Merging ext4/dev (6121258c2b33 ext4: fix off by one issue in alloc_flex_gd()) Merging f2fs/dev (eca631b8fe80 Merge tag 'f2fs-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) Merging fuse/for-next (5d9e1455630d fuse: convert fuse_notify_store to use folios) Merging gfs2/for-next (7e4a0a50b403 KMSAN: uninit-value in inode_go_dump (5)) Merging jfs/jfs-next (2b59ffad47db jfs: Fix uninit-value access of new_ea in ea_buffer) Merging ksmbd/ksmbd-for-next (a77e0e02af1c ksmbd: add support for supplementary groups) 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 (7ef60108069b NFS: remove revoked delegation from server's delegation list) Merging nfsd/nfsd-next (a6c8f091e362 NFSD: Replace use of NFSD_MAY_LOCK in nfsd4_lock()) Merging ntfs3/master (8e929cb546ee Linux 6.12-rc3) Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) Merging overlayfs/overlayfs-next (2d66a7cea561 ovl: convert ovl_real_fdget() callers to ovl_real_file()) Merging ubifs/next (92a286e90203 ubi: Fix ubi_init() ubiblock_exit() section mismatch) Merging v9fs/9p-next (79efebae4afc 9p: Avoid creating multiple slab caches with the same name) Merging v9fs-ericvh/ericvh/for-next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) Merging xfs/for-next (f6f91d290c8b xfs: punch delalloc extents from the COW fork for COW writes) 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 (2232c1874e5c Merge branch 'vfs.exportfs' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) 18f08714e7b2 ("iomap: factor out a iomap_last_written_block helper") 1eef06039a75 ("iomap: remove iomap_file_buffered_write_punch_delalloc") 2f58268678f1 ("xfs: take XFS_MMAPLOCK_EXCL xfs_file_write_zero_eof") 71f1cd607850 ("xfs: factor out a xfs_file_write_zero_eof helper") 7f6e164457c6 ("xfs: support the COW fork in xfs_bmap_punch_delalloc_range") 99c29f16b79f ("xfs: IOMAP_ZERO and IOMAP_UNSHARE already hold invalidate_lock") c650b5a9028f ("xfs: punch delalloc extents from the COW fork for COW writes") cd97b59a531d ("xfs: share more code in xfs_buffered_write_iomap_begin") f66815a521bd ("iomap: move locking out of iomap_write_delalloc_release") f8bb8ce211ce ("xfs: set IOMAP_F_SHARED for all COW fork allocations") CONFLICT (content): Merge conflict in fs/btrfs/file.c CONFLICT (content): Merge conflict in include/linux/iomap.h Merging vfs/for-next (8f602276d390 Merge tag 'bcachefs-2024-10-05' of git://evilpiepirate.org/bcachefs) Merging mm-hotfixes/mm-hotfixes-unstable (80bf308c69a9 mm/mglru: only clear kswapd_failures if reclaimable) Merging fs-current (6c0f52b60a8f Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git) Merging kbuild-current/fixes (8cf0b93919e1 Linux 6.12-rc2) Merging arc-current/for-curr (8bf275d61925 arc: rename aux.h to arc_aux.h) 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 (7aed6a2c51ff kasan: Disable Software Tag-Based KASAN with GCC) Merging arm-soc-fixes/arm/fixes (1b59d6c19c2c Merge tag 'scmi-fixes-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) Merging davinci-current/davinci/for-current (9852d85ec9d4 Linux 6.12-rc1) Merging drivers-memory-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging sophgo-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging m68k-current/for-linus (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) Merging powerpc-fixes/fixes (8956c582ac6b powerpc/8xx: Fix kernel DTLB miss on dcbz) Merging s390-fixes/fixes (cad4b3d4ab1f KVM: s390: Change virtual to physical address access in diag 0x258 handler) Merging net/main (c186b7a7f238 net: ethernet: rtsn: fix potential memory leak in rtsn_start_xmit()) Merging bpf/master (ee230090f62f Merge branch 'fix-truncation-bug-in-coerce_reg_to_size_sx-and-extend-selftests') Merging ipsec/master (6889cd2a93e1 xfrm: fix one more kernel-infoleak in algo dumping) Merging netfilter/main (174714f0e505 selftests: drivers: net: fix name not defined) Merging ipvs/main (c6a0862bee69 selftests: netfilter: conntrack_vrf.sh: add fib test case) Merging wireless/for-next (52009b419355 wifi: mac80211: skip non-uploaded keys in ieee80211_iter_keys) Merging ath/for-current (2f833e8948d6 Revert "wifi: ath11k: support hibernation") Merging wpan/master (09573b1cc76e net: ieee802154: mcr20a: Use IRQF_NO_AUTOEN flag in request_irq()) Merging rdma-fixes/for-rc (dc5006cfcf62 RDMA/bnxt_re: Fix the GID table length) Merging sound-current/for-linus (71dce222d586 ALSA/hda: intel-sdw-acpi: add support for sdw-manager-list property read) Merging sound-asoc-fixes/for-linus (3692a4ccacf3 MAINTAINERS: Update maintainer list for MICROCHIP ASOC, SSC and MCP16502 drivers) Merging regmap-fixes/for-linus (8cf0b93919e1 Linux 6.12-rc2) Merging regulator-fixes/for-linus (8e929cb546ee Linux 6.12-rc3) Merging spi-fixes/for-linus (b5a468199b99 spi: stm32: fix missing device mode capability in stm32mp25) Merging pci-current/for-linus (1d59d474e1cb PCI: Hold rescan lock while adding devices during host probe) Merging driver-core.current/driver-core-linus (8e929cb546ee Linux 6.12-rc3) Merging tty.current/tty-linus (be847a3a8d4e serial: qcom-geni: rename suspend functions) Merging usb.current/usb-linus (8e929cb546ee Linux 6.12-rc3) Merging usb-serial-fixes/usb-linus (9852d85ec9d4 Linux 6.12-rc1) Merging phy/fixes (1e48fd0574ee phy: usb: disable COMMONONN for dual mode) Merging staging.current/staging-linus (8cf0b93919e1 Linux 6.12-rc2) Merging iio-fixes/fixes-togreg (6b8e9dbfaed4 iio: frequency: admv4420: fix missing select REMAP_SPI in Kconfig) Merging counter-current/counter-current (9852d85ec9d4 Linux 6.12-rc1) Merging char-misc.current/char-misc-linus (2471787c1f0d misc: microchip: pci1xxxx: add support for NVMEM_DEVID_AUTO for OTP device) Merging soundwire-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging thunderbolt-fixes/fixes (e9e1b20fae7d thunderbolt: Fix KASAN reported stack out-of-bounds read in tb_retimer_scan()) Merging input-current/for-linus (c684771630e6 Input: adp5589-keys - fix adp5589_gpio_get_value()) Merging crypto-current/master (e845d2399a00 crypto: marvell/cesa - Disable hash algorithms) Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) Merging kselftest-fixes/fixes (4ee5ca9a2938 ftrace/selftest: Test combination of function_graph tracer and function profiler) Merging dmaengine-fixes/fixes (d35f40642904 dmaengine: ti: k3-udma: Set EOP for all TRs in cyclic BCDMA transfer) 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 (fa88dc7db176 media: dvb-core: add missing buffer index check) Merging reset-fixes/reset/fixes (2cf596636607 reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC) Merging mips-fixes/mips-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging at91-fixes/at91-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging omap-fixes/fixes (5062d9c0cbbc ARM: dts: omap3-n900: correct the accelerometer orientation) Merging kvm-fixes/master (c8d430db8eec Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) Merging hwmon-fixes/hwmon (eabb03810194 [PATCH} hwmon: (jc42) Properly detect TSE2004-compliant devices again) Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases) Merging cxl-fixes/fixes (ee1e3c46ed19 EINJ, CXL: Fix CXL device SBDF calculation) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (2fae3129c0c0 platform/x86: x86-android-tablets: Fix use after free on platform_device_register() errors) Merging samsung-krzk-fixes/fixes (a03c246d4ec8 clk: samsung: Fix out-of-bound access of of_match_node()) Merging pinctrl-samsung-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging devicetree-fixes/dt/linus (6e0391e48cf9 of: Skip kunit tests when arm64+ACPI doesn't populate root node) Merging dt-krzk-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging scsi-fixes/fixes (d539a871ae47 scsi: scsi_transport_fc: Allow setting rport state to current state) Merging drm-fixes/drm-fixes (8e929cb546ee Linux 6.12-rc3) Merging drm-intel-fixes/for-linux-next-fixes (8e929cb546ee Linux 6.12-rc3) Merging mmc-fixes/fixes (8e929cb546ee Linux 6.12-rc3) Merging rtc-fixes/rtc-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging gnss-fixes/gnss-linus (9852d85ec9d4 Linux 6.12-rc1) Merging hyperv-fixes/hyperv-fixes (895384881ec9 hv: vmbus: Constify struct kobj_type and struct attribute_group) Merging risc-v-fixes/fixes (cfb10de18538 riscv: Fix kernel stack size when KASAN is enabled) Merging riscv-dt-fixes/riscv-dt-fixes (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) Merging riscv-soc-fixes/riscv-soc-fixes (61f2e8a3a941 riscv: dts: starfive: jh7110-common: Fix lower rate of CPUfreq by setting PLL0 rate to 1.5GHz) 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 (8e929cb546ee Linux 6.12-rc3) Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging pinctrl-intel-fixes/fixes (37756257093b pinctrl: intel: platform: Add Panther Lake to the list of supported) Merging auxdisplay-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging kunit-fixes/kunit-fixes (9852d85ec9d4 Linux 6.12-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 (e934a35e3cc1 perf cs-etm: Fix the assert() to handle captured and unprocessed cpu trace) 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 (9852d85ec9d4 Linux 6.12-rc1) Merging rust-fixes/rust-fixes (8b8ca9c25fe6 cfi: fix conditions for HAVE_CFI_ICALL_NORMALIZE_INTEGERS) Merging w1-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging pmdomain-fixes/fixes (7738568885f2 PM: domains: Fix alloc/free in dev_pm_domain_attach|detach_list()) Merging i2c-host-fixes/i2c/i2c-host-fixes (8cf0b93919e1 Linux 6.12-rc2) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (23dbbe888925 Merge tag 'samsung-clk-fixes-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-fixes) Merging pwrseq-fixes/pwrseq/for-current (a85bbe01a320 power: sequencing: make the QCom PMU pwrseq driver depend on CONFIG_OF) Merging thead-dt-fixes/thead-dt-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging drm-misc-fixes/for-linux-next-fixes (fcf38bc321fb drm/panel: himax-hx83102: Adjust power and gamma to optimize brightness) Merging mm-stable/mm-stable (8e929cb546ee Linux 6.12-rc3) Merging mm-nonmm-stable/mm-nonmm-stable (8e929cb546ee Linux 6.12-rc3) Merging mm/mm-everything (a3abd8cc2c8f foo) Merging kbuild/for-next (f8746e3712be kconfig: remove zconfprint()) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (77b679453d33 Merge tag 'v6.12-rc3' into perf-tools-next) Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) Merging dma-mapping/for-next (bfc4a245a794 dma-mapping: fix DMA API tracing for chained scatterlists) Merging asm-generic/master (f822712a2c69 UAPI/ioctl: Improve parameter name of ioctl request definition helpers) 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 (45d27a4d0627 Merge branches 'for-next/gcs', 'for-next/probes' and 'for-next/asm-offsets' into for-next/core) Merging arm-perf/for-next/perf (cc8476789983 drivers perf: remove unused field pmu_node) Merging arm-soc/for-next (1b59d6c19c2c Merge tag 'scmi-fixes-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) Merging amlogic/for-next (58e2d28ed28e Merge branch 'v6.13/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (6339c43063ae ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board) Merging at91/at91-next (9852d85ec9d4 Linux 6.12-rc1) Merging broadcom/next (f8078d7ae62b Merge branch 'soc/next' into next) Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging drivers-memory/for-next (1f1d847a6575 arm64: defconfig: Update defconfig with now user-visible CONFIG_FSL_IFC) Merging imx-mxs/for-next (995b96e17150 Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (b5ae2d0590f7 Merge branches 'v6.12-next/dts32', 'v6.12-next/soc' and 'v6.12-next/dts64' into for-next) Merging mvebu/for-next (841dd5b122b4 arm64: dts: marvell: cn9130-sr-som: fix cp0 mdio pin numbers) Merging omap/for-next (f45840d172a0 Merge branch 'omap-for-v6.13/drivers' into tmp/omap-next-20241004.145243) Merging qcom/for-next (cea73ac3d218 Merge branches 'arm32-for-6.13', 'arm64-fixes-for-6.12', 'arm64-for-6.13', 'clk-for-6.13', 'drivers-fixes-for-6.12' and 'drivers-for-6.13' into for-next) Merging renesas/next (9c520ac4bc1c Merge branch 'renesas-dts-for-v6.13' into renesas-next) Merging reset/reset/next (c0260e2b0ed8 reset: uniphier-glue: Use devm_reset_control_bulk_get_shared_deasserted()) Merging rockchip/for-next (3b6c7fe2e0e2 Merge branch 'v6.13-armsoc/dts32' into for-next) Merging samsung-krzk/for-next (c1461d6ef750 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (a76ce8bf37ca Merge branches 'for-next/ffa/fixes', 'for-next/scmi/fixes' and 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) 1d49af538dea ("firmware: arm_ffa: Fix warning caused by memcpy()") Merging sophgo/for-next (30003e3f802e riscv: dts: sophgo: cv1812h: add pinctrl support) Merging stm32/stm32-next (b14c9f6bd0ba ARM: dts: stm32: Use SAI to generate bit and frame clock on STM32MP15xx DHCOM PDK2) Merging sunxi/sunxi/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging tee/next (9852d85ec9d4 Linux 6.12-rc1) Merging tegra/for-next (6726d2c6a157 Merge branch for-6.12/arm64/defconfig into for-next) Merging thead-dt/thead-dt-for-next (2a3bf75a9408 riscv: dts: thead: remove enabled property for spi0) Merging ti/ti-next (9852d85ec9d4 Linux 6.12-rc1) Merging xilinx/for-next (0e355cb69e19 Merge branch 'zynq/soc' into for-next) Merging clk/clk-next (79d8a06a6f3c Merge branch 'clk-fixes' 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 (92850bed9d4d clk: renesas: r8a779h0: Drop CLK_PLL2_DIV2 to clarify ZCn clocks) 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 (f339bd3b51da Docs/LoongArch: Add advanced extended IRQ model description) Merging m68k/for-next (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) Merging m68knommu/for-next (8e929cb546ee Linux 6.12-rc3) Merging microblaze/next (badf752b5e4b microblaze: Export xmb_manager functions) Merging mips/mips-next (9852d85ec9d4 Linux 6.12-rc1) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (98f7e32f20d2 Linux 6.11) Merging powerpc/next (8cf0b93919e1 Linux 6.12-rc2) Merging risc-v/for-next (1540def11f0c Merge patch series "riscv: Per-thread envcfg CSR support") Merging riscv-dt/riscv-dt-for-next (7cf3e9bfc63d dt-bindings: vendor-prefixes: add spacemit) Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1) Merging s390/for-next (7c974a82bc45 Merge branch 'features' into for-next) Merging sh/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging sparc/for-next (d21dffe51baa arch/sparc: remove unused varible paddrbase in function leon_swprobe()) Merging uml/next (41ab5fe7471f um: Switch to 4 level page tables on 64 bit) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging fs-next (90b99ed85f69 Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) Merging printk/for-next (ebdf88c2479b Merge branch 'for-6.13' into for-next) Merging pci/next (afb15ca28055 Merge branch 'pci/misc') Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) Merging hid/for-next (af27f2c22f5e Merge branch 'for-6.13/intel-ish' into for-next) Merging i2c/i2c/for-next (3b2af08fadc4 i2c: core: Remove extra space in Makefile) Merging i2c-host/i2c/i2c-host (c2d449ce0fbd i2c: designware: Add a new ACPI HID for HJMC01 I2C controller) Merging i3c/i3c/next (9852d85ec9d4 Linux 6.12-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 (031e6b6f3df1 hwmon: (nzxt-kraken2) Simplify specifying static visibility attribute) Merging jc_docs/docs-next (878b56e011af fix grammar on false-sharing.rst) Merging v4l-dvb/next (bcd4f091cf1e media: verisilicon: Use V4L2_FMTDESC_FLAG_ENUM_ALL flag) bfe703ac0c9f ("media: dvb-core: add missing buffer index check") c5120f3b20a1 ("MAINTAINERS: mailmap: update Alexey Klimov's email address") Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) Merging pm/linux-next (93a8c1ef3ab8 Merge branch 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (41baf662a0c2 cpufreq: ti-cpufreq: Remove revision offsets in AM62 family) Merging cpupower/cpupower (b78abc21b263 cpupower: Add Chinese Simplified translation) Merging devfreq/devfreq-next (d47552124bb0 PM / devfreq: imx-bus: Use of_property_present()) Merging pmdomain/next (d6caca30a548 OPP: Drop redundant *_opp_attach|detach_genpd()) Merging opp/opp/linux-next (53205a790366 dt-bindings: opp: operating-points-v2-ti-cpu: Describe opp-supported-hw) Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) Merging rdma/for-next (89e9ae55dc56 IB/hfi1: make clear_all_interrupts static) Merging net-next/main (068f3b34c5c2 net: cxgb3: Remove stid deadcode) Merging bpf-next/for-next (e4b495eecfb9 Merge branch 'bpf-next/net' into for-next) Merging ipsec-next/master (6aac56631831 Merge branch 'ethtool-write-firmware') Merging mlx5-next/mlx5-next (8cf0b93919e1 Linux 6.12-rc2) Merging netfilter-next/main (08e52cccae11 netfilter: nf_tables: prefer nft_trans_elem_alloc helper) Merging ipvs-next/main (9539446cc659 netfilter: replace call_rcu by kfree_rcu for simple kmem_cache_free callback) 0398cffb7459 ("netfilter: nf_tables: Fix percpu address space issues in nf_tables_api.c") 3478b99fc515 ("netfilter: nf_tables: prefer nft_trans_elem_alloc helper") 73e467915aab ("netfilter: nf_tables: replace deprecated strncpy with strscpy_pad") cb3d289366b0 ("netfilter: Make legacy configs user selectable") CONFLICT (content): Merge conflict in net/netfilter/nf_tables_api.c Merging bluetooth/master (cbb516bbcdfd Bluetooth: btmtksdio: Lookup device node only as fallback) Merging wireless-next/for-next (a0efa2f362a6 Merge net-next/main to resolve conflicts) CONFLICT (content): Merge conflict in Documentation/networking/net_cachelines/net_device.rst Merging ath-next/for-next (e805272f8c2d wifi: ath12k: ath12k_mac_op_sta_state(): clean up update_wk cancellation) Merging wpan-next/master (ac49b950bea9 dt-bindings: net: add Microchip's LAN865X 10BASE-T1S MACPHY) Merging wpan-staging/staging (ac49b950bea9 dt-bindings: net: add Microchip's LAN865X 10BASE-T1S MACPHY) Merging mtd/mtd/next (869acb874f2b Merge tag 'nand/for-6.12' into mtd/next) Merging nand/nand/next (475aadeba5df mtd: spinand: macronix: Flag parts needing explicit plane select) Merging spi-nor/spi-nor/next (afe1ea1344bb mtd: spi-nor: add support for Macronix Octal flash) Merging crypto/master (5c20772738e1 crypto: doc - Fix akcipher title reference) Merging drm/drm-next (26bb2dc10278 Merge tag 'drm-xe-next-2024-10-10' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gr3d.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c Merging drm-exynos/for-linux-next (5b272bf7dcf9 Merge tag 'drm-xe-fixes-2024-10-03' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes) Merging drm-misc/for-linux-next (0654196d7ea2 dma-buf: Use atomic64_inc_return() in dma_buf_getfile()) Merging amdgpu/drm-next (3d73327b748b drm/amdgpu/swsmu: add automatic parameter to set_soft_freq_range) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc_types.h Merging drm-intel/for-linux-next (750a95407bcb drm/i915/irq: s/gen3/gen2/) Merging drm-msm/msm-next (a20a91fb1bfa Documentation: document adreno preemption) Merging drm-msm-lumag/msm-next-lumag (15302579373e drm/msm/dpu: enable writeback on SM6350) Merging drm-xe/drm-xe-next (73e8e2f9a358 drm/i915/display: Don't allow tile4 framebuffer to do hflip on display20 or greater) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c Applying: fix up for "drm/xe: Wire up device shutdown handler" Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (bb94f56b9cfa fbdev: da8xx: remove the driver) Merging regmap/for-next (c2288599691c regmap: Merge up v6.12-rc2) Merging sound/for-next (52345d356220 ALSA: hda: Fix all stream interrupts definition) Merging ieee1394/for-next (8f04019d71cb firewire: Correct some typos) Merging sound-asoc/for-next (469819cc1736 Merge remote-tracking branch 'asoc/for-6.13' into asoc-next) Merging modules/modules-next (b319cea80539 module: Refine kmemleak scanned areas) Merging input/next (515ef92b4939 Input: correct typos in multiple comments across misc drivers) Merging block/for-next (a151f85b3b7d Merge branch 'for-6.13/io_uring' into for-next) Merging device-mapper/for-next (29e11586b56a dm vdo: Remove unused uds_compute_index_size) Merging libata/for-next (06e314c0ab47 Merge remote-tracking branch 'libata/for-6.13' into for-next) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (328bda09cc91 mmc: mmc_spi: drop buggy snprintf()) Merging mfd/for-mfd-next (f4b00ab2c299 dt-bindings: mfd: Convert zii,rave-sp.txt to yaml format) Merging backlight/for-backlight-next (0eda30af5880 dt-bindings: backlight: Convert zii,rave-sp-backlight.txt to yaml) Merging battery/for-next (24227455dd08 power: supply: Fix a typo) Merging regulator/for-next (2e8215d7ce53 Merge remote-tracking branch 'regulator/for-6.13' into regulator-next) d7a5f27342a8 ("mfd: sec-core: add s2dos05 support") ef9690c04f3b ("dt-bindings: mfd: add samsung,s2dos05") Merging security/next (904059fc295f Automated merge of 'dev' into 'next') CONFLICT (content): Merge conflict in kernel/auditsc.c Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1) Merging integrity/next-integrity (08ae3e5f5fc8 integrity: Use static_assert() to check struct sizes) Merging selinux/next (d7b6918e22c7 selinux: Deprecate /sys/fs/selinux/user) Merging smack/next (2749749afa07 smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso) Merging tomoyo/master (ada1986d0797 tomoyo: fallback to realpath if symlink's pathname does not exist) Merging tpmdd/next (2f87d0916ce0 Merge tag 'trace-ringbuffer-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) Merging watchdog/master (9852d85ec9d4 Linux 6.12-rc1) Merging iommu/next (acbec6fa25b5 Merge branches 'fixes', 's390', 'amd/amd-vi' and 'core' into next) Merging audit/next (2132b355267f audit: Reorganize kerneldoc parameter names) Merging devicetree/for-next (d79616b04f0e of/address: Constify of_busses[] array and pointers) Merging dt-krzk/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging mailbox/for-next (54595f2807d2 mailbox, remoteproc: omap2+: fix compile testing) Merging spi/for-next (f2213b1e5942 Merge remote-tracking branch 'spi/for-6.13' into spi-next) Merging tip/master (e9f5d371ca98 Merge branch into tip/master: 'x86/misc') CONFLICT (content): Merge conflict in fs/bcachefs/fs.c Applying: fix up for "clocksource: Remove unused clocksource_change_rating" Merging clockevents/timers/drivers/next (d7a87891e2f5 platform/x86:intel/pmc: fix build regression with pmtimer turned off) Merging edac/edac-for-next (0be9f1af3902 EDAC/igen6: Add Intel Panther Lake-H SoCs support) Merging ftrace/for-next (80f0fe47f3a1 Merge tools/for-next) Merging rcu/next (355debb83bf7 Merge branches 'context_tracking.15.08.24a', 'csd.lock.15.08.24a', 'nocb.09.09.24a', 'rcutorture.14.08.24a', 'rcustall.09.09.24a', 'srcu.12.08.24a', 'rcu.tasks.14.08.24a', 'rcu_scaling_tests.15.08.24a', 'fixes.12.08.24a' and 'misc.11.08.24a' into next.09.09.24a) Merging paulmck/non-rcu/next (c87bf8b02737 Merge branches 'cmpxchg.2024.10.11a', 'csd-lock.2024.10.11a' and 'lkmm.2024.10.11a' into HEAD) Merging kvm/next (c8d430db8eec Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (17a000564499 Merge branch kvm-arm64/visibility-cleanups into kvmarm-master/next) Merging kvms390/next (f9b56b2c31e5 s390: Enable KVM_S390_UCONTROL config in debug_defconfig) Merging kvm-ppc/topic/ppc-kvm (8cf0b93919e1 Linux 6.12-rc2) Merging kvm-riscv/riscv_kvm_next (5aa09297a3dc RISC-V: KVM: Fix to allow hpmcounter31 from the guest) Merging kvm-x86/next (8cf0b93919e1 Linux 6.12-rc2) Merging xen-tip/linux-next (bf56c410162d x86/xen: mark boot CPU of PV guest in MSR_IA32_APICBASE) Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging workqueues/for-next (581434654e01 workqueue: Adjust WQ_MAX_ACTIVE from 512 to 2048) Merging sched-ext/for-next (330db9b638b2 Merge branch 'for-6.12-fixes' into for-next) CONFLICT (content): Merge conflict in kernel/sched/ext.c Merging drivers-x86/for-next (8150408bfdb2 asus-laptop: prefer strscpy() over strcpy()) Merging chrome-platform/for-next (9c41f371457b platform/chrome: cros_ec_typec: fix missing fwnode reference decrement) Merging chrome-platform-firmware/for-firmware-next (32b0901e141f firmware: google: Unregister driver_info on failure) Merging hsi/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging leds-lj/for-leds-next (681d5fa6440c leds: lp5562: Add multicolor brightness control) Merging ipmi/for-next (2378bd0b264a ipmi: ipmb: Add check devm_kasprintf() returned value) Merging driver-core/driver-core-next (9bd133f05b1d lib: devres: Simplify API devm_ioport_unmap() implementation) 0ee4dcafda95 ("lib: devres: Simplify API devm_iounmap() implementation") 9bd133f05b1d ("lib: devres: Simplify API devm_ioport_unmap() implementation") Merging usb/usb-next (64f3b5a6bc49 Merge 6.12-rc3 into usb-next) Merging thunderbolt/next (8cf0b93919e1 Linux 6.12-rc2) Merging usb-serial/usb-next (9852d85ec9d4 Linux 6.12-rc1) Merging tty/tty-next (f5927d832bb8 serial: 8250_exar: Remove old exar_ee_read() and other unneeded code) Merging char-misc/char-misc-next (619325ca7abb firmware: memmap: Constify memmap_ktype) 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 (9852d85ec9d4 Linux 6.12-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 (f548c11a85ff iio: light: rpr0521: Use generic iio_pollfunc_store_time()) Merging phy-next/next (11dad94b5026 phy: sun4i-usb: Fix a typo) Merging soundwire/next (830f1aa53c02 soundwire: cadence: clear MCP BLOCK_WAKEUP in init) Merging extcon/extcon-next (9852d85ec9d4 Linux 6.12-rc1) Merging gnss/gnss-next (9852d85ec9d4 Linux 6.12-rc1) Merging vfio/next (aab439ffa1ca vfio/pci: clean up a type in vfio_pci_ioctl_pci_hot_reset_groups()) Merging w1/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging spmi/spmi-next (917572b9aff1 dt-bindings: spmi: spmi-mtk-pmif: Add compatible for MT8188) Merging staging/staging-next (e0eb7cc4d70d staging: gpib: mark HP82341 driver as broken) CONFLICT (modify/delete): drivers/staging/media/omap4iss/iss.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/omap4iss/iss.c left in tree. $ git rm -f drivers/staging/media/omap4iss/iss.c Applying: mark the Driver for Frank Mori Hess' FPGA based PCI board as BROKEN Merging counter-next/counter-next (a3911e087d62 counter: ftm-quaddec: Enable module autoloading) 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 (76355c25e4f7 dmaengine: Switch back to struct platform_driver::remove()) Merging cgroup/for-next (a6b3efd2cf3c Merge branch 'for-6.13' into for-next) Merging scsi/for-next (d539a871ae47 scsi: scsi_transport_fc: Allow setting rport state to current state) Merging scsi-mkp/for-next (94c4c5d78b0f scsi: ufs: ufs-qcom: Add fixup_dev_quirks vops) Merging vhost/linux-next (221af82f606d vhost/scsi: null-ptr-dereference in vhost_scsi_get_req()) Merging rpmsg/for-next (f5964cecd91f remoteproc: ti_k3_r5: Simplify with scoped for each OF child loop) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (476f18c0895d gpio: ljca: use devm_mutex_init() to simplify the error path and remove()) Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped()) Merging pinctrl/for-next (038f084d0c6b Merge fixup) Merging pinctrl-intel/for-next (37756257093b pinctrl: intel: platform: Add Panther Lake to the list of supported) Merging pinctrl-renesas/renesas-pinctrl (5dcde519a067 pinctrl: renesas: Select PINCTRL_RZG2L for RZ/V2H(P) SoC) Merging pinctrl-samsung/for-next (eed2e79221e2 pinctrl: samsung: Add exynos8895 SoC pinctrl configuration) Merging pwm/pwm/for-next (74fed3d16280 pwm: axi-pwmgen: Enable FORCE_ALIGN by default) Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) Merging kselftest/next (ecfe6870abac selftests:timers: remove local CLOCKID defines) Merging kunit/test (9852d85ec9d4 Linux 6.12-rc1) Merging kunit-next/kunit (9852d85ec9d4 Linux 6.12-rc1) Merging livepatching/for-next (9fbf78b6d6ce Merge branch 'for-6.12/trivial' into for-next) Merging rtc/rtc-next (f8560812be1d dt-bindings: rtc: mpfs-rtc: Properly name file) Merging nvdimm/libnvdimm-for-next (447b167bb60d nvdimm: Remove dead code for ENODEV checking in scan_labels()) Merging at24/at24/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers) 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 (9852d85ec9d4 Linux 6.12-rc1) Merging nvmem/for-next (3e93f43ae64b nvmem: Correct some typos in comments) Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) Merging hyperv/hyperv-next (94e86b174d10 tools/hv: Add memory allocation check in hv_fcopy_start) Merging auxdisplay/for-next (0b028ff7e70e auxdisplay: Remove unused functions) Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr_task()) Merging hmm/hmm (8cf0b93919e1 Linux 6.12-rc2) Merging cfi/cfi/next (9852d85ec9d4 Linux 6.12-rc1) Merging mhi/mhi-next (6d61859bbe76 bus: mhi: host: pci_generic: Use pcim_iomap_region() to request and map MHI BAR) Merging memblock/for-next (cb088e38aab4 s390/mm: get estimated free pages by memblock api) Merging cxl/next (2c70677dabb5 cxl: Add documentation to explain the shared link bandwidth calculation) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (63971b0f51fa libstub,tpm: do not ignore failure case when reading final event log) Merging unicode/for-next (66715f005bde unicode: change the reference of database file) Merging slab/slab/for-next (7fee1d5f11be Merge branch 'slab/for-6.13/features' into slab/for-next) Merging random/master (d18c13697b4d prandom: Include <linux/percpu.h> in <linux/prandom.h>) Applying: fix up for "random: Do not include <linux/prandom.h> in <linux/random.h>" Merging landlock/next (fe76bd133024 landlock: Optimize scope enforcement) Merging rust/rust-next (6ce162a00265 MAINTAINERS: add entry for the Rust `alloc` module) CONFLICT (content): Merge conflict in rust/kernel/types.rs Merging sysctl/sysctl-next (5cc3199ed06c const_structs.checkpatch: add ctl_table) Merging execve/for-next/execve (44f65d900698 binfmt_elf: mseal address zero) 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 (c00ac1f9fd7b Merge branches 'for-linus/hardening' and 'for-next/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (9852d85ec9d4 Linux 6.12-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (e2d8fe9148b7 Documentation: userspace-api: iommufd: Update HWPT_PAGING and HWPT_NESTED) Merging turbostat/next (a119348cb685 tools/power turbostat: Honor --show CPU, even when even when num_cpus=1) Merging pwrseq/pwrseq/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging capabilities-next/caps-next (de2433c608c2 capabilities: remove cap_mmap_file()) Merging ipe/next (b51a254cebc9 ipe: fallback to platform keyring also if key in trusted keyring is rejected) Merging kcsan/next (b86f7c9fad06 kcsan: Remove redundant call of kallsyms_lookup_name()) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) Applying: Revert "Merge branch 'bpf-add-kmem_cache-iterator-and-kfunc'"
Attachment:
pgplu4Ja1zHSZ.pgp
Description: OpenPGP digital signature
