Hi all, Changes since 20241021: Reinstated tree: ecryptfs The bpf-next tree gained a conflict against Linus' tree. The memblock tree gained a boot failure for which I have reverted a commit. Non-merge commits (relative to Linus' tree): 5428 7443 files changed, 245550 insertions(+), 205584 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 379 trees (counting Linus' and 141 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 (d12937763990 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) 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 (35100ae2dc33 Merge patch series "fs/super.c: introduce get_tree_bdev_flags()") 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 (2e40f67ef4c2 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 (d5ff2fb2e716 nfsd: cancel nfsd_shrinker_work using sync mode in nfs4_state_shutdown_net) 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 (1ea1b6b00bf8 bcachefs: Use str_write_read() helper function) 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 (824610854c60 Merge branch 'for-next-next-v6.12-20241021' into for-next-20241021) Merging ceph/master (ccda9910d849 ceph: fix cap ref leak via netfs init_request) Merging cifs/for-next (8738e35e1e0e cifs: Fix parsing native symlinks directory/file type) 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 (0632723b5978 erofs: add SEEK_{DATA,HOLE} support) Merging exfat/dev (cb7d85014fb1 MAINTAINERS: exfat: add myself as reviewer) Merging exportfs/exportfs-next (98f7e32f20d2 Linux 6.11) Merging ext3/for_next (6cb3f5ca9e44 Merge dropping of reiserfs) 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 (8e929cb546ee Linux 6.12-rc3) Merging fuse/for-next (12c4c8ed42d9 fuse: convert fuse_notify_store to use folios) Merging gfs2/for-next (d23dfaea3c54 gfs2: Flush glock work queue on inode lookup / create) Merging jfs/jfs-next (2b59ffad47db jfs: Fix uninit-value access of new_ea in ea_buffer) Merging ksmbd/ksmbd-for-next (9f635d44d766 Merge tag 'v6.12-rc3-ksmbd-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 (7ef60108069b NFS: remove revoked delegation from server's delegation list) Merging nfsd/nfsd-next (9998b0dcb4f2 nfsd: release svc_expkey/svc_export with rcu_work) 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 (faa0ca355ebd Merge branch 'vfs.usercopy' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) CONFLICT (content): Merge conflict in fs/btrfs/file.c Merging vfs/for-next (8f602276d390 Merge tag 'bcachefs-2024-10-05' of git://evilpiepirate.org/bcachefs) Merging mm-hotfixes/mm-hotfixes-unstable (9228b1e93524 mm/gup: memfd: stop leaking pinned pages in low memory conditions) CONFLICT (content): Merge conflict in mm/memory.c Merging fs-current (fd447ea61489 Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging kbuild-current/fixes (8cf0b93919e1 Linux 6.12-rc2) Merging arc-current/for-curr (bb5d272ed94d 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 (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 (cf8989d20d64 powerpc/powernv: Free name on error in opal_event_init()) Merging s390-fixes/fixes (b4fa00fd428b s390: Update defconfigs) Merging net/main (d95d9a31aceb virtio_net: fix integer overflow in stats) Merging bpf/master (a552e2ef5fd1 bpf, arm64: Fix address emission with tag-based KASAN enabled) Merging ipsec/master (6889cd2a93e1 xfrm: fix one more kernel-infoleak in algo dumping) Merging netfilter/main (306ed1728e84 netfilter: xtables: fix typo causing some targets not to load on IPv6) Merging ipvs/main (1230fe7ad397 netfilter: bpf: must hold reference on net namespace) Merging wireless/for-next (a940b3a1ad0f Merge tag 'ath-current-20241016' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) 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 (42f7652d3eb5 Linux 6.12-rc4) Merging sound-current/for-linus (86c96e7289c5 ALSA: hda/tas2781: select CRC32 instead of CRC32_SARWATE) Merging sound-asoc-fixes/for-linus (038fa6ddf5d2 ASoC: rt722-sdca: increase clk_stop_timeout to fix clock stop issue) 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 (f2b5b8201b15 spi: mtk-snfi: fix kerneldoc for mtk_snand_is_page_ops()) 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 (42f7652d3eb5 Linux 6.12-rc4) Merging usb.current/usb-linus (42f7652d3eb5 Linux 6.12-rc4) Merging usb-serial-fixes/usb-linus (6d951576ee16 USB: serial: option: add Telit FN920C04 MBIM compositions) Merging phy/fixes (d8f9d6d826fc phy: phy-rockchip-samsung-hdptx: Depend on CONFIG_COMMON_CLK) Merging staging.current/staging-linus (807babf69027 staging: vchiq_arm: Use devm_kzalloc() for drv_mgmt allocation) 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 (42f7652d3eb5 Linux 6.12-rc4) Merging soundwire-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging thunderbolt-fixes/fixes (3cea8af2d1a9 thunderbolt: Honor TMU requirements in the domain when setting TMU mode) Merging input-current/for-linus (2de01e0e57f3 Input: zinitix - don't fail if linux,keycodes prop is absent) Merging crypto-current/master (cd843399d706 crypto: lib/mpi - Fix an "Uninitialized scalar variable" issue) Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) Merging kselftest-fixes/fixes (fe05c40ca9c1 selftest: hid: add the missing tests directory) 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 (ba9cf6b43043 media: pulse8-cec: fix data timestamp at pulse8_setup()) 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 (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 (ee1e3c46ed19 EINJ, CXL: Fix CXL device SBDF calculation) Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory) 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 (fca6caeb4a61 scsi: target: core: Fix null-ptr-deref in target_alloc_device()) Merging drm-fixes/drm-fixes (42f7652d3eb5 Linux 6.12-rc4) Merging drm-intel-fixes/for-linux-next-fixes (338b655a1178 i915: fix DRM_I915_GVT_KVMGT dependencies) Merging mmc-fixes/fixes (8e929cb546ee Linux 6.12-rc3) 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 (c05ad457ce8c riscv: Use '%u' to format the output of 'cpu') Merging riscv-dt-fixes/riscv-dt-fixes (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) Merging riscv-soc-fixes/riscv-soc-fixes (2e11e78667db riscv: dts: starfive: disable unused csi/camss nodes) 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 (42f7652d3eb5 Linux 6.12-rc4) 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 (42f7652d3eb5 Linux 6.12-rc4) 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 (8e929cb546ee Linux 6.12-rc3) 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 (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 (5c2387825251 drm/bridge: tc358767: fix missing of_node_put() in for_each_endpoint_of_node()) 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 (a8883372ec25 foo) Merging kbuild/for-next (32f280d02aa5 kconfig: nconf: Use TAB to cycle thru dialog buttons) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (46610ba41ef1 perf vendor events amd: Update Zen 5 data cache fill events) 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 (b8be9b42e20c Merge branch 'for-next/mops' 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 (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 (9415b23aa236 Merge branch 'at91-defconfig' 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 (cae6b5b772ff Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (367fceb7a8af 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 (7ad566b677b1 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 (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 (819d509b1749 Merge branch 'v6.12-armsoc/dtsfixes' into for-next) Merging samsung-krzk/for-next (9bb31db10558 Merge branch 'next/clk' into for-next) Merging scmi/for-linux-next (73d536b8803d 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 (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 (30a9a1a26b95 arm64: dts: ti: k3-am64: Add ti,pa-stats property) Merging xilinx/for-next (0e355cb69e19 Merge branch 'zynq/soc' into for-next) Merging clk/clk-next (94be1620fb60 Merge branch 'clk-nuvoton' 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 (268271067898 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 (ca4babb6e3ea m68k: mcfgpio: Fix incorrect register offset for CONFIG_M5441x) 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 (0882db7f928c Merge branch 'topic/vdso' into next) Merging risc-v/for-next (77270206955d Merge patch series "cpuidle: riscv-sbi: Allow cpuidle pd used by other devices") 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 (cde6d9d63b06 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 (8508a5e0e9db um: Fix misaligned stack in stub_exe) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging fs-next (0632061dba01 Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) Merging printk/for-next (16475a8fd500 Merge branch 'for-6.13' into for-next) Merging pci/next (912bf26eced7 Merge branch 'pci/misc') Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) Merging hid/for-next (e9a6e717706b Merge branch 'for-6.13/bpf' into for-next) Merging i2c/i2c/for-next (3b2af08fadc4 i2c: core: Remove extra space in Makefile) Merging i2c-host/i2c/i2c-host (dc3dbfa4231c 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 (516ddbfef736 hwmon: (nct6775) Add 665-ACE/600M-CL to ASUS WMI monitoring list) Merging jc_docs/docs-next (56aaee3915b3 docs/zh_CN: Add a entry in Chinese glossary) Merging v4l-dvb/next (698b6e3163ba media: atomisp: Replace ternary operator with if) Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) Merging pm/linux-next (0ff62a524d0f Merge branch 'thermal-core' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (5f856d71ccdf cpufreq: loongson2: Unregister platform_driver on failure) 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 (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 (6f07cd830170 Merge branch 'net-mlx5-refactor-esw-qos-to-support-generalized-operations') Merging bpf-next/for-next (5564215fd413 Merge branch 'bpf-next/master' into for-next) CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile Merging ipsec-next/master (30d9d8f6a2d7 net: airoha: Fix typo in REG_CDM2_FWD_CFG configuration) 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 (08e52cccae11 netfilter: nf_tables: prefer nft_trans_elem_alloc helper) Merging bluetooth/master (017dced0da79 Bluetooth: Set quirks for ATS2851) Merging wireless-next/for-next (1f3de77752a7 Merge tag 'rtw-next-2024-10-10' of https://github.com/pkshih/rtw) CONFLICT (content): Merge conflict in Documentation/networking/net_cachelines/net_device.rst Merging ath-next/for-next (477cabfdb776 wifi: ath12k: modify link arvif creation and removal for MLO) 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 (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 (afe1ea1344bb mtd: spi-nor: add support for Macronix Octal flash) Merging crypto/master (0a53948477ca crypto: crypto4xx - use devm in probe) Merging drm/drm-next (0a4d0b2d9d84 Merge tag 'drm-xe-next-2024-10-17' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gr3d.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/regs/xe_gt_regs.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c Merging drm-exynos/for-linux-next (9053b370bfad drm/exynos: remove unused prototype for crtc) Merging drm-misc/for-linux-next (d284ccd8588c drm/bridge: sii902x: Set input bus format based on bus-width) 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 (682c9d3d7abb drm/i915/pxp: Add missing tag for Wa_14019159160) 341e4023032f ("i915: fix DRM_I915_GVT_KVMGT dependencies") Merging drm-msm/msm-next (1fac1fa4a675 Merge branch 'msm-fixes' into msm-next) Merging drm-msm-lumag/msm-next-lumag (2261751d5f22 drm/msm/dpu: sync mode_config limits to the FB limits in dpu_plane.c) 42170670ee76 ("drm/msm: Use video aperture helpers") Merging drm-xe/drm-xe-next (6ef3bb60557d drm/xe: enable lite restore) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (51521d2e2c35 fbdev: wm8505fb: select CONFIG_FB_IOMEM_FOPS) 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 (3e302b33fa27 Merge remote-tracking branch 'asoc/for-6.13' into asoc-next) Merging modules/modules-next (2295cf87ed5a module: Reformat struct for code style) Merging input/next (d0c3a7aa814c Input: serio_raw - fix uninitialized variable bug) Merging block/for-next (df3f94f32f56 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 (08b64eeee4d6 ata: libata-scsi: Refactor scsi_6_lba_len() with use of get_unaligned_be24()) 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 (38d09a34b422 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 (83bce34420ea power: Switch back to struct platform_driver::remove()) Merging regulator/for-next (fce55cf5eda5 Merge remote-tracking branch 'regulator/for-6.13' into regulator-next) 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 (2e030910fa90 of: module: remove strlen() call in of_modalias()) 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 (5015943c0421 Merge remote-tracking branch 'spi/for-6.13' into spi-next) Merging tip/master (21f0d4005e7e Merge branch into tip/master: 'x86/sev') Merging clockevents/timers/drivers/next (d7a87891e2f5 platform/x86:intel/pmc: fix build regression with pmtimer turned off) CONFLICT (content): Merge conflict in include/linux/delay.h CONFLICT (add/add): Merge conflict in kernel/time/sleep_timeout.c Merging edac/edac-for-next (1fe774a93b46 EDAC/bluefield: Fix potential integer overflow) Merging ftrace/for-next (2b849181ca84 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 (644cbf77cbcc Merge branches 'csd-lock.2024.10.11a' and 'lkmm.2024.10.11a' into HEAD) Merging kvm/next (e9001a382fa2 Merge tag 'kvmarm-fixes-6.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (116224161be7 Merge tag 'kvmarm-fixes-6.12-3' 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 (0fd2a743301b xen: Remove dependency between pciback and privcmd) 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 (0725fd84374f Merge branch 'for-6.12-fixes' into for-next) 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) Merging usb/usb-next (c6d9e43954bf Merge 6.12-rc4 into usb-next) Merging thunderbolt/next (42f7652d3eb5 Linux 6.12-rc4) Merging usb-serial/usb-next (8e929cb546ee Linux 6.12-rc3) Merging tty/tty-next (ec8c17e5ecb4 Merge 6.12-rc4 into tty-next) Merging char-misc/char-misc-next (d723c456ef5a Merge 6.12-rc4 into char-misc-next) Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) Merging coresight/next (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 (a5733950fe35 Merge branch 'icc-sm8350' into icc-next) Merging iio/togreg (d09a1cd8226a drivers: iio: adc: add support for ad777x family) Merging phy-next/next (26ac85e3adb4 dt-bindings: phy: ti,tcan104x-can: Document Microchip ATA6561) 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 (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 (0ef2fbdf7d4f staging: vchiq_dev: Drop userdata local pointer) 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 (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 (546cf20e7ec4 Merge branch 'for-6.13' into for-next) Merging scsi/for-next (c352c52452ab Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (a3517717c3c0 Merge patch series "scsi: hisi_sas: Some fixes for hisi_sas") Merging vhost/linux-next (221af82f606d vhost/scsi: null-ptr-dereference in vhost_scsi_get_req()) Merging rpmsg/for-next (be3e6529a8b9 remoteproc: k3-r5: Add compile testing support) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (57e0e7188712 gpio: max730x: use devres to shrink and simplify code) Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped()) Merging pinctrl/for-next (fd716bb9e14b 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 (2193074458de pinctrl: samsung: Add Exynos 990 SoC pinctrl configuration) Merging pwm/pwm/for-next (4f6938e6ed2e MAINTAINERS: add self as reviewer for AXI PWM GENERATOR) 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 (ad48825232a9 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE) 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 (233fc3ca16e6 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 (7923cf4a9564 landlock: Optimize scope enforcement) Merging rust/rust-next (15541c9263ce rust: macros: fix documentation of the paste! macro) 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 (0838c9ca0d76 MAINTAINERS: Add kernel hardening keywords __counted_by{_le|_be}) 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 (42f7652d3eb5 Linux 6.12-rc4) 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 "memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE"
Attachment:
pgpCklbL09cy_.pgp
Description: OpenPGP digital signature
