Hi all, Changes since 20250219: Removed tree: arc not updated in over a year and not currently needed The mm tree still had its build failure for which I reverted a commit. The pmdomain tree gained a build failure so I used the version from next-20250219. The amdgpu tree gained a conflict against the drm tree. The sound-asoc tree gained a build failure for which I reverted 3 commits. The usb tree gained a conflict against the usb.current tree. Non-merge commits (relative to Linus' tree): 4524 5287 files changed, 281703 insertions(+), 106003 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 383 trees (counting Linus' and 147 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 (6537cfb395f3 Merge tag 'sound-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2) Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4) Merging vfs-brauner-fixes/vfs.fixes (b8d975e7cccf Merge tag 'fuse-fixes-6.14-rc4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse) Merging fscrypt-current/for-current (2014c95afece Linux 6.14-rc1) Merging fsverity-current/for-current (2014c95afece Linux 6.14-rc1) Merging btrfs-fixes/next-fixes (94a4abd7e129 Merge branch 'misc-6.14' into next-fixes) Merging vfs-fixes/fixes (60a600243244 hostfs: fix string handling in __dentry_name()) Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-backed mounts by default) Merging nfsd-fixes/nfsd-fixes (4990d098433d NFSD: Fix CB_GETATTR status fix) Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) 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 (b32136a85a3d bcachefs: bcachefs_metadata_version_stripe_lru) Merging fscrypt/for-next (75eb8b9410ee Revert "fscrypt: relax Kconfig dependencies for crypto API algorithms") Merging btrfs/for-next (ac7c66c504ab Merge branch 'for-next-next-v6.14-20250217' into for-next-20250217) Merging ceph/master (3981be13ec1b ceph: exchange hardcoded value on NAME_MAX) Merging cifs/for-next (b015ce7aceee CIFS: Propagate min offload along with other parameters from primary to secondary channels.) Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance) Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) Merging dlm/next (8e2bad543eca dlm: prevent NPD when writing a positive value to event_done) Merging erofs/dev (78ee54f6e0e8 erofs: get rid of erofs_kmap_type) Merging exfat/dev (dda0407a2026 exfat: short-circuit zero-byte writes in exfat_file_write_iter) Merging exportfs/exportfs-next (adc218676eef Linux 6.12) Merging ext3/for_next (ef51934a05d3 ext2: Remove reference to bh->b_page) Merging ext4/dev (9e28059d5664 ext4: introduce linear search for dentries) Merging f2fs/dev (48ea8b200414 f2fs: fix to avoid panic once fallocation fails for pinfile) Merging fsverity/for-next (a19bcde49998 Revert "fsverity: relax build time dependency on CRYPTO_SHA256") Merging fuse/for-next (150b838b03e8 fuse: optmize missing FUSE_LINK support) Merging gfs2/for-next (1259f36ab395 gfs2: Fix additional unlikely request cancelation race) Merging jfs/jfs-next (06f4613f3935 jfs: Remove reference to bh->b_page) Merging ksmbd/ksmbd-for-next (a7a8a72c7c30 ksmbd: Use str_read_write() and str_true_false() helpers) Merging nfs/linux-next (0ad2507d5d93 Linux 6.14-rc3) Merging nfs-anna/linux-next (7a2f6f7687c5 SUNRPC: Handle -ETIMEDOUT return from tlshd) Merging nfsd/nfsd-next (71cdb645faf2 nfsd: eliminate special handling of NFS4ERR_SEQ_MISORDERED) Merging ntfs3/master (b432163ebd15 fs/ntfs3: Update inode->i_mapping->a_ops on compression state) 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 (69146a8c893f ubi: ubi_get_ec_info: Fix compiling error 'cast specifies array type') Merging v9fs/9p-next (a22a29655c42 net/9p/fd: support ipv6 for trans=tcp) Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1) Merging xfs/for-next (2d873efd174b xfs: flush inodegc before swapon) Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH) Merging vfs-brauner/vfs.all (a6b0914a43ce Merge branch 'vfs-6.15.overlayfs' into vfs.all) Merging vfs/for-next (2e72b1e0aac2 Merge branch 'work.d_revalidate' into for-next) Merging mm-hotfixes/mm-hotfixes-unstable (da8396ed6fd5 mm: page_isolation: avoid calling folio_hstate() without hugetlb_lock) Merging fs-current (67116d6331a1 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git) Merging kbuild-current/fixes (b28fb1f2ef45 modpost: Fix a few typos in a comment) Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3) 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 (446a8351f160 arm64: rust: clean Rust 1.85.0 warning using softfloat target) Merging arm-soc-fixes/arm/fixes (70b0d6b0a199 tee: optee: Fix supplicant wait loop) Merging davinci-current/davinci/for-current (2014c95afece Linux 6.14-rc1) Merging drivers-memory-fixes/fixes (304e6c02b76f memory: omap-gpmc: drop no compatible check) Merging sophgo-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging m68k-current/for-linus (bb2e0fb1e6aa m68k: libgcc: Fix lvalue abuse in umul_ppmm()) Merging powerpc-fixes/fixes (d262a192d38e powerpc/code-patching: Fix KASAN hit by not flagging text patching area as VM_ALLOC) Merging s390-fixes/fixes (c3a589fd9fcb s390/boot: Fix ESSA detection) Merging net/main (a92c32287664 Merge branch 'net-fix-race-of-rtnl_net_lock-dev_net-dev') Merging bpf/master (dbf7cc560007 Merge branch 'bpf-skip-non-exist-keys-in-generic_map_lookup_batch') Merging ipsec/master (a1300691aed9 net: rose: lock the socket in rose_bind()) Merging netfilter/main (1438f5d07b9a rtnetlink: fix netns leak with rtnl_setlink()) Merging ipvs/main (1438f5d07b9a rtnetlink: fix netns leak with rtnl_setlink()) Merging wireless/for-next (3640dbc1f75c wifi: iwlwifi: Fix A-MSDU TSO preparation) Merging ath/for-current (3640dbc1f75c wifi: iwlwifi: Fix A-MSDU TSO preparation) Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) Merging rdma-fixes/for-rc (8238c7bd8420 RDMA/bnxt_re: Fix the statistics for Gen P7 VF) Merging sound-current/for-linus (a3bdd8f5c221 ALSA: usb-audio: Avoid dropping MIDI events at closing multiple ports) Merging sound-asoc-fixes/for-linus (f5468beeab1b ASoC: tas2764: Set the SDOUT polarity correctly) Merging regmap-fixes/for-linus (32ffed055dce regmap-irq: Add missing kfree()) Merging regulator-fixes/for-linus (35e21de48e69 regulator: core: let dt properties override driver init_data) Merging spi-fixes/for-linus (3d7a20f9ba7b MAINTAINERS: add tambarus as R for Samsung SPI) Merging pci-current/for-linus (81f64e925c29 PCI: Avoid FLR for Mediatek MT7922 WiFi) Merging driver-core.current/driver-core-linus (0ad2507d5d93 Linux 6.14-rc3) Merging tty.current/tty-linus (0ad2507d5d93 Linux 6.14-rc3) Merging usb.current/usb-linus (bf4f9ae1cb08 usb: typec: ucsi: increase timeout for PPM reset operations) Merging usb-serial-fixes/usb-linus (0ad2507d5d93 Linux 6.14-rc3) Merging phy/fixes (55f1a5f7c97c phy: tegra: xusb: reset VBUS & ID OVERRIDE) Merging staging.current/staging-linus (2014c95afece Linux 6.14-rc1) Merging iio-fixes/fixes-togreg (cc2c3540d947 iio: filter: admv8818: Force initialization of SDO) Merging counter-current/counter-current (2014c95afece Linux 6.14-rc1) Merging char-misc.current/char-misc-linus (954b8915ff86 MAINTAINERS: change maintainer for FSI) Merging soundwire-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging thunderbolt-fixes/fixes (a64dcfb451e2 Linux 6.14-rc2) Merging input-current/for-linus (3492321e2e60 Input: xpad - add multiple supported devices) Merging crypto-current/master (9d4f8e54cef2 rhashtable: Fix rhashtable_try_insert test) Merging vfio-fixes/for-linus (09dfc8a5f2ce vfio/pci: Fallback huge faults for unaligned pfn) Merging kselftest-fixes/fixes (a64dcfb451e2 Linux 6.14-rc2) Merging dmaengine-fixes/fixes (76ed9b7d177e dmaengine: tegra210-adma: check for adma max page) CONFLICT (content): Merge conflict in drivers/dma/tegra210-adma.c Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (1dbf60277e9b Merge tag 'spi-nor/fixes-for-6.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/fixes) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging reset-fixes/reset/fixes (2014c95afece Linux 6.14-rc1) Merging mips-fixes/mips-fixes (0ad2507d5d93 Linux 6.14-rc3) Merging at91-fixes/at91-fixes (2014c95afece Linux 6.14-rc1) Merging omap-fixes/fixes (c2a5f8c4f28f ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP) Merging kvm-fixes/master (d3d0b8dfe060 Merge tag 'kvm-x86-fixes-6.14-rcN' of https://github.com/kvm-x86/linux into HEAD) Merging kvms390-fixes/master (e376d958871c KVM: s390: selftests: Add has device attr check to uc_attr_mem_limit selftest) Merging hwmon-fixes/hwmon (f9e5312b6269 hwmon: (peci/dimmtemp) Do not provide fake thresholds data) Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl) Merging cxl-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory) Merging drivers-x86-fixes/fixes (b3e127dacad6 platform/x86: thinkpad_acpi: Fix registration of tpacpi platform driver) Merging samsung-krzk-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging pinctrl-samsung-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging devicetree-fixes/dt/linus (038e33fcd40e dt-bindings: display: Add powertip,{st7272|hx8238a} as DT Schema description) Merging dt-krzk-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging scsi-fixes/fixes (5233e3235dec scsi: qla1280: Fix kernel oops when debug level > 2) Merging drm-fixes/drm-fixes (0ad2507d5d93 Linux 6.14-rc3) Merging drm-intel-fixes/for-linux-next-fixes (8058b49bf6ff drm/i915/dp: Fix disabling the transcoder function in 128b/132b mode) Merging mmc-fixes/fixes (3e68abf2b9ce mmc: mtk-sd: Fix register settings for hs400(es) mode) Merging rtc-fixes/rtc-fixes (2014c95afece Linux 6.14-rc1) Merging gnss-fixes/gnss-linus (0ad2507d5d93 Linux 6.14-rc3) Merging hyperv-fixes/hyperv-fixes (2a1852f9062b fbdev: hyperv_fb: iounmap() the correct memory when removing a device) Merging risc-v-fixes/fixes (245aece3750d MAINTAINERS: Add myself as a riscv reviewer) Merging riscv-dt-fixes/riscv-dt-fixes (1b133129ad6b riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions) Merging riscv-soc-fixes/riscv-soc-fixes (2014c95afece Linux 6.14-rc1) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (2014c95afece Linux 6.14-rc1) Merging gpio-brgl-fixes/gpio/for-current (81570d6a7ad3 gpiolib: protect gpio_chip with SRCU in array_info paths in multi get/set) Merging gpio-intel-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging pinctrl-intel-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging auxdisplay-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging kunit-fixes/kunit-fixes (a64dcfb451e2 Linux 6.14-rc2) 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) CONFLICT (content): Merge conflict in MAINTAINERS Merging perf-current/perf-tools (42367eca7604 tools: Remove redundant quiet setup) Merging efi-fixes/urgent (bbc4578537e3 efi: Use BIT_ULL() constants for memory attributes) Merging battery-fixes/fixes (98380110bd48 power: supply: axp20x_battery: Fix fault handling for AXP717) 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 (0ad2507d5d93 Linux 6.14-rc3) Merging w1-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging pmdomain-fixes/fixes (a64dcfb451e2 Linux 6.14-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (0ad2507d5d93 Linux 6.14-rc3) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (2014c95afece Linux 6.14-rc1) Merging pwrseq-fixes/pwrseq/for-current (2014c95afece Linux 6.14-rc1) Merging thead-dt-fixes/thead-dt-fixes (40384c840ea1 Linux 6.13-rc1) Merging ftrace-fixes/ftrace/fixes (c8c9b1d2d5b4 fgraph: Fix set_graph_notrace with setting TRACE_GRAPH_NOTRACE_BIT) Merging ring-buffer-fixes/ring-buffer/fixes (97937834ae87 ring-buffer: Update pages_touched to reflect persistent buffer content) Merging trace-fixes/trace/fixes (60295b944ff6 tracing: gfp: Fix the GFP enum values shown for user space tracing tools) Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test) Merging spacemit-fixes/fixes (2014c95afece Linux 6.14-rc1) Merging tip-fixes/tip/urgent (d5e608b7b081 Merge branch into tip/master: 'perf/urgent') Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnreclaim for post charged objects) Merging drm-msm-fixes/msm-fixes (73f69c6be2a9 drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source) Merging uml-fixes/fixes (96178631c3f5 um: convert irq_lock to raw spinlock) Merging drm-misc-fixes/for-linux-next-fixes (838c17fd077e accel/amdxdna: Add missing include linux/slab.h) Merging linus/for-next (ffd294d346d1 Linux 6.13) Merging mm-stable/mm-stable (0ad2507d5d93 Linux 6.14-rc3) Merging mm-nonmm-stable/mm-nonmm-stable (0ad2507d5d93 Linux 6.14-rc3) Merging mm/mm-everything (a72de96e3445 foo) Applying: Revert "x86/mce: add EX_TYPE_EFAULT_REG as in-kernel recovery context to fix copy-from-user operations regression" Merging kbuild/for-next (a77b570b6c3f modpost: use strstarts() to clean up parse_source_files()) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (29bab85418ef perf script: Fix hangup in offline flamegraph report) 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 alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported()) Merging arm/for-next (f520fab580c9 ARM: 9440/1: cacheinfo fix format field mask) Merging arm64/for-next/core (e6747d19291c Merge branch 'for-next/el2-enable-feat-pmuv3p9' into for-next/core) Merging arm-perf/for-next/perf (ba113ecad81a perf docs: arm_spe: Document new discard mode) Merging arm-soc/for-next (5bc55a333a2f Linux 6.13-rc7) Merging amlogic/for-next (953913df9c3a Merge branch 'v6.15/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ef3903f59a49 Merge branch 'asahi-soc/soc' into asahi-soc/for-next) Merging aspeed/for-next (3540adcccc71 ARM: dts: aspeed: yosemite4: adjust secondary flash name) Merging at91/at91-next (2e60cf9d46df ARM: dts: microchip: sama7d65_curiosity: Add power monitor support) Merging broadcom/next (bdac656f1bb5 Merge branch 'devicetree/fixes' into next) Merging davinci/davinci/for-next (58abc69e479c ARM: dts: ti: davinci: Align GPIO hog name with bindings) Merging drivers-memory/for-next (b9c791c65ced Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (a8fd7fa3f984 Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (b7e3ba5f431d Merge branch 'v6.14-next/soc' into for-next) Merging mvebu/for-next (960766b45fa2 arm64: dts: marvell: Add missing board compatible for IEI-Puzzle-M801) Merging omap/for-next (065f3bd4f22b Merge branch 'omap-for-v6.15/dt' into tmp/omap-next-20250205.163245) Merging qcom/for-next (c177fed7617d Merge branches 'arm64-for-6.15', 'clk-for-6.15', 'drivers-fixes-for-6.14' and 'drivers-for-6.15' into for-next) Merging renesas/next (35e0987b0012 Merge branch 'renesas-dts-for-v6.15' into renesas-next) Merging reset/reset/next (2014c95afece Linux 6.14-rc1) Merging rockchip/for-next (faf7db65e170 Merge branch 'v6.15-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (413415a525af Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (3fb3fc0015ff Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates', tag 'scmi-fix-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (f047a9285f9f riscv: sophgo: dts: add cooling maps for Milk-V Pioneer) Merging spacemit/for-next (5b90a3d6092d riscv: dts: spacemit: Add Milk-V Jupiter board device tree) Merging stm32/stm32-next (8c6d469f5249 ARM: dts: stm32: lxa-fairytux2: add Linux Automation GmbH FairyTux 2) Merging sunxi/sunxi/for-next (6e085e64a290 ARM: dts: sunxi: add support for NetCube Systems Kumquat) Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' into next) Merging tegra/for-next (0a891b9fcd9b Merge branch for-6.14/arm64/dt into for-next) Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node) Merging ti/ti-next (c7691aec5e99 arm64: defconfig: Enable TISCI Interrupt Router and Aggregator) Merging xilinx/for-next (5a54cbb209d5 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (2014c95afece Linux 6.14-rc1) Merging clk-imx/for-next (48806be08636 clk: imx: Apply some clks only for i.MX93) Merging clk-renesas/renesas-clk (43961f7ee3f3 clk: renesas: rzv2h: Update error message) Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working) Merging loongarch/loongarch-next (3011b29ec5a3 LoongArch: KVM: Set host with kernel mode when switch to VM mode) Merging m68k/for-next (723be3c6ab31 m68k: sun3: Fix DEBUG_MMU_EMU build) Merging m68knommu/for-next (e333ac9cf7f9 m68k: mm: Replace deprecated strncpy() with strscpy()) Merging microblaze/next (920354d7818b microblaze: Use of_property_present() for non-boolean properties) Merging mips/mips-next (0ad2507d5d93 Linux 6.14-rc3) Merging openrisc/for-next (ea1413e5b53a rseq/selftests: Add support for OpenRISC) Merging parisc-hd/for-next (4e3ff3c5854f parisc: Remove memcpy_fromio) Merging powerpc/next (6aa989ab2bd0 powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory) Merging risc-v/for-next (2014c95afece Linux 6.14-rc1) Merging riscv-dt/riscv-dt-for-next (38818f7c9c17 riscv: dts: starfive: jh7110-pine64-star64: enable USB 3.0 port) Merging riscv-soc/riscv-soc-for-next (2014c95afece Linux 6.14-rc1) Merging s390/for-next (aa6b9c1da333 Merge branch 'features' into for-next) Merging sh/for-next (2014c95afece Linux 6.14-rc1) Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs()) Merging uml/next (2d2b61ae38bd um: Remove unused asm/archparam.h header) Merging xtensa/xtensa-for-next (dbef257ab7fa xtensa: ptrace: Remove zero-length alignment array) Merging fs-next (af8250a030b9 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging printk/for-next (9022df7f5e05 Merge branch 'for-6.14-cpu_sync-fixup' into for-next) Merging pci/next (6f01230b1cac Merge branch 'pci/endpoint') Merging pstore/for-next/pstore (5674609535ba pstore: Change kmsg_bytes storage size to u32) Merging hid/for-next (594050682df1 Merge branch 'for-6.14/upstream-fixes' into for-next) Merging i2c/i2c/for-next (7e45b505e699 Merge branch 'i2c/for-current' into i2c/for-next) Merging i2c-host/i2c/i2c-host (3c59e2039afc i2c: amd-asf: Set cmd variable when encountering an error) Merging i3c/i3c/next (2014c95afece Linux 6.14-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 (8df0f002827e hwmon: (xgene-hwmon) use appropriate type for the latency value) Merging jc_docs/docs-next (56f2399f0e90 Documentation: typo fixes) Merging v4l-dvb/next (955a999ca233 media: platform: rpi1-cfe: drop vb2_ops_wait_prepare/finish) Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) Merging pm/linux-next (f0293c861552 Merge branch 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (f2d32942026c cpufreq: enable 1200Mhz clock speed for armada-37xx) Merging cpupower/cpupower (208baa3ec904 pm: cpupower: bench: Prevent NULL dereference on malloc failure) Merging devfreq/devfreq-next (f3253b23535f PM / devfreq: exynos: remove unused function parameter) Merging pmdomain/next (6568cb40e731 pmdomain: imx: gpcv2: use proper helper for property detection) $ git reset --hard HEAD^ Merging next-20250219 version of pmdomain Merging opp/opp/linux-next (2014c95afece Linux 6.14-rc1) Merging thermal/thermal/linux-next (ecb642900deb dt-bindings: thermal: Correct indentation and style in DTS example) Merging rdma/for-next (486055f5e09d RDMA/core: Fix best page size finding when it can cross SG entries) Merging net-next/main (de7a88b639d4 Merge branch 'am65-cpsw-cleanup') Merging bpf-next/for-next (d0da259de581 Merge branch 'selftests-bpf-tc_links-tc_opts-unserialize-tests') CONFLICT (content): Merge conflict in kernel/bpf/btf.c Merging ipsec-next/master (e3aa43a50a64 xfrm: prevent high SEQ input in non-ESN mode) Merging mlx5-next/mlx5-next (a64dcfb451e2 Linux 6.14-rc2) Merging netfilter-next/main (4e41231249f4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) Merging ipvs-next/main (4e41231249f4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) Merging bluetooth/master (e2040fe3b82b Bluetooth: hci_uart: fix race during initialization) Merging wireless-next/for-next (c61da149b9c2 Merge tag 'rtw-next-2025-02-10-v2' of https://github.com/pkshih/rtw) Merging ath-next/for-next (ceb3b35f5ef4 wifi: ath12k: cleanup ath12k_mac_mlo_ready()) Merging wpan-next/master (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next) Merging wpan-staging/staging (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next) Merging mtd/mtd/next (3f930a52d715 mtd: capture device name setting failure when adding mtd) Merging nand/nand/next (1db50b96b059 mtd: rawnand: qcom: finish converting register to FIELD_PREP) Merging spi-nor/spi-nor/next (03e7bb864d9a mtd: spi-nor: use scope-based mutex cleanup helpers) Merging crypto/master (c346fef6fef5 crypto: inside-secure - Eliminate duplication in top-level Makefile) Merging drm/drm-next (0ed1356af8f6 Merge tag 'drm-misc-next-2025-02-12' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) Merging drm-exynos/for-linux-next (81a50378559b drm/exynos: Remove unnecessary checking) Merging drm-misc/for-linux-next (f56b6db3e5e4 drm/atomic-helper: Change parameter name of drm_atomic_helper_wait_for_flip_done()) Merging amdgpu/drm-next (3521276ad14f drm/amdgpu: update the handle ptr in get_clockgating_state) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Merging drm-intel/for-linux-next (2ed653c7b843 drm/i915/dp: Fix disabling the transcoder function in 128b/132b mode) 2ed653c7b843 ("drm/i915/dp: Fix disabling the transcoder function in 128b/132b mode") 8b4bbaf8ddc1 ("drm/i915/dp: Fix error handling during 128b/132b link training") CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Merging drm-msm/msm-next (866e43b945bf drm/msm: UAPI error reporting) Merging drm-msm-lumag/msm-next-lumag (a5463629299b drm/msm/dpu: Add RM support for allocating CWB) Merging drm-xe/drm-xe-next (a1e5b6d83e03 drm/xe: Drop unnecessary GT lookup in xe_exec_queue_create_ioctl()) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_sriov_pf.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_log.c Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support) Merging fbdev/for-next (720fcad9d12e fbdev: core: Split CFB and SYS pixel reversing configuration) Merging regmap/for-next (14b33926f576 Merge remote-tracking branch 'regmap/for-6.15' into regmap-next) Merging sound/for-next (becc794c5e46 ALSA: hda: intel: Add Lenovo IdeaPad Z570 to probe denylist) Merging ieee1394/for-next (2014c95afece Linux 6.14-rc1) Merging sound-asoc/for-next (af32ee82a676 Merge remote-tracking branch 'asoc/for-6.15' into asoc-next) Merging modules/modules-next (afa92869776a params: Annotate struct module_param_attrs with __counted_by()) Merging input/next (9995b98a4b2a MAINTAINERS: Add entries for Apple Z2 touchscreen driver) Merging block/for-next (b54b68b8bd53 Merge branch 'for-6.15/io_uring-rx-zc' into for-next) Merging device-mapper/for-next (a8b8a126c857 dm: Enable inline crypto passthrough for striped target) Merging libata/for-next (deca423213cb ata: libata-core: Add 'external' to the libata.force kernel parameter) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (cb71db3b2cea mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (0b1cfd51841c mfd: intel_soc_pmic_crc: Drop unneeded assignment for cache_type) Merging backlight/for-backlight-next (373dacfeb55e backlight: wm831x_bl: Do not include <linux/fb.h>) Merging battery/for-next (45291874a762 power: supply: bq27xxx_battery: do not update cached flags prematurely) Merging regulator/for-next (c80657ac85dc Merge remote-tracking branch 'regulator/for-6.15' into regulator-next) Merging security/next (4632cd0ec3fa lsm: fix a missing security_uring_allowed() prototype) Merging apparmor/apparmor-next (3e45553acb14 apparmor: Remove unused variable 'sock' in __file_sock_perm()) Merging integrity/next-integrity (57a0ef02fefa ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr) Merging selinux/next (5fc80fb5b776 selinux: always check the file label in selinux_kernel_read_file()) Merging smack/next (a158a937d864 smack: recognize ipv4 CIPSO w/o categories) Merging tomoyo/master (09fbf3d50205 Merge tag 'tomoyo-pr-20250211' of git://git.code.sf.net/p/tomoyo/tomoyo) Merging tpmdd/next (34c26c5e1cb0 tpm: do not start chip while suspended) Merging watchdog/master (0ad2507d5d93 Linux 6.14-rc3) Merging iommu/next (add43c4fbc92 iommu/vt-d: Make intel_iommu_drain_pasid_prq() cover faults for RID) Merging audit/next (2014c95afece Linux 6.14-rc1) Merging devicetree/for-next (b69cfaf884f3 dt-bindings: imx: fsl,aips-bus: Ensure all properties are defined) Merging dt-krzk/for-next (854a080f0b73 loongarch: dts: remove non-existent DAC from 2k1000-ref) Merging mailbox/for-next (4783ce32b080 riscv: export __cpuid_to_hartid_map) Merging spi/for-next (1f9233e5c443 Merge remote-tracking branch 'spi/for-6.15' into spi-next) Merging tip/master (5eaced72c885 Merge branch into tip/master: 'x86/misc') Merging clockevents/timers/drivers/next (fafc3058cc2f dt-bindings: timer: exynos4210-mct: Add samsung,exynos990-mct compatible) Merging edac/edac-for-next (c158647c1073 EDAC/qcom: Correct interrupt enable register configuration) Merging ftrace/for-next (04787ae88833 Merge tools/for-next) Merging rcu/next (236815038841 Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.02.05a', 'misc.2025.02.06a', 'srcu.2025.02.05a' and 'torture.2025.02.05a') 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 (d3d0b8dfe060 Merge tag 'kvm-x86-fixes-6.14-rcN' of https://github.com/kvm-x86/linux into HEAD) Merging kvm-arm/next (01009b06a6b5 arm64/sysreg: Get rid of TRFCR_ELx SysregFields) Merging kvms390/next (32239066776a KVM: s390: selftests: Streamline uc_skey test to issue iske after sske) Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2) Merging kvm-riscv/riscv_kvm_next (af79caa83f6a RISC-V: KVM: Add new exit statstics for redirected traps) Merging kvm-x86/next (fed48e2967f4 Merge branches 'fixes', 'misc', 'mmu', 'pvclock', 'selftests', 'selftests_6.14', 'svm' and 'xen') Merging xen-tip/linux-next (75ad02318af2 Xen/swiotlb: mark xen_swiotlb_fixup() __init) 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 (8221fd1a7304 workqueue: Log additional details when rejecting work) Merging sched-ext/for-next (a7d8e69496ef Merge branch 'for-6.15' into for-next) Merging drivers-x86/for-next (d497c47481f8 platform/x86: ideapad-laptop: use dev_groups to register attribute groups) Merging chrome-platform/for-next (435a3d78b87a platform/chrome: cros_ec_sysfs: Expose AP_MODE_ENTRY feature state) Merging chrome-platform-firmware/for-firmware-next (2014c95afece Linux 6.14-rc1) Merging hsi/for-next (40384c840ea1 Linux 6.13-rc1) Merging leds-lj/for-leds-next (59670b23bfb6 leds: lp8860: Drop unneeded assignment for cache_type) Merging ipmi/for-next (83d8c79aa958 ipmi: ssif_bmc: Fix new request loss when bmc ready for a response) Merging driver-core/driver-core-next (2ce177e9b364 Merge 6.14-rc3 into driver-core-next) Merging usb/usb-next (f8da37e46253 Merge 6.14-rc3 into usb-next) CONFLICT (content): Merge conflict in drivers/usb/typec/ucsi/ucsi_acpi.c Merging thunderbolt/next (35ad0d62da83 MAINTAINERS: Use my kernel.org address for USB4/Thunderbolt work) Merging usb-serial/usb-next (6a7713ec5337 USB: serial: mos7840: drop unused defines) Merging tty/tty-next (e749820252c7 Merge 6.14-rc3 into tty-next) Merging char-misc/char-misc-next (a64dcfb451e2 Linux 6.14-rc2) 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 (56e14a21cee4 coresight-tpda: Optimize the function of reading element size) Merging fastrpc/for-next (2014c95afece Linux 6.14-rc1) Merging fpga/for-next (cc1eb048e7ee fpga: m10bmc-sec: update email address for Peter Colberg) Merging icc/icc-next (4cc004716977 Merge branch 'icc-sm8750' into icc-next) Merging iio/togreg (ac856912f210 iio: adc: ad7606: add support for writing registers when using backend) Merging phy-next/next (7dff18535b93 phy: PHY_LAN966X_SERDES should depend on SOC_LAN966 || MCHP_LAN966X_PCI) Merging soundwire/next (aac2f8363f77 soundwire: slave: fix an OF node reference leak in soundwire slave device) Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0) Merging gnss/gnss-next (0ad2507d5d93 Linux 6.14-rc3) Merging vfio/next (2bb447540e71 vfio/nvgrace-gpu: Add GB200 SKU to the devid table) Merging w1/for-next (33c145297840 w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code) Merging spmi/spmi-next (40384c840ea1 Linux 6.13-rc1) Merging staging/staging-next (7b66aae77da5 staging: gpib: Remove depends on BROKEN) Merging counter-next/counter-next (c2a756660324 counter: ti-eqep: add direction support) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) Merging mux/for-next (59b723cd2adb Linux 6.12-rc6) Merging dmaengine/next (2c17e9ea0caa dmaengine: idxd: Delete unnecessary NULL check) CONFLICT (modify/delete): Documentation/devicetree/bindings/misc/atmel-ssc.txt deleted in HEAD and modified in dmaengine/next. Version dmaengine/next of Documentation/devicetree/bindings/misc/atmel-ssc.txt left in tree. $ git rm -f Documentation/devicetree/bindings/misc/atmel-ssc.txt Merging cgroup/for-next (d920908fe36c Merge branch 'for-6.14-fixes' into for-next) Merging scsi/for-next (2f9523091a97 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (3bcd901e4257 scsi: ufs: Constify the third pwr_change_notify() argument) Merging vhost/linux-next (5820a3b08987 virtio_blk: Add support for transport error recovery) Merging rpmsg/for-next (a64dcfb451e2 Linux 6.14-rc2) Merging gpio-brgl/gpio/for-next (63cdf6241ac7 gpiolib: don't build HTE code with CONFIG_HTE disabled) Merging gpio-intel/for-next (2014c95afece Linux 6.14-rc1) Merging pinctrl/for-next (d01895c5b118 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (0eee258cdf17 pinctrl: intel: Fix wrong bypass assignment in intel_pinctrl_probe_pwm()) Merging pinctrl-renesas/renesas-pinctrl (f752ee5b5b86 pinctrl: renesas: rza2: Fix potential NULL pointer dereference) Merging pinctrl-samsung/for-next (574d0f2120b8 pinctrl: samsung: add exynos2200 SoC pinctrl configuration) Merging pwm/pwm/for-next (e8af7c083520 pwm: Strengthen dependency for PWM_SIFIVE) Merging ktest/for-next (f3a30016e4b5 ktest.pl: Fix typo "accesing") Merging kselftest/next (a64dcfb451e2 Linux 6.14-rc2) Merging kunit/test (a64dcfb451e2 Linux 6.14-rc2) Merging kunit-next/kunit (0619a4868fc1 kunit: Clarify kunit_skip() argument name) Merging livepatching/for-next (f76ad354146d Merge branch 'for-6.14/selftests-dmesg' into for-next) Merging rtc/rtc-next (2014c95afece Linux 6.14-rc1) Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations) Merging at24/at24/for-next (03480898cefe dt-bindings: eeprom: at24: Add compatible for Giantec GT24P128E) Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers) Merging seccomp/for-next/seccomp (e1cec5107c39 seccomp: remove the 'sd' argument from __seccomp_filter()) Merging slimbus/for-next (2014c95afece Linux 6.14-rc1) Merging nvmem/for-next (4770132f37db nvmem: qfprom: switch to 4-byte aligned reads) Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) Merging hyperv/hyperv-next (3a7f7785eae7 drivers/hv: add CPU offlining support) Merging auxdisplay/for-next (d5808b5b17e8 auxdisplay: seg-led-gpio: use gpiod_multi_set_value_cansleep) Merging kgdb/kgdb/for-next (6beaa75cd24d kdb: Remove unused flags stack) Merging hmm/hmm (40384c840ea1 Linux 6.13-rc1) Merging cfi/cfi/next (2014c95afece Linux 6.14-rc1) Merging mhi/mhi-next (0f96e4d32983 bus: mhi: host: pci_generic: Use pci_try_reset_function() to avoid deadlock) Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE) Merging cxl/next (8760c1c0bf7e cxl/cdat: Remove redundant gp_port initialization) Merging efi/next (2014c95afece Linux 6.14-rc1) Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) Merging slab/slab/for-next (c6bb909b8f11 Merge branch 'slab/for-6.15/kfree_rcu_tiny' into slab/for-next) CONFLICT (content): Merge conflict in kernel/rcu/tiny.c Merging random/master (93354d866ac4 prandom: remove next_pseudo_random32) Merging landlock/next (78332fdb956f selftests/landlock: Add binaries to .gitignore) Merging rust/rust-next (beeb78d46249 MAINTAINERS: add Danilo Krummrich as Rust reviewer) Merging sysctl/sysctl-next (2694b6bb871d MAINTAINERS: Update sysctl file list in MAINTAINERS) Merging execve/for-next/execve (7e620b56d958 crash: Remove KEXEC_CORE_NOTE_NAME) Merging bitmap/bitmap-for-next (ea5fa879a1d4 cpumask: drop cpumask_next_wrap_old()) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (0ef71a1dc3a5 Merge branch 'for-next/hardening' into for-next/kspp) CONFLICT (content): Merge conflict in lib/Makefile Applying: fix up for "lib: Move KUnit tests into tests/ subdirectory" Merging nolibc/nolibc (a64dcfb451e2 Linux 6.14-rc2) Merging iommufd/for-next (dc10ba25d43f iommufd/fault: Remove iommufd_fault_domain_attach/detach/replace_dev()) Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting) Merging pwrseq/pwrseq/for-next (2014c95afece Linux 6.14-rc1) Merging capabilities-next/caps-next (d48da4d5ed7b security: add trace event for cap_capable) Merging ipe/next (aefadf03b3e3 ipe: policy_fs: fix kernel-doc warnings) Merging kcsan/next (9d89551994a4 Linux 6.13-rc6) Merging crc/crc-next (a0bd462f3a13 x86/crc: add ANNOTATE_NOENDBR to suppress objtool warnings) Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code) Applying: Revert "ASoC: SOF: amd: Drop host bridge ID from struct" Applying: Revert "ASoC: amd: acp: Drop local symbols for smn read/write" Applying: Revert "ASoC: SOF: amd: Use AMD_NODE"
Attachment:
pgp26PyNzU7NB.pgp
Description: OpenPGP digital signature
