Hi all, Changes since 20241213: The erofs-fixes tree lost its build failure. The mfd tree gained a conflict against Linus' tree. The slab tree gained a conflict against the mm tree. The rust tree gained a conflict against the security tree and a build failure so I used the version from next-20241213. Non-merge commits (relative to Linus' tree): 3497 3905 files changed, 168326 insertions(+), 62751 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 390 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 (dccbe2047a5b Merge tag 'edac_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras) Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2) Merging ext4-fixes/fixes (4a622e4d477b ext4: fix FS_IOC_GETFSMAP handling) Merging vfs-brauner-fixes/vfs.fixes (aa21f333c86c fs: fix is_mnt_ns_file()) 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 (1c4c399d5213 Merge branch 'misc-6.13' into next-fixes) Merging vfs-fixes/fixes (678379e1d4f7 close_range(): fix the logics in descriptor table trimming) Merging erofs-fixes/fixes (93b8ae78880f erofs: use buffered I/O for file-backed mounts by default) Merging nfsd-fixes/nfsd-fixes (583772eec7b0 nfsd: allow for up to 32 callback session slots) 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 (228a1157fb9f Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging bcachefs/for-next (f8ed2074989f bcachefs: add counter_flags for counters) 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 (9beddfa54b00 Merge branch 'for-next-next-v6.13-20241213' into for-next-20241213) Merging ceph/master (1f3c2fa362c5 ceph: validate snapdirname option length when mounting) Merging cifs/for-next (8e0fb7d0748c cifs: Add support for SMB1 Session Setup NTLMSSP Request in non-UNICODE mode) Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance) Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) Merging dlm/next (200b977ebbc3 dlm: fix dlm_recover_members refcount on error) Merging erofs/dev (0bc8061ffc73 erofs: handle NONHEAD !delta[1] lclusters gracefully) Merging exfat/dev (744e50c7e25a exfat: fix exfat_find_empty_entry() not returning error on failure) Merging exportfs/exportfs-next (adc218676eef Linux 6.12) Merging ext3/for_next (3f1063103cf2 Merge fanotify HSM implementation.) Merging ext4/dev (3e7c69cdb053 jbd2: Fix comment describing journal_init_common()) Merging f2fs/dev (40384c840ea1 Linux 6.13-rc1) Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3) Merging fuse/for-next (78f2560fc9fa fuse: Set *nbytesp=0 in fuse_get_user_pages on allocation failure) Merging gfs2/for-next (ead64b20f16e gfs2: reorder capability check last) Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree) Merging ksmbd/ksmbd-for-next (03e823d58eed ksmbd: conn lock to serialize smb2 negotiate) Merging nfs/linux-next (38a125b31504 fs/nfs/io: make nfs_start_io_*() killable) Merging nfs-anna/linux-next (867da60d463b nfs: avoid i_lock contention in nfs_clear_invalid_mapping) Merging nfsd/nfsd-next (fac04efc5c79 Linux 6.13-rc2) Merging ntfs3/master (40384c840ea1 Linux 6.13-rc1) Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function) Merging ubifs/next (b29bf7119d6b jffs2: Fix rtime decompressor) Merging v9fs/9p-next (e0260d530b73 net/9p/usbg: allow building as standalone module) 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 (bf354410af83 Merge tag 'xfs-6.13-fixes_2024-12-12' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into next-rc) 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 (1d7d385bad08 Merge branch 'vfs-6.14.mount' into vfs.all) Merging vfs/for-next (5cc68af412a9 fs/overlayfs/namei.c: get rid of include ../internal.h) Merging mm-hotfixes/mm-hotfixes-unstable (0f2a0b2978aa alloc_tag: fix set_codetag_empty() when !CONFIG_MEM_ALLOC_PROFILING_DEBUG) Merging fs-current (e296f1841100 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git) Merging kbuild-current/fixes (fac04efc5c79 Linux 6.13-rc2) Merging arc-current/for-curr (824927e88456 ARC: build: Try to guess GCC variant of cross compiler) 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 (ce03573a1917 kselftest/arm64: abi: fix SVCR detection) Merging arm-soc-fixes/arm/fixes (f578281000c5 Merge tag 'ffa-fix-6.13' 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 (40384c840ea1 Linux 6.13-rc1) Merging sophgo-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging m68k-current/for-linus (647619b6bd27 m68k: defconfig: Update defconfigs for v6.12-rc1) Merging powerpc-fixes/fixes (fac04efc5c79 Linux 6.13-rc2) Merging s390-fixes/fixes (282da38b4653 s390/mm: Consider KMSAN modules metadata for paging levels) Merging net/main (922b4b955a03 net: renesas: rswitch: rework ts tags management) Merging bpf/master (2d8308bf5b67 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging ipsec/master (e952837f3ddb xfrm: state: fix out-of-bounds read during lookup) Merging netfilter/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT) Merging ipvs/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT) Merging wireless/for-next (b83accfec081 MAINTAINERS: wifi: ath: add Jeff Johnson as maintainer) Merging ath/for-current (f1d3334d604c wifi: cfg80211: sme: init n_channels before channels[] access) Merging wpan/master (eb09fbeb4870 mac802154: check local interfaces before deleting sdata list) Merging rdma-fixes/for-rc (d507d29bfde3 RDMA/bnxt_re: Don't fail destroy QP and cleanup debugfs earlier) Merging sound-current/for-linus (7b26bc6582b1 Merge tag 'asoc-fix-v6.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (255cc582e6e1 ASoC: Intel: sof_sdw: Add space for a terminator into DAIs array) Merging regmap-fixes/for-linus (fac04efc5c79 Linux 6.13-rc2) Merging regulator-fixes/for-linus (f07ae52f5cf6 regulator: axp20x: AXP717: set ramp_delay) Merging spi-fixes/for-linus (25fb0e77b90e spi: spi-cadence-qspi: Disable STIG mode for Altera SoCFPGA.) Merging pci-current/for-linus (978463f811ec PCI: Honor Max Link Speed when determining supported speeds) Merging driver-core.current/driver-core-linus (2d8308bf5b67 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging tty.current/tty-linus (4e450dfd0f96 tty: serial: Work around warning backtrace in serial8250_set_defaults) Merging usb.current/usb-linus (33ead7e53818 usb: typec: ucsi: Fix connector status writing past buffer size) Merging usb-serial-fixes/usb-linus (8366e64a4454 USB: serial: option: add Telit FE910C04 rmnet compositions) Merging phy/fixes (9d23e4865462 phy: rockchip: samsung-hdptx: Set drvdata before enabling runtime PM) Merging staging.current/staging-linus (48e8a8160dba staging: gpib: Fix i386 build issue) Merging iio-fixes/fixes-togreg (f248a1066cf0 iio: light: as73211: fix channel handling in only-color triggered buffer) Merging counter-current/counter-current (fac04efc5c79 Linux 6.13-rc2) Merging char-misc.current/char-misc-linus (a0e3919a2df2 Merge tag 'usb-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging soundwire-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging thunderbolt-fixes/fixes (e34f1717ef06 thunderbolt: Don't display nvm_version unless upgrade supported) Merging input-current/for-linus (0201710ba630 Merge branch 'next' into for-linus) Merging crypto-current/master (cd26cd654767 crypto: hisilicon/debugfs - fix the struct pointer incorrectly offset problem) Merging vfio-fixes/for-linus (9c7c5430bca3 vfio/mlx5: Align the page tracking max message size with the device capability) Merging kselftest-fixes/fixes (777f290ab328 selftests/ftrace: adjust offset for kprobe syntax error test) Merging dmaengine-fixes/fixes (dcbef0798eb8 dmaengine: amd: qdma: Remove using the private get and set dma_ops APIs) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (140054a25f85 mtd: rawnand: omap2: Fix build warnings with W=1) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (ecf2b43018da media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format) Merging reset-fixes/reset/fixes (1f8af9712413 reset: rzg2l-usbphy-ctrl: Assign proper of node to the allocated device) Merging mips-fixes/mips-fixes (40384c840ea1 Linux 6.13-rc1) Merging at91-fixes/at91-fixes (40384c840ea1 Linux 6.13-rc1) Merging omap-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging kvm-fixes/master (7d4050728c83 Merge tag 'vfs-6.13-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs) Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) Merging hwmon-fixes/hwmon (fac04efc5c79 Linux 6.13-rc2) Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl) Merging cxl-fixes/fixes (76467a94810c cxl/region: Fix region creation for greater than x2 switches) Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory) Merging drivers-x86-fixes/fixes (83848e37f6ee platform/x86/intel/vsec: Add support for Panther Lake) Merging samsung-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging pinctrl-samsung-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging devicetree-fixes/dt/linus (0f7ca6f69354 of/irq: Fix using uninitialized variable @addr_len in API of_irq_parse_one()) Merging dt-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging scsi-fixes/fixes (f103396ae318 scsi: ufs: core: Update compl_time_stamp_local_clock after completing a cqe) Merging drm-fixes/drm-fixes (d172ea67dbee Merge tag 'amd-drm-fixes-6.13-2024-12-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (2828e5808bcd drm/i915: Fix memory leak by correcting cache object name in error handler) Merging mmc-fixes/fixes (f3d87abe11ed mmc: mtk-sd: disable wakeup in .remove() and in the error path of .probe()) Merging rtc-fixes/rtc-fixes (9852d85ec9d4 Linux 6.12-rc1) Merging gnss-fixes/gnss-linus (40384c840ea1 Linux 6.13-rc1) Merging hyperv-fixes/hyperv-fixes (175c71c2acee tools/hv: reduce resource usage in hv_kvp_daemon) Merging risc-v-fixes/fixes (21f1b85c8912 riscv: mm: Do not call pmd dtor on vmemmap page table teardown) Merging riscv-dt-fixes/riscv-dt-fixes (40384c840ea1 Linux 6.13-rc1) Merging riscv-soc-fixes/riscv-soc-fixes (48808b55b07c firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state()) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (e70140ba0d2b Get rid of 'remove_new' relic from platform driver struct) Merging gpio-brgl-fixes/gpio/for-current (9ac4b58fcef0 gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace) Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging pinctrl-intel-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging auxdisplay-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) Merging kunit-fixes/kunit-fixes (40384c840ea1 Linux 6.13-rc1) Merging memblock-fixes/fixes (180bbad69864 arch_numa: Restore nid checks before registering a memblock with a node) Merging renesas-fixes/fixes (124f4f1a1869 MAINTAINERS: Re-add cancelled Renesas driver sections) Merging perf-current/perf-tools (434fffa926b1 perf probe: Fix uninitialized variable) Merging efi-fixes/urgent (145ac100b637 efi/esrt: remove esre_attribute::store()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (c28dc9fc24f5 power: supply: cros_charge-control: hide start threshold on v2 cmd) Merging iommufd-fixes/for-rc (2ca704f55e22 iommu/arm-smmu-v3: Improve uAPI comment for IOMMU_HW_INFO_TYPE_ARM_SMMUV3) Merging rust-fixes/rust-fixes (7a5f93ea5862 rust: kbuild: set `bindgen`'s Rust target version) Merging w1-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging pmdomain-fixes/fixes (fac04efc5c79 Linux 6.13-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (de6b43798d90 i2c: riic: Always round-up when calculating bus period) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (52fd1709e41d clk: en7523: Initialize num before accessing hws in en7523_register_clocks()) Merging pwrseq-fixes/pwrseq/for-current (40384c840ea1 Linux 6.13-rc1) Merging thead-dt-fixes/thead-dt-fixes (40384c840ea1 Linux 6.13-rc1) Merging ftrace-fixes/ftrace/fixes (607f2f4884c1 ftrace/microblaze: Do not find "true_parent" for return address) Merging ring-buffer-fixes/ring-buffer/fixes (09663753bb7c tracing/ring-buffer: Clear all memory mapped CPU ring buffers on first recording) Merging trace-fixes/trace/fixes (dc1b157b828d tracing: Fix archs that still call tracepoints without RCU watching) 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 (d81034985224 Merge branch into tip/master: 'sched/urgent') Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnreclaim for post charged objects) Merging drm-misc-fixes/for-linux-next-fixes (9398332f23fa drm/modes: Avoid divide by zero harder in drm_mode_vrefresh()) Merging mm-stable/mm-stable (40384c840ea1 Linux 6.13-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (40384c840ea1 Linux 6.13-rc1) Merging mm/mm-everything (82594a430da3 foo) Merging kbuild/for-next (8f2db654f79c kbuild: suppress stdout from merge_config for silent builds) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (aec95d7ce1c8 Merge remote-tracking branch 'torvalds/master' into perf-tools-next) Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) Merging dma-mapping/for-next (aef7ee7649e0 dma-debug: fix physical address calculation for struct dma_debug_entry) Merging asm-generic/master (0af8e32343f8 empty include/asm-generic/vga.h) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (6139f7913689 Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (6bc0d5daebcd Merge branches 'for-next/cpufeature' and 'for-next/misc' into for-next/core) Merging arm-perf/for-next/perf (b34d605d120f perf/dwc_pcie: Qualify RAS DES VSEC Capability by Vendor, Revision) Merging arm-soc/for-next (6c2bb9f225bc Merge branch 'soc/defconfig' into for-next) Merging amlogic/for-next (4de5110762b9 Merge branch 'v6.14/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (2eff056a229e ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names) Merging at91/at91-next (40384c840ea1 Linux 6.13-rc1) Merging broadcom/next (f4733d5e7751 Merge branch 'devicetree/next' into next) Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging drivers-memory/for-next (ef683ac22848 Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (4b534cfc654f 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 (aff0ae97f7d0 Merge branch 'omap-for-v6.14/drivers' into tmp/omap-next-20241213.084510) 56d96fc55390 ("memory: omap-gpmc: deadcode a pair of functions") Merging qcom/for-next (f2b086fc9f03 Merge branches 'arm64-defconfig-for-6.14', 'arm64-fixes-for-6.13', 'arm64-for-6.14', 'clk-for-6.14' and 'drivers-for-6.14' into for-next) Merging renesas/next (9ed22c3f97e9 Merge branches 'renesas-arm-defconfig-for-v6.14', 'renesas-drivers-for-v6.14' and 'renesas-dts-for-v6.14' into renesas-next) Merging reset/reset/next (3d99f9231bed reset: amlogic: add support for A1 SoC in auxiliary reset driver) Merging rockchip/for-next (e0fc7a786945 Merge branch 'v6.14-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (51a4b945a726 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (0abd3a8b7c2f Merge tags 'juno-fix-6.13', 'scmi-fix-6.13' and 'ffa-fix-6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (40384c840ea1 Linux 6.13-rc1) Merging spacemit/for-next (819837584309 Linux 6.12-rc5) Merging stm32/stm32-next (ae3d4abced05 firewall: remove misplaced semicolon from stm32_firewall_get_firewall) Merging sunxi/sunxi/for-next (20296f8baa25 ARM: dts: suniv: f1c100s: Activate Audio Codec for Lichee Pi Nano) Merging tee/next (9852d85ec9d4 Linux 6.12-rc1) Merging tegra/for-next (ca398b41b0a3 Merge branch for-6.14/arm/dt into for-next) Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node) Merging ti/ti-next (40384c840ea1 Linux 6.13-rc1) Merging xilinx/for-next (18b1e1ae30c7 arm64: zynqmp: add clock-output-names property in clock nodes) Merging clk/clk-next (15212db53d85 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 (f96274528995 clk: renesas: r9a08g045: Add clocks, resets and power domain support for the ADC IP) Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working) Merging loongarch/loongarch-next (7f71507851fc LoongArch: KVM: Protect kvm_io_bus_{read,write}() with SRCU) Merging m68k/for-next (e419ddeabe7e m68k: Use kernel's generic muldi3 libgcc function) Merging m68knommu/for-next (fac04efc5c79 Linux 6.13-rc2) Merging microblaze/next (40384c840ea1 Linux 6.13-rc1) Merging mips/mips-next (40384c840ea1 Linux 6.13-rc1) Merging openrisc/for-next (c8f8d4344d50 openrisc: Fix misalignments in head.S) Merging parisc-hd/for-next (df195d931a33 parisc: Remove memcpy_toio and memset_io) Merging powerpc/next (3a7a53c8d481 selftests/powerpc: Fix typo in test-vphn.c) Merging risc-v/for-next (fac04efc5c79 Linux 6.13-rc2) Merging riscv-dt/riscv-dt-for-next (708d55db3edb riscv: dts: starfive: jh7110-milkv-mars: enable usb0 host function) Merging riscv-soc/riscv-soc-for-next (c813ef3c5f6c MAINTAINERS: drop riscv list from cache controllers) Merging s390/for-next (45dc6ded4ca6 Merge branch 'features' into for-next) Merging sh/for-next (63e72e551942 sh: intc: Fix use-after-free bug in register_intc_controller()) Merging sparc/for-next (b6370b338e71 sparc/vdso: Add helper function for 64-bit right shift on 32-bit target) Merging uml/next (bed2cc482600 hostfs: Fix the NULL vs IS_ERR() bug for __filemap_get_folio()) Merging xtensa/xtensa-for-next (d14b9a713b34 xtensa/simdisk: Use str_write_read() helper in simdisk_transfer()) Merging fs-next (6b818c2b83f9 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging printk/for-next (44722ff7611c Merge branch 'for-6.14' into for-next) Merging pci/next (5c3f0be500ee Merge branch 'pci/endpoint') Merging pstore/for-next/pstore (9852d85ec9d4 Linux 6.12-rc1) Merging hid/for-next (2f18ba6583d1 Merge branch 'for-6.13/upstream-fixes' into for-next) Merging i2c/i2c/for-next (5b6b08af1fb0 Merge tag 'i2c-host-fixes-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current) Merging i2c-host/i2c/i2c-host (6827fa0c518e i2c: imx: make controller available until system suspend_noirq() and from resume_noirq()) Merging i3c/i3c/next (6cf7b65f7029 i3c: Use i3cdev->desc->info instead of calling i3c_device_get_info() to avoid deadlock) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (c2a806763068 hwmon: (occ/p9_sbe) Constify 'struct bin_attribute') Merging jc_docs/docs-next (5fad5e0a6014 Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/next (d216d9cb4dd8 media: hantro: Replace maintainers) Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) Merging pm/linux-next (a02f1f619c09 Merge branches 'pm-cpuidle' and 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (a28276cac1f0 dt-bindings: cpufreq: Document support for Airoha EN7581 CPUFreq) Merging cpupower/cpupower (46fd8c707b55 cpupower: revise is_valid flag handling for idle_monitor) Merging devfreq/devfreq-next (1f8ac4b95fee PM / devfreq: Switch back to struct platform_driver::remove()) CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-nocp.c CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-ppmu.c CONFLICT (content): Merge conflict in drivers/devfreq/mtk-cci-devfreq.c CONFLICT (content): Merge conflict in drivers/devfreq/rk3399_dmc.c CONFLICT (content): Merge conflict in drivers/devfreq/sun8i-a33-mbus.c Merging pmdomain/next (b06bc4727991 pmdomain: ti_sci: handle wake IRQs for IO daisy chain wakeups) Merging opp/opp/linux-next (e0460b08c67a OPP: fix dev_pm_opp_find_bw_*() when bandwidth table not initialized) Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) Merging rdma/for-next (8e2442abec07 IB/mad: Add flow control for solicited MADs) Merging net-next/main (92c932b9946c Merge branch 'mptcp-pm-userspace-misc-cleanups') 734ff310d38c ("gve: Convert timeouts to secs_to_jiffies()") Merging bpf-next/for-next (6c43a9846c9a Merge branch 'bpf-next/master' into for-next) Merging ipsec-next/master (59af653a6998 Merge branch 'Add IP-TFS mode to xfrm') Merging mlx5-next/mlx5-next (f09ed834a946 net/mlx5: qos: Add ifc support for cross-esw scheduling) Merging netfilter-next/main (f3674384709b Merge branch 'net-smc-two-features-for-smc-r') Merging ipvs-next/main (f3674384709b Merge branch 'net-smc-two-features-for-smc-r') Merging bluetooth/master (514e14b1a7c3 Bluetooth: MGMT: Mark LL Privacy as stable) Merging wireless-next/for-next (104372ff3594 Merge tag 'rtw-next-2024-12-12' of https://github.com/pkshih/rtw) Merging ath-next/for-next (5a10971c7645 wifi: ath12k: fix read pointer after free in ath12k_mac_assign_vif_to_vdev()) Merging wpan-next/master (aad4b41a3419 Documentation: ieee802154: fix grammar) Merging wpan-staging/staging (aad4b41a3419 Documentation: ieee802154: fix grammar) Merging mtd/mtd/next (02ba194feacb mtd: mchp48l640: add support for Fujitsu MB85RS128TY FRAM) Merging nand/nand/next (1a50e3612de9 mtd: spinand: Add support for SkyHigh S35ML-3 family) Merging spi-nor/spi-nor/next (93e00ccab5f7 mtd: spi-nor: macronix: remove mx25u25635f from parts list to enable SFDP) Merging crypto/master (f916e44487f5 crypto: keywrap - remove assignment of 0 to cra_alignmask) Merging drm/drm-next (bdecb30d579e Merge tag 'drm-xe-next-2024-12-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) Merging drm-exynos/for-linux-next (a46b48810254 drm/exynos: Remove unnecessary checking) Merging drm-misc/for-linux-next (0ca953ac226e drm/rockchip: vop2: Fix the windows switch between different layers) Merging amdgpu/drm-next (e70ba4679540 drm/amdgpu/jpeg5.0.1: use num_jpeg_inst for SR-IOV) Merging drm-intel/for-linux-next (a831920c370c drm/i915/xe3: Use hw support for min/interim ddb allocations for async flip) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dsb.c Merging drm-msm/msm-next (86313a9cd152 drm/msm/dpu: rework documentation comments) Merging drm-msm-lumag/msm-next-lumag (d82c9281189d drm/msm/dpu: include SSPP allocation state into the dumped state) Merging drm-xe/drm-xe-next (70fb86a85dc9 drm/xe: Revert some changes that break a mesa debug tool) Applying: fix up for "drm/xe/ptl: Add another PTL PCI ID" Merging etnaviv/etnaviv/next (6bef484c5e9a drm/etnaviv: Add fdinfo support for memory stats) Merging fbdev/for-next (40384c840ea1 Linux 6.13-rc1) Merging regmap/for-next (eb708cd631a8 regmap: regmap_multi_reg_read(): make register list const) Merging sound/for-next (42d28736a5a4 ALSA: sonicvibes: Use str_on_off() helper in snd_sonicvibes_proc_read()) Merging ieee1394/for-next (ce4339d021c4 firewire: ohci: use generic power management) Merging sound-asoc/for-next (4fa9de4bcdb8 Merge remote-tracking branch 'asoc/for-6.14' into asoc-next) Merging modules/modules-next (3c9c790d218e module: Put known GPL offenders in an array) Merging input/next (04337738629e Input: mpr121 - use devm_regulator_get_enable_read_voltage()) Merging block/for-next (20c9c19e1853 Merge branch 'for-6.14/io_uring' into for-next) Merging device-mapper/for-next (0bb1968da273 dm array: fix cursor index when skipping across block boundaries) Merging libata/for-next (a7f08ca7df92 ata: sata_gemini: Remove unused gemini_sata_reset_bridge()) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (df425814019f mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (f35d82b6f639 MAINTAINERS: Add entry for AAEON UP board FPGA drivers) CONFLICT (content): Merge conflict in drivers/mfd/cs42l43.c Merging backlight/for-backlight-next (40384c840ea1 Linux 6.13-rc1) Merging battery/for-next (288a2cabcf6b power: supply: core: add UAPI to discover currently used extensions) Merging regulator/for-next (f913cbef6310 Merge remote-tracking branch 'regulator/for-6.14' into regulator-next) Merging security/next (9c76eaf78488 rust: replace lsm context+len with lsm_context) Merging apparmor/apparmor-next (40384c840ea1 Linux 6.13-rc1) Merging integrity/next-integrity (08ae3e5f5fc8 integrity: Use static_assert() to check struct sizes) Merging selinux/next (4aa176193475 selinux: add support for xperms in conditional policies) Merging smack/next (6f71ad02aae8 smack: deduplicate access to string conversion) Merging tomoyo/master (adc218676eef Linux 6.12) Merging tpmdd/next (2ba9f676d0a2 Merge tag 'drm-next-2024-11-29' of https://gitlab.freedesktop.org/drm/kernel) Merging watchdog/master (7cb1b4663150 Merge tag 'locking_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging iommu/next (dda2b8c3c6cc iommu/vt-d: Avoid draining PRQ in sva mm release path) Merging audit/next (8bea8f86f7a1 Automated merge of 'dev' into 'next') Merging devicetree/for-next (3a973ce1b918 of/irq: Correct element count for array @dummy_imask in API of_irq_parse_raw()) Merging dt-krzk/for-next (5aab15cd4794 Merge branch 'next/dt64' into for-next) Merging mailbox/for-next (7f9e19f207be mailbox: pcc: Check before sending MCTP PCC response ACK) Merging spi/for-next (3f3b063e0c6d spi: Unify and simplify fwnode related checks) Merging tip/master (83c86b33de89 Merge branch into tip/master: 'x86/tdx') CONFLICT (content): Merge conflict in include/linux/mm.h CONFLICT (content): Merge conflict in include/linux/mm_types.h CONFLICT (content): Merge conflict in kernel/fork.c CONFLICT (content): Merge conflict in tools/testing/vma/vma_internal.h Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties) Merging edac/edac-for-next (e3e7a5a35d6e Merge edac-misc into for-next) Merging ftrace/for-next (7dbc10961c8a tracing/dynevent: Adopt guard() and scoped_guard()) Merging rcu/next (d8dfba2c606a Merge branches 'rcu/fixes', 'rcu/nocb', 'rcu/torture', 'rcu/stall' and 'rcu/srcu' into rcu/dev) Merging paulmck/non-rcu/next (b6f62437f431 Merge branches 'csd-lock.2024.10.11a', 'lkmm.2024.11.09a' and 'scftorture.2024.11.09a', tag 'nolibc.2024.11.01a' into HEAD) Merging kvm/next (3522c419758e Merge tag 'kvm-riscv-fixes-6.13-1' of https://github.com/kvm-riscv/linux into HEAD) Merging kvm-arm/next (60ad25e14ab5 KVM: arm64: Pass on SVE mapping failures) Merging kvms390/next (7a1f3143377a KVM: s390: selftests: Add regression tests for PFCR subfunctions) Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2) Merging kvm-riscv/riscv_kvm_next (ea6398a5af81 RISC-V: KVM: Fix csr_write -> csr_set for HVIEN PMU overflow bit) Merging kvm-x86/next (fac04efc5c79 Linux 6.13-rc2) Merging xen-tip/linux-next (fac04efc5c79 Linux 6.13-rc2) 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 (b03917e02bf9 rust: add safety comment in workqueue traits) Merging sched-ext/for-next (471069f5ae88 Merge branch 'for-6.14' into for-next) Merging drivers-x86/for-next (18131e9f1682 Merge branch 'platform-drivers-x86-platform-profile' into for-next) Merging chrome-platform/for-next (770aed02a55a dt-bindings: cros-ec: Remove google,cros-kbd-led-backlight) Merging chrome-platform-firmware/for-firmware-next (40384c840ea1 Linux 6.13-rc1) Merging hsi/for-next (40384c840ea1 Linux 6.13-rc1) Merging leds-lj/for-leds-next (4cc40bf45b6f leds: turris-omnia: Use uppercase first letter in all comments) Merging ipmi/for-next (7868b3a94045 char:ipmi: Fix the wrong format specifier) Merging driver-core/driver-core-next (2d8308bf5b67 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging usb/usb-next (d8d936c51388 usb: storage: add a macro for the upper limit of max LUN) Merging thunderbolt/next (fac04efc5c79 Linux 6.13-rc2) Merging usb-serial/usb-next (40384c840ea1 Linux 6.13-rc1) Merging tty/tty-next (535a07698b8b serial: 8250_pci: Share WCH IDs with parport_serial driver) Merging char-misc/char-misc-next (a0e3919a2df2 Merge tag 'usb-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) 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 (d4276259f3a5 coresight: Fix dsb_mode_store() unsigned val is never less than zero) Merging fastrpc/for-next (40384c840ea1 Linux 6.13-rc1) Merging fpga/for-next (b658e40be3c1 fpga: dfl: destroy/recreate feature platform device on port release/assign) Merging icc/icc-next (40384c840ea1 Linux 6.13-rc1) Merging iio/togreg (4d112ebd02d1 iio: adc: ad-sigma-delta: Document ABI for sigma delta adc) Merging phy-next/next (b6096751a652 phy: sun4i-usb: Remove unused of_gpio.h) Merging soundwire/next (40384c840ea1 Linux 6.13-rc1) Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging gnss/gnss-next (40384c840ea1 Linux 6.13-rc1) Merging vfio/next (fe4bf8d0b671 vfio/pci: Properly hide first-in-list PCIe extended capability) Merging w1/for-next (0f28374e99a4 w1: ds28e04: Constify 'struct bin_attribute') Merging spmi/spmi-next (a45e4aa263d6 spmi: Set fwnode for spmi devices) Merging staging/staging-next (0a4edbeef1e4 staging: gpib: Remove duplicate include) Merging counter-next/counter-next (fac04efc5c79 Linux 6.13-rc2) 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 (9d880452fb3e dmaengine: amd: qdma: make read-only arrays h2c_types and c2h_types static const) Merging cgroup/for-next (9b496a8bbed9 cgroup/cpuset: Prevent leakage of isolated CPUs into sched domains) Merging scsi/for-next (1fb3855b8a12 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (c9a71ca13f71 scsi: Constify struct pci_device_id) Merging vhost/linux-next (6a39bb15b3d1 virtio_vdpa: remove redundant check on desc) Merging rpmsg/for-next (1dc7c8ed7cb3 remoteproc: omap: Handle ARM dma_iommu_mapping) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (934bacb6441a gpio: omap: allow building the module with COMPILE_TEST=y) Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped()) Merging pinctrl/for-next (39c53afeb599 ARM: imx: Re-introduce the PINCTRL selection) Merging pinctrl-intel/for-next (40384c840ea1 Linux 6.13-rc1) Merging pinctrl-renesas/renesas-pinctrl (53967d9c146d pinctrl: renesas: rzg2l: Add audio clock pins) Merging pinctrl-samsung/for-next (0ebb1e9e1b12 pinctrl: samsung: update child reference drop comment) Merging pwm/pwm/for-next (483082d78a09 pwm: stm32-lp: Add check for clk_enable()) Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) Merging kselftest/next (2c062752811d selftests/zram: gitignore output file) Merging kunit/test (40384c840ea1 Linux 6.13-rc1) Merging kunit-next/kunit (40384c840ea1 Linux 6.13-rc1) Merging livepatching/for-next (7e17e80c3a7e Merge branch 'for-6.14/stack-order' into for-next) Merging rtc/rtc-next (e0779a0dcf41 rtc: ab-eoz9: don't fail temperature reads on undervoltage notification) Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations) Merging at24/at24/for-next (40384c840ea1 Linux 6.13-rc1) 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 (40384c840ea1 Linux 6.13-rc1) Merging nvmem/for-next (ea4ef69b81f0 nvmem: imx-ocotp-ele: set word length to 1) Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) Merging hyperv/hyperv-next (4d4ace979a30 hyperv: Remove the now unused hyperv-tlfs.h files) Merging auxdisplay/for-next (93b216cb312d auxdisplay: img-ascii-lcd: Constify struct img_ascii_lcd_config) Merging kgdb/kgdb/for-next (24b2455fe8fc kdb: fix ctrl+e/a/f/b/d/p/n broken in keyboard mode) Merging hmm/hmm (40384c840ea1 Linux 6.13-rc1) Merging cfi/cfi/next (40384c840ea1 Linux 6.13-rc1) Merging mhi/mhi-next (33c792a22879 Merge branch 'mhi-fixes' into mhi-next) Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE) Merging cxl/next (e2b952ffafce ACPI/HMAT: Move HMAT messages to pr_debug()) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (40384c840ea1 Linux 6.13-rc1) Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) Merging slab/slab/for-next (c44d336ad5ba mm/slab: Move kvfree_rcu() into SLAB) CONFLICT (content): Merge conflict in kernel/rcu/tree.c Applying: fix up for "mm/slab: Move kvfree_rcu() into SLAB" Merging random/master (d18c13697b4d prandom: Include <linux/percpu.h> in <linux/prandom.h>) Merging landlock/next (adc218676eef Linux 6.12) Merging rust/rust-next (f158bf49d7e7 rust: cleanup unnecessary casts) CONFLICT (content): Merge conflict in rust/kernel/security.rs $ git reset --hard HEAD^ Merging next-20241213 version of rust Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache()) Merging execve/for-next/execve (fa1bdca98d74 exec: remove legacy custom binfmt modules autoloading) Merging bitmap/bitmap-for-next (af206905fa22 riscv: Always inline bitops) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (8cd2cd407bc1 Merge branch 'for-next/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (40384c840ea1 Linux 6.13-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (11534b4de2a1 iommufd: Deal with IOMMU_HWPT_FAULT_ID_VALID in iommufd core) Merging turbostat/next (86d237734091 tools/power turbostat: 2024.11.30) Merging pwrseq/pwrseq/for-next (93e3c990fcd9 power: sequencing: qcom-wcn: add support for the WCN6750 PMU) Merging capabilities-next/caps-next (d48da4d5ed7b security: add trace event for cap_capable) 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 crc/crc-next (72914faebaab MAINTAINERS: add entry for CRC library) Merging kthread/for-next (087ee688828f rcu: Use kthread preferred affinity for RCU exp kworkers) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgp_WnuEixSBE.pgp
Description: OpenPGP digital signature
