Hi all, Changes since 20241105: New tree: slab-fixes The tip tree still had its build failure for which I applied a patch. The ftrace tree gained a semantic conflict against the powerpc tree. Non-merge commits (relative to Linus' tree): 8780 10818 files changed, 390164 insertions(+), 302260 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 388 trees (counting Linus' and 149 trees of bug fix patches pending for the current release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . 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 (2e1b3cc9d7f7 Merge tag 'arm-fixes-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) Merging fixes/fixes (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging ext4-fixes/fixes (b2ef7a39bcaf ext4: fix FS_IOC_GETFSMAP handling) Merging vfs-brauner-fixes/vfs.fixes (c749d9b7ebbc iov_iter: fix copy_page_from_iter_atomic() if KMAP_LOCAL_FORCE_MAP) Merging fscrypt-current/for-current (8e929cb546ee Linux 6.12-rc3) Merging fsverity-current/for-current (8e929cb546ee Linux 6.12-rc3) Merging btrfs-fixes/next-fixes (3ab734e63295 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 (63a81588cd20 rpcrdma: Always release the rpcrdma_device's xa_array) 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 (e4b827e638b5 bcachefs: Reserve 8 bits in bch_reflink_p) Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (7a7053f5c21f Merge branch 'for-next-next-v6.12-20241104' into for-next-20241104) Merging ceph/master (515f493a1ce5 MAINTAINERS: exclude net/ceph from networking) Merging cifs/for-next (159588869a5c cifs: support mounting with alternate password to allow password rotation) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) Merging dlm/next (dfe5a6cc4204 dlm: make add_to_waiters() that it can't fail) Merging erofs/dev (2f831c82ddc2 erofs: sunset `struct erofs_workgroup`) Merging exfat/dev (a1d37a0236e9 exfat: fix file being changed by unaligned direct write) Merging exportfs/exportfs-next (98f7e32f20d2 Linux 6.11) Merging ext3/for_next (6cb3f5ca9e44 Merge dropping of reiserfs) Merging ext4/dev (b2ef7a39bcaf ext4: fix FS_IOC_GETFSMAP handling) Merging f2fs/dev (43563069e1c1 f2fs: check curseg->inited before write_sum_page in change_curseg) Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3) Merging fuse/for-next (8807f117be9d fuse: convert fuse_notify_store to use folios) Merging gfs2/for-next (b6900ce15191 gfs2: Simplify DLM_LKF_QUECVT use) Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree) Merging ksmbd/ksmbd-for-next (5662e1337c7c ksmbd: check outstanding simultaneous SMB operations) Merging nfs/linux-next (42f7652d3eb5 Linux 6.12-rc4) Merging nfs-anna/linux-next (867da60d463b nfs: avoid i_lock contention in nfs_clear_invalid_mapping) Merging nfsd/nfsd-next (26e6e6939369 NFSD: Add nfsd4_copy time-to-live) Merging ntfs3/master (bac89bb33d91 fs/ntfs3: Accumulated refactoring changes) Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) Merging overlayfs/overlayfs-next (6fe907090200 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 (be2ca3825372 Revert "fs/9p: simplify iget to remove unnecessary paths") 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 (81a1e1c32ef4 xfs: streamline xfs_filestream_pick_ag) 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 (26213e1a6caa Merge branch 'vfs.ecryptfs' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) CONFLICT (content): Merge conflict in fs/btrfs/file.c CONFLICT (content): Merge conflict in fs/btrfs/inode.c Merging vfs/for-next (46efeff7d4b0 Merge branch 'work.xattr2' into for-next) Merging mm-hotfixes/mm-hotfixes-unstable (d576a0e1c227 mm/gup: avoid an unnecessary allocation call for FOLL_LONGTERM cases) Merging fs-current (a65f6ea9c631 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git) Merging kbuild-current/fixes (59b723cd2adb Linux 6.12-rc6) Merging arc-current/for-curr (9a1a5caeaa6d ARC: build: Use __force to suppress per-CPU cmpxchg warnings) 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 (2e8a1acea859 arm64: signal: Improve POR_EL0 handling to avoid uaccess failures) Merging arm-soc-fixes/arm/fixes (566064e57066 Merge tag 'qcom-arm64-fixes-for-6.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into HEAD) 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 (d99913e1b80b riscv: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices) Merging m68k-current/for-linus (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) Merging powerpc-fixes/fixes (cf8989d20d64 powerpc/powernv: Free name on error in opal_event_init()) Merging s390-fixes/fixes (b4fa00fd428b s390: Update defconfigs) Merging net/main (9eaff63bfb59 Merge branch 'net-ethernet-ti-am65-cpsw-fixes-to-multi-queue-rx-feature') Merging bpf/master (6c52d4da1c74 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) Merging ipsec/master (94c11e852955 usb: add support for new USB device ID 0x17EF:0x3098 for the r8152 driver) Merging netfilter/main (50ae879de107 Merge tag 'nf-24-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) Merging ipvs/main (50ae879de107 Merge tag 'nf-24-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) Merging wireless/for-next (c05c62850a8f Merge tag 'wireless-2024-10-29' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) Merging ath/for-current (befd716ed429 wifi: ath11k: Fix invalid ring usage in full monitor mode) Merging wpan/master (09573b1cc76e net: ieee802154: mcr20a: Use IRQF_NO_AUTOEN flag in request_irq()) Merging rdma-fixes/for-rc (aceee63a3aba RDMA/bnxt_re: Remove some dead code) Merging sound-current/for-linus (dabc44c28f11 ALSA: usb-audio: Add quirk for HP 320 FHD Webcam) Merging sound-asoc-fixes/for-linus (9bb4af400c38 ASoC: stm32: spdifrx: fix dma channel release in stm32_spdifrx_remove) Merging regmap-fixes/for-linus (8cf0b93919e1 Linux 6.12-rc2) Merging regulator-fixes/for-linus (5e53e4a66bc7 regulator: rk808: Add apply_bit for BUCK3 on RK809) Merging spi-fixes/for-linus (ebdcba2126a8 MAINTAINERS: update AMD SPI maintainer) Merging pci-current/for-linus (f3c3ccc4fe49 PCI: Fix pci_enable_acs() support for the ACS quirks) Merging driver-core.current/driver-core-linus (59b723cd2adb Linux 6.12-rc6) Merging tty.current/tty-linus (42f7652d3eb5 Linux 6.12-rc4) Merging usb.current/usb-linus (7dd08a0b4193 usb: typec: fix potential out of bounds in ucsi_ccg_update_set_new_cam_cmd()) Merging usb-serial-fixes/usb-linus (37bb56283792 USB: serial: io_edgeport: fix use after free in debug printk) Merging phy/fixes (e70d2677ef40 phy: tegra: xusb: Add error pointer check in xusb.c) Merging staging.current/staging-linus (807babf69027 staging: vchiq_arm: Use devm_kzalloc() for drv_mgmt allocation) Merging iio-fixes/fixes-togreg (3993ca4add24 iio: Fix fwnode_handle in __fwnode_iio_channel_get_by_name()) Merging counter-current/counter-current (1437d9f1c56f counter: ti-ecap-capture: Add check for clk_enable()) Merging char-misc.current/char-misc-linus (59b723cd2adb Linux 6.12-rc6) Merging soundwire-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging thunderbolt-fixes/fixes (bd646c768a93 thunderbolt: Fix connection issue with Pluggable UD-4VPD dock) Merging input-current/for-linus (071b24b54d2d Input: fix regression when re-registering input handlers) Merging crypto-current/master (dd41b283ef2f crypto: mips/crc32 - fix the CRC32C implementation) Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) Merging kselftest-fixes/fixes (dc1308bee1ed selftests/watchdog-test: Fix system accidentally reset after watchdog-test) 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 (9852d85ec9d4 Linux 6.12-rc1) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (96d856956391 media: vivid: fix buffer overwrite when using > 32 buffers) Merging reset-fixes/reset/fixes (2cf596636607 reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC) Merging mips-fixes/mips-fixes (819837584309 Linux 6.12-rc5) Merging at91-fixes/at91-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging omap-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging kvm-fixes/master (e9001a382fa2 Merge tag 'kvmarm-fixes-6.12-3' 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 (3a2b97b3210b cxl/test: Improve init-order fidelity relative to real-world systems) Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory) Merging drivers-x86-fixes/fixes (36e66be874a7 platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys) 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 (54c814c8b23b scsi: ufs: core: Start the RTC update work later) Merging drm-fixes/drm-fixes (59b723cd2adb Linux 6.12-rc6) Merging drm-intel-fixes/for-linux-next-fixes (59b723cd2adb Linux 6.12-rc6) Merging mmc-fixes/fixes (c4dedaaeb3f7 mmc: sdhci-pci-gli: GL9767: Fix low power mode in the SD Express process) Merging rtc-fixes/rtc-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging gnss-fixes/gnss-linus (8e929cb546ee Linux 6.12-rc3) Merging hyperv-fixes/hyperv-fixes (895384881ec9 hv: vmbus: Constify struct kobj_type and struct attribute_group) Merging risc-v-fixes/fixes (5f153a692bac Merge commit 'bf40167d54d5' into fixes) Merging riscv-dt-fixes/riscv-dt-fixes (8e929cb546ee Linux 6.12-rc3) Merging riscv-soc-fixes/riscv-soc-fixes (384f2024e1a1 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) 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 (59b723cd2adb Linux 6.12-rc6) Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging pinctrl-intel-fixes/fixes (59b723cd2adb Linux 6.12-rc6) 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 (a5384c426744 perf cap: Add __NR_capget to arch/x86 unistd) 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 (2313ab74c300 cfi: tweak llvm version for HAVE_CFI_ICALL_NORMALIZE_INTEGERS) Merging w1-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging pmdomain-fixes/fixes (f7c7c5aa5563 pmdomain: imx93-blk-ctrl: correct remove path) Merging i2c-host-fixes/i2c/i2c-host-fixes (ab2e5c8ff253 i2c: muxes: Fix return value check in mule_i2c_mux_probe()) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (6b5cca7868fd clk: test: Fix some memory leaks) Merging pwrseq-fixes/pwrseq/for-current (9852d85ec9d4 Linux 6.12-rc1) Merging thead-dt-fixes/thead-dt-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging ftrace-fixes/ftrace/fixes (fae4078c289a fgraph: Allocate ret_stack_list with proper size) Merging ring-buffer-fixes/ring-buffer/fixes (09661f75e75c ring-buffer: Fix reader locking when changing the sub buffer order) Merging trace-fixes/trace/fixes (2a13ca2e8abb tracing/hwlat: Fix a race during cpuhp processing) Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test) Merging spacemit-fixes/fixes (819837584309 Linux 6.12-rc5) Merging tip-fixes/tip/urgent (2f9f041b54ec Merge branch into tip/master: 'x86/urgent') Merging slab-fixes/slab/for-next-fixes (9c9201afebea mm/slab: fix warning caused by duplicate kmem_cache creation in kmem_buckets_create) Merging drm-misc-fixes/for-linux-next-fixes (e301aea030d6 Merge drm/drm-fixes into drm-misc-fixes) Merging mm-stable/mm-stable (59b723cd2adb Linux 6.12-rc6) Merging mm-nonmm-stable/mm-nonmm-stable (59b723cd2adb Linux 6.12-rc6) Merging mm/mm-everything (87ef014d9f0d foo) Merging kbuild/for-next (8bb26465f87e kbuild: simplify rustfmt target) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (29bf07bc9ad2 perf test: Fix ftrace test with regex patterns) Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) Merging dma-mapping/for-next (be164349e173 dma-mapping: drop unneeded includes from dma-mapping.h) Merging asm-generic/master (c0dc92144ba1 tty: serial: export serial_8250_warn_need_ioport) CONFLICT (content): Merge conflict in lib/Makefile 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 (9bb774f5728f Merge branch 'for-next/pkey-signal' into for-next/core) CONFLICT (content): Merge conflict in arch/arm64/include/asm/mman.h CONFLICT (content): Merge conflict in arch/arm64/mm/pageattr.c CONFLICT (content): Merge conflict in include/linux/mm.h Merging arm-perf/for-next/perf (9643aaa19473 perf: arm_pmuv3: Add support for Samsung Mongoose PMU) Merging arm-soc/for-next (edb9f21726a9 Merge branch 'arm/fixes' into for-next) Merging amlogic/for-next (171aa289a6fe Merge branch 'v6.13/arm-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (faabe02697d7 ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board) Merging at91/at91-next (44339d0de195 Merge branch 'at91-dt' into at91-next) 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 (6451378c2735 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (3102ce10f311 Merge branch 'v6.12-next/dts64' into for-next) Merging mvebu/for-next (5f55ff35bfaa Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (1aedd4a93c6c Merge branch 'omap-for-v6.13/drivers' into tmp/omap-next-20241104.135423) Merging qcom/for-next (9b7661c568b9 Merge branches 'arm32-for-6.13', 'arm64-defconfig-for-6.13', 'arm64-fixes-for-6.12', 'arm64-for-6.13', 'clk-fixes-for-6.12', 'clk-for-6.13', 'drivers-fixes-for-6.12' and 'drivers-for-6.13' into for-next) Merging renesas/next (38d9bfd52cc3 Merge branches 'renesas-arm-defconfig-for-v6.13' and 'renesas-dts-for-v6.13' into renesas-next) Merging reset/reset/next (cf3e10cc0e88 misc: lan966x_pci: Fix dtc warn 'Missing interrupt-parent') Merging rockchip/for-next (9220a541da2b Merge branch 'v6.13-armsoc/drivers' into for-next) Merging samsung-krzk/for-next (59a22cf03f67 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (e8f36daa92b1 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 (b5cf65cc0fd0 riscv: dts: sophgo: Add emmc support for Huashan Pi) Merging spacemit/for-next (819837584309 Linux 6.12-rc5) Merging stm32/stm32-next (b0191a5cbc22 arm64: dts: st: add DMA support on SPI instances of stm32mp25) Merging sunxi/sunxi/for-next (cbfca2bd2a00 Merge branches 'sunxi/dt-for-6.13' and 'sunxi/clk-for-6.13' into sunxi/for-next) Merging tee/next (9852d85ec9d4 Linux 6.12-rc1) Merging tegra/for-next (2a4425682b6f Merge branch for-6.13/arm64/dt into for-next) Merging thead-dt/thead-dt-for-next (2a3bf75a9408 riscv: dts: thead: remove enabled property for spi0) Merging ti/ti-next (6eaad8fca267 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (0e355cb69e19 Merge branch 'zynq/soc' into for-next) Merging clk/clk-next (11713909beb7 Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (81a206d736c1 clk: imx: imx8-acm: Fix return value check in clk_imx_acm_attach_pm_domains()) Merging clk-renesas/renesas-clk (be20a73e03e1 clk: renesas: vbattb: Add VBATTB clock driver) Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working) Merging loongarch/loongarch-next (73adbd92f322 LoongArch: KVM: Mark hrtimer to expire in hard interrupt context) Merging m68k/for-next (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) Merging m68knommu/for-next (818b71432cc0 m68k: coldfire/device.c: only build FEC when HW macros are defined) Merging microblaze/next (01a9664e0d9f microblaze: Remove empty #ifndef __ASSEMBLY__ statement) Merging mips/mips-next (1aa675538788 MIPS: mobileye: eyeq6h-epm6: Use eyeq6h in the board device tree) 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 (d677ce521334 powerpc/vdso: Drop -mstack-protector-guard flags in 32-bit files with clang) Merging risc-v/for-next (075fde581896 Merge patch series "riscv: Userspace pointer masking and tagged address ABI") Merging riscv-dt/riscv-dt-for-next (c8b72c301dbe riscv: dts: starfive: add DeepComputing FML13V01 board device tree) Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1) Merging s390/for-next (ad4c3c461a58 Merge branch 'features' into for-next) CONFLICT (content): Merge conflict in arch/s390/include/asm/set_memory.h CONFLICT (content): Merge conflict in arch/s390/mm/pageattr.c 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 (d3b08e5f3f28 um: fix stub exe build with CONFIG_GCOV) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging fs-next (7671d2ddc9d7 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging printk/for-next (16475a8fd500 Merge branch 'for-6.13' into for-next) Merging pci/next (87f9a42bd6c1 Merge branch 'pci/misc') Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) Merging hid/for-next (eee425746638 Merge branch 'for-6.13/multitouch' into for-next) Merging i2c/i2c/for-next (a876d40a8f3e Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i2c-host/i2c/i2c-host (23ea7ef23014 i2c: qcom-cci: Remove unused struct member cci_clk_rate) Merging i3c/i3c/next (25bc99be5fe5 i3c: master: svc: Modify enabled_events bit 7:0 to act as IBI enable counter) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (aa8cbc089890 hwmon: (pmbus/ltc2978) add support for ltc7841) Merging jc_docs/docs-next (b934bc754265 docs/zh_CN: add the translation of kbuild/llvm.rst) Merging v4l-dvb/next (c7ccf3683ac9 media: ati_remote: don't push static constants on stack for %*ph) Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) Merging pm/linux-next (4bce7a94aff1 Merge branch 'acpi-battery' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (1a1374bb8c59 cpufreq: CPPC: Fix possible null-ptr-deref for cppc_get_cpu_cost()) Merging cpupower/cpupower (47d7650b9cb1 cpupower: add checks for xgettext and msgfmt) Merging devfreq/devfreq-next (d47552124bb0 PM / devfreq: imx-bus: Use of_property_present()) Merging pmdomain/next (bc4fc409f4f0 pmdomain: Merge branch fixes into next) 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 (7566752e4d7d RDMA/nldev: Add IB device and net device rename events) Merging net-next/main (0452a2d8b8b9 mlx5_en: use read sequence for gettimex64) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/enetc/enetc_pf.c Merging bpf-next/for-next (212b7294d9e0 Merge branch 'bpf-next/master' into for-next) Merging ipsec-next/master (83dfce38c49f xfrm: Restrict percpu SA attribute to specific netlink message types) Merging mlx5-next/mlx5-next (8ab3138a9b2d net/mlx5: Introduce data placement ordering bits) Merging netfilter-next/main (08e52cccae11 netfilter: nf_tables: prefer nft_trans_elem_alloc helper) Merging ipvs-next/main (08e52cccae11 netfilter: nf_tables: prefer nft_trans_elem_alloc helper) Merging bluetooth/master (408ec48013da Bluetooth: btusb: Add 3 HWIDs for MT7925) Merging wireless-next/for-next (2b94751626a6 wifi: cw1200: Fix potential NULL dereference) Merging ath-next/for-next (c33f9c2728d0 wifi: ath12k: Add MLO peer assoc command support) Merging wpan-next/master (aad4b41a3419 Documentation: ieee802154: fix grammar) Merging wpan-staging/staging (aad4b41a3419 Documentation: ieee802154: fix grammar) Merging mtd/mtd/next (f8470006c4d6 mtd: Switch back to struct platform_driver::remove()) Merging nand/nand/next (af264e598905 mtd: spinand: Constify struct nand_ecc_engine_ops) Merging spi-nor/spi-nor/next (b61c35e34045 mtd: spi-nor: spansion: Use nor->addr_nbytes in octal DTR mode in RD_ANY_REG_OP) Merging crypto/master (c418ba6baca3 crypto: hisilicon/qm - disable same error report before resetting) Merging drm/drm-next (086ed1d51544 Merge tag 'exynos-drm-next-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/qxl/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/tiny/bochs.c Merging drm-exynos/for-linux-next (086ed1d51544 Merge tag 'exynos-drm-next-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next) Merging drm-misc/for-linux-next (aadcf584583c drm/ci: remove update-xfails.py) Merging amdgpu/drm-next (f5d873f5825b drm/amdgpu: add missing size check in amdgpu_debugfs_gprwave_read()) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c Merging drm-intel/for-linux-next (3c1d5ced18db drm/i915/gsc: ARL-H and ARL-U need a newer GSC FW.) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c Merging drm-msm/msm-next (86313a9cd152 drm/msm/dpu: rework documentation comments) Merging drm-msm-lumag/msm-next-lumag (86313a9cd152 drm/msm/dpu: rework documentation comments) Merging drm-xe/drm-xe-next (20ade9c3f195 drm/xe: Reword exec_queue and vm lock doc) Merging etnaviv/etnaviv/next (2c7ac7dd1b6c drm/etnaviv: etnaviv_cmdbuf.c: Drop the unneeded include of drm_mm.h) Merging fbdev/for-next (819837584309 Linux 6.12-rc5) Merging regmap/for-next (953e549471ca regmap: irq: Set lockdep class for hierarchical IRQ domains) Merging sound/for-next (d6e6b9218ced ALSA: usb-audio: Make mic volume workarounds globally applicable) Merging ieee1394/for-next (b7688fcde3cf firewire: ohci: Replace deprecated PCI functions) Merging sound-asoc/for-next (a18dadd1209a Merge remote-tracking branch 'asoc/for-6.13' into asoc-next) Merging modules/modules-next (7a56ca20c09d scripts: Remove export_report.pl) Merging input/next (57a063632df8 Input: introduce notion of passive observers for input handlers) Merging block/for-next (476c7f4cef6e Merge branch 'for-6.13/io_uring' into for-next) Merging device-mapper/for-next (02f655ded530 dm vdo: fix function doc comment formatting) Merging libata/for-next (5251ae224d8d ata: libata-scsi: Return residual for emulated SCSI commands) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (84185573da38 mmc: sdhci-esdhc-imx: Update esdhc sysctl dtocv bitmask) Merging mfd/for-mfd-next (76c6217c3126 dt-bindings: mfd: aspeed: Support for AST2700) Merging backlight/for-backlight-next (0eda30af5880 dt-bindings: backlight: Convert zii,rave-sp-backlight.txt to yaml) Merging battery/for-next (83bce34420ea power: Switch back to struct platform_driver::remove()) Merging regulator/for-next (e18da71634d1 Merge remote-tracking branch 'regulator/for-6.13' into regulator-next) Merging security/next (0554c22185fb 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 (53e0d5c627f3 char: tpm: cr50: Add new device/vendor ID 0x50666666) Merging watchdog/master (bad201b2ac4e watchdog: rzg2l_wdt: Power on the watchdog domain in the restart handler) Merging iommu/next (75bc266cd1a6 Merge branch 'iommufd/arm-smmuv3-nested' into next) Merging audit/next (89282beaf75d audit: Use str_yes_no() helper function) Merging devicetree/for-next (b2473a359763 of/fdt: add dt_phys arg to early_init_dt_scan and early_init_dt_verify) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/cache/qcom,llcc.yaml 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 (e38568da5f05 Merge remote-tracking branch 'spi/for-6.13' into spi-next) Merging tip/master (1596ed05f2f4 Merge branch into tip/master: 'x86/sev') CONFLICT (content): Merge conflict in kernel/time/timekeeping.c Applying: fix up for "cleanup: Adjust scoped_guard() macros to avoid potential warning" Merging clockevents/timers/drivers/next (57cbfd333c9d clocksource/drivers/ralink: Add Ralink System Tick Counter driver) Merging edac/edac-for-next (9acfd179c728 Merge branch 'edac-drivers' into edac-for-next) Merging ftrace/for-next (f0f277c9b30b Merge tools/for-next) Applying: fix up for "ftrace: Make ftrace_regs abstract from direct use" Merging rcu/next (3d8269244e31 Merge branches 'rcu/fixes', 'rcu/nocb', 'rcu/torture', 'rcu/stall' and 'rcu/srcu' into rcu/dev) Merging paulmck/non-rcu/next (7dc725efeb30 Merge branches 'csd-lock.2024.10.11a' and 'lkmm.2024.10.11a', tag 'nolibc.2024.11.01a' into HEAD) Merging kvm/next (5cb1659f4120 Merge branch 'kvm-no-struct-page' into HEAD) CONFLICT (content): Merge conflict in arch/arm64/kvm/guest.c Merging kvm-arm/next (25a8556b5400 Merge branch kvm-arm64/misc into kvmarm/next) CONFLICT (content): Merge conflict in arch/arm64/tools/sysreg Merging kvms390/next (75ec613efa25 KVM: s390: selftests: Add regression tests for PLO subfunctions) Merging kvm-ppc/topic/ppc-kvm (1db6a4e8a3fc KVM: PPC: replace call_rcu by kfree_rcu for simple kmem_cache_free callback) Merging kvm-riscv/riscv_kvm_next (332fa4a802b1 riscv: kvm: Fix out-of-bounds array access) Merging kvm-x86/next (c55f6b8a2441 Merge branch 'vmx') Merging xen-tip/linux-next (5c6808d1a9dd x86/pvh: Avoid absolute symbol references in .head.text) 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 (b6b7a41d89d8 Merge branch 'for-6.12-fixes' into for-next) Merging drivers-x86/for-next (d68cb6023356 alienware-wmi: Fix spelling mistake "requieres" -> "requires") Merging chrome-platform/for-next (ea45f3f46734 platform/chrome: Switch back to struct platform_driver::remove()) 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 (64dd44a65806 MAINTAINERS: Replace Siemens IPC related bouncing maintainers) Merging ipmi/for-next (2378bd0b264a ipmi: ipmb: Add check devm_kasprintf() returned value) Merging driver-core/driver-core-next (09fbb82f9413 Merge 6.12-rc6 into driver-core-next) Merging usb/usb-next (85c4efbe6088 Merge v6.12-rc6 into usb-next) Merging thunderbolt/next (916f26f1c24c thunderbolt: debugfs: Implement asymmetric lane margining) Merging usb-serial/usb-next (42f7652d3eb5 Linux 6.12-rc4) Merging tty/tty-next (7dcb7bf4a2ba tty: serial: samsung: Add Exynos8895 compatible) Merging char-misc/char-misc-next (9365f0de4303 Merge 6.12-rc6 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 (42f7652d3eb5 Linux 6.12-rc4) 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 (b1fd28da86aa Merge branch 'icc-sar2130p' into icc-next) Merging iio/togreg (bb18885ed823 iio: light: veml6070: add support for integration time) Merging phy-next/next (32f4a76b8e7c phy: qcom: qmp: Fix lecacy-legacy typo) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml 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 (8e929cb546ee Linux 6.12-rc3) Merging vfio/next (9283b7392570 vfio/qat: fix overflow check in qat_vf_resume_write()) Merging w1/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging spmi/spmi-next (a5438c7ec212 dt-bindings: spmi: qcom,x1e80100-spmi-pmic-arb: Add SAR2130P compatible) Merging staging/staging-next (1235b909d312 staging: rtl8723bs: Remove function pointer hal_xmitframe_enqueue) 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 Merging counter-next/counter-next (522ae89b7858 counter: intel-qep: Replace deprecated PCI functions) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) Merging mux/for-next (49a9b01803e4 mux: constify mux class) Merging dmaengine/next (8974f34de2ef dmaengine: loongson2-apb: Rename the prefix ls2x to loongson2) Merging cgroup/for-next (0d28736c3193 Merge branch 'for-6.13' into for-next) Merging scsi/for-next (6abc45870e04 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (8829c890c19d Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging) CONFLICT (content): Merge conflict in drivers/ufs/core/ufs-mcq.c Merging vhost/linux-next (9d0596c68f32 virtio_net: fix integer overflow in stats) Merging rpmsg/for-next (ad64a7c4a49d remoteproc: Switch back to struct platform_driver::remove()) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (50dded8d9d62 gpio: altera: Drop legacy-of-mm-gpiochip.h header) Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped()) Merging pinctrl/for-next (be7a84f660ce Merge fixup) Merging pinctrl-intel/for-next (c6235c426d2a pinctrl: elkhartlake: Add support for DSW community) Merging pinctrl-renesas/renesas-pinctrl (f407af78c8d3 pinctrl: renesas: rzg2l: Use gpiochip_populate_parent_fwspec_twocell helper) Merging pinctrl-samsung/for-next (6d2dbd4cec89 pinctrl: samsung: Add Exynos9810 SoC specific data) Merging pwm/pwm/for-next (2ea25aab938a pwm: core: export pwm_get_state_hw()) Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) Merging kselftest/next (a44c26d7fa74 selftests/resctrl: Replace magic constants used as array size) Merging kunit/test (9852d85ec9d4 Linux 6.12-rc1) Merging kunit-next/kunit (9852d85ec9d4 Linux 6.12-rc1) Merging livepatching/for-next (9c66f50477e2 Merge branch 'for-6.13/selftests-kprobe' into for-next) Merging rtc/rtc-next (0a6efab33eab rtc: cmos: avoid taking rtc_lock for extended period of time) Merging nvdimm/libnvdimm-for-next (447b167bb60d nvdimm: Remove dead code for ENODEV checking in scan_labels()) Merging at24/at24/for-next (339cb28b9ee6 eeprom: at24: add ST M24256E Additional Write lockable page support) Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers) Merging seccomp/for-next/seccomp (8cf8dfceebda seccomp: Stub for !HAVE_ARCH_SECCOMP_FILTER) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging nvmem/for-next (9852d85ec9d4 Linux 6.12-rc1) 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 (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE) Merging cxl/next (86bcd81d66d6 Merge branch 'cxl/for-6.12/printf' into cxl-for-next) 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 (1e1c23b244c1 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 (156d775cb9e6 landlock: Optimize scope enforcement) Merging rust/rust-next (ae7851c29747 rust: macros: enable the rest of the tests) CONFLICT (content): Merge conflict in rust/kernel/types.rs Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache()) Merging execve/for-next/execve (f14e5adc14c2 exec: NULL out bprm->argv0 when it is an ERR_PTR) 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 (a508ef4b1dcc lib: string_helpers: silence snprintf() output truncation warning) 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 (0bcceb1f51c7 iommufd: Selftest coverage for IOMMU_IOAS_MAP_FILE) Merging turbostat/next (a119348cb685 tools/power turbostat: Honor --show CPU, even when even when num_cpus=1) Merging pwrseq/pwrseq/for-next (bd4c8bafcf50 power: sequencing: qcom-wcn: improve support for wcn6855) Merging capabilities-next/caps-next (de2433c608c2 capabilities: remove cap_mmap_file()) Merging ipe/next (d881f0eb6f23 scripts: ipe: polgen: remove redundant close and error exit path) 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)
Attachment:
pgpkrQukruAuR.pgp
Description: OpenPGP digital signature
