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 7C43B28C840; Thu, 10 Jul 2025 08:42:20 +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=1752136946; cv=none; b=pspBkqmm8AEo3eVO2QNvRmtKZPY3hLT8jq3ht/pUf99a6nmgfjb/MsAfqXhGw/UAFZhZkzjBVmrn6jjEqt0oV3m3+ocxgdV1eIg4E6l9NQbG5wvfzHA3d72RXLD7ZJbSfX2blo/jgc2AU25BbjjNVrfyXKw61vJh0eBsiRQd2QA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752136946; c=relaxed/simple; bh=0Z2LXM2HeKzm52K4fXp6oDzYSV1lqq5tfLrQtQN/1yw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=eCMTHKGbXXYHC9OQF6f7jzT+bqiQ+XAu4UxF4rkoclq6GFZ28fbRH/lP0Y1CsJnRh55Y73psa3X+sFA1qfWh2ZHakNvnPbyJD9Q1eNk1LG3ahKP0gROQMNWBZEEKxjMxtQdMclLWBpQevKtARrFXeh7iLJbcExCRTe+RBWYOF7s= 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=Qrm0iUKU; 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="Qrm0iUKU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1752136866; bh=gRIxpJywxTzQfuOQ9NzAoboIJOdvSyUj4W+fEdHagow=; h=Date:From:To:Cc:Subject:From; b=Qrm0iUKUMdBhPIDSvhlmWIdXBQzwxp11Nv5ZmeoeX9YvKbeNhMPQi8oRyrjdvgKxN BkXIamgsog7oxtNWFTEE7CxWpdTFYx+GWvuE5uWMDPiyN9RdtJR5HfUKnrdpMayfut CK5gxRz9vxvYmIyyeUT09nen5MaFFkLPGtP9KlosfNJNNyNfDCM4au2QMegaHEjbzE KnEjUKQopILdYH4IM7Jfi6Vd8SxctTN6lXwrvtcBPTqA0wUez+B2HIbEMt/3tZ+h9t zpOlnX1rJColYFzVJ5K9ekOn8MTduYDI6w1lKqCaoO12vgKtUFK9xc98d9hHpsuFAY kh7A67iupDf5A== 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 4bd7bk5jNkz4wbn; Thu, 10 Jul 2025 18:41:06 +1000 (AEST) Date: Thu, 10 Jul 2025 18:42:18 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jul 10 Message-ID: <20250710184218.3adb8752@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/0Fb4O7Iyg8shnFB=wdm9j2b"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/0Fb4O7Iyg8shnFB=wdm9j2b Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Note: the probe of the vscsi adaptor on PowerPC LE in qemu is fixed. Changes since 20250709: The tegra tree gained a conflict against the qcom tree. The mfd tree still had its build failure, so I used the version from next-20250702. The tip tree gained a conflict against the mm-unstable tree. The efi tree lost its build failure. The vhost tree lost its build failure. Non-merge commits (relative to Linus' tree): 7654 8359 files changed, 291602 insertions(+), 168059 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 403 trees (counting Linus' and 153 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 (8c2e52ebbe88 eventpoll: don't decrement ep refcount = while still holding the ep mutex) Merging fixes/fixes (b3c623b9a94f Merge tag 'thermal-6.15-rc1' of git://git= .kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4) Merging vfs-brauner-fixes/vfs.fixes (98f99394a104 secretmem: use SB_I_NOEXE= C) Merging fscrypt-current/for-current (0af2f6be1b42 Linux 6.15-rc1) Merging fsverity-current/for-current (0af2f6be1b42 Linux 6.15-rc1) Merging btrfs-fixes/next-fixes (296391a79b55 Merge branch 'misc-6.16' into = next-fixes) Merging vfs-fixes/fixes (b969f9614885 fix proc_sys_compare() handling of in= -lookup dentries) Merging erofs-fixes/fixes (86731a2a651e Linux 6.16-rc3) Merging nfsd-fixes/nfsd-fixes (94d10a4dba0b sunrpc: handle SVC_GARBAGE duri= ng svc auth processing as auth error) Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) Merging overlayfs-fixes/ovl-fixes (924577e4f6ca ovl: Fix nested backing fil= e paths) Merging bcachefs/for-next (7db8228dd403 bcachefs: don't call get_update_reb= alance_opts() on btree ptrs) Merging fscrypt/for-next (5ad915826b24 fscrypt: Switch to sync_skcipher and= on-stack requests) Merging btrfs/for-next (dab3d5c7d219 Merge branch 'for-next-next-v6.16-2025= 0708' into for-next-20250708) CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c Merging ceph/master (b828b4bf29d1 ceph: fix variable dereferenced before ch= eck in ceph_umount_begin()) Merging cifs/for-next (f88980b6cf8a smb: change return type of cached_dir_l= ease_break() to bool) Merging configfs/configfs-next (c6b190822459 MAINTAINERS: add configfs Rust= abstractions) Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecry= ptfs_fill_zeros()) Merging dlm/next (6f8b4788266c dlm: drop SCTP Kconfig dependency) Merging erofs/dev (720a556a42a8 erofs: do sanity check on m->type in z_erof= s_load_compact_lcluster()) Merging exfat/dev (1edbfabb7967 exfat: add cluster chain loop check for dir) Merging exportfs/exportfs-next (adc218676eef Linux 6.12) Merging ext3/for_next (3b74cc21766e Merge FAN_ACCESS_PERM optimization patc= hes from Amir) Merging ext4/dev (7acd1b315cdc ext4: Add a WARN_ON_ONCE for querying LAST_I= N_LEAF instead) Merging f2fs/dev (c1cfc87e4952 f2fs: introduce is_cur{seg,sec}()) Merging fsverity/for-next (d0b3b7b22dfa Linux 6.16-rc4) Merging fuse/for-next (f0e84022479b virtio_fs: Remove redundant spinlock in= virtio_fs_request_complete()) Merging gfs2/for-next (06234af9e3a1 gfs2: Remove GIF_ALLOC_FAILED flag) Merging jfs/jfs-next (5dff41a86377 jfs: fix array-index-out-of-bounds read = in add_missing_indices) Merging ksmbd/ksmbd-for-next (50f930db2236 ksmbd: fix potential use-after-f= ree in oplock/lease break ack) Merging nfs/linux-next (d7b8f8e20813 Linux 6.16-rc5) Merging nfs-anna/linux-next (38074de35b01 NFSv4/flexfiles: Fix handling of = NFS level errors in I/O) Merging nfsd/nfsd-next (d77dbc020182 NFSD: Simplify struct knfsd_fh) Merging ntfs3/master (d99208b91933 fs/ntfs3: cancle set bad inode after rem= oving name fails) Merging orangefs/for-next (4dc784e92d4f orangefs: Convert to use the new mo= unt API) Merging overlayfs/overlayfs-next (6f9ccdad0fea ovl: Annotate struct ovl_ent= ry with __counted_by()) Merging ubifs/next (2b6d96503255 jffs2: check jffs2_prealloc_raw_node_refs(= ) result in few other places) Merging v9fs/9p-next (4210030d8bc4 docs: fs/9p: Add missing "not" in cache = documentation) Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1) Merging xfs/for-next (1928a4228b2f Merge branch 'xfs-6.17-merge' into for-n= ext) Merging zonefs/for-next (6982100bb829 zonefs: use ZONEFS_SUPER_SIZE instead= of PAGE_SIZE) Merging vfs-brauner/vfs.all (0d21e5ab2c20 Merge branch 'vfs-6.17.super' int= o vfs.all) Merging vfs/for-next (270800a1ce0a Merge branch 'work.mount' into for-next) Merging mm-hotfixes/mm-hotfixes-unstable (55396fea33ca selftests/mm: fix sp= lit_huge_page_test for folio_split() tests.) Merging fs-current (e6c9ce21fbfc Merge branch 'next-fixes' of git://git.ker= nel.org/pub/scm/linux/kernel/git/kdave/linux.git) Merging kbuild-current/fixes (e04c78d86a96 Linux 6.16-rc2) Merging arc-current/for-curr (179e949719fe ARC: Replace __ASSEMBLY__ with _= _ASSEMBLER__ in the non-uapi headers) 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 (9dd175749341 arm64/mm: Drop wrong write= s into TCR2_EL1) Merging arm-soc-fixes/arm/fixes (3f3fb9737430 Merge tag 'apple-soc-fixes-6.= 16' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux into arm/= fixes) Merging davinci-current/davinci/for-current (19272b37aa4f Linux 6.16-rc1) Merging drivers-memory-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging sophgo-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1) Merging m68k-current/for-linus (f440518f379d m68k: defconfig: Update defcon= figs for v6.15-rc1) Merging powerpc-fixes/fixes (ab107276607a powerpc: Fix struct termio relate= d ioctl macros) Merging s390-fixes/fixes (62355f1f87b8 s390/pci: Allow automatic recovery w= ith minimal driver support) Merging net/main (3c78f91e82d6 Merge branch 'net-phy-smsc-robustness-fixes-= for-lan87xx-lan9500') Merging bpf/master (bf4807c89d8f selftests/bpf: Add negative test cases for= snprintf) Merging ipsec/master (a90b2a1aaacb xfrm: interface: fix use-after-free afte= r changing collect_md xfrm interface) Merging netfilter/main (d0fa59897e04 tcp: fix tcp_packet_delayed() for tcp_= is_non_sack_preventing_reopen() behavior) Merging ipvs/main (d0fa59897e04 tcp: fix tcp_packet_delayed() for tcp_is_no= n_sack_preventing_reopen() behavior) Merging wireless/for-next (a066917360ed wifi: mac80211: Fix uninitialized v= ariable with __free() in ieee80211_ml_epcs()) Merging ath/for-current (e34a79b96ab9 Merge tag 'net-6.16-rc4' of git://git= .kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging iwlwifi/fixes (e5d110fec068 wifi: iwlwifi: pcie: fix locking on inv= alid TOP reset) Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal= return) Merging rdma-fixes/for-rc (a9a9e68954f2 RDMA/mlx5: Fix vport loopback for M= PV device) Merging sound-current/for-linus (d78f76457d70 ALSA: hda/realtek: Enable hea= dset Mic on Positivo K116J) Merging sound-asoc-fixes/for-linus (a609bd74b868 ASoC: Intel: avs: Fix NULL= ptr deref on rmmod) Merging regmap-fixes/for-linus (c871c199accb regmap: fix potential memory l= eak of regmap_bus) Merging regulator-fixes/for-linus (c9764fd88bc7 regulator: gpio: Fix the ou= t-of-bounds access to drvdata::gpiods) Merging spi-fixes/for-linus (04a8ff1bc351 spi: cadence-quadspi: fix cleanup= of rx_chan on failure paths) Merging pci-current/for-linus (ba74278c638d Revert "PCI: ecam: Allow cfg->p= riv to be pre-populated from the root port device") Merging driver-core.current/driver-core-linus (86731a2a651e Linux 6.16-rc3) Merging tty.current/tty-linus (6c0e9f05c9d7 pch_uart: Fix dma_sync_sg_for_d= evice() nents value) Merging usb.current/usb-linus (cd0f8649d0e1 Merge tag 'usb-serial-6.16-rc6'= of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial int= o usb-linus) Merging usb-serial-fixes/usb-linus (08f49cdb71f3 USB: serial: option: add F= oxconn T99W640) Merging phy/fixes (cf0233491b3a phy: use per-PHY lockdep keys) Merging staging.current/staging-linus (d0b3b7b22dfa Linux 6.16-rc4) Merging iio-fixes/fixes-togreg (9b9e8939b75b iio: adc: ad7313: fix calibrat= ion channel) Merging counter-current/counter-current (19272b37aa4f Linux 6.16-rc1) Merging char-misc.current/char-misc-linus (ae68ad3d7a93 MAINTAINERS: add mi= scdevice Rust abstractions) Merging soundwire-fixes/fixes (a628e69b6412 soundwire: amd: fix for clearin= g command status register) Merging thunderbolt-fixes/fixes (2cdde91c14ec thunderbolt: Fix bit masking = in tb_dp_port_set_hops()) Merging input-current/for-linus (4cf65845fdd0 Input: cs40l50-vibra - fix po= tential NULL dereference in cs40l50_upload_owt()) Merging crypto-current/master (ccafe2821cfa crypto: qat - Use crypto_shash_= export_core) Merging libcrypto-fixes/libcrypto-fixes (68279380266a crypto: s390/sha - Fi= x uninitialized variable in SHA-1 and SHA-2) Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to o= rder) Merging kselftest-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging dmaengine-fixes/fixes (8eba2187391e dmaengine: mediatek: Fix a flag= reuse error in mtk_cqdma_tx_status()) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (6463cbe08b0c mtd: spinand: fix memory leak of = ECC engine conf) Merging mfd-fixes/for-mfd-fixes (d9d79e4f7dc9 mfd: Fix building without CON= FIG_OF) Merging v4l-dvb-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging reset-fixes/reset/fixes (38fec10eb60d Linux 6.14) Merging mips-fixes/mips-fixes (86731a2a651e Linux 6.16-rc3) Merging at91-fixes/at91-fixes (19272b37aa4f Linux 6.16-rc1) Merging omap-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging kvm-fixes/master (4578a747f3c7 KVM: x86: avoid underflow when scali= ng TSC frequency) Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when mak= ing a page secure) Merging hwmon-fixes/hwmon (c25892b7a174 hwmon: (ltc4282) avoid repeated reg= ister write) Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4) Merging cxl-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) Merging dma-mapping-fixes/dma-mapping-fixes (aa807b9f22df dma-contiguous: h= ornor the cma address limit setup by user) Merging drivers-x86-fixes/fixes (4f30f946f27b platform/x86: think-lmi: Fix = sysfs group cleanup) Merging samsung-krzk-fixes/fixes (8d2c2fa2209e firmware: exynos-acpm: fix t= imeouts on xfers handling) Merging pinctrl-samsung-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging devicetree-fixes/dt/linus (f75794b6077e dt-bindings: serial: Conver= t altr,uart-1.0 to DT schema) Merging dt-krzk-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging scsi-fixes/fixes (021f243627ea scsi: ufs: core: Fix spelling of a s= ysfs attribute name) Merging drm-fixes/drm-fixes (d7b8f8e20813 Linux 6.16-rc5) Merging drm-intel-fixes/for-linux-next-fixes (01870d09f295 drm/i915/bios: A= pply vlv_fixup_mipi_sequences() to v2 mipi-sequences too) Merging mmc-fixes/fixes (ff09b71bf9da mmc: bcm2835: Fix dma_unmap_sg() nent= s value) Merging rtc-fixes/rtc-fixes (08d82d0cad51 rtc: pcf2127: add missing semicol= on after statement) Merging gnss-fixes/gnss-linus (86731a2a651e Linux 6.16-rc3) Merging hyperv-fixes/hyperv-fixes (14ae3003e73e Drivers: hv: Fix bad ref to= hv_synic_eventring_tail when CPU goes offline) Merging risc-v-fixes/fixes (5903a7452e64 Merge tag 'riscv-fixes-6.16-rc4' o= f ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux into f= ixes) Merging riscv-dt-fixes/riscv-dt-fixes (19272b37aa4f Linux 6.16-rc1) Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1) Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging spdx/spdx-linus (19272b37aa4f Linux 6.16-rc1) Merging gpio-brgl-fixes/gpio/for-current (d563e7f95c93 gpio: of: initialize= local variable passed to the .of_xlate() callback) Merging gpio-intel-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging pinctrl-intel-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging auxdisplay-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging kunit-fixes/kunit-fixes (19272b37aa4f Linux 6.16-rc1) Merging memblock-fixes/fixes (da8bf5daa5e5 memblock: Accept allocated memor= y before use in memblock_double_array()) Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmob= ile_smp_* alignment) Merging perf-current/perf-tools (86731a2a651e Linux 6.16-rc3) Merging efi-fixes/urgent (f8b53cc9174c efi: Fix .data section size calculat= ions when .sbat is present) Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1) Merging iommufd-fixes/for-rc (9a96876e3c65 iommufd/selftest: Fix build warn= ings due to uninitialized mfd) Merging rust-fixes/rust-fixes (fe49aae0fcb3 rust: init: Fix generics in *_i= nit! macros) Merging w1-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging pmdomain-fixes/fixes (500ba3328441 pmdomain: governor: Consider CPU= latency tolerance from pm_domain_cpu_gov) Merging i2c-host-fixes/i2c/i2c-host-fixes (02ef7e9d592f i2c: stm32f7: unmap= DMA mapped buffer) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (a42b4dcc4f9f dt-bindings: clock: mediatek: Add= #reset-cells property for MT8188) Merging thead-clk-fixes/thead-clk-fixes (19272b37aa4f Linux 6.16-rc1) Merging pwrseq-fixes/pwrseq/for-current (19272b37aa4f Linux 6.16-rc1) Merging thead-dt-fixes/thead-dt-fixes (19272b37aa4f Linux 6.16-rc1) Merging ftrace-fixes/ftrace/fixes (327e28664307 fgraph: Do not enable funct= ion_graph tracer when setting funcgraph-args) Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use = flush_kernel_vmap_range() over flush_dcache_folio()) Merging trace-fixes/trace/fixes (6921d1e07cb5 tracing: Fix filter logic err= or) Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tr= acefs mount options test) Merging spacemit-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging tip-fixes/tip/urgent (717b7f7d6bff Merge x86/urgent into tip/urgent) Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up sla= b->obj_exts always) Merging drm-msm-fixes/msm-fixes (8290d37ad2b0 drm/msm: Small function param= doc fix) CONFLICT (content): Merge conflict in drivers/gpu/drm/display/drm_dp_helper= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_ggtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_hwmon.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_lrc.c Merging uml-fixes/fixes (2dca89df0d11 Merge tag 'uml-for-6.16-rc4' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/uml/linux) Merging fwctl-fixes/for-rc (19272b37aa4f Linux 6.16-rc1) Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL = dereference of tsm_ops) Merging drm-misc-fixes/for-linux-next-fixes (bd46cece51a3 drm/gem: Fix race= in drm_gem_handle_create_tail()) Merging linus/for-next (ffd294d346d1 Linux 6.13) Merging mm-stable/mm-stable (d7b8f8e20813 Linux 6.16-rc5) Merging mm-nonmm-stable/mm-nonmm-stable (d7b8f8e20813 Linux 6.16-rc5) Merging mm-unstable/mm-unstable (db63de7a28bf tools/testing/selftests: exte= nd mremap_test to test multi-VMA mremap) Merging mm-nonmm-unstable/mm-nonmm-unstable (7f9f8d3aa733 ocfs2: avoid pote= ntial ABBA deadlock by reordering tl_inode lock) Merging kbuild/for-next (f4363dfc900a kheaders: double-quote variables to s= atisfy shellcheck) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v= 6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (585189332afe perf vendor events: Update Tiger= Lake events) Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) Merging dma-mapping/dma-mapping-for-next (fbf5e2234169 dma-mapping: properl= y calculate offset in the page) Merging asm-generic/master (582847f97024 Makefile.kcov: apply needed compil= er option unconditionally in CFLAGS_KCOV) Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pc= i_dac_dma_supported()) Merging arm/for-next (293bb049380e ARM: 9446/1: Disallow kernel mode NEON w= hen IRQs are disabled) Merging arm64/for-next/core (16b0485f601c Merge branches 'for-next/acpi', '= for-next/debug-entry', 'for-next/feat_mte_store_only', 'for-next/kselftest'= , 'for-next/livepatch', 'for-next/mdscr-cleanup', 'for-next/misc', 'for-nex= t/user-contig-bbml2' and 'for-next/vmap-stack' into for-next/core) Merging arm-perf/for-next/perf (ba2ff3e1b640 perf: arm_spe: Relax period re= striction) Merging arm-soc/for-next (c12078d3a11c Merge branch 'soc/arm' into for-next) Merging amlogic/for-next (58abdca0eb65 Merge branch 'v6.17/arm64-dt' into f= or-next) Merging asahi-soc/asahi-soc/for-next (2132bbd7aa16 Merge branch 'asahi-soc/= drivers-6.17' into asahi-soc/for-next) Merging at91/at91-next (52dd9740ce88 Merge branch 'at91-dt' into at91-next) Merging bmc/for-next (6566ab474302 Merge branches 'aspeed/drivers', 'aspeed= /dt' and 'nuvoton/arm64/dt' into for-next) Merging broadcom/next (89abb622d518 Merge branch 'drivers/next' into next) Merging davinci/davinci/for-next (19272b37aa4f Linux 6.16-rc1) Merging drivers-memory/for-next (93a7aedc4cc4 dt-bindings: memory: renesas,= rzg3e-xspi: Document RZ/V2H(P) and RZ/V2N support) Merging imx-mxs/for-next (3743a4050159 Merge branch 'imx/defconfig' into fo= r-next) Merging mediatek/for-next (2c11ea2c78f0 Merge branches 'v6.16-next/soc', 'v= 6.16-next/arm32' and 'v6.16-next/dts32' into for-next) Merging mvebu/for-next (88084e0358ff Merge branch 'mvebu/dt' into mvebu/for= -next) Merging omap/for-next (db91121f001a Merge branch 'omap-for-v6.17/soc' into = tmp/omap-next-20250707.142928) Merging qcom/for-next (0672fe83ed07 Merge branches 'arm32-for-6.17', 'arm64= -defconfig-fixes-for-6.16', 'arm64-defconfig-for-6.17', 'arm64-fixes-for-6.= 16', 'arm64-for-6.17', 'clk-for-6.17' and 'drivers-for-6.17' into for-next) Merging renesas/next (7a323accaf6b Merge branches 'renesas-arm-defconfig-fo= r-v6.17', 'renesas-drivers-for-v6.17', 'renesas-dt-bindings-for-v6.17' and = 'renesas-dts-for-v6.17' into renesas-next) Merging reset/reset/next (196dbace0824 dt-bindings: reset: Convert snps,dw-= reset to DT schema) Merging rockchip/for-next (e05818ef75be Merge branch 'v6.17-armsoc/dts64' i= nto for-next) Merging samsung-krzk/for-next (5e55762f952a Merge branch 'next/dt64' into f= or-next) Merging scmi/for-linux-next (08602c5ae0e8 Merge tags 'scmi-updates-6.17' an= d 'smccc-updates-6.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/gi= t/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (55fd09df36d7 riscv: dts: sophgo: sg2044: add PCIe = device support for SG2044) Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: = New driver (handling RTC only)) Merging spacemit/for-next (6be7a5a768aa Merge branch 'spacemit-clk-for-6.17= ' into spacemit-for-next) Merging stm32/stm32-next (000006155029 arm64: defconfig: Enable STM32 Octo = Memory Manager and OcstoSPI driver) Merging sunxi/sunxi/for-next (92f1189baf56 Merge branch 'sunxi/dt-for-6.17'= into sunxi/for-next) Merging tee/next (c580875fc93a Merge branch 'optee_fix_for_6.16' into next) Merging tegra/for-next (93496cc0d1eb Merge branch for-6.17/arm64/defconfig = into for-next) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging thead-dt/thead-dt-for-next (c31f2899eab0 riscv: dts: thead: Add PVT= node) Merging ti/ti-next (4be4dfed7cbd Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (487e52a21734 firmware: xilinx: Add debugfs support= for PM_GET_NODE_STATUS) Merging clk/clk-next (b721267f02a1 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (19272b37aa4f Linux 6.16-rc1) Merging clk-renesas/renesas-clk (0ab2d84f94da clk: renesas: r9a08g045: Add = MSTOP for coupled clocks as well) Merging thead-clk/thead-clk-for-next (0370395d45ca clk: thead: Mark essenti= al bus clocks as CLK_IGNORE_UNUSED) Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not work= ing) Merging loongarch/loongarch-next (955853cf8365 LoongArch: KVM: Disable upda= ting of "num_cpu" and "feature") Merging m68k/for-next (c8995932db2b m68k: mac: Improve clocksource driver c= ommentary) Merging m68knommu/for-next (d7b8f8e20813 Linux 6.16-rc5) Merging microblaze/next (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with= __ASSEMBLER__ in non-uapi headers) Merging mips/mips-next (b5a1f9870f98 mips: boot: use 'targets' instead of e= xtra-y in Makefile) Merging openrisc/for-next (f0eedcf22581 openrisc: Replace __ASSEMBLY__ with= __ASSEMBLER__ in non-uapi headers) Merging parisc-hd/for-next (19272b37aa4f Linux 6.16-rc1) Merging powerpc/next (cf183c1730f2 powerpc: floppy: Add missing checks afte= r DMA map) Merging risc-v/for-next (fda589c28604 Merge patch series "Move duplicated i= nstructions macros into asm/insn.h") Merging riscv-dt/riscv-dt-for-next (19272b37aa4f Linux 6.16-rc1) Merging riscv-soc/riscv-soc-for-next (bd4d5d3faadc riscv: defconfig: spacem= it: enable sdhci driver for K1 SoC) Merging s390/for-next (d14e99cde31f Merge branch 'features' into for-next) Merging sh/for-next (19272b37aa4f Linux 6.16-rc1) Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in= sun4v_cookie_only_virqs()) Merging uml/next (6ea355619635 um: Re-evaluate thread flags repeatedly) Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ w= ith __ASSEMBLER__ in non-uapi headers) Merging fs-next (7eefa9f3f4c2 Merge branch 'for-next' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/viro/vfs.git) CONFLICT (content): Merge conflict in include/linux/proc_fs.h Merging printk/for-next (3f5857e726d8 Merge branch 'rework/ringbuffer-kunit= -test' into for-next) Merging pci/next (38be2ac97d2d Merge branch 'pci/misc') Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comm= ents for better understanding) Merging hid/for-next (3cfbba33b181 Merge branch 'for-6.16/upstream-fixes' i= nto for-next) Merging i2c/i2c/for-next (67505b2f73ec Merge branch 'i2c/for-current' into = i2c/for-next) Merging i2c-host/i2c/i2c-host (e3b7a7ef2f71 i2c: imx: use guard to take spi= nlock) Merging i3c/i3c/next (12aa3e0cb0c6 i3c: prefix hexadecimal entries in sysfs) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for = number of populated and total memory slots) Merging hwmon-staging/hwmon-next (a41a9728941f hwmon: emc2305: Set initial = PWM minimum value during probe based on thermal state) Merging jc_docs/docs-next (f55b3ca3cf1d tracing: doc: fix "for a while" typ= o) Merging v4l-dvb/next (3e43442d4994 media: vivid: fix wrong pixel_array cont= rol size) CONFLICT (content): Merge conflict in .mailmap Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before c= alling vb2_queue_init()) Merging pm/linux-next (b712c4074408 Merge branch 'fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (0ae93389b6c8 cpufreq: tegra124:= Allow building as a module) Merging cpupower/cpupower (b74710eaff31 cpupower: Improve Python binding's = Makefile) Merging devfreq/devfreq-next (a579e91b6fd2 PM / devfreq: rockchip-dfi: doub= le count on RK3588) Merging pmdomain/next (eb34a0b5fee7 cpuidle: riscv-sbi: Drop redundant sync= _state support) Merging opp/opp/linux-next (22679d807dea rust: opp: use c_* types via kerne= l prelude) Merging thermal/thermal/linux-next (e23cba0ab49a thermal/drivers/airoha: Fi= x spelling mistake) Merging rdma/for-next (f3b7a65ce551 Merge branch 'mlx5-next' into wip/leon-= for-next) Merging net-next/main (f47e8f618c7d virtio-net: xsk: rx: move the xdp->data= adjustment to buf_to_xdp()) CONFLICT (content): Merge conflict in net/core/net_namespace.c Merging bpf-next/for-next (872a38db5933 Merge branch 'bpf-next/master' into= for-next) CONFLICT (modify/delete): arch/s390/net/bpf_jit.h deleted in bpf-next/for-n= ext and modified in HEAD. Version HEAD of arch/s390/net/bpf_jit.h left in = tree. CONFLICT (content): Merge conflict in kernel/bpf/helpers.c CONFLICT (add/add): Merge conflict in tools/testing/selftests/bpf/prog_test= s/cgroup_xattr.c CONFLICT (add/add): Merge conflict in tools/testing/selftests/bpf/progs/rea= d_cgroupfs_xattr.c $ git rm -f arch/s390/net/bpf_jit.h Merging ipsec-next/master (95cfe23285a6 xfrm: Skip redundant statistics upd= ate for crypto offload) Merging mlx5-next/mlx5-next (70f238c902b8 net/mlx5: Check device memory poi= nter before usage) Merging netfilter-next/main (27390db9592d testptp: add option to enable ext= ernal timestamping edges) Merging ipvs-next/main (27390db9592d testptp: add option to enable external= timestamping edges) Merging bluetooth/master (98b3f8ecdd57 Bluetooth: hci_sync: fix connectable= extended advertising when using static random address) CONFLICT (content): Merge conflict in include/net/bluetooth/hci_core.h Merging wireless-next/for-next (6b04716cdcac wifi: mac80211: don't complete= management TX on SAE commit) Merging ath-next/for-next (a1bff3d6cc45 wifi: ath12k: Add num_stations coun= ter for each interface) Merging iwlwifi-next/next (6b04716cdcac wifi: mac80211: don't complete mana= gement TX on SAE commit) Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg8= 02154_pernet_exit()) Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in = cfg802154_pernet_exit()) Merging mtd/mtd/next (9358bdb9f9f5 mtd: fix possible integer overflow in er= ase_xfer()) Merging nand/nand/next (4b5532d4581d mtd: nand: brcmnand: replace manual st= ring choices with standard helpers) Merging spi-nor/spi-nor/next (2e3a7476ec39 mtd: spi-nor: Fix spi_nor_try_un= lock_all()) Merging crypto/master (181698af38d3 crypto: ccp - Fix crash when rebind ccp= device for ccp.ko) Merging libcrypto/libcrypto-next (9c3a89af3d30 Merge remote-tracking branch= es 'ebiggers/libcrypto-tests' and 'ebiggers/libcrypto-conversions' into lib= crypto-next) CONFLICT (modify/delete): arch/s390/crypto/sha512_s390.c deleted in libcryp= to/libcrypto-next and modified in HEAD. Version HEAD of arch/s390/crypto/s= ha512_s390.c left in tree. CONFLICT (modify/delete): arch/s390/lib/crypto/sha256.c deleted in libcrypt= o/libcrypto-next and modified in HEAD. Version HEAD of arch/s390/lib/crypt= o/sha256.c left in tree. $ git rm -f arch/s390/crypto/sha512_s390.c arch/s390/lib/crypto/sha256.c Merging drm/drm-next (203dcde88156 Merge tag 'drm-msm-next-2025-07-05' of h= ttps://gitlab.freedesktop.org/drm/msm into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_dev= ice.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_fen= ce.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_sdm= a.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_uco= de.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/sdma_v4_4_= 2.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc.h Applying: fix up bad merge of the amdgpu tree Merging drm-exynos/for-linux-next (19272b37aa4f Linux 6.16-rc1) Merging drm-misc/for-linux-next (0f168e7be696 fbcon: Fix outdated registere= d_fb reference in comment) Merging amdgpu/drm-next (a886d26f2c8f drm/amdgpu: fix use-after-free in amd= gpu_userq_suspend+0x51a/0x5a0) Merging drm-intel/for-linux-next (d6a59ee85275 drm/ttm: Remove unneeded bla= nk line in comment) Merging drm-msm/msm-next (8290d37ad2b0 drm/msm: Small function param doc fi= x) Merging drm-msm-lumag/msm-next-lumag (cd86e80b77b2 drm/msm/dp: add linux/io= .h header to fix build errors) Merging drm-nova/nova-next (215a3f917133 Documentation: gpu: nova-core: Doc= ument basics of the Falcon) Merging drm-xe/drm-xe-next (cdc36b66cd41 drm/xe: Expose fan control and vol= tage regulator version) Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset = support) Merging fbdev/for-next (59d1fc7b3e1a fbdev: pm3fb: fix potential divide by = zero) Merging regmap/for-next (5c3a02bdb0a8 Merge remote-tracking branch 'regmap/= for-6.17' into regmap-next) Merging sound/for-next (907e01b3ce4c ALSA: echoaudio: Replace deprecated st= rcpy() with strscpy()) Merging ieee1394/for-next (81456710391d firewire: core: minor code refactor= ing to localize table of gap count) Merging sound-asoc/for-next (8d8f5ca8800e Merge remote-tracking branch 'aso= c/for-6.17' into asoc-next) Merging modules/modules-next (af1ccf546e5f MAINTAINERS: update Daniel Gomez= 's role and email address) Merging input/next (bc25e6bf032e Input: mtk-pmic-keys - add support for MT6= 359 PMIC keys) Merging block/for-next (f4ca523ce7bf Merge branch 'for-6.17/block' into for= -next) Merging device-mapper/for-next (846e9e999dd3 dm-stripe: fix a possible inte= ger overflow) Merging libata/for-next (48925ba7dfa7 ata: libata-transport: replace scnpri= ntf with sysfs_emit for simple attributes) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIP= TION() macros) Merging mmc/next (7aada8ecf66b mmc: loongson2: prevent integer overflow in = ret variable) Merging mfd/for-mfd-next (2e8185c0f214 mfd: rk8xx-core: Allow to customize = RK806 reset mode) CONFLICT (modify/delete): drivers/input/keyboard/adp5589-keys.c deleted in = mfd/for-mfd-next and modified in HEAD. Version HEAD of drivers/input/keybo= ard/adp5589-keys.c left in tree. $ git rm -f drivers/input/keyboard/adp5589-keys.c $ git reset --hard HEAD^ Merging next-20250702 version of mfd Merging backlight/for-backlight-next (19272b37aa4f Linux 6.16-rc1) Merging battery/for-next (f9335bb4f5d4 power: supply: twl4030_charger: Remo= ve redundant pm_runtime_mark_last_busy() calls) Merging regulator/for-next (0b2e8d0b1e7e Merge remote-tracking branch 'regu= lator/for-6.17' into regulator-next) Merging security/next (f3128dd6762d security: Remove unused declaration cap= _mmap_file()) Merging apparmor/apparmor-next (2016a299b547 apparmor: update kernel doc co= mments for xxx_label_crit_section) Merging integrity/next-integrity (aa9bb1b32594 ima: add a knob ima=3D to al= low disabling IMA in kdump kernel) Merging selinux/next (850dada4b3af Automated merge of 'dev' into 'next') Merging smack/next (6ddd169d0288 smack: fix kernel-doc warnings for smk_imp= ort_valid_label()) Merging tomoyo/master (d7b8f8e20813 Linux 6.16-rc5) Merging tpmdd/next (c56b74efe01e tpm: Replace scnprintf() with sysfs_emit()= and sysfs_emit_at() in sysfs show functions) Merging watchdog/master (d7b8f8e20813 Linux 6.16-rc5) Merging iommu/next (83392e166db4 Merge branches 'fixes', 'apple/dart', 'med= iatek', 'ti/omap', 'amd/amd-vi' and 'core' into next) Merging audit/next (ae1ae11fb277 audit,module: restore audit logging in loa= d failure case) Merging devicetree/for-next (62c51c2b3872 docs: dt: writing-bindings: Consi= stently use single-whitespace) Merging dt-krzk/for-next (6cd594ed969d ARM: dts: vt8500: Add L2 cache contr= oller on WM8850/WM8950) Merging mailbox/for-next (d0b497df02e9 mailbox: qcom-apcs-ipc: Assign OF no= de to clock controller child device) Merging spi/for-next (ce669d44622c Merge remote-tracking branch 'spi/for-6.= 17' into spi-next) Merging tip/master (b4ec95e3bc3f Merge x86/microcode into tip/master) CONFLICT (content): Merge conflict in mm/vmstat.c Merging clockevents/timers/drivers/next (d204e391a0d8 clocksource/drivers/r= enesas-ostm: Unconditionally enable reprobe support) Merging edac/edac-for-next (12b5099a184a Merge branch 'edac-drivers' into e= dac-for-next) Merging ftrace/for-next (0119ada8b05f Merge probes/for-next) Merging rcu/next (095a2945ba6f Merge branches 'rcu-exp.08.07.2025', 'rcu.09= .07.2025', 'torture-scripts.07.07.2025', 'srcu.07.07.2025', 'rcu.nocb.08.07= .2025' and 'refscale.07.07.2025' into rcu.merge.09.07.2025) Merging paulmck/non-rcu/next (125b9ae97219 Merge branches 'lkmm.2025.07.09a= ' and 'ratelimit.2025.06.24a' into HEAD) Merging kvm/next (8046d29dde17 KVM: x86/mmu: Reject direct bits in gpa pass= ed to KVM_PRE_FAULT_MEMORY) Merging kvm-arm/next (15724a984643 Merge branch 'kvm-arm64/doublefault2' in= to kvmarm/next) Merging kvms390/next (d6c8097803cb KVM: s390: Simplify and move pv code) Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2) Merging kvm-riscv/riscv_kvm_next (2e7be1629966 RISC-V: KVM: Don't treat SBI= HFENCE calls as NOPs) Merging kvm-x86/next (6c7ecd725e50 Merge branches 'dirty_ring', 'fixes', 'g= eneric', 'misc', 'mmu', 'no_assignment', 'selftests', 'svm' and 'vmx') CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.c Merging xen-tip/linux-next (7f9bbc1140ff xen/arm: call uaccess_ttbr0_enable= for dm_op hypercall) 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 (dad7c0d4bc5f Merge branch 'for-6.17' into for-= next) Merging sched-ext/for-next (fea07f9a211e Merge branch 'for-6.16-fixes' into= for-next) Merging drivers-x86/for-next (428f6f3a56ac platform/x86/intel/pmt/discovery= : Fix size_t specifiers for 32-bit) Merging chrome-platform/for-next (5af89b630941 platform/chrome: chromeos_la= ptop: Replace open coded variant of DEFINE_RES_IRQ()) Merging chrome-platform-firmware/for-firmware-next (19272b37aa4f Linux 6.16= -rc1) Merging hsi/for-next (19272b37aa4f Linux 6.16-rc1) Merging leds-lj/for-leds-next (239afba8b9f3 leds: pca955x: Avoid potential = overflow when filling default_label (take 2)) Merging ipmi/for-next (f6f9760320a9 char: ipmi: remove redundant variable '= type' and check) Merging driver-core/driver-core-next (5cddd546df0f rust: pci: fix documenta= tion related to Device instances) CONFLICT (content): Merge conflict in drivers/gpu/nova-core/driver.rs CONFLICT (modify/delete): drivers/infiniband/hw/qib/qib_sysfs.c deleted in = HEAD and modified in driver-core/driver-core-next. Version driver-core/dri= ver-core-next of drivers/infiniband/hw/qib/qib_sysfs.c left in tree. CONFLICT (content): Merge conflict in rust/helpers/helpers.c $ git rm -f drivers/infiniband/hw/qib/qib_sysfs.c Merging usb/usb-next (d1b07cc0868f arm64: dts: s32g: Add USB device tree in= formation for s32g2/s32g3) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/s32g2.d= tsi CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/s32g3.d= tsi Merging thunderbolt/next (2d1beba54fda thunderbolt: Fix typos in documentat= ion comments) Merging usb-serial/usb-next (bdf2ab177e2f USB: serial: cp210x: use new GPIO= line value setter callbacks) Merging tty/tty-next (0c8a3a284a4f dt-bindings: serial: mediatek,uart: add = MT6572) Merging char-misc/char-misc-next (db15ec7abd33 rust: miscdevice: remove unn= ecessary import) 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 (f0148bd729b8 hwtracing: coresight: Use of_reserved_= mem_region_to_resource() for "memory-region") Merging fastrpc/for-next (0af2f6be1b42 Linux 6.15-rc1) Merging fpga/for-next (37e00703228a zynq_fpga: use sgtable-based scatterlis= t wrappers) Merging icc/icc-next (c5b60592886f interconnect: avoid memory allocation wh= en 'icc_bw_lock' is held) Merging iio/togreg (caa3268ec188 iio: adc: ad7768-1: add low pass -3dB cuto= ff attribute) CONFLICT (content): Merge conflict in MAINTAINERS Merging phy-next/next (304c102cff73 phy: qcom: qmp-combo: Add missing PLL (= VCO) configuration on SM8750) CONFLICT (content): Merge conflict in MAINTAINERS Merging soundwire/next (06f77ff9d852 soundwire: debugfs: move debug stateme= nt outside of error handling) Merging extcon/extcon-next (195609a5d811 extcon: fsa9480: Avoid buffer over= flow in fsa9480_handle_change()) Merging gnss/gnss-next (e326371f3002 dt-bindings: gnss: u-blox: add u-blox,= neo-9m compatible) Merging vfio/next (4518e5a60c7f vfio/type1: Fix error unwind in migration d= irty bitmap allocation) Merging w1/for-next (19272b37aa4f Linux 6.16-rc1) Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15) Merging staging/staging-next (505bffe21233 staging: fbtft: fix potential me= mory leak in fbtft_framebuffer_alloc()) Merging counter-next/counter-next (19272b37aa4f Linux 6.16-rc1) 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 (0044c5fcae3d dmaengine: idxd: Remove __packed from = structures) Merging cgroup/for-next (89bad5d60181 Merge branch 'for-6.16-fixes' into fo= r-next) Merging scsi/for-next (dc9f707da52e Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (26b971d58ab9 scsi: scsi_devinfo: Remove redundan= t 'found') Merging vhost/linux-next (8fc65f847b89 virtio: support device disconnect) Merging rpmsg/for-next (76970c009cef Merge branches 'rproc-next' and 'rpmsg= -next' into for-next) Merging gpio-brgl/gpio/for-next (0cf6d425d39c gpio: sim: allow to mark simu= lated lines as invalid) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/tri= vial-devices.yaml CONFLICT (modify/delete): drivers/input/keyboard/adp5589-keys.c deleted in = gpio-brgl/gpio/for-next and modified in HEAD. Version HEAD of drivers/inpu= t/keyboard/adp5589-keys.c left in tree. $ git rm -f drivers/input/keyboard/adp5589-keys.c Merging gpio-intel/for-next (9ab29ed50555 gpiolib: acpi: Add a quirk for Ac= er Nitro V15) Merging pinctrl/for-next (31b6d25a25ac Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (3b4408038da9 pinctrl: intel: fix build warn= ings about export.h) Merging pinctrl-renesas/renesas-pinctrl (7000167796a0 pinctrl: renesas: Sim= plify PINCTRL_RZV2M logic) Merging pinctrl-samsung/for-next (683d532dfc96 pinctrl: samsung: Fix gs101 = irq chip) Merging pwm/pwm/for-next (a582469541a3 pwm: img: Remove redundant pm_runtim= e_mark_last_busy() calls) Merging ktest/for-next (19272b37aa4f Linux 6.16-rc1) Merging kselftest/next (a089bb2822a4 selftests: tracing: Use mutex_unlock f= or testing glob filter) Merging kunit/test (19272b37aa4f Linux 6.16-rc1) Merging kunit-next/kunit (5ac244b9cc8f kunit: Make default kunit_test timeo= ut configurable via both a module parameter and a Kconfig option) CONFLICT (content): Merge conflict in lib/kunit/Kconfig Merging livepatching/for-next (a8e905a819fd Merge branch 'for-6.15/ftrace-t= est' into for-next) Merging rtc/rtc-next (0bafe291cb42 dt-bindings: rtc: nxp,lpc1788-rtc: add c= ompatible string nxp,lpc1850-rtc) Merging nvdimm/libnvdimm-for-next (9f97e61bde6a cxl: Include range.h in cxl= .h) Merging at24/at24/for-next (19272b37aa4f Linux 6.16-rc1) Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions) Merging seccomp/for-next/seccomp (a9b33aae79ce selftests: seccomp: Fix "per= formace" to "performance") Merging slimbus/for-next (0af2f6be1b42 Linux 6.15-rc1) Merging nvmem/for-next (1cd2162f9055 Merge branches 'nvmem-fixes' and 'nvme= m-for-6.17' into nvmem-for-next) Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_= lock and friends) Merging hyperv/hyperv-next (d9016a249be5 hv/hv_kvp_daemon: Prevent similar = logs in kvp_key_add_or_modify()) Merging auxdisplay/for-next (19272b37aa4f Linux 6.16-rc1) Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size argument= s from strscpy() calls) Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1) Merging cfi/cfi/next (19272b37aa4f Linux 6.16-rc1) Merging mhi/mhi-next (7a793ba2cc4a bus: mhi: host: pci_generic: Add Foxconn= T99W696 modem) Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblo= ck_set_node) Merging cxl/next (1a45e1cd694f cxl: Remove core/acpi.c and cxl core depende= ncy on ACPI) Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) Merging efi/next (f393a761763c efi: add ovmf debug log driver) Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) Merging slab/slab/for-next (3cf3ee6a0be4 slab: Update MAINTAINERS entry) Merging random/master (3778dcb2dcc1 random: use offstack cpumask when neces= sary) Merging landlock/next (86fdfbade8bb selftests/landlock: Add layout4_disconn= ected test suite) Merging rust/rust-next (2009a2d56969 rust: sync: implement `Borrow` and `Bo= rrowMut` for `Arc` types) CONFLICT (content): Merge conflict in rust/kernel/devres.rs CONFLICT (content): Merge conflict in rust/kernel/sync/poll.rs Merging rust-alloc/alloc-next (d49ac7744f57 MAINTAINERS: add mm folks as re= viewers to rust alloc) Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3) Merging rust-pin-init/pin-init-next (fc3870dc5cad rust: pin-init: examples,= tests: use `ignore` instead of conditionally compiling tests) Merging rust-timekeeping/timekeeping-next (d4b29ddf82a4 rust: time: Add wra= pper for fsleep() function) Applying: fix up for "rust: time: Make Instant generic over ClockSource" Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Ru= st XArray API) Merging sysctl/sysctl-next (060a1b0567f7 docs: Downgrade arm64 & riscv from= titles to comment) CONFLICT (content): Merge conflict in kernel/panic.c Merging execve/for-next/execve (11854fe263eb binfmt_elf: Move brk for stati= c PIE even if ASLR disabled) Merging bitmap/bitmap-for-next (f66f9c3d09c1 bitfield: Ensure the return va= lues of helper functions are checked) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCR= IPTION() macro) Merging kspp/for-next/kspp (5e54510a9389 acpi: nfit: intel: avoid multiple = -Wflex-array-member-not-at-end warnings) Merging nolibc/for-next (750aef513c61 selftests/nolibc: show failed run if = test process crashes) Merging iommufd/for-next (3e2a9811f6a9 iommufd: Apply the new iommufd_objec= t_alloc_ucmd helper) CONFLICT (content): Merge conflict in include/linux/iommu.h Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle govern= or statistics reporting) CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8 CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c Merging pwrseq/pwrseq/for-next (07d59dec6795 power: sequencing: qcom-wcn: f= ix bluetooth-wifi copypasta for WCN6855) Merging capabilities-next/caps-next (cdd73b166607 uapi: fix broken link in = linux/capability.h) Merging ipe/next (324692100cc9 ipe: use SHA-256 library API instead of cryp= to_shash API) Merging kcsan/next (9d89551994a4 Linux 6.13-rc6) Merging crc/crc-next (9b0236f4efb8 lib/crc: crc64: Add include/linux/crc64.= h to kernel-api.rst) CONFLICT (content): Merge conflict in lib/crc/s390/crc32.h Merging fwctl/for-next (19272b37aa4f Linux 6.16-rc1) Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into t= sm-next) Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function = name to match code) --Sig_/0Fb4O7Iyg8shnFB=wdm9j2b Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmhvfOoACgkQAVBC80lX 0Gx/ZggAovJ2JfVQlnYjYUO8PqJt7i8A9DfqCoDSngFgvJAFiyWd15aoGlJOSNX/ zmfA2IesQl3slnXY1B6oCObKD92UoOpNBVj8USLkD72aO0JpSRQzgrhQ67HXjGbD LwX4mf9Kqv/Hn/37HgLblF/YIAB4IaViOE7p/t9YT8PBSLStpkFEqsH3K/ozz1AJ PH3o+IajrPVCsYoeJg9LPYUQRlu95NmH+J+95L/2+CeajKQnzFlMCTmwCybb6oUq asvlDN/C/fPgKVhkQoLulF2Vea3lVzFRR2+zGKSxBFZLXj9oFkHvoShHHcIiMQ56 7GxXFDX6Zr1XFkJvW5m/BjcsW5Xkmg== =EVQ5 -----END PGP SIGNATURE----- --Sig_/0Fb4O7Iyg8shnFB=wdm9j2b--