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 9BE8F2E36E3; Fri, 25 Jul 2025 02:48:43 +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=1753411732; cv=none; b=uZcMK0Z/g+nJ2rKcBK5gQngr/XXqFGbOXujc/aQWz2oGv0mzvXe284mGp4/K8HcWeALqemD+CzpTaRna82xVzldxX2x0xAk3EMm4tXWoLFR0PpMUBDbzGvpwWeEprdx45X1GxFTS7qcYLc+n4xSJeE/MK/mwEFR01awuQimLrp8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753411732; c=relaxed/simple; bh=vUPkjIzfxosM6OKfQ9L7d9IDn4ei62opPOD1vDhYmeQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=R2FDF5VzIMfWUpdd7tdAxNp3LyVWjAZ2WhbME53HoB3PGLx3ZwmhKNwACad0DuIs1qVgsz0sXwiSzJovXqJ3zhan3c8bm18Jl71tOVILkMquYmeMm4qQO8ggScQ0CAlw9jVviORy2wxd5rslr5p47Wkz+RgTOrg0oEBq7tU5yVQ= 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=EHYWKPR+; 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="EHYWKPR+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1753411537; bh=KKgLjE7DbTN6zcIynkhsniXypQWfqk4JfUJr4VrP5tU=; h=Date:From:To:Cc:Subject:From; b=EHYWKPR+RJX6m6dCBQQSXP8ys7Q1bVJnSMP4+GHJhkh4KNNQykqSeL9flUagmPY3R zg/6XDnV3D8PzD4390LV4EoWmCAtyyGWdTclmFjEJi/UkvnpjFzjzvsX8YZhVN2mIT 4+iXeDUNlsiUAvuQ4Q6PlA6cs1ITUi4KAQZukHPbwsYZEkvEc99KZ1dqwM3qIo7/2X /ffeNRo2nK/uFeprpEoxqMwELSupoHUciJXmJF5JvIargeySyNbt9kJIQRr8fWw805 S124ZYjvV6O2iez4BBrns7UgvbT4n+7Njt23dM9fr8ehWeD4l6p7Ldb/xEomOe/jq5 j5SDBAbhyGy5A== 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 4bpC0d1Qzxz4wbn; Fri, 25 Jul 2025 12:45:37 +1000 (AEST) Date: Fri, 25 Jul 2025 12:48:35 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jul 25 Message-ID: <20250725124835.53f998d0@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_/XNhVhpq4WkwantLTQ.AN4Y_"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/XNhVhpq4WkwantLTQ.AN4Y_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20250724: The pci tree gained a conflict against Linus' tree. The mfd tree gained a conflict against the arm-soc tree. Non-merge commits (relative to Linus' tree): 11015 11167 files changed, 443003 insertions(+), 234322 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 405 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 (94ce1ac2c9b4 Merge tag 'pci-v6.16-fixes-4' of git://= git.kernel.org/pub/scm/linux/kernel/git/pci/pci) Merging fixes/fixes (89be9a83ccf1 Linux 6.16-rc7) Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) Merging vfs-brauner-fixes/vfs.fixes (8b3c655fa240 afs: Set vllist to NULL i= f addr parsing fails) 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 (33927f3d0ecd habanalabs: fix UAF in export_dmabuf(= )) Merging erofs-fixes/fixes (347e9f5043c8 Linux 6.16-rc6) 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 (8256f991715c bcachefs: live_child() no longer us= es recursion) Merging fscrypt/for-next (fa65058063cb ceph: Remove gfp_t argument from cep= h_fscrypt_encrypt_*()) Merging btrfs/for-next (841778d9fd80 Merge branch 'for-next-next-v6.16-2025= 0721' into for-next-20250721) 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 (99710710db5f 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 (df0ce6cefa45 erofs: support to readahead dirent blocks i= n erofs_readdir()) Merging exfat/dev (1edbfabb7967 exfat: add cluster chain loop check for dir) Merging exportfs/exportfs-next (adc218676eef Linux 6.12) Merging ext3/for_next (8f975e4b413a Merge UDF partition map count fix.) Merging ext4/dev (a8a47fa84cc2 ext4: do not BUG when INLINE_DATA_FL lacks s= ystem.data xattr) Merging f2fs/dev (3bf1bab503a5 f2fs: zone: wait for inflight dio completion= , excluding pinned files read using dio) 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 (deb016c16690 gfs2: No more self recovery) Merging jfs/jfs-next (b89798e79cf7 jfs: stop using write_cache_pages) Merging ksmbd/ksmbd-for-next (4e45cca31d4e smb/server: add ksmbd_vfs_kern_p= ath()) Merging nfs/linux-next (f06bedfa62d5 pNFS/flexfiles: don't attempt pnfs on = fatal DS errors) Merging nfs-anna/linux-next (38074de35b01 NFSv4/flexfiles: Fix handling of = NFS level errors in I/O) Merging nfsd/nfsd-next (e339967eecf1 nfsd: Drop dprintk in blocklayout xdr = functions) Merging ntfs3/master (a49f0abd8959 Revert "fs/ntfs3: Replace inode_trylock = with inode_lock") Merging orangefs/for-next (2138e89cb066 fs/orangefs: Allow 2 more character= s in do_c_string()) Merging overlayfs/overlayfs-next (6f9ccdad0fea ovl: Annotate struct ovl_ent= ry with __counted_by()) Merging ubifs/next (99dbb2a1bd66 ubifs: stop using write_cache_pages) 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 (ded74fddcaf6 xfs: don't use a xfs_log_iovec for ri_bu= f in log recovery) Merging zonefs/for-next (6982100bb829 zonefs: use ZONEFS_SUPER_SIZE instead= of PAGE_SIZE) Merging vfs-brauner/vfs.all (66639db85811 Merge branch 'vfs-6.17.iomap' int= o vfs.all) Merging vfs/for-next (dd589648208a Merge branch 'work.mount' into for-next) Merging mm-hotfixes/mm-hotfixes-unstable (e89f90f1a588 sprintf.h requires s= tdarg.h) Merging fs-current (e4a7d2ee3593 Merge branch 'fixes' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (e04c78d86a96 Linux 6.16-rc2) Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5) 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 (d42e6c20de61 arm64/entry: Mask DAIF in = cpu_switch_to(), call_on_irq_stack()) Merging arm-soc-fixes/arm/fixes (912b1f2a796e arm64: dts: rockchip: Drop ne= tdev led-triggers on NanoPi R5S) 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 (407c114c983f Merge tag 'net-6.16-rc8' of git://git.kernel= .org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (7abc678e3084 Merge tag 'pmdomain-v6.16-rc2' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm) Merging ipsec/master (28712d6ed320 Merge branch 'ipsec: fix splat due to ip= comp fallback tunnel') Merging netfilter/main (81e0db8e8398 Merge branch 'mlx5-misc-fixes-2025-07-= 17') Merging ipvs/main (81e0db8e8398 Merge branch 'mlx5-misc-fixes-2025-07-17') Merging wireless/for-next (6832a9317eee Merge tag 'net-6.16-rc7' of git://g= it.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ath/for-current (6832a9317eee Merge tag 'net-6.16-rc7' of git://git= .kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging iwlwifi/fixes (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.k= ernel.org/pub/scm/linux/kernel/git/netdev/net) 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 (0d57ed922b9a Merge tag 'asoc-fix-v6.16-rc7= ' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for= -linus) Merging sound-asoc-fixes/for-linus (696e123aa36b ASoC: mediatek: common: fi= x device and OF node leak) Merging regmap-fixes/for-linus (c871c199accb regmap: fix potential memory l= eak of regmap_bus) Merging regulator-fixes/for-linus (d7b8f8e20813 Linux 6.16-rc5) Merging spi-fixes/for-linus (f820034864dd spi: spi-qpic-snand: don't hardco= de ECC steps) Merging pci-current/for-linus (8c493cc91f3a PCI/pwrctrl: Create pwrctrl dev= ices only when CONFIG_PCI_PWRCTRL is enabled) Merging driver-core.current/driver-core-linus (86731a2a651e Linux 6.16-rc3) Merging tty.current/tty-linus (89be9a83ccf1 Linux 6.16-rc7) Merging usb.current/usb-linus (89be9a83ccf1 Linux 6.16-rc7) Merging usb-serial-fixes/usb-linus (ad1244e1ce18 USB: serial: option: add F= oxconn T99W709) Merging phy/fixes (89be9a83ccf1 Linux 6.16-rc7) Merging staging.current/staging-linus (f2b8ebfb8670 staging: vchiq_arm: Mak= e vchiq_shutdown never fail) Merging iio-fixes/fixes-togreg (ae68ad3d7a93 MAINTAINERS: add miscdevice Ru= st abstractions) Merging counter-current/counter-current (19272b37aa4f Linux 6.16-rc1) Merging char-misc.current/char-misc-linus (2d7521aa26ec nvmem: layouts: u-b= oot-env: remove crc32 endianness conversion) Merging soundwire-fixes/fixes (89be9a83ccf1 Linux 6.16-rc7) Merging thunderbolt-fixes/fixes (2cdde91c14ec thunderbolt: Fix bit masking = in tb_dp_port_set_hops()) Merging input-current/for-linus (bcce05041b21 Input: xpad - set correct con= troller type for Acer NGR200) 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 (89be9a83ccf1 Linux 6.16-rc7) 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 (19272b37aa4f Linux 6.16-rc1) 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 (5a53249d149f KVM: x86/xen: Fix cleanup logic in e= mulation of Xen schedop poll hypercalls) Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when mak= ing a page secure) Merging hwmon-fixes/hwmon (9c62e2282900 hwmon: (gsc-hwmon) fix fan pwm setp= oint show functions) 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 (e2967b50b709 MAINTAINERS: Update entries f= or IFS and SBL drivers) 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 (337666c522b9 Merge tag 'drm-misc-fixes-2025-07= -23' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (fd77b2c1b6eb drm/i915/display= : Fix dma_fence_wait_timeout() return value handling) Merging mmc-fixes/fixes (21b34a3a204e memstick: core: Zero initialize id_re= g in h_memstick_read_dev_id()) 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 (a4131a50d072 tools/hv: fcopy: Fix irregu= larities with size of ring buffer) Merging risc-v-fixes/fixes (b65ca21835ed riscv: uaccess: Fix -Wuninitialize= d and -Wshadow in __put_user_nocheck) 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 (06a9a4408697 LICENSES: Replace the obsolete addres= s of the FSF in the GFDL-1.2) Merging gpio-brgl-fixes/gpio/for-current (89be9a83ccf1 Linux 6.16-rc7) Merging gpio-intel-fixes/fixes (9ab29ed50555 gpiolib: acpi: Add a quirk for= Acer Nitro V15) 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 (64e135f1eaba efivarfs: Fix memory leak of efivarf= s_fs_info in fs_context error paths) 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 (89be9a83ccf1 Linux 6.16-rc7) Merging w1-fixes/fixes (19272b37aa4f Linux 6.16-rc1) Merging pmdomain-fixes/fixes (621a88dbfe90 cpuidle: psci: Fix cpuhotplug ro= utine with PREEMPT_RT=3Dy) Merging i2c-host-fixes/i2c/i2c-host-fixes (a7982a14b301 i2c: qup: jump out = of the loop in case of timeout) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (e4b2a0c2b9be Merge tag 'sunxi-clk-fixes-for-6.= 16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk= -fixes) 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 (b5e8acc14dcb tracing: Add down_write(trace= _event_sem) when adding trace event) 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 (81d1d9c76d06 Merge branch into tip/master: 't= imers/urgent') Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up sla= b->obj_exts always) Merging drm-msm-fixes/msm-fixes (d3deabe4c619 drm/msm: Fix inverted WARN_ON= () logic) 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 (15a7ca747d95 drm/bridge: ti-sn= 65dsi86: Remove extra semicolon in ti_sn_bridge_probe()) Merging linus/for-next (ffd294d346d1 Linux 6.13) Merging mm-stable/mm-stable (9989db9f2305 mm/page_owner: convert set_page_o= wner_migrate_reason() to folios) Merging mm-nonmm-stable/mm-nonmm-stable (a9ed4422adac lib/raid6: update rec= ov_rvv.c zero page usage) Merging mm-unstable/mm-unstable (ca61f72618dd mm: add process info to bad r= ss-counter warning) Merging mm-nonmm-unstable/mm-nonmm-unstable (ac38f086177e samples: Kconfig:= fix spelling mistake "instancess" -> "instances") Merging kbuild/for-next (cce56902b934 scripts: add zboot support to extract= -vmlinux) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v= 6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (008b75759eb9 perf ui scripts: Switch FILENAME= _MAX to NAME_MAX) 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 (5b1ae9de7133 Merge branch 'for-next/feat_mte_s= tore_only' into for-next/core) Merging arm-perf/for-next/perf (e480898e767c drivers/perf: hisi: Support PM= Us with no interrupt) Merging arm-soc/for-next (5a0f59d877c1 soc: document merges) Merging amlogic/for-next (58abdca0eb65 Merge branch 'v6.17/arm64-dt' into f= or-next) Merging asahi-soc/asahi-soc/for-next (6b9e8a091eca Merge branch 'asahi-soc/= drivers-6.17' into asahi-soc/for-next) Merging at91/at91-next (e99113d11171 Merge branch 'clk-microchip' into at91= -next) Merging bmc/for-next (0741a5ca8643 Merge branches 'aspeed/drivers', 'aspeed= /dt', 'nuvoton/arm/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 fsl/soc_fsl (8b3da0519ae6 soc: fsl: qe: convert set_multiple() to r= eturning an integer) Merging imx-mxs/for-next (cdc22fb12eff Merge branch 'imx/defconfig' into fo= r-next) Merging mediatek/for-next (6cbb623586d5 Merge branches 'v6.16-next/arm32', = 'v6.16-next/dts32', 'v6.16-next/dts64' and 'v6.16-next/soc' 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 (ba94ec807b07 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 (1f0c7abd8235 Merge branch 'v6.16-armsoc/dtsfixes= ' into for-next) Merging samsung-krzk/for-next (94f19ac4670d Merge branch 'next/drivers' int= o for-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 (349ae53a949c Merge branch 'dt/riscv' into for-next) 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 (1a32f7427eb3 arm64: dts: st: remove empty line in= stm32mp251.dtsi) Merging sunxi/sunxi/for-next (cbe908fc8ebb 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 (19272b37aa4f Linux 6.16-rc1) Merging thead-dt/thead-dt-for-next (c31f2899eab0 riscv: dts: thead: Add PVT= node) Merging ti/ti-next (65f6e3eb6351 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (7f9c1c0a006e Merge branch 'zynqmp/soc' into for-ne= xt2) Merging clk/clk-next (575288da240c Merge branch 'clk-microchip' into clk-ne= xt) Merging clk-imx/for-next (c78865241ecf MAINTAINERS: Update i.MX Clock Entry) CONFLICT (content): Merge conflict in drivers/clk/imx/clk-imx95-blk-ctl.c Merging clk-renesas/renesas-clk (0ab2d84f94da clk: renesas: r9a08g045: Add = MSTOP for coupled clocks as well) Merging thead-clk/thead-clk-for-next (54edba916e29 clk: thead: th1520-ap: D= escribe mux clocks with clk_mux) Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not work= ing) Merging loongarch/loongarch-next (36d09b96d3e7 LoongArch: KVM: Add tracepoi= nts for CPUCFG and CSR emulation exits) Merging m68k/for-next (c8995932db2b m68k: mac: Improve clocksource driver c= ommentary) Merging m68knommu/for-next (89be9a83ccf1 Linux 6.16-rc7) Merging microblaze/next (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with= __ASSEMBLER__ in non-uapi headers) Merging mips/mips-next (35ad7e181541 MIPS: mm: tlb-r4k: Uniquify TLB entrie= s on init) 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 (da30705c4621 arch/powerpc: Remove .interp section in = vmlinux) 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 (28fa0dcb571a dt-bindings: riscv: cpus: = Add AMD MicroBlaze V 64bit compatible) Merging riscv-soc/riscv-soc-for-next (bd4d5d3faadc riscv: defconfig: spacem= it: enable sdhci driver for K1 SoC) Merging s390/for-next (54743383452e 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 (fc9ed2f6589d um: Replace __ASSEMBLY__ with __ASSEMBLER__ = in the usermode headers) Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ w= ith __ASSEMBLER__ in non-uapi headers) Merging fs-next (f5ee0655f157 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 (dcc3191a3dde Merge branch 'rework/ringbuffer-kunit= -test' into for-next) Merging pci/next (da8e705aff1f Merge branch 'pci/misc') CONFLICT (content): Merge conflict in drivers/pci/pci.c Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comm= ents for better understanding) Merging hid/for-next (1e625b35e265 Merge branch 'for-6.17/apple' into for-n= ext) Merging i2c/i2c/for-next (466c7203e5f9 Merge branch 'i2c/for-mergewindow' i= nto i2c/for-next) Merging i2c-host/i2c/i2c-host (88a66a1799b5 i2c: lpi2c: implement xfer_atom= ic callback) 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 (a2609b707b58 hwmon: ina238: Add support f= or INA228) Merging jc_docs/docs-next (35293ebbb65e scripts: add origin commit identifi= cation based on specific patterns) Merging v4l-dvb/next (d968e50b5c26 media: rkvdec: Unstage the driver) 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 (77d832285656 Merge branch 'pm-cpufreq' into linux-ne= xt) Merging cpufreq-arm/cpufreq/arm/linux-next (bbd67be5546d cpufreq: mediatek-= hw: Add support for MT8196) Merging cpupower/cpupower (e6c3f96141eb cpupower: Allow control of boost fe= ature on non-x86 based systems with boost support.) Merging devfreq/devfreq-next (7da2fdaaa1e6 PM / devfreq: Add HiSilicon unco= re frequency scaling driver) Merging pmdomain/next (05e35bd07d56 pmdomain: qcom: rpmhpd: Add Glymur RPMh= Power Domains) Merging opp/opp/linux-next (22679d807dea rust: opp: use c_* types via kerne= l prelude) Merging thermal/thermal/linux-next (1d264d3a1988 dt-bindings: thermal: tegr= a: Document Tegra210B01) Merging rdma/for-next (ee235923d205 RDMA/siw: Change maintainer email addre= ss) Merging net-next/main (a4f5759b6f0a Merge tag 'for-netdev' of https://git.k= ernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) CONFLICT (content): Merge conflict in net/core/net_namespace.c Merging bpf-next/for-next (f227e9ed4fe4 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 (888a7776f4fb net/mlx5: Add support for device = steering tag) Merging netfilter-next/main (dd500e4aecf2 net: usb: Remove duplicate assign= ments for net->pcpu_stat_type) Merging ipvs-next/main (dd500e4aecf2 net: usb: Remove duplicate assignments= for net->pcpu_stat_type) Merging bluetooth/master (e74375b59a51 Bluetooth: btintel: Add support for = BlazarIW core) Merging wireless-next/for-next (55c172c13718 ssb: use new GPIO line value s= etter callbacks for the second GPIO chip) Merging ath-next/for-next (708243c62efd wifi: mac80211: fix unassigned vari= able access) Merging iwlwifi-next/next (d2af710d6d50 wifi: iwlwifi: mvm/fw: Avoid -Wflex= -array-member-not-at-end warnings) 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 (4fec76bcc535 crypto: jitter - replace ARRAY_SIZE def= inition with header include) Merging libcrypto/libcrypto-next (2a1a127aecf6 Merge branches 'libcrypto-co= nversions' and 'libcrypto-tests' into libcrypto-next) CONFLICT (modify/delete): arch/s390/crypto/sha1_s390.c deleted in libcrypto= /libcrypto-next and modified in HEAD. Version HEAD of arch/s390/crypto/sha= 1_s390.c left in tree. 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 ar= ch/s390/crypto/sha1_s390.c Merging drm/drm-next (ba0f4c4c0f9d Merge tag 'nova-next-v6.17-2025-07-18' o= f https://gitlab.freedesktop.org/drm/nova 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_rin= g.h 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_v5_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/sdma_v5_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 CONFLICT (content): Merge conflict in drivers/gpu/drm/display/drm_dp_helper= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_sched= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_prime.c 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_gt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_sriov_pf_con= fig.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_hwmon.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_lmtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_module.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_uc_fw.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa_oob.rules 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 (b213eb34f857 drm/tidss: oldi: convert to d= evm_drm_bridge_alloc() API) Merging amdgpu/drm-next (6ac55eab4fc4 drm/amdgpu: move reset support type c= hecks into the caller) Merging drm-intel/for-linux-next (cdb16039515a drm/i915/display: Fix dma_fe= nce_wait_timeout() return value handling) 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 (14ae91a81ec8 gpu: nova-core: fix bounds check i= n PmuLookupTableEntry::new) Merging drm-xe/drm-xe-next (d72779c29d82 drm/xe/ptl: Apply Wa_16026007364) 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 (bca53a176f3d Merge tag 'asoc-v6.17' of https://git.= kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next) Merging ieee1394/for-next (95a042a0c8ec firewire: ohci: reduce the size of = common context structure by extracting members into AT structure) Merging sound-asoc/for-next (4563cd386e80 Merge remote-tracking branch 'aso= c/for-6.17' into asoc-next) Merging modules/modules-next (699657e8e50a kunit: test: Drop CONFIG_MODULE = ifdeffery) Merging input/next (bc25e6bf032e Input: mtk-pmic-keys - add support for MT6= 359 PMIC keys) Merging block/for-next (a8fa17318672 Merge branch 'for-6.17/block' into for= -next) CONFLICT (content): Merge conflict in Documentation/userspace-api/ioctl/ioc= tl-number.rst Merging device-mapper/for-next (035663ceb5da dm-raid: do not include dm-cor= e.h) CONFLICT (content): Merge conflict in drivers/md/dm-stripe.c Merging libata/for-next (546527b92d7e Documentation: driver-api: Update lib= ata error handler information) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIP= TION() macros) Merging mmc/next (c3ad4ec3fdab mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (b6bf74c82178 mfd: dt-bindings: Convert TPS65910 t= o DT schema) ba9ae011e837 ("soc: apple: rtkit: Make shmem_destroy optional") CONFLICT (content): Merge conflict in MAINTAINERS 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 Merging backlight/for-backlight-next (19272b37aa4f Linux 6.16-rc1) Merging battery/for-next (7b41a2341fa6 power: supply: core: fix static chec= ker warning) Merging regulator/for-next (0bd042ae771d regulator: mt6370: Fix spelling mi= stake in mt6370_regualtor_register) Merging security/next (5d8b97c94677 MAINTAINERS: Add Xiu and myself as Lock= down maintainers) Merging apparmor/apparmor-next (4d9d1a08b796 apparmor: fix: accept2 being s= pecifie even when permission table is presnt) 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 (7f0c6675b319 tpm_crb_ffa: handle tpm busy return code) Merging watchdog/master (ac3dbb91e016 watchdog: dw_wdt: Fix default timeout) Merging iommu/next (b9e6e8ae0a5f Merge branch 'arm/smmu/updates' into next) Merging audit/next (ae1ae11fb277 audit,module: restore audit logging in loa= d failure case) Merging devicetree/for-next (2558df8c13ae dt-bindings: display: sprd,sharkl= 3-dsi-host: Fix missing clocks constraints) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/tri= vial-devices.yaml Merging dt-krzk/for-next (6cd594ed969d ARM: dts: vt8500: Add L2 cache contr= oller on WM8850/WM8950) Merging mailbox/for-next (872798f61d8b dt-bindings: mailbox: qcom-ipcc: doc= ument the SM7635 Inter-Processor Communication Controller) CONFLICT (content): Merge conflict in drivers/mailbox/Kconfig CONFLICT (content): Merge conflict in drivers/mailbox/Makefile Merging spi/for-next (1b903ab9192f Merge remote-tracking branch 'spi/for-6.= 17' into spi-next) Merging tip/master (7ec401d5b972 Merge branch into tip/master: 'x86/sev') CONFLICT (content): Merge conflict in drivers/net/ethernet/amd/xgbe/xgbe-pt= p.c Merging clockevents/timers/drivers/next (7e477e9c4eb4 clocksource/drivers/e= xynos_mct: Fix section mismatch from the module conversion) Merging edac/edac-for-next (1fb0ddddf5d1 Merge branch 'edac-drivers' into e= dac-for-next) Merging ftrace/for-next (3bc30b065e58 Merge tools/for-next) Merging rcu/next (cc1d1365f0f4 Merge branches 'rcu-exp.23.07.2025', 'rcu.22= .07.2025', 'torture-scripts.16.07.2025', 'srcu.19.07.2025', 'rcu.nocb.18.07= .2025' and 'refscale.07.07.2025' into rcu.merge.23.07.2025) Merging paulmck/non-rcu/next (b706eec9304f Merge branches 'lkmm.2025.07.09a= ', 'ratelimit.2025.06.24a' and 'stop-machine.2025.07.17a' into HEAD) Merging kvm/next (5a53249d149f KVM: x86/xen: Fix cleanup logic in emulation= of Xen schedop poll hypercalls) Merging kvm-arm/next (7daec466b0de Merge branch 'kvm-arm64/misc' into kvmar= m/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 (583c7288feb4 RISC-V: KVM: Avoid re-acquir= ing memslot in kvm_riscv_gstage_map()) Merging kvm-x86/next (33f843444e28 Merge branch 'vmx') Merging xen-tip/linux-next (114a2de6fa86 xen/netfront: Fix TX response spur= ious interrupts) 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 (324cee0c272c Merge branch 'for-6.17' into for-= next) Merging sched-ext/for-next (9f0744a0e87e Merge branch 'for-6.17' into for-n= ext) Merging drivers-x86/for-next (1798561befd8 platform/x86: oxpec: Add support= for OneXPlayer X1 Mini Pro (Strix Point)) Merging chrome-platform/for-next (cc2d5b72b13b platform/chrome: Fix typo in= CROS_USBPD_NOTIFY help text) 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 (4903924ac7ef dt-bindings: leds: ncp5623: Add= 0x39 as a valid I2C address) Merging ipmi/for-next (f6f9760320a9 char: ipmi: remove redundant variable '= type' and check) Merging driver-core/driver-core-next (51a486feac0c rust: io: fix broken int= ra-doc links to `platform::Device`) 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 (ea83bf05873f Merge tag 'usb-serial-6.17-rc1-2' of ssh= ://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-n= ext) 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 (b43cb4ff85da vt: defkeymap: Map keycodes above 127 to= K_HOLE) a8d455db2621 ("serial: 8250_dw: Fix typo "notifer"") Merging char-misc/char-misc-next (a6d283c526f9 Merge tag 'icc-6.17-rc1' of = ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-mis= c-next) CONFLICT (content): Merge conflict in MAINTAINERS 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 (a80198ba650f coresight: fix indentation error in cs= cfg_remove_owned_csdev_configs()) 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 (ca652cf0c261 Merge branch 'icc-milos' into icc-next) Merging iio/togreg (0a686b9c4f84 iio: adc: ad_sigma_delta: Select IIO_BUFFE= R_DMAENGINE and SPI_OFFLOAD) Merging phy-next/next (4a3556b81b99 phy: qcom: phy-qcom-m31: Update IPQ5332= M31 USB phy initialization sequence) CONFLICT (content): Merge conflict in MAINTAINERS Merging soundwire/next (35323d8ab811 soundwire: replace scnprintf() with sy= sfs_emit() for sysfs consistency) Merging extcon/extcon-next (5f09caafc652 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 (9c4a082c8347 vfio/type1: conditional rescheduling while = pinning) Merging w1/for-next (19272b37aa4f Linux 6.16-rc1) Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15) Merging staging/staging-next (ce32eff1cf3a staging: greybus: gbphy: fix up = const issue with the match callback) 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 (e3a9ccd21897 dt-bindings: dma: fsl-mxs-dma: allow i= nterrupt-names for fsl,imx23-dma-apbx) Merging cgroup/for-next (d445d2ab8129 Merge branch 'for-6.17' into for-next) Merging scsi/for-next (28e51caedadd Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (3ea3a256ed81 scsi: libiscsi: Initialize iscsi_co= nn->dd_data only if memory is allocated) Merging vhost/linux-next (60c060930f48 virtio_ring: add in order support) CONFLICT (content): Merge conflict in drivers/vhost/net.c CONFLICT (content): Merge conflict in include/uapi/linux/vhost.h Merging rpmsg/for-next (01d7d9241256 Merge branches 'rproc-next' and 'rpmsg= -next' into for-next) Merging gpio-brgl/gpio/for-next (678bae2eaa81 gpiolib: make legacy interfac= es optional) CONFLICT (content): Merge conflict in MAINTAINERS Merging gpio-intel/for-next (9ab29ed50555 gpiolib: acpi: Add a quirk for Ac= er Nitro V15) Merging pinctrl/for-next (0bbd90c2c6b2 pinctrl: ingenic: use pinmux_generic= _add_pinfunction()) 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 (68b9272ca7ac pwm: raspberrypi-poe: Fix spelling m= istake "Firwmware" -> "Firmware") Merging ktest/for-next (23a2d4c64e71 ktest.pl: Always display BUILD_DIR and= OUTPUT_DIR at the start of tests) Merging kselftest/next (30fb5e134f05 selftests/pidfd: Fix duplicate-symbol = warnings for SCHED_ CPP symbols) Merging kunit/test (19272b37aa4f Linux 6.16-rc1) Merging kunit-next/kunit (34db4fba8191 kunit: fix longest symbol length tes= t) Merging livepatching/for-next (a8e905a819fd Merge branch 'for-6.15/ftrace-t= est' into for-next) Merging rtc/rtc-next (ae48d3542783 rtc: Optimize calculations in rtc_time64= _to_tm()) 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 (19272b37aa4f Linux 6.16-rc1) 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 (00559ba3ae74 bus: mhi: host: pci_generic: Add Telit F= N990B40 modem support) Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblo= ck_set_node) Merging cxl/next (3a32c5b3bb7d Merge branch 'for-6.17/cxl-events-updates' i= nto cxl-for-next) Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) Merging efi/next (02eb7a8eee20 efi: add API doc entry for ovmf_debug_log) Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) Merging slab/slab/for-next (8185696483dc MAINTAINERS: add missing files to = slab section) Merging random/master (3778dcb2dcc1 random: use offstack cpumask when neces= sary) Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements) Merging rust/rust-next (dff64b072708 rust: Add warn_on macro) CONFLICT (content): Merge conflict in arch/riscv/include/asm/bug.h CONFLICT (content): Merge conflict in arch/x86/include/asm/bug.h CONFLICT (content): Merge conflict in drivers/cpufreq/rcpufreq_dt.rs CONFLICT (content): Merge conflict in rust/helpers/helpers.c CONFLICT (content): Merge conflict in rust/kernel/device_id.rs CONFLICT (content): Merge conflict in rust/kernel/devres.rs CONFLICT (content): Merge conflict in rust/kernel/drm/gem/mod.rs CONFLICT (content): Merge conflict in rust/kernel/pci.rs CONFLICT (content): Merge conflict in rust/kernel/platform.rs CONFLICT (content): Merge conflict in rust/kernel/sync/poll.rs CONFLICT (content): Merge conflict in rust/kernel/types.rs CONFLICT (content): Merge conflict in scripts/Makefile.build 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 include/linux/module.h CONFLICT (content): Merge conflict in kernel/panic.c Merging execve/for-next/execve (7f71195c15dc fork: reorder function qualifi= ers for copy_clone_args_from_user) 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 (897627bc44d2 kstack_erase: Support Clang stack = depth tracking) Merging nolibc/for-next (b9e50363178a selftests/nolibc: add x32 test config= uration) Merging iommufd/for-next (ab6bc44159d8 iommufd: Rename some shortterm-relat= ed identifiers) 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 (9872916ad1a1 kcsan: test: Initialize dummy variable) Merging crc/crc-next (118da22eb6fb lib/crc: x86/crc32c: Enable VPCLMULQDQ o= ptimization where beneficial) 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 hisilicon/for-next (b1136432c972 soc: hisilicon: kunpeng_hccs: Fix = incorrect log information) Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function = name to match code) --Sig_/XNhVhpq4WkwantLTQ.AN4Y_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmiC8IMACgkQAVBC80lX 0Gx1wwf9EfwNmy6NiT50XNNxteXLs4ze0OohZZtp3m6I6o/GAxkEF1clI64858LI jHjRHrO7UX7vgySZSDJMJPOEMPstOreFfeqqxIBEWRwc9SfjVPazxQP3xev6TjjU xx+xlTN76V2x9m+4uMdXQMq+H5ThXg1Ydx2A0J36jaRmvkqYMgBV5z1OWUwPfD/9 Dl+MzPuV/dUewgOIRddIaO6Ci8Ngzw5nZJEHbBFFxNRwpeW4Fk4fN7/3QNApYslP 9L9uBkt1J9NAyIijbPsKyzFPvkERQd1t7La2fxVcEoxB7om7nooF6pZy80icG+Wq 7HnpaSVWvl5Q0L0M5MvHQNowxiskCA== =u4ja -----END PGP SIGNATURE----- --Sig_/XNhVhpq4WkwantLTQ.AN4Y_--