From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09433149DF0; Mon, 20 Jan 2025 08:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737362057; cv=none; b=ehXS/BUGECMKzJIHCyW9Ae00ndV8VVDb8prhhu0icvIM9ouWpKU3fKRUWj+YPoFwkM7DjGCrF7/LJzsgaY43/pZyv+EhAt1qdYervrDmVqcH3TN4ht5jEIXoGN9pn82QDiGxAZuyzQf0RivJf63ZztBGoiDLWQzNuu97+qHBkog= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737362057; c=relaxed/simple; bh=qabpmvuBhB8nm1kiAT0y+Xx6w7ZFiPDUp4oZQc265c8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=cnLtIw0DfvKr9wu8wBvKWJCPwvlcuaUMgRs9uhtYzh5OSjwQ1qIH6tj4U7GnBemuyOxpcJDaICLgW/IG/nGoeEG3SHr6Q9562q3mJAUg1vll3knQ0HBkFi3JAFhosLEvp09faUTZ5VITWNdZ9QxfWkuLdFTnjLc8gUo9GaPM7Q8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=ArOcUGLq; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ArOcUGLq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1737362043; bh=sunu/oZTPnMlHlby0UbLR+7EulTpXzrDOODm2A2VtYo=; h=Date:From:To:Cc:Subject:From; b=ArOcUGLqdID69G0s6aqZ0BZMvl+nHBcRt2cw4DlSwC8vqILGDORQ/CDarYkIjHC5Y J78Q9wjd+RinbsP4CE/dtAxrQA1HsokmFAAe/f93qBDCiHIRSvR3D+9n+k88iWdbT3 K7PRL9+OTlY1Am23P5KfmerU+U3j9OHMAl7NJSQMuYEd+5AAeRZ1gf63oPlntrMA4h MbViDDl6htS9w2Uw+VAuu3AgNp5uBjQVPoNTh1QvmofJKKz1Sada/fj2QyPtcYxAek PkmHXGRv9N7T3M3Zisw40nsJBBkTvdErmRqzdAOUsZYCAYp02BPTHd9sYsZjappqg4 reHrWncPt8tfg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Yc3XV6bWbz4x8P; Mon, 20 Jan 2025 19:34:02 +1100 (AEDT) Date: Mon, 20 Jan 2025 19:34:10 +1100 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jan 20 Message-ID: <20250120193410.79faf9ff@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Bs4t7WUFaxiWn.u3LGcrmwo"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/Bs4t7WUFaxiWn.u3LGcrmwo Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Please do not add any material destined for v6.15 to your linux-next included branches until after v6.14-rc1 has been released. Changes since 20250117: The cifs tree lost its build failure. The vfs tree gained a conflict against the vfs-brauner tree. The sound tree gained a build failure for which I applied a patch. The nand tree still had its build failure but I applied a supplied patch. The crc tree gained a build failure when merged with the sound tree for which I reverted a commit from the sound tree. Non-merge commits (relative to Linus' tree): 8874 8948 files changed, 407822 insertions(+), 144253 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 392 trees (counting Linus' and 150 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (9528d418de4d Merge tag 'x86_urgent_for_v6.13' of git= ://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2) Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4) Merging vfs-brauner-fixes/vfs.fixes (1623bc27a85a Merge branch 'vfs-6.14.po= ll' into vfs.fixes) 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 (d141653e23bc Merge branch 'misc-6.13' into = next-fixes) Merging vfs-fixes/fixes (60a600243244 hostfs: fix string handling in __dent= ry_name()) Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-ba= cked mounts by default) Merging nfsd-fixes/nfsd-fixes (7917f01a286c nfsd: restore callback function= ality for NFSv4.0) Merging v9fs-fixes/fixes/next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of g= it://git.linux-nfs.org/projects/anna/linux-nfs) Merging overlayfs-fixes/ovl-fixes (228a1157fb9f Merge tag '6.13-rc-part1-SM= B3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging bcachefs/for-next (ff0b7ed607e7 bcachefs: Fix check_inode_hash_info= _matches_root()) Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3) Merging afs/afs-next (3c9ca856fd12 afs: Make /afs/@cell and /afs/.@cell sym= links) Merging btrfs/for-next (dff28a5fdd05 Merge branch 'for-next-next-v6.13-2025= 0113' into for-next-20250113) Merging ceph/master (3b7d93db450e ceph: fix memory leak in ceph_mds_auth_ma= tch()) Merging cifs/for-next (d93fde3696ed cifs: Fix endian types in struct rfc100= 2_session_packet) Merging configfs/for-next (84147f4e84c4 configfs: improve item creation per= formance) Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecry= ptfs_fill_zeros()) Merging dlm/next (6784ed98fde5 dlm: return -ENOENT if no comm was found) Merging erofs/dev (6e2c2342e2b6 erofs: remove dead code in erofs_fc_parse_p= aram) Merging exfat/dev (c45323b7560e Merge tag 'mm-hotfixes-stable-2025-01-13-00= -03' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) Merging exportfs/exportfs-next (adc218676eef Linux 6.12) Merging ext3/for_next (94dfee45999c Merge fix for access beyond end of bitm= ap in fanotify_init(2).) Merging ext4/dev (4bbf9020becb Linux 6.13-rc4) Merging f2fs/dev (5c1768b67250 f2fs: fix to do sanity check correctly on i_= inline_xattr_size) Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3) Merging fuse/for-next (78f2560fc9fa fuse: Set *nbytesp=3D0 in fuse_get_user= _pages on allocation failure) Merging gfs2/for-next (7c9d9223802f gfs2: Truncate address space when flipp= ing GFS2_DIF_JDATA flag) Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-= out-of-bounds in dbAdjTree) Merging ksmbd/ksmbd-for-next (aab98e2dbd64 ksmbd: fix integer overflows on = 32 bit systems) Merging nfs/linux-next (4bbf9020becb Linux 6.13-rc4) Merging nfs-anna/linux-next (b3344839a7f1 nfs: use wait_var_event_spinlock(= ) to wait for nfsi->layout to change.) Merging nfsd/nfsd-next (29f6ab9b8cfc sunrpc: Remove gss_{de,en}crypt_xdr_bu= f deadcode) Merging ntfs3/master (55ad333de0f8 fs/ntfs3: Unify inode corruption marking= with _ntfs_bad_inode()) Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes w= ith missing lookup function) Merging ubifs/next (01099f635a4c ubi: Implement ioctl for detailed erase co= unters) Merging v9fs/9p-next (e0260d530b73 net/9p/usbg: allow building as standalon= e 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 (4e35be63c4ad xfs: add a b_iodone callback to struct x= fs_buf) Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSS= YSFSPATH) 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 (6554b3d21309 Merge branch 'vfs-6.14.afs' into = vfs.all) CONFLICT (content): Merge conflict in fs/nfsd/filecache.c Merging vfs/for-next (565801ddb68b Merge branch 'work.d_revalidate' into fo= r-next) CONFLICT (content): Merge conflict in fs/afs/dir.c Merging mm-hotfixes/mm-hotfixes-unstable (f48d515b0c49 mailmap, docs: updat= e email to carlos.bilbao@kernel.org) Merging fs-current (4a68c5997586 Merge branch 'fixes' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (9d89551994a4 Linux 6.13-rc6) Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3) Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the fo= lio is reserved for no-mapping addresses) Merging arm64-fixes/for-next/fixes (926e86205897 arm64/signal: Silence spar= se warning storing GCSPR_EL0) Merging arm-soc-fixes/arm/fixes (352bba6c19cd Merge tag 'ti-driver-soc-for-= v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/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 defcon= figs for v6.12-rc1) Merging powerpc-fixes/fixes (05aa156e156e powerpc/pseries/vas: Add close() = callback in vas_vm_ops struct) Merging s390-fixes/fixes (282da38b4653 s390/mm: Consider KMSAN modules meta= data for paging levels) Merging net/main (bc50835e83f6 net: sched: Disallow replacing of child qdis= c from one parent to another) Merging bpf/master (c45323b7560e Merge tag 'mm-hotfixes-stable-2025-01-13-0= 0-03' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) Merging ipsec/master (600258d555f0 xfrm: delete intermediate secpath entry = in packet offload mode) Merging netfilter/main (0a5b8fff01bd selftests: net: Adapt ethtool mq tests= to fix in qdisc graft) Merging ipvs/main (0a5b8fff01bd selftests: net: Adapt ethtool mq tests to f= ix in qdisc graft) Merging wireless/for-next (146b6057e1fd wifi: cw1200: Fix potential NULL de= reference) Merging ath/for-current (f1d3334d604c wifi: cfg80211: sme: init n_channels = before channels[] access) Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal= return) Merging rdma-fixes/for-rc (45d339fefaa3 RDMA/mlx5: Enable multiplane mode o= nly when it is supported) Merging sound-current/for-linus (1a0f59b04c8c Merge tag 'asoc-fix-v6.13-rc7= ' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for= -linus) Merging sound-asoc-fixes/for-linus (75a7f7d6e7e1 ASoC: Intel: sof_sdw: Fix = DMI match entries for a) Merging regmap-fixes/for-linus (5bc55a333a2f Linux 6.13-rc7) Merging regulator-fixes/for-linus (5bc55a333a2f Linux 6.13-rc7) Merging spi-fixes/for-linus (5bc55a333a2f Linux 6.13-rc7) Merging pci-current/for-linus (15b8968dcb90 PCI/bwctrl: Fix NULL pointer de= ref on unbind and bind) Merging driver-core.current/driver-core-linus (5bc55a333a2f Linux 6.13-rc7) Merging tty.current/tty-linus (5bc55a333a2f Linux 6.13-rc7) Merging usb.current/usb-linus (5bc55a333a2f Linux 6.13-rc7) Merging usb-serial-fixes/usb-linus (5bc55a333a2f Linux 6.13-rc7) Merging phy/fixes (17194c2998d3 phy: mediatek: phy-mtk-hdmi: add regulator = dependency) Merging staging.current/staging-linus (5bc55a333a2f Linux 6.13-rc7) Merging iio-fixes/fixes-togreg (012b8276f08a iio: dac: ad3552r-hs: clear re= set status flag) Merging counter-current/counter-current (fac04efc5c79 Linux 6.13-rc2) Merging char-misc.current/char-misc-linus (5bc55a333a2f Linux 6.13-rc7) Merging soundwire-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging thunderbolt-fixes/fixes (5bc55a333a2f Linux 6.13-rc7) Merging input-current/for-linus (1863f213d3e8 Input: mma8450 - add chip ID = check in probe) Merging crypto-current/master (cd26cd654767 crypto: hisilicon/debugfs - fix= the struct pointer incorrectly offset problem) Merging vfio-fixes/for-linus (09dfc8a5f2ce vfio/pci: Fallback huge faults f= or unaligned pfn) Merging kselftest-fixes/fixes (777f290ab328 selftests/ftrace: adjust offset= for kprobe syntax error test) Merging dmaengine-fixes/fixes (ebc008699fd9 dmaengine: tegra: Return correc= t DMA status when paused) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (d15638bf76ad Revert "mtd: spi-nor: core: repla= ce dummy buswidth from addr to data") Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix miss= ing IRQ status registers range) Merging v4l-dvb-fixes/fixes (8b55f8818900 media: mediatek: vcodec: mark vde= c_vp9_slice_map_counts_eob_coef noinline) Merging reset-fixes/reset/fixes (1f8af9712413 reset: rzg2l-usbphy-ctrl: Ass= ign 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 (a5546c2f0dc4 Merge tag 'kvm-s390-master-6.13-1' o= f https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvms390-fixes/master (e376d958871c KVM: s390: selftests: Add has de= vice attr check to uc_attr_mem_limit selftest) Merging hwmon-fixes/hwmon (595523945be0 Merge tag 'devicetree-fixes-for-6.1= 3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-= of-bounds Read in acpi_nfit_ctl) Merging cxl-fixes/fixes (fc033cf25e61 Linux 6.13-rc5) Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing = dma_alloc/free with vmalloc'd memory) Merging drivers-x86-fixes/fixes (59616a91e5e7 platform/x86: lenovo-yoga-tab= 2-pro-1380-fastcharger: fix serdev race) 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 (6e5773d52f4a of/address: Fix WARN when a= ttempting translating non-translatable addresses) Merging dt-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging scsi-fixes/fixes (63ca02221cc5 scsi: iscsi: Fix redundant response = for ISCSI_UEVENT_GET_HOST_STATS request) Merging drm-fixes/drm-fixes (9b1c673a1648 Merge tag 'drm-xe-fixes-2025-01-1= 6' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (1a5401ec3018 drm/i915/fb: Rel= ax clear color alignment to 64 bytes) Merging mmc-fixes/fixes (8d90a86ed053 mmc: sdhci-msm: fix crypto key evicti= on) Merging rtc-fixes/rtc-fixes (40384c840ea1 Linux 6.13-rc1) Merging gnss-fixes/gnss-linus (40384c840ea1 Linux 6.13-rc1) Merging hyperv-fixes/hyperv-fixes (175c71c2acee tools/hv: reduce resource u= sage in hv_kvp_daemon) Merging risc-v-fixes/fixes (6f6ecce59d99 Merge patch series "SBI PMU event = related fixes") Merging riscv-dt-fixes/riscv-dt-fixes (8d19d5a76bf6 riscv: dts: starfive: F= ix a typo in StarFive JH7110 pin function definitions) 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 (b62cef9a5c67 Merge tag 'hwmon-for-v6.13-rc7' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) Merging gpio-brgl-fixes/gpio/for-current (9860370c2172 gpio: xilinx: Conver= t gpio_lock to raw spinlock) 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 be= fore registering a memblock with a node) Merging renesas-fixes/fixes (124f4f1a1869 MAINTAINERS: Re-add cancelled Ren= esas driver sections) Merging perf-current/perf-tools (434fffa926b1 perf probe: Fix uninitialized= variable) Merging efi-fixes/urgent (145ac100b637 efi/esrt: remove esre_attribute::sto= re()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bo= unds UBSAN warning) Merging battery-fixes/fixes (b3ded6072c56 power: supply: bq24190: Fix BQ242= 96 Vbus regulator support) 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 (78d4f34e2115 Linux 6.13-rc3) Merging w1-fixes/fixes (40384c840ea1 Linux 6.13-rc1) Merging pmdomain-fixes/fixes (726efa92e02b pmdomain: imx8mp-blk-ctrl: add m= issing loop break condition) Merging i2c-host-fixes/i2c/i2c-host-fixes (9d89551994a4 Linux 6.13-rc6) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (5fb33b679763 clk: clk-loongson2: Fix the numbe= r count of clk provider) 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 (789a8cff8d2d ftrace: Fix function profil= er's filtering functionality) Merging ring-buffer-fixes/ring-buffer/fixes (8cd63406d081 trace/ring-buffer= : Do not use TP_printk() formatting for boot mapped buffers) Merging trace-fixes/trace/fixes (60295b944ff6 tracing: gfp: Fix the GFP enu= m values shown for user space tracing tools) Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tr= acefs mount options test) Merging spacemit-fixes/fixes (fac04efc5c79 Linux 6.13-rc2) Merging tip-fixes/tip/urgent (3b71af21407a Merge branch into tip/master: 'x= 86/urgent') Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnre= claim for post charged objects) Merging drm-msm-fixes/msm-fixes (789384eb1437 drm/msm/dpu: check dpu_plane_= atomic_print_state() for valid sspp) Merging drm-misc-fixes/for-linux-next-fixes (ef84aee151bd drm/bridge: ite-i= t6263: Prevent error pointer dereference in probe()) Merging linus/for-next (ecdc475e0707 vsnprintf: fix the number base for non= -numeric formats) Merging mm-stable/mm-stable (2877a83e4a0a mm/hugetlb: use folio->lru int de= mote_free_hugetlb_folios()) Merging mm-nonmm-stable/mm-nonmm-stable (55b21f5c73a9 Xarray: use xa_mark_t= in xas_squash_marks() to keep code consistent) Merging mm/mm-everything (6cb10d50cba3 foo) Merging kbuild/for-next (0939156bc07c genksyms: fix syntax error for attrib= ute before init-declarator) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v= 6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (ac22d75377a0 perf lock: Rename fields in lock= _type_table) 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 (a9ff94477836 ARM: 9433/2: implement cacheinfo support) Merging arm64/for-next/core (1dd3393696ef Merge branch 'for-next/perf' into= for-next/core) Merging arm-perf/for-next/perf (ba113ecad81a perf docs: arm_spe: Document n= ew discard mode) Merging arm-soc/for-next (fcf4173cc889 soc: document merges) Merging amlogic/for-next (953913df9c3a Merge branch 'v6.15/arm64-dt' into f= or-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (3540adcccc71 ARM: dts: aspeed: yosemite4: adjust s= econdary flash name) Merging at91/at91-next (bbc393c6e77b Merge branch 'at91-dt' into at91-next) Merging broadcom/next (ed54a84051c6 Merge branch 'devicetree/next' into dev= icetree-arm64/next) Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-rc1) Merging drivers-memory/for-next (af995eea227f Merge branch 'mem-ctrl-next' = into for-next) Merging imx-mxs/for-next (f89ee1bb86d7 Merge branch 'imx/defconfig' into fo= r-next) Merging mediatek/for-next (7605336e9d13 Merge branch 'v6.13-next/soc' into = for-next) Merging mvebu/for-next (a34c9fac85b2 arm64: dts: marvell: drop additional p= hy-names for sata) Merging omap/for-next (e1fc1384cf70 Merge branch 'omap-for-v6.14/drivers' i= nto tmp/omap-next-20250107.145157) Merging qcom/for-next (aa82c3c323a6 Merge branches 'arm32-for-6.14', '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 (14af1e5de568 Merge branches 'renesas-arm-defconfig-fo= r-v6.14', 'renesas-drivers-for-v6.14' and 'renesas-dts-for-v6.14' into rene= sas-next) Merging reset/reset/next (72bb8275a3b0 reset: amlogic: aux: drop aux regist= ration helper) Merging rockchip/for-next (4ec376748558 Merge branch 'v6.14-armsoc/dts64' i= nto for-next) Merging samsung-krzk/for-next (61a0af40d810 Merge branch 'next/clk' into fo= r-next) Merging scmi/for-linux-next (b81ada150448 Merge tag 'scmi-updates-6.14' 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 (3d72d603afa7 riscv: dts: spacemit: move aliases = to board dts) Merging stm32/stm32-next (b7ebfb84a09d arm64: dts: st: enable imx335/csi/dc= mipp pipeline on stm32mp257f-ev1) Merging sunxi/sunxi/for-next (cc47f07a40d6 Merge branches 'sunxi/clk-fixes-= for-6.13', 'sunxi/dt-for-6.14' and 'sunxi/clk-for-6.14' into sunxi/for-next) 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 fo= r-next) Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mai= lbox node) Merging ti/ti-next (86e856a18264 Merge branches 'ti-k3-dts-next' and 'ti-k3= -config-next' into ti-next) Merging xilinx/for-next (3d431068ed63 Merge branch 'zynq/dt' into for-next) Merging clk/clk-next (47b32b50ee28 Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (48806be08636 clk: imx: Apply some clks only for i= .MX93) Merging clk-renesas/renesas-clk (e91609f1c3b0 dt-bindings: clock: renesas,r= 9a08g045-vbattb: Fix include guard) Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not work= ing) Merging loongarch/loongarch-next (2737dee1067c LoongArch: KVM: Add hypercal= l service support for usermode VMM) Merging m68k/for-next (bb2e0fb1e6aa m68k: libgcc: Fix lvalue abuse in umul_= ppmm()) Merging m68knommu/for-next (a0a8306c8239 m68k: coldfire: Use proper clock r= ate for timers) Merging microblaze/next (920354d7818b microblaze: Use of_property_present()= for non-boolean properties) Merging mips/mips-next (04e4ec98e405 MIPS: migrate to generic rule for buil= t-in DTBs) Merging openrisc/for-next (ea1413e5b53a rseq/selftests: Add support for Ope= nRISC) Merging parisc-hd/for-next (f5959f9ec658 parisc: add vdso linker script to = 'targets' instead of extra-y) Merging powerpc/next (7fee0217538a MAINTAINERS: powerpc: Update my status) Merging risc-v/for-next (fac04efc5c79 Linux 6.13-rc2) Merging riscv-dt/riscv-dt-for-next (708d55db3edb riscv: dts: starfive: jh71= 10-milkv-mars: enable usb0 host function) Merging riscv-soc/riscv-soc-for-next (a5362510bafc Merge branch 'riscv-conf= ig-for-next' into riscv-soc-for-next) Merging s390/for-next (b2832409e00b Merge branch 'features' into for-next) Merging sh/for-next (63e72e551942 sh: intc: Fix use-after-free bug in regis= ter_intc_controller()) 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 (d14b9a713b34 xtensa/simdisk: Use str_write_= read() helper in simdisk_transfer()) Merging fs-next (b26690adc8e8 Merge branch 'for-next' of git://git.kernel.o= rg/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 (c3016b84d065 Merge branch 'pci/misc') Merging pstore/for-next/pstore (067cdf020329 pstore/zone: avoid dereferenci= ng zero sized ptr after init zones) Merging hid/for-next (bb796ffb21b3 Merge branch 'for-6.13/upstream-fixes' i= nto for-next) Merging i2c/i2c/for-next (b06791c9472a Merge branch 'i2c/for-current' into = i2c/for-next) Merging i2c-host/i2c/i2c-host (fd4e93083129 i2c: i801: Add lis3lv02d for De= ll Precision M6800) Merging i3c/i3c/next (5eb6d3561f6c i3c: master: Improve initialization of n= umbered I2C adapters) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for = number of populated and total memory slots) Merging hwmon-staging/hwmon-next (a76539b29367 hwmon: pmbus: dps920ab: Add = ability to instantiate through i2c) Merging jc_docs/docs-next (ba56006b9c30 Merge branch 'docs-mw' into docs-ne= xt) CONFLICT (content): Merge conflict in scripts/checkpatch.pl Merging v4l-dvb/next (c4b7779abc66 media: nuvoton: Fix an error check in np= cm_video_ece_init()) Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before c= alling vb2_queue_init()) Merging pm/linux-next (49d5ece0cb0f Merge branch 'pm-tools' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (84cf9e541ccc cpufreq: airoha: A= dd EN7581 CPUFreq SMCCC driver) Merging cpupower/cpupower (3d6f25870d17 pm: cpupower: Add missing residency= header changes in cpuidle.h to SWIG) Merging devfreq/devfreq-next (f3253b23535f PM / devfreq: exynos: remove unu= sed function parameter) Merging pmdomain/next (c2d7aa308ecf pmdomain: arm: scmi_pm_domain: Send an = explicit request to set the current state) Merging opp/opp/linux-next (1d38eb7f7b26 OPP: OF: Fix an OF node leak in _o= pp_add_static_v2()) Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_the= rmal: Use dev_err_probe) Merging rdma/for-next (f5f01c5c409e RDMA/qib: Constify 'struct bin_attribut= e') CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_net.c CONFLICT (content): Merge conflict in drivers/infiniband/sw/siw/siw_main.c CONFLICT (content): Merge conflict in drivers/infiniband/sw/siw/siw_verbs.c Applying: fix up for "RDMA/rxe: Remove deliver net device event" Merging net-next/main (59372af69d4d Merge tag 'batadv-next-pullrequest-2025= 0117' of git://git.open-mesh.org/linux-merge) Merging bpf-next/for-next (1a2367d92dfc Merge branch 'bpf-next/master' into= for-next) Merging ipsec-next/master (7082a6dc84eb net/mlx5e: Update TX ESN context fo= r IPSec hardware offload) Merging mlx5-next/mlx5-next (6ca00ec47b70 net/mlx5: Add nic_cap_reg and vhc= a_icm_ctrl registers) Merging netfilter-next/main (9c7ad3563229 Merge branch 'arrange-pse-core-an= d-update-tps23881-driver') Merging ipvs-next/main (9c7ad3563229 Merge branch 'arrange-pse-core-and-upd= ate-tps23881-driver') Merging bluetooth/master (26fbd3494a7d Bluetooth: MGMT: Fix slab-use-after-= free Read in mgmt_remove_adv_monitor_sync) Merging wireless-next/for-next (59372af69d4d Merge tag 'batadv-next-pullreq= uest-20250117' of git://git.open-mesh.org/linux-merge) Merging ath-next/for-next (89d62bcd2501 Merge tag 'ath-next-20250114' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) Merging wpan-next/master (3e5908172c05 Merge tag 'ieee802154-for-net-next-2= 025-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-ne= xt-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-n= ext) Merging mtd/mtd/next (cd97c961681a mtd: hyperbus: Use of_property_present()= for non-boolean properties) Merging nand/nand/next (be7a05db4252 mtd: spinand: winbond: Add support for= DTR operations) Applying: mtd: spinand: skyhigh: Align with recent read from cache variant = changes Merging spi-nor/spi-nor/next (943e5f856007 mtd: spi-nor: sysfs: constify 's= truct bin_attribute') Merging crypto/master (9d4f8e54cef2 rhashtable: Fix rhashtable_try_insert t= est) Merging drm/drm-next (951a6bf30667 Merge tag 'drm-misc-next-fixes-2025-01-1= 6' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/display/drm_bridge_co= nnector.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_di= splay_driver.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_tlb_invalida= tion.c Merging drm-exynos/for-linux-next (31b2be07afd0 drm/exynos: Remove unnecess= ary checking) Merging drm-misc/for-linux-next (db8b2c0e2abc drm/virtio: Fix UAF in virtgp= u_dma_buf_free_obj()) Merging amdgpu/drm-next (97e5c9e41390 drm/amd/display: fix CEC DC_DEBUG_MAS= K documentation) Merging drm-intel/for-linux-next (24c61d553302 Merge tag 'drm-msm-next-2025= -01-07' of gitlab.freedesktop.org:drm/msm into drm-next) Merging drm-msm/msm-next (866e43b945bf drm/msm: UAPI error reporting) Merging drm-msm-lumag/msm-next-lumag (a5463629299b drm/msm/dpu: Add RM supp= ort for allocating CWB) Merging drm-xe/drm-xe-next (173baa1b2dc4 drm/xe: Suppress printing of mode = when running in non-sriov mode) Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset = support) Merging fbdev/for-next (c542a56aad1f fbdev: vga16fb: fix orig_video_isVGA c= onfusion) Merging regmap/for-next (78798d887531 Merge remote-tracking branch 'regmap/= for-6.14' into regmap-next) Merging sound/for-next (dd85bbb7fc48 ALSA: usb: fcp: Fix hwdep read ops arg= ument) Applying: fixup for "ALSA: FCP: Add Focusrite Control Protocol driver" Merging ieee1394/for-next (352fafe97784 firewire: test: Fix potential null = dereference in firewire kunit test) Merging sound-asoc/for-next (c2ff66aefa98 Merge remote-tracking branch 'aso= c/for-6.14' into asoc-next) Merging modules/modules-next (0217859ce172 module: sign with sha512 instead= of sha1 by default) Merging input/next (92600f3295ff Input: xpad - add QH Electronics VID/PID) Merging block/for-next (e8153972dea5 Merge branch 'for-6.14/io_uring' into = for-next) Applying: fix up for "io_uring/memmap: implement kernel allocated regions" Merging device-mapper/for-next (6845de78ae37 dm-mirror: Support atomic writ= es) Merging libata/for-next (f2809aa4f591 ahci: st: Switch from CONFIG_PM_SLEEP= guards to pm_sleep_ptr()) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIP= TION() macros) Merging mmc/next (20a0c37e4406 mmc: sdhci-msm: Correctly set the load for t= he regulator) Merging mfd/for-mfd-next (2816b0c949af MAINTAINERS: Adjust the file entry f= or the qnap-mcu header) CONFLICT (content): Merge conflict in drivers/mfd/cs42l43.c Merging backlight/for-backlight-next (40384c840ea1 Linux 6.13-rc1) Merging battery/for-next (b4a95b8fd3e6 power: supply: max1720x: add support= for reading internal and thermistor temperatures) Merging regulator/for-next (5754b3acbe28 Merge remote-tracking branch 'regu= lator/for-6.14' into regulator-next) Merging security/next (714d87c90a76 lockdown: initialize local array before= use to quiet static analysis) Merging apparmor/apparmor-next (e6b087676954 apparmor: fix dbus permission = queries to v9 ABI) Merging integrity/next-integrity (4785ed362a24 ima: ignore suffixed policy = rule comments) Merging selinux/next (854bc7623602 Automated merge of 'dev' into 'next') Merging smack/next (6f71ad02aae8 smack: deduplicate access to string conver= sion) Merging tomoyo/master (08ae2487b202 tomoyo: automatically use patterns for = several situations in learning mode) Merging tpmdd/next (e8988ff01353 tpm: Change to kvalloc() in eventlog/acpi.= c) Merging watchdog/master (b3db0b5356ff dt-bindings: watchdog: Document Qualc= omm IPQ5424) Merging iommu/next (125f34e4c107 Merge branches 'arm/smmu/updates', 'arm/sm= mu/bindings', 'qualcomm/msm', 'rockchip', 'riscv', 'core', 'intel/vt-d' and= 'amd/amd-vi' into next) Merging audit/next (8bea8f86f7a1 Automated merge of 'dev' into 'next') Merging devicetree/for-next (8537a7011be9 of: Correct element count for two= arrays in API of_parse_phandle_with_args_map()) Merging dt-krzk/for-next (dcdd69c1e196 Merge branch 'next/dt' into for-next) Merging mailbox/for-next (db049866943a mailbox: th1520: Fix memory corrupti= on due to incorrect array size) Merging spi/for-next (f3e44cc2ee37 Merge remote-tracking branch 'spi/for-6.= 14' into spi-next) Merging tip/master (2c13dabd8d8d Merge branch into tip/master: 'x86/tdx') CONFLICT (content): Merge conflict in include/linux/seqlock.h Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/a= rm_arch_timer: Use of_property_present() for non-boolean properties) Merging edac/edac-for-next (1d1a6ae52176 Merge edac-drivers into for-next) CONFLICT (content): Merge conflict in drivers/edac/i10nm_base.c Merging ftrace/for-next (9f3ccaeedbe0 Merge branch 'trace/fix-for-next' int= o trace/for-next) Merging rcu/next (4b5c2205526c Merge branches 'fixes.2024.12.14a', 'rcutort= ure.2024.12.14a', 'srcu.2024.12.14a' and 'torture-test.2024.12.14a' into rc= u-merge.2024.12.14a) CONFLICT (content): Merge conflict in kernel/rcu/tree.c 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 (5cf32aff2088 Merge tag 'loongarch-kvm-6.14' of git://git.= kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD) Merging kvm-arm/next (01009b06a6b5 arm64/sysreg: Get rid of TRFCR_ELx Sysre= gFields) Merging kvms390/next (dec5629b7570 KVM: s390: remove the last user of page-= >index) Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2) Merging kvm-riscv/riscv_kvm_next (af79caa83f6a RISC-V: KVM: Add new exit st= atstics for redirected traps) Merging kvm-x86/next (eb723766b103 Merge branches 'memslots', 'misc', 'mmu'= , 'selftests', 'svm', 'vcpu_array' and 'vmx') CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c Merging xen-tip/linux-next (fac04efc5c79 Linux 6.13-rc2) Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/mst/vhost) Merging workqueues/for-next (da30ba227c41 workqueue: warn if delayed_work i= s queued to an offlined cpu.) Merging sched-ext/for-next (5106a8fe8c61 Merge branch 'for-6.14' into for-n= ext) Merging drivers-x86/for-next (4055e18bfbb7 ACPI: platform_profile: Add a pr= efix to log messages) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-i801.c CONFLICT (content): Merge conflict in drivers/platform/x86/dell/alienware-w= mi.c Applying: fix up for "platform/x86: dell-smo8800: Move instantiation of lis= 3lv02d i2c_client from i2c-i801 to dell-lis3lv02d" Merging chrome-platform/for-next (fccebbdde206 platform/chrome: cros_ec_lpc= : Handle EC without CRS section) Merging chrome-platform-firmware/for-firmware-next (7543d5702c2c firmware: = google: vpd: Use const 'struct bin_attribute' callback) Merging hsi/for-next (40384c840ea1 Linux 6.13-rc1) Merging leds-lj/for-leds-next (daefd7fbd544 leds: triggers: Constify 'struc= t bin_attribute') Merging ipmi/for-next (83d8c79aa958 ipmi: ssif_bmc: Fix new request loss wh= en bmc ready for a response) Merging driver-core/driver-core-next (01b3cb620815 rust: device: Use as_cha= r_ptr() to avoid explicit cast) CONFLICT (content): Merge conflict in kernel/module/sysfs.c Applying: fix up for "driver core: Constify API device_find_child() and ada= pt for various usages" Applying: fix up 2 for "driver core: Constify API device_find_child() and a= dapt for various usages" Merging usb/usb-next (70cd0576aa39 usb: hcd: Bump local buffer size in rh_s= tring()) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/x1e80100-qcp= .dts Merging thunderbolt/next (43d84701d2aa thunderbolt: Expose router DROM thro= ugh debugfs) Merging usb-serial/usb-next (575a5adf48b0 USB: serial: quatech2: fix null-p= tr-deref in qt2_process_read_urb()) Merging tty/tty-next (651dee03696e serial: sh-sci: Increment the runtime us= age counter for the earlycon device) Merging char-misc/char-misc-next (970b9757cb44 ntsync: Fix reference leaks = in the remaining create ioctls.) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/nvm= em/qcom,qfprom.yaml Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-20= 24-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 (40384c840ea1 Linux 6.13-rc1) Merging fpga/for-next (46b155acbf4e fpga: dfl: destroy/recreate feature pla= tform device on port release/assign) Merging icc/icc-next (4cc004716977 Merge branch 'icc-sm8750' into icc-next) Merging iio/togreg (577a66e2e634 iio: iio-mux: kzalloc instead of devm_kzal= loc to ensure page alignment) Merging phy-next/next (af1bc0ebe743 dt-bindings: phy: qcom,qmp-pcie: docume= nt the SM8350 two lanes PCIe PHY) Merging soundwire/next (74148bb59e20 soundwire: amd: clear wake enable regi= ster for power off mode) Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initializati= on of struct i2c_device_id::driver_data to 0) Merging gnss/gnss-next (40384c840ea1 Linux 6.13-rc1) Merging vfio/next (e021e6cbfb5a vfio/pci: Expose setup ROM at ROM bar when = needed) Merging w1/for-next (419a40cc2bdd w1: core: use sysfs_emit() instead of spr= intf()) Merging spmi/spmi-next (40384c840ea1 Linux 6.13-rc1) Merging staging/staging-next (579b6f18c5ca staging: gpib: Agilent usb code = cleanup) Merging counter-next/counter-next (ceb3075433d9 counter: ti-eqep: add direc= tion support) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using dev= m_siox_* functions) Merging mux/for-next (59b723cd2adb Linux 6.12-rc6) Merging dmaengine/next (98d187a98903 dmaengine: idxd: Enable Function Level= Reset (FLR) for halt) Merging cgroup/for-next (ca3957ef3f80 cgroup: update comment about dropping= cgroup kn refs) Merging scsi/for-next (ad8063b3f12f Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/ata/ahci.h CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c CONFLICT (content): Merge conflict in include/linux/libata.h Merging scsi-mkp/for-next (7d6f88e76e28 Merge patch series "Introduce suppo= rt for Fabric Discovery and Login Services") Merging vhost/linux-next (a9e50e19ec45 virtio_blk: Add support for transpor= t error recovery) Merging rpmsg/for-next (3a53ff95b0be remoteproc: st: Use syscon_regmap_look= up_by_phandle_args) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (b0fa00fe38f6 gpio: regmap: Use generic req= uest/free ops) Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_= each_child_node_scoped()) Merging pinctrl/for-next (dadea124cc27 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (40384c840ea1 Linux 6.13-rc1) Merging pinctrl-renesas/renesas-pinctrl (accabfaae094 pinctrl: renesas: rzg= 2l: Fix PFC_MASK for RZ/V2H and RZ/G3E) Merging pinctrl-samsung/for-next (0ebb1e9e1b12 pinctrl: samsung: update chi= ld reference drop comment) Merging pwm/pwm/for-next (e8c59791ebb6 pwm: stm32: Add check for clk_enable= ()) Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with g= rub2 skip regex) Merging kselftest/next (336d02bc4c6b selftests/rseq: Fix handling of glibc = without rseq support) CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest/kta= p_helpers.sh Merging kunit/test (40384c840ea1 Linux 6.13-rc1) Merging kunit-next/kunit (31691914c392 kunit: Introduce autorun option) Merging livepatching/for-next (7e17e80c3a7e Merge branch 'for-6.14/stack-or= der' into for-next) Merging rtc/rtc-next (58589c6a6e9e rtc: Remove hpet_rtc_dropped_irq()) Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field= in struct dax_operations) Merging at24/at24/for-next (36036a164fac dt-bindings: eeprom: at24: Add com= patible for Puya P24C256C) Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers) Merging seccomp/for-next/seccomp (f90877dd7fb5 seccomp: Stub for !CONFIG_SE= CCOMP) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (40384c840ea1 Linux 6.13-rc1) Merging nvmem/for-next (40384c840ea1 Linux 6.13-rc1) Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_= lock and friends) Merging hyperv/hyperv-next (2e03358be78b Documentation: hyperv: Add overvie= w of guest VM hibernation) Merging auxdisplay/for-next (93b216cb312d auxdisplay: img-ascii-lcd: Consti= fy 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 (29904a40127c bus: mhi: host: pci_generic: Enable MSI-= X if the endpoint supports) Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all = reserved pages to MIGRATE_MOVABLE) Merging cxl/next (6cdbd84dc42b cxl/test: Update test code for event records= to CXL spec rev 3.1) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (374ac8cdcbf1 selftests/efivarfs: add concurrent update te= sts) Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) Merging slab/slab/for-next (e492fac3657b Merge branch 'slab/for-6.14/kfree_= rcu_move' into slab/for-next) 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 in ) Merging landlock/next (2a794ee61361 selftests/landlock: Add layout1.umount_= sandboxer tests) Merging rust/rust-next (ceff0757f5da kbuild: rust: add PROCMACROLDFLAGS) CONFLICT (content): Merge conflict in rust/kernel/lib.rs CONFLICT (content): Merge conflict in rust/kernel/miscdevice.rs CONFLICT (content): Merge conflict in rust/kernel/security.rs Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls i= n proc_sys_fill_cache()) Merging execve/for-next/execve (8fa1179c840a Merge branch 'for-next/topic/e= xecve/core' into for-next/execve) Merging bitmap/bitmap-for-next (e876695aab1e cpumask: Rephrase comments for= cpumask_any*() APIs) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCR= IPTION() macro) Merging kspp/for-next/kspp (d9a67659846f Merge branch 'for-linus/hardening'= into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (24728b70b036 Merge tag 'nolibc-20250113-for-6.14-1' = of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc into= nolibc) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation su= pport using TSM_REPORTS) Merging iommufd/for-next (3f4818ec1390 iommufd/fault: Destroy response and = mutex in iommufd_fault_destroy()) Merging turbostat/next (84c6f8c430e3 tools/power turbostat: version 2025.01= .14) Merging pwrseq/pwrseq/for-next (29da3e8748f9 power: sequencing: qcom-wcn: e= xplain why we need the WLAN_EN GPIO hack) 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 (72914faebaab MAINTAINERS: add entry for CRC library) Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function = name to match code) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing b= uild for PREEMPT_RT) Applying: Revert "ALSA: hda/tas2781: Add tas2781 hda SPI driver" --Sig_/Bs4t7WUFaxiWn.u3LGcrmwo Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmeOCoIACgkQAVBC80lX 0GwWNAf/ae99uGwMoP7+4540pQo038n7ZPZGCR6UTKBHyLUFPCXpmvKnh3KJwPY4 /6JJmSdjFYBy7Jgq9XDhFqPgs7lKFE4lMPfeQakFmXIlGlcXBR6fkNH6uNEBK649 nHet6PVMY7maOKSDH4Sd9RayB7nw6RgjETVpFNvHZePfnzXyEOcFvlmbx/BsgOGa F5Jd4mPiOcCPdtEnp8CmVV4tNNN4mFFArlN62hUmgvHpVD98PO2VK6hqmL5HRJJm 1WOCDmYnG16kRy26rH4gQu9HX5Q2KSkTt8kMkjyTP+OS2kkYq5aAgVguKnnDNXIZ eqmK6sWi5ZbtSPNcjLuEfUsbAz9acw== =rGw6 -----END PGP SIGNATURE----- --Sig_/Bs4t7WUFaxiWn.u3LGcrmwo--