diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3890 |
1 files changed, 3890 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 0000000000000..9531ecc5c0ea9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3890 @@ +$ date -R +Thu, 30 Apr 2026 09:03:45 +0200 +$ git checkout master +Switched to branch 'master' +$ git reset --hard stable +HEAD is now at e75a43c7cec4 Merge tag 'trace-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace +Merging origin/master (e75a43c7cec4 Merge tag 'trace-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging ext4-fixes/fixes (981fcc5674e6 jbd2: fix deadlock in jbd2_journal_cancel_revoke()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (ac8777cc3622 Merge patch series "eventpoll: fix ep_remove() UAF and follow-up cleanup") +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (fcc6790ed71c Merge branch 'misc-7.1' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (49c5d168a3a8 udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. + fs/udf/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging erofs-fixes/fixes (6e7188a8d725 erofs: fix managed cache race for unaligned extents) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/zdata.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) +Merging nfsd-fixes/nfsd-fixes (b0bf14546bce nfsd: fix GET_DIR_DELEGATION when VFS leases are disabled) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/nfs4proc.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging v9fs-fixes/fixes/next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (1f6ee9be92f8 ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (6bf684b88235 Merge branch 'for-next-next-v7.0-20260408' into for-next-20260408) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (49a74f6a818f ceph: add ceph_has_realms_with_quotas() check to ceph_quota_update_statfs()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/quota.c | 37 +++++++++++++++++++++++++++---------- + fs/ceph/xattr.c | 17 +++++++++++++++++ + net/ceph/auth_x.c | 5 +++++ + net/ceph/crush/crush.c | 6 +----- + net/ceph/osdmap.c | 7 +++++-- + 5 files changed, 55 insertions(+), 17 deletions(-) +Merging cifs/for-next (c208a2b95811 cifs: change_conf needs to be called for session setup) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/cifsproto.h | 1 - + fs/smb/client/fs_context.c | 31 ------------------------------- + fs/smb/client/smb2inode.c | 2 +- + fs/smb/client/smb2ops.c | 11 +++++++++++ + 4 files changed, 12 insertions(+), 33 deletions(-) +Merging configfs/configfs-next (6363844fdbbb samples: configfs: Constify struct configfs_item_operations and configfs_group_operations) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (eb5e768eaf7c ecryptfs: remove redundant variable found_auth_tok) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/keystore.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) +Merging dlm/next (2c3a0b730012 dlm: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (a5242d37c83a erofs: error out obviously illegal extents in advance) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (ec5e84e1605d exfat: simplify exfat_lookup()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 4 +++- + fs/exfat/namei.c | 56 +++++++++++++------------------------------------------- + fs/exfat/nls.c | 19 +++++++++++++------ + 3 files changed, 29 insertions(+), 50 deletions(-) +Merging ext3/for_next (38b4aa1a24f0 Pull isofs doc fix.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (981fcc5674e6 jbd2: fix deadlock in jbd2_journal_cancel_revoke()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (cb8ff3ead9a3 f2fs: add page-order information for large folio reads in iostat) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (a59c5242b280 fuse: drop redundant check in fuse_sync_bucket_alloc()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/Makefile | 3 +- + fs/fuse/args.h | 65 +++ + fs/fuse/backing.c | 1 + + fs/fuse/control.c | 16 +- + fs/fuse/cuse.c | 28 +- + fs/fuse/dev.c | 1253 ++++++++++++++++++------------------------------- + fs/fuse/dev.h | 110 +++++ + fs/fuse/dev_uring.c | 143 +++--- + fs/fuse/dev_uring_i.h | 39 +- + fs/fuse/dir.c | 12 +- + fs/fuse/file.c | 146 +----- + fs/fuse/fuse_dev_i.h | 350 +++++++++++++- + fs/fuse/fuse_i.h | 860 +++++++++++---------------------- + fs/fuse/fuse_trace.h | 4 +- + fs/fuse/inode.c | 263 +++-------- + fs/fuse/notify.c | 434 +++++++++++++++++ + fs/fuse/poll.c | 141 ++++++ + fs/fuse/req.c | 99 ++++ + fs/fuse/req_timeout.c | 148 ++++++ + fs/fuse/sysctl.c | 1 + + fs/fuse/sysctl.h | 9 + + fs/fuse/virtio_fs.c | 21 +- + 22 files changed, 2291 insertions(+), 1855 deletions(-) + create mode 100644 fs/fuse/args.h + create mode 100644 fs/fuse/dev.h + create mode 100644 fs/fuse/notify.c + create mode 100644 fs/fuse/poll.c + create mode 100644 fs/fuse/req.c + create mode 100644 fs/fuse/req_timeout.c + create mode 100644 fs/fuse/sysctl.h +Merging gfs2/for-next (4da0dd95be3b Merge tag 'gfs2-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (dad98c5b2a05 jfs: avoid -Wtautological-constant-out-of-range-compare warning again) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (35e13b6abe0e smb: smbdirect: fix MR registration for coalesced SG lists) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/smb/client/smbdirect.c | 3 +- + fs/smb/client/smbdirect.h | 2 +- + fs/smb/server/connection.c | 149 +++++++-- + fs/smb/server/connection.h | 7 + + fs/smb/server/oplock.c | 7 +- + fs/smb/server/server.c | 12 + + fs/smb/server/smb2pdu.c | 14 +- + fs/smb/server/transport_rdma.c | 3 +- + fs/smb/server/transport_rdma.h | 2 +- + fs/smb/server/vfs_cache.c | 341 +++++++++++++++++---- + fs/smb/server/vfs_cache.h | 4 +- + fs/smb/smbdirect/accept.c | 2 +- + fs/smb/smbdirect/connect.c | 4 +- + fs/smb/smbdirect/connection.c | 16 +- + fs/smb/smbdirect/debug.c | 2 +- + fs/smb/smbdirect/devices.c | 2 +- + fs/smb/smbdirect/internal.h | 4 +- + fs/smb/smbdirect/listen.c | 2 +- + fs/smb/smbdirect/mr.c | 27 +- + fs/smb/smbdirect/rw.c | 2 +- + fs/smb/smbdirect/smbdirect.h | 52 ---- + fs/smb/smbdirect/socket.c | 20 +- + .../public.h => include/linux/smbdirect.h | 52 +++- + 24 files changed, 537 insertions(+), 193 deletions(-) + delete mode 100644 fs/smb/smbdirect/smbdirect.h + rename fs/smb/smbdirect/public.h => include/linux/smbdirect.h (76%) +Merging nfs/linux-next (e6614b88d59d NFS: Fix RCU dereference of cl_xprt in nfs_compare_super_address) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (4529e0015432 NFS: Fix NFS KConfig typos) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (a60fafb3f689 NFSD: Update my maintainer email addresses) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 229 +++++++++ + Documentation/netlink/specs/sunrpc_cache.yaml | 149 ++++++ + MAINTAINERS | 8 +- + fs/nfs/dns_resolve.c | 2 +- + fs/nfsd/export.c | 713 +++++++++++++++++++++++++- + fs/nfsd/netlink.c | 93 ++++ + fs/nfsd/netlink.h | 18 + + fs/nfsd/nfs4idmap.c | 4 +- + fs/nfsd/nfs4state.c | 9 +- + fs/nfsd/nfsctl.c | 79 +++ + fs/nfsd/nfsd.h | 17 +- + include/linux/sunrpc/cache.h | 15 +- + include/uapi/linux/nfsd_netlink.h | 132 +++++ + include/uapi/linux/sunrpc_netlink.h | 84 +++ + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/cache.c | 127 ++++- + net/sunrpc/netlink.c | 97 ++++ + net/sunrpc/netlink.h | 35 ++ + net/sunrpc/sunrpc_syms.c | 10 + + net/sunrpc/svc_xprt.c | 46 +- + net/sunrpc/svcauth_unix.c | 516 ++++++++++++++++++- + 22 files changed, 2335 insertions(+), 52 deletions(-) + create mode 100644 Documentation/netlink/specs/sunrpc_cache.yaml + create mode 100644 include/uapi/linux/sunrpc_netlink.h + create mode 100644 net/sunrpc/netlink.c + create mode 100644 net/sunrpc/netlink.h +Merging ntfs/ntfs-next (9e9354075d5a ntfs: Use return instead of goto in ntfs_mapping_pairs_decompress()) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Merge made by the 'ort' strategy. + fs/ntfs/bitmap.c | 19 +++++++++++-------- + fs/ntfs/dir.c | 13 ++++++++++--- + fs/ntfs/index.c | 17 +++++++++++++---- + fs/ntfs/iomap.c | 6 +++--- + fs/ntfs/namei.c | 13 +++++++++++-- + fs/ntfs/reparse.c | 5 +++-- + fs/ntfs/runlist.c | 24 +++++++++++++++++++++--- + 7 files changed, 72 insertions(+), 25 deletions(-) +Merging ntfs3/master (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (e61bc5e4d874 bufmap: manage as folios, V2.) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (1f6ee9be92f8 ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (11efa98bcc0d ubi: ubi.h: fix kernel-doc warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/ubi.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/ubi.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging v9fs/9p-next (8fc518e489c1 9p/trans_xen: replace simple_strto* with kstrtouint) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (87e63466c9fc xfs: flush delalloc blocks on ENOSPC in xfs_trans_alloc_icreate) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_dir2_data.c | 18 +++++++++++------- + fs/xfs/libxfs/xfs_refcount.c | 3 +-- + fs/xfs/scrub/common.c | 11 +++++++++++ + fs/xfs/scrub/common.h | 2 ++ + fs/xfs/scrub/dabtree.c | 7 ++++++- + fs/xfs/scrub/dir.c | 7 ++++++- + fs/xfs/xfs_inode.c | 6 ------ + fs/xfs/xfs_trans.c | 11 +++++++++++ + fs/xfs/xfs_zone_alloc.c | 2 +- + fs/xfs/xfs_zone_gc.c | 2 +- + 10 files changed, 50 insertions(+), 19 deletions(-) +Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (8ee708daac8a Merge branch 'kernel-7.1.misc' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging fs/aio.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/netfs/buffered_write.c +Auto-merging include/uapi/linux/sched.h +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/nsproxy.c +CONFLICT (content): Merge conflict in kernel/nsproxy.c +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'kernel/nsproxy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next fb6ff53c5050] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + fs/netfs/buffered_read.c | 9 +++++--- + fs/netfs/buffered_write.c | 51 ++++++++++++++++++++++++++++---------------- + fs/netfs/iterator.c | 13 ++++++++--- + fs/netfs/misc.c | 8 +++++-- + fs/netfs/read_retry.c | 11 ++++++++-- + include/trace/events/netfs.h | 5 +++++ + kernel/nsproxy.c | 2 +- + 7 files changed, 70 insertions(+), 29 deletions(-) +Merging vfs/for-next (e82ff9b6cb76 Merge branches 'work.coda' and 'work.dcache-busy-wait' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging mm-hotfixes/mm-hotfixes-unstable (eb1a3cffaa57 drivers/base/memory: fix locking for poison accounting lookup) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + .mailmap | 5 ++ + MAINTAINERS | 30 +++++------ + arch/arm64/include/asm/page.h | 2 +- + arch/arm64/mm/fault.c | 11 ++-- + arch/sh/include/asm/setup.h | 2 +- + drivers/base/memory.c | 18 +++++-- + drivers/dax/bus.c | 7 ++- + include/linux/gfp_types.h | 10 ++-- + include/linux/highmem.h | 7 +-- + include/linux/maple_tree.h | 2 +- + include/linux/mm.h | 2 +- + include/trace/events/damon.h | 2 +- + kernel/liveupdate/kexec_handover.c | 21 +++++--- + kernel/liveupdate/luo_session.c | 15 ++++-- + lib/maple_tree.c | 2 +- + lib/test_maple_tree.c | 4 +- + lib/tests/kunit_iov_iter.c | 10 ++-- + mm/damon/lru_sort.c | 85 ++++++++++++++++++++----------- + mm/damon/reclaim.c | 85 ++++++++++++++++++++----------- + mm/damon/stat.c | 30 +++++++---- + mm/damon/sysfs-schemes.c | 25 ++++++++- + mm/hugetlb.c | 1 + + mm/hugetlb_cma.c | 1 + + mm/memcontrol.c | 29 +++++++---- + mm/memory_hotplug.c | 2 + + mm/migrate_device.c | 2 +- + mm/page-writeback.c | 16 +++--- + mm/page_alloc.c | 8 +-- + mm/userfaultfd.c | 12 ++++- + mm/util.c | 26 ++++++---- + mm/vma.c | 3 +- + mm/vmalloc.c | 2 +- + scripts/gdb/linux/mm.py | 6 +-- + scripts/gdb/linux/slab.py | 4 +- + tools/testing/radix-tree/maple.c | 2 +- + tools/testing/selftests/mm/config | 1 + + tools/testing/selftests/mm/run_vmtests.sh | 2 +- + tools/testing/vma/include/dup.h | 2 +- + tools/testing/vma/include/stubs.h | 3 +- + 39 files changed, 318 insertions(+), 179 deletions(-) +Merging fs-current (83394f501bed Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/erofs/zdata.c | 15 ++++++++------- + fs/nfsd/nfs4proc.c | 4 ---- + fs/udf/super.c | 2 +- + 3 files changed, 9 insertions(+), 12 deletions(-) +Merging kbuild-current/kbuild-fixes-for-next (75f7c47ccd78 kbuild: Never respect CONFIG_WERROR / W=e to fixdep) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Already up to date. +Merging clang-fixes/clang-fixes-for-next (4f96b7c68a99 extract-cert: Wrap key_pass with '#ifdef USE_PKCS11_ENGINE') +$ git merge -m Merge branch 'clang-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes/clang-fixes-for-next +Already up to date. +Merging arc-current/for-curr (7aaa8047eafd Linux 7.0-rc6) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (75f9a484e817 ARM: 9472/1: fix race condition on PG_dcache_clean in __sync_icache_dcache()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (3ea4415015d6 ACPI: arm64: cpuidle: Tolerate platforms with no deep PSCI idle states) +$ git merge -m Merge branch 'for-next/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'ort' strategy. + arch/arm64/include/asm/irqflags.h | 14 +++++++------- + arch/arm64/kernel/pi/patch-scs.c | 4 ++-- + drivers/acpi/arm64/cpuidle.c | 10 +++------- + 3 files changed, 12 insertions(+), 16 deletions(-) +Merging arm-soc-fixes/arm/fixes (3e2444044d16 Merge tag 'mvebu-fixes-7.0-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (cb39cf99d88e m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (328335a79487 powerpc/powernv/iommu: iommu incorrectly bypass DMA APIs) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (b95e0e792822 s390/mm: Fix phys_to_folio() usage in do_secure_storage_access()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/s390/kernel/debug.c | 8 ++++++++ + arch/s390/mm/fault.c | 2 +- + drivers/s390/char/Kconfig | 8 -------- + drivers/s390/char/sclp_config.c | 6 ------ + 5 files changed, 10 insertions(+), 16 deletions(-) +Merging net/main (5ef343614db7 page_pool: fix memory-provider leak in page_pool_create_percpu() error path) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/netlink/specs/psp.yaml | 2 + + MAINTAINERS | 70 +++-- + drivers/net/bareudp.c | 3 + + drivers/net/bonding/bond_3ad.c | 109 +++---- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/bonding/bond_netlink.c | 16 +- + drivers/net/bonding/bond_procfs.c | 3 +- + drivers/net/bonding/bond_sysfs_slave.c | 17 +- + drivers/net/ethernet/airoha/airoha_eth.c | 51 ++-- + drivers/net/ethernet/airoha/airoha_eth.h | 5 + + drivers/net/ethernet/ibm/ibmveth.c | 22 ++ + drivers/net/ethernet/ibm/ibmveth.h | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +- + drivers/net/mctp/mctp-i2c.c | 4 +- + drivers/net/netconsole.c | 49 ++-- + drivers/net/netdevsim/dev.c | 2 +- + drivers/net/phy/dp83869.c | 13 +- + drivers/net/usb/rtl8150.c | 12 +- + drivers/net/vrf.c | 15 +- + drivers/nfc/trf7970a.c | 3 +- + include/linux/mroute_base.h | 3 + + include/linux/rculist.h | 29 ++ + include/net/bond_3ad.h | 2 +- + include/net/netfilter/nf_tables.h | 13 + + include/net/netmem.h | 15 + + io_uring/zcrx.c | 3 +- + net/core/devmem.c | 3 +- + net/core/neighbour.c | 10 +- + net/core/netpoll.c | 19 +- + net/core/page_pool.c | 10 +- + net/ipv4/ipmr.c | 108 +++---- + net/ipv4/ipmr_base.c | 16 ++ + net/ipv4/netfilter/arp_tables.c | 18 +- + net/ipv4/netfilter/arpt_mangle.c | 8 + + net/ipv4/tcp_timer.c | 5 +- + net/ipv6/exthdrs.c | 9 +- + net/ipv6/rpl_iptunnel.c | 9 + + net/ipv6/seg6_iptunnel.c | 9 + + net/mptcp/pm_kernel.c | 1 + + net/mptcp/protocol.c | 3 +- + net/mptcp/sockopt.c | 12 +- + net/netfilter/nf_conntrack_proto_sctp.c | 10 +- + net/netfilter/nf_conntrack_sip.c | 152 +++++++--- + net/netfilter/nf_nat_sip.c | 1 + + net/netfilter/nf_tables_api.c | 314 +++++++++++++++------ + net/netfilter/nft_bitwise.c | 3 +- + net/netfilter/xt_policy.c | 2 +- + net/phonet/socket.c | 10 +- + net/psp/psp-nl-gen.c | 4 +- + net/psp/psp_nl.c | 10 +- + net/sched/cls_flower.c | 4 +- + net/sched/sch_cake.c | 217 +++++++------- + net/sched/sch_choke.c | 26 +- + net/sched/sch_fq_pie.c | 19 +- + net/sched/sch_netem.c | 76 ++++- + net/sched/sch_taprio.c | 13 +- + net/sctp/sm_statefuns.c | 6 + + net/vmw_vsock/hyperv_transport.c | 4 +- + tools/testing/selftests/drivers/net/README.rst | 10 +- + .../tc-testing/tc-tests/qdiscs/taprio.json | 26 ++ + 60 files changed, 1135 insertions(+), 501 deletions(-) +Merging bpf/master (b5c111f4967b bpf: Fix sk_local_storage diag dumping uninitialized special fields) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Auto-merging net/core/filter.c +Merge made by the 'ort' strategy. + include/linux/bpf.h | 1 + + net/core/bpf_sk_storage.c | 14 ++++---- + net/core/filter.c | 32 ++++++++++++++++++ + net/core/sock_map.c | 39 ++++++++++++++-------- + net/ipv4/bpf_tcp_ca.c | 2 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 4 +++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 4 +++ + tools/testing/selftests/bpf/progs/bpf_cubic.c | 14 ++++++++ + .../bpf/progs/test_misc_tcp_hdr_options.c | 15 ++++++++- + 9 files changed, 103 insertions(+), 22 deletions(-) +Merging ipsec/master (fa90a3145c03 xfrm: Don't clobber inner headers when already set) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv4/ah4.c | 14 +- + net/ipv6/ah6.c | 14 +- + net/ipv6/xfrm6_protocol.c | 4 +- + net/xfrm/xfrm_output.c | 20 +- + tools/testing/selftests/drivers/net/hw/Makefile | 1 + + tools/testing/selftests/drivers/net/hw/config | 5 + + .../selftests/drivers/net/hw/ipsec_vxlan.py | 204 +++++++++++++++++++++ + tools/testing/selftests/drivers/net/lib/py/load.py | 5 +- + 8 files changed, 255 insertions(+), 12 deletions(-) + create mode 100755 tools/testing/selftests/drivers/net/hw/ipsec_vxlan.py +Merging netfilter/main (0c7a5ba011d3 Merge branch 'mptcp-misc-fixes-for-v7-1-rc2') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (9351edf65cb6 Merge branch 'bnxt_en-bug-fixes') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (d997c32157d2 Merge tag 'ath-current-20260427' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/net/wireless/ath/ath12k/core.c | 77 ++++++++++++++-------- + drivers/net/wireless/ath/ath12k/dp_rx.c | 3 + + drivers/net/wireless/ath/ath12k/mac.c | 2 +- + drivers/net/wireless/ath/ath12k/p2p.c | 2 +- + drivers/net/wireless/broadcom/b43/xmit.c | 3 +- + drivers/net/wireless/broadcom/b43legacy/xmit.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 5 +- + drivers/net/wireless/rsi/rsi_common.h | 5 +- + net/mac80211/mlme.c | 9 +++ + net/mac80211/rx.c | 6 +- + net/wireless/nl80211.c | 2 + + 13 files changed, 82 insertions(+), 42 deletions(-) +Merging ath/for-current (d997c32157d2 Merge tag 'ath-current-20260427' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (687a95d204e7 wifi: iwlwifi: mld: correctly set wifi generation data) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (c488df06bd55 RDMA/mlx5: Fix error path fall-through in mlx5_ib_dev_res_srq_init()) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/hw/hfi1/pio.c | 5 ++++- + drivers/infiniband/hw/hfi1/sdma.c | 4 +++- + drivers/infiniband/hw/mlx5/main.c | 1 + + drivers/infiniband/sw/rxe/rxe_recv.c | 11 +++++++++++ + drivers/infiniband/sw/rxe/rxe_resp.c | 14 +++++++++++++- + 5 files changed, 32 insertions(+), 3 deletions(-) +Merging sound-current/for-linus (e052a1f71992 ALSA: hda/tas2781: Fix incorrect bit update for non-book-zero or book 0 pages >1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/core/oss/pcm_oss.c | 29 +++++++++--- + sound/drivers/aloop.c | 43 ++++++++++++------ + sound/hda/codecs/Makefile | 2 - + sound/hda/codecs/conexant.c | 8 +++- + sound/hda/codecs/realtek/alc269.c | 14 +++++- + sound/hda/codecs/side-codecs/cs35l56_hda.c | 31 ++++++++----- + sound/hda/codecs/side-codecs/cs35l56_hda.h | 1 + + sound/hda/codecs/side-codecs/tas2781_hda_spi.c | 14 ++++-- + sound/hda/core/hdmi_chmap.c | 11 +++-- + sound/soc/amd/acp/acp-legacy-mach.c | 2 +- + sound/soc/amd/acp/acp-mach-common.c | 22 +++++++-- + sound/soc/amd/acp/acp-mach.h | 4 ++ + sound/soc/amd/acp/acp-sof-mach.c | 2 +- + sound/soc/codecs/ab8500-codec.c | 6 +-- + sound/soc/codecs/aw88395/aw88395.c | 9 ++-- + sound/soc/codecs/cs35l56-shared.c | 7 ++- + sound/soc/codecs/es8389.c | 2 +- + sound/soc/codecs/tas2764.c | 1 + + sound/soc/codecs/tas2770.c | 4 +- + sound/soc/codecs/wcd937x.c | 26 ++++++++++- + sound/soc/intel/boards/bytcr_wm5102.c | 1 + + sound/soc/sof/intel/hda.c | 3 +- + sound/soc/spacemit/k1_i2s.c | 49 +++++++++++++------- + sound/soc/tegra/Makefile | 1 - + sound/usb/caiaq/device.c | 6 +-- + sound/usb/caiaq/input.c | 2 +- + sound/usb/misc/ua101.c | 7 +++ + sound/usb/mixer.c | 10 +++++ + sound/usb/quirks-table.h | 4 +- + sound/usb/quirks.c | 2 +- + sound/usb/stream.c | 62 +++++++++++--------------- + sound/usb/stream.h | 3 +- + 32 files changed, 266 insertions(+), 122 deletions(-) +Merging sound-asoc-fixes/for-linus (03dcb5b68a96 ASoC: spacemit: adjust FIFO trigger threshold to half FIFO size) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (4b7774eeab8d regmap: sdw-mbq: Fix spelling mistake "undeferable" -> "undeferrable") +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-sdw-mbq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging regulator-fixes/for-linus (e4f06b825ddc Merge remote-tracking branch 'regulator/for-7.0' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (8d0189c1ea98 spi: amlogic-spisg: initialize completion before requesting IRQ) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-amlogic-spisg.c | 3 +-- + drivers/spi/spi-axiado.c | 2 +- + drivers/spi/spi-rockchip.c | 6 ++---- + drivers/spi/spi-rzv2h-rspi.c | 2 +- + 4 files changed, 5 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (b693c023be49 MAINTAINERS: Update Marek Vasut email for PCIe R-Car) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/pci/pci.c | 9 ++++----- + 2 files changed, 5 insertions(+), 6 deletions(-) +Merging driver-core.current/driver-core-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (b38e53cbfb9d usb: usblp: fix uninitialized heap leak via LPGETSTATUS ioctl) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/class/usblp.c | 3 ++- + drivers/usb/common/ulpi.c | 5 ++++- + drivers/usb/dwc3/core.c | 12 ++++++------ + drivers/usb/gadget/udc/omap_udc.c | 4 ---- + drivers/usb/typec/tcpm/tcpm.c | 27 ++++++++++++++++++--------- + 5 files changed, 30 insertions(+), 21 deletions(-) +Merging usb-serial-fixes/usb-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (208afbaf9b0e iio: ssp_sensors: cancel delayed work_refresh on remove) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad4695.c | 23 ++++++++--------------- + drivers/iio/adc/ad_sigma_delta.c | 2 +- + drivers/iio/adc/meson_saradc.c | 4 +++- + drivers/iio/adc/mt6359-auxadc.c | 1 + + drivers/iio/adc/npcm_adc.c | 25 ++++++++----------------- + drivers/iio/adc/nxp-sar-adc.c | 24 ++++++++++++++++++++---- + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +- + drivers/iio/adc/xilinx-xadc-core.c | 11 +++++++++-- + drivers/iio/chemical/mhz19b.c | 17 +++++++++++++++++ + drivers/iio/chemical/scd30_core.c | 2 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 1 + + drivers/iio/dac/max5821.c | 9 ++++++++- + drivers/iio/gyro/adis16260.c | 3 +++ + drivers/iio/imu/adis16550.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- + drivers/iio/industrialio-buffer.c | 1 + + drivers/iio/inkern.c | 6 +++++- + drivers/iio/light/cm3323.c | 5 ++--- + drivers/iio/light/veml6070.c | 14 ++------------ + drivers/iio/magnetometer/st_magn_core.c | 13 +++++++++++-- + drivers/iio/pressure/bmp280-core.c | 2 +- + 21 files changed, 105 insertions(+), 64 deletions(-) +Merging counter-current/counter-current (2932095c114b counter: rz-mtu3-cnt: do not use struct rz_mtu3_channel's dev member) +$ git merge -m Merge branch 'counter-current' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (6cdc46b38cf1 Input: xpad - fix out-of-bounds access for Share button) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/joystick/xpad.c | 8 ++++---- + drivers/input/mouse/elan_i2c_core.c | 3 +++ + drivers/input/mouse/elan_i2c_i2c.c | 2 +- + drivers/input/touchscreen/usbtouchscreen.c | 5 +++++ + 4 files changed, 13 insertions(+), 5 deletions(-) +Merging crypto-current/master (5db6ef984771 crypto: authencesn - reject short ahash digests during instance creation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + crypto/authencesn.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging libcrypto-fixes/libcrypto-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (e98137f0a874 vfio/pci: Fix double free in dma-buf feature) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (465b05bae5ac selftests: harness: Restore order of test functions) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/kselftest.h | 2 +- + tools/testing/selftests/kselftest_harness.h | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging dmaengine-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (135ac3b84bce mtd: spinand: winbond: Fix ODTR write VCR on W35NxxJW) +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/spi/core.c | 24 +++++++++++++++++++++--- + drivers/mtd/nand/spi/winbond.c | 6 +++--- + drivers/mtd/spi-nor/debugfs.c | 4 +++- + include/linux/mtd/spinand.h | 7 +++++++ + 4 files changed, 34 insertions(+), 7 deletions(-) +Merging mfd-fixes/for-mfd-fixes (aa6e63373d91 mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Merge made by the 'ort' strategy. +Merging v4l-dvb-fixes/fixes (23c39cb59897 media: qcom: camss: avoid format string warning) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + .../media/platform/qcom/camss/camss-csid-gen3.c | 6 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 10 ++- + drivers/media/platform/qcom/camss/camss.c | 80 +++++++++++----------- + drivers/media/platform/qcom/iris/Kconfig | 2 +- + drivers/media/platform/qcom/iris/iris_buffer.c | 8 ++- + drivers/media/platform/qcom/iris/iris_core.c | 4 ++ + drivers/media/platform/qcom/iris/iris_hfi_common.c | 4 ++ + drivers/media/platform/qcom/iris/iris_hfi_queue.c | 2 +- + drivers/media/platform/qcom/iris/iris_vdec.c | 6 -- + drivers/media/platform/qcom/iris/iris_vdec.h | 1 - + drivers/media/platform/qcom/iris/iris_venc.c | 6 -- + drivers/media/platform/qcom/iris/iris_venc.h | 1 - + drivers/media/platform/qcom/iris/iris_vidc.c | 6 +- + drivers/media/platform/qcom/iris/iris_vpu2.c | 1 + + drivers/media/platform/qcom/iris/iris_vpu3x.c | 9 +-- + drivers/media/platform/qcom/iris/iris_vpu4x.c | 24 ++++--- + drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 2 +- + drivers/media/platform/qcom/iris/iris_vpu_common.c | 16 +++-- + drivers/media/platform/qcom/iris/iris_vpu_common.h | 3 + + drivers/media/platform/qcom/venus/Kconfig | 2 +- + 20 files changed, 99 insertions(+), 94 deletions(-) +Merging reset-fixes/reset/fixes (9797524ef2b6 reset: amlogic: t7: Fix null reset ops) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (907150bbe566 ARM: dts: microchip: sam9x7: fix gpio-lines count for pioB) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0cfe660559e8 KVM: s390: pci: Fix aisb calculation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'ort' strategy. + arch/s390/kvm/interrupt.c | 3 +-- + arch/s390/kvm/pci.c | 10 ++++------ + 2 files changed, 5 insertions(+), 8 deletions(-) +Merging kvm-arm-fixes/fixes (4ce98bf0865c KVM: arm64: Wake-up from WFI when iqrchip is in userspace) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Already up to date. +Merging hwmon-fixes/hwmon (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (a8aec1423032 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (be5c5280cf2b cxl: Adjust the startup priority of cxl_pmem to be higher than that of cxl_acpi) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (81122fba08fa of: fix reference count leak in of_alias_scan()) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (98f69975d4c0 Merge branch '7.1/scsi-queue' into 7.1/scsi-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 14 +++++++++++++- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 1 + + drivers/target/iscsi/iscsi_target.c | 22 ++++++++++++++++++---- + drivers/target/target_core_configfs.c | 2 +- + drivers/ufs/core/ufshcd.c | 30 ++++++++++++++++++++++++++++-- + include/ufs/unipro.h | 5 +++++ + 10 files changed, 70 insertions(+), 12 deletions(-) +Merging drm-fixes/drm-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (8f4d20a71022 mmc: vub300: fix use-after-free on disconnect) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (3f8c8497b4fc hv: utils: replace deprecated strcpy with strscpy in kvp_register) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/hv/hv_kvp.c | 27 +++++++++++++-------------- + include/hyperv/hvhdk.h | 1 + + 2 files changed, 14 insertions(+), 14 deletions(-) +Merging risc-v-fixes/fixes (f2abc305aa93 riscv: Define __riscv_copy_{,vec_}{words,bytes}_unaligned() using SYM_TYPED_FUNC_START) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/kernel/copy-unaligned.S | 5 +++-- + arch/riscv/kernel/vec-copy-unaligned.S | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (0df8aa2b9aec riscv: dts: microchip: fix icicle i2c pinctrl configuration) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 10 -------- + .../boot/dts/microchip/mpfs-icicle-kit-prod.dts | 10 ++++++++ + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 19 +++++++++++++++ + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 27 +-------------------- + arch/riscv/boot/dts/starfive/jh7110.dtsi | 28 ---------------------- + 5 files changed, 30 insertions(+), 64 deletions(-) +Merging riscv-soc-fixes/riscv-soc-fixes (c7596f9001e2 firmware: microchip: fail auto-update probe if no flash found) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (3bb62e3f99a5 gpiolib: acpi: Only trigger ActiveBoth interrupts on boot) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-acpi-core.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) +Merging pinctrl-intel-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (afd218bb1dd8 mm/fake-numa: fix under-allocation detection in uniform split) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Merge made by the 'ort' strategy. + mm/numa_emulation.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) +Merging renesas-fixes/fixes (8a78d1c454b3 Merge branch 'renesas-pinctrl-fixes-for-v7.1' into renesas-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 3 --- + arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts | 2 -- + arch/arm/boot/dts/renesas/r7s72100.dtsi | 2 +- + arch/arm/boot/dts/renesas/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/renesas/r8a7779.dtsi | 2 +- + arch/arm/boot/dts/renesas/r8a7792.dtsi | 2 +- + .../dts/renesas/draak-ebisu-panel-aa104xd12.dtso | 5 +++++ + arch/arm64/boot/dts/renesas/r8a78000.dtsi | 8 ++++---- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 2 ++ + .../boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi | 5 +++++ + .../boot/dts/renesas/rz-smarc-du-adv7513.dtsi | 5 +++++ + .../boot/dts/renesas/salvator-panel-aa104xd12.dtso | 5 +++++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 23 ++++++++++++++-------- + 14 files changed, 46 insertions(+), 21 deletions(-) +Merging perf-current/perf-tools (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (cda92ac47c02 efi/libstub: Synchronize instruction cache after kernel relocation) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi-pstore.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/efistub.h | 7 -- + drivers/firmware/efi/libstub/loongarch-stub.c | 80 +++++++++++++ + drivers/firmware/efi/libstub/loongarch.c | 5 + + drivers/firmware/efi/libstub/mem.c | 82 +++++++++++++ + drivers/firmware/efi/libstub/relocate.c | 166 -------------------------- + fs/efivarfs/super.c | 5 +- + 8 files changed, 172 insertions(+), 179 deletions(-) + delete mode 100644 drivers/firmware/efi/libstub/relocate.c +Merging battery-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (ec1fcddb3117 pmdomain: mediatek: fix use-after-free in scpsys_get_bus_protection_legacy()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/core.c | 10 +++++++++- + drivers/pmdomain/mediatek/mtk-pm-domains.c | 10 +++++++--- + 2 files changed, 16 insertions(+), 4 deletions(-) +Merging i2c-host-fixes/i2c/i2c-host-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging i2c-rust-fixes/rust-i2c-fixes (7ca6d1cfec80 Merge tag 'powerpc-7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Already up to date. +Merging sparc-fixes/for-linus (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (de019f203b0d clk: rk808: fix OF node reference imbalance) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/clk/clk-eyeq.c | 60 +++++++++++-------------------------------- + drivers/clk/clk-rk808.c | 2 +- + drivers/clk/spacemit/ccu-k3.c | 2 +- + drivers/reset/reset-eyeq.c | 24 ++--------------- + 5 files changed, 20 insertions(+), 69 deletions(-) +Merging thead-clk-fixes/thead-clk-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging tenstorrent-clk-fixes/tenstorrent-clk-fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk-fixes/tenstorrent-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1a fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (92d5a606721f ring-buffer: Do not double count the reader_page) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (b2aa3b4d64e4 tracing/probes: Limit size of event probe to 3K) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (07004a8c4b57 eventfs: Hold eventfs_mutex and SRCU when remount walks events) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (fef931b4effe Merge branch into tip/master: 'sched/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + kernel/sched/core.c | 1 + + kernel/sched/fair.c | 44 +++++++++++++++++++++++++------------------- + 2 files changed, 26 insertions(+), 19 deletions(-) +Merging slab-fixes/slab/for-next-fixes (5b31044e649e mm/slab: return NULL early from kmalloc_nolock() in NMI on UP) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + mm/page_alloc.c | 5 +++++ + mm/slub.c | 4 ++++ + 2 files changed, 9 insertions(+) +Merging kexec-fixes/kexec-fixes (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'kexec-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec-fixes/kexec-fixes +Already up to date. +Merging liveupdate-fixes/fixes (0fb1daf0b78d mm/memfd_luo: report error when restoring a folio fails mid-loop) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate-fixes/fixes +Auto-merging kernel/liveupdate/kexec_handover.c +Merge made by the 'ort' strategy. + kernel/liveupdate/kexec_handover.c | 2 +- + mm/memfd_luo.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging drm-msm-fixes/msm-fixes (a972d1b864e8 drm/msm: Use of_get_available_child_by_name()) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (c3fd16c3b98e virt: tdx-guest: Fix handling of host controlled 'quote' buffer length) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/drm-rust-fixes (15e8bae5d930 MAINTAINERS: nova: update mailing list) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 ++---- + rust/kernel/drm/gem/shmem.rs | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (ac2c99667575 drm/udl: Increase GET_URB_TIMEOUT) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 2 +- + drivers/gpu/drm/drm_color_mgmt.c | 2 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 4 ++-- + drivers/gpu/drm/imagination/pvr_fw_trace.c | 2 +- + drivers/gpu/drm/sysfb/ofdrm.c | 2 ++ + drivers/gpu/drm/tiny/appletbdrm.c | 4 ++-- + drivers/gpu/drm/udl/udl_main.c | 3 +-- + drivers/gpu/drm/udl/udl_modeset.c | 5 ++++- + include/linux/dma-buf.h | 4 ++-- + 10 files changed, 17 insertions(+), 12 deletions(-) +Merging rust/rust-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging rust-interop/interop-next (05f7e89ab973 Linux 6.19) +$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next +Already up to date. +Merging rust-alloc/alloc-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (ddb1444d3335 hrtimer: add usage examples to documentation) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (c455f19bbe61 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Already up to date. +Merging mm-stable/mm-stable (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (88ca94c88496 mm/swap: remove redundant swap device reference in alloc/free) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/mm/transhuge.rst | 81 +++- + include/linux/gfp.h | 4 + + include/linux/highmem.h | 15 + + include/linux/huge_mm.h | 5 + + include/linux/khugepaged.h | 6 +- + include/linux/mm.h | 7 - + include/linux/swap.h | 5 +- + include/trace/events/huge_memory.h | 34 +- + include/trace/events/vmscan.h | 52 +++ + kernel/power/swap.c | 2 +- + kernel/power/user.c | 15 +- + mm/gup.c | 21 +- + mm/huge_memory.c | 22 +- + mm/khugepaged.c | 623 ++++++++++++++++++++++------- + mm/memory.c | 55 +-- + mm/page_alloc.c | 158 +++++++- + mm/shmem.c | 5 +- + mm/sparse-vmemmap.c | 10 +- + mm/swapfile.c | 205 +++++++--- + mm/vma.c | 6 +- + mm/vmalloc.c | 16 +- + mm/vmscan.c | 348 +++++++--------- + tools/testing/selftests/mm/Makefile | 9 +- + tools/testing/selftests/mm/check_config.sh | 2 +- + tools/testing/vma/include/stubs.h | 3 +- + 25 files changed, 1192 insertions(+), 517 deletions(-) +Merging mm-nonmm-unstable/mm-nonmm-unstable (de3572c8e793 lib/tests: extend cmdline KUnit with next_arg() tests) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Merge made by the 'ort' strategy. + .clang-format | 2 + + Documentation/atomic_t.txt | 14 +- + Documentation/dev-tools/checkpatch.rst | 14 + + Makefile | 2 +- + arch/arc/include/asm/uaccess.h | 3 +- + arch/arm/include/asm/uaccess.h | 3 +- + arch/arm64/Kconfig | 3 + + arch/arm64/include/asm/barrier.h | 23 ++ + arch/arm64/include/asm/cmpxchg.h | 62 +++- + arch/arm64/include/asm/delay-const.h | 27 ++ + arch/arm64/include/asm/rqspinlock.h | 85 ----- + arch/arm64/include/asm/uaccess.h | 3 +- + arch/arm64/lib/delay.c | 17 +- + arch/hexagon/include/asm/uaccess.h | 3 +- + arch/loongarch/include/asm/uaccess.h | 3 +- + arch/m68k/include/asm/uaccess.h | 3 +- + arch/microblaze/include/asm/uaccess.h | 3 +- + arch/mips/include/asm/uaccess.h | 3 +- + arch/nios2/include/asm/uaccess.h | 3 +- + arch/openrisc/include/asm/uaccess.h | 3 +- + arch/parisc/include/asm/uaccess.h | 3 +- + arch/riscv/kernel/image-vars.h | 9 + + arch/s390/include/asm/uaccess.h | 3 +- + arch/sh/include/asm/uaccess.h | 3 +- + arch/sparc/include/asm/uaccess_32.h | 3 +- + arch/sparc/include/asm/uaccess_64.h | 3 +- + arch/um/include/asm/uaccess.h | 3 +- + arch/xtensa/include/asm/uaccess.h | 3 +- + certs/Kconfig | 14 +- + drivers/clocksource/arm_arch_timer.c | 2 + + drivers/cpuidle/poll_state.c | 21 +- + drivers/soc/qcom/rpmh-rsc.c | 8 +- + fs/Kconfig | 6 +- + fs/fat/fat_test.c | 33 ++ + fs/ocfs2/quota_local.c | 2 +- + fs/proc/base.c | 63 ++-- + fs/proc/generic.c | 10 +- + include/asm-generic/barrier.h | 95 ++++++ + include/asm-generic/uaccess.h | 3 +- + include/linux/atomic.h | 10 + + include/linux/atomic/atomic-long.h | 18 +- + include/linux/codetag.h | 3 +- + include/linux/init.h | 2 +- + include/linux/sched/idle.h | 29 ++ + include/linux/uaccess.h | 25 +- + init/Kconfig | 24 +- + kernel/bpf/rqspinlock.c | 77 +++-- + kernel/fork.c | 11 +- + kernel/taskstats.c | 62 ++-- + lib/Kconfig | 2 +- + lib/Kconfig.debug | 10 + + lib/alloc_tag.c | 8 +- + lib/base64.c | 5 +- + lib/cmdline.c | 30 +- + lib/codetag.c | 12 +- + lib/idr.c | 55 ++- + lib/kstrtox.c | 37 +- + lib/seq_buf.c | 1 + + lib/test-kstrtox.c | 6 + + lib/test_ida.c | 14 + + lib/tests/Makefile | 1 + + lib/tests/barrier-timeout-test.c | 125 +++++++ + lib/tests/cmdline_kunit.c | 118 +++++++ + lib/tests/seq_buf_kunit.c | 34 ++ + lib/tests/string_helpers_kunit.c | 15 +- + lib/usercopy.c | 4 +- + mm/Kconfig | 4 +- + rust/helpers/uaccess.c | 2 +- + scripts/atomic/gen-atomic-long.sh | 16 +- + scripts/checkpatch.pl | 47 ++- + scripts/get_maintainer.pl | 71 ++-- + tools/accounting/getdelays.c | 8 +- + tools/testing/selftests/acct/.gitignore | 3 +- + tools/testing/selftests/acct/Makefile | 7 +- + .../selftests/acct/taskstats_fill_stats_tgid.c | 375 +++++++++++++++++++++ + tools/testing/selftests/filelock/.gitignore | 1 + + tools/testing/selftests/filelock/ofdlocks.c | 94 +++--- + 77 files changed, 1434 insertions(+), 498 deletions(-) + create mode 100644 arch/arm64/include/asm/delay-const.h + create mode 100644 lib/tests/barrier-timeout-test.c + create mode 100644 tools/testing/selftests/acct/taskstats_fill_stats_tgid.c + create mode 100644 tools/testing/selftests/filelock/.gitignore +Merging kbuild/kbuild-for-next (b9d21c32dca2 kconfig: fix potential NULL pointer dereference in conf_askvalue) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Merge made by the 'ort' strategy. + Documentation/kbuild/makefiles.rst | 41 ++++++++++++++++++++++++++++++-------- + scripts/Makefile.modfinal | 10 +--------- + scripts/kconfig/conf.c | 6 ++---- + 3 files changed, 36 insertions(+), 21 deletions(-) +Merging clang-format/clang-format (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (841dbf4871c5 perf loongarch: Fix build failure with CONFIG_LIBDW_DWARF_UNWIND) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Already up to date. +Merging compiler-attributes/compiler-attributes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Already up to date. +Merging asm-generic/master (adbbd9714f80 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging nocache-cleanup/nocache-cleanup (809b997a5ce9 x86-64/arm64/powerpc: clean up and rename __copy_from_user_flushcache) +$ git merge -m Merge branch 'nocache-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git nocache-cleanup/nocache-cleanup +Already up to date. +Merging alpha/alpha-next (d58041d2c63e MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (c6e61c06d606 ARM: 9463/1: Allow to enable RT) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Already up to date. +Merging arm64/for-next/core (858fbd7248bd Merge branch 'for-next/c1-pro-erratum-4193714' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (47f06ebbe8da perf/arm-cmn: Fix resource_size_t printk specifier in arm_cmn_init_dtc()) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (65e1752b3f5b soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (8b379d5e9eb7 Merge branch 'v7.2/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 199 +++++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 464 +++++++++++++++++++++ + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 15 + + .../dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts | 81 ++++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 45 ++ + 5 files changed, 804 insertions(+) +Merging asahi-soc/asahi-soc/for-next (d31647c698f6 Merge branch 'apple-soc/drivers-6.20' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (c96e60ae720a Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (b333a0f1c857 soc: aspeed: cleanup dead default for ASPEED_SOCINFO) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + drivers/soc/aspeed/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging broadcom/next (ddfdca13def5 Merge branch 'devicetree-arm64/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging cix/for-next (517d8fc52f3c arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/configs/defconfig | 3 +++ + 1 file changed, 3 insertions(+) +Merging davinci/davinci/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging fsl/soc_fsl (c99d8ac7b355 bus: fsl-mc: wait for the MC firmware to complete its boot) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/base/platform-msi.c | 4 - + drivers/bus/fsl-mc/dprc-driver.c | 14 +-- + drivers/bus/fsl-mc/fsl-mc-bus.c | 50 ++++++++- + drivers/bus/fsl-mc/fsl-mc-msi.c | 166 +++++---------------------- + drivers/bus/fsl-mc/fsl-mc-private.h | 2 +- + drivers/irqchip/Kconfig | 6 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-gic-its-msi-parent.c | 7 +- + drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 168 ---------------------------- + drivers/soc/fsl/qe/qe.c | 3 + + drivers/soc/fsl/qe/qe_ports_ic.c | 23 ++-- + include/linux/fsl/mc.h | 6 +- + include/linux/irqdomain_defs.h | 1 - + include/uapi/linux/fsl_hypervisor.h | 4 +- + 14 files changed, 106 insertions(+), 349 deletions(-) + delete mode 100644 drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +Merging imx-mxs/for-next (06856fe10891 Merge branches 'imx/bindings', 'imx/dt', 'imx/dt64', 'imx/fixes' and 'imx/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (e6490a169f6d Merge branch 'v7.0-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (ae4fe907b770 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (7889b194a15e Merge branch 'omap-for-v7.1/soc' into tmp/omap-next-20260331.171532) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Already up to date. +Merging renesas/next (c6a8c3383ee7 Merge branch 'renesas-dts-for-v7.2' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,cpg-clocks.yaml | 6 +- + arch/arm/boot/dts/renesas/r8a7740.dtsi | 116 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 1 + + drivers/soc/renesas/r9a08g045-sysc.c | 41 ++++---- + drivers/soc/renesas/r9a08g046-sysc.c | 31 +++--- + drivers/soc/renesas/r9a09g047-sys.c | 42 +++----- + drivers/soc/renesas/r9a09g056-sys.c | 41 ++++---- + drivers/soc/renesas/r9a09g057-sys.c | 52 ++++----- + include/dt-bindings/clock/r8a7740-clock.h | 2 + + 15 files changed, 208 insertions(+), 130 deletions(-) +Merging reset/reset/next (d373605cd514 Merge tag 'reset-fixes-for-v7.0-2' into reset/next) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (3fe8502644c4 Merge branch 'v7.2-clk/next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + .../dts/rockchip/rk3288-veyron-analog-audio.dtsi | 2 - + arch/arm64/boot/dts/rockchip/px30-cobra.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts | 20 +- + .../boot/dts/rockchip/rk3576-khadas-edge-2l.dts | 466 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 12 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 35 +- + drivers/clk/rockchip/clk-rk3588.c | 16 + + drivers/clk/rockchip/clk.c | 25 +- + drivers/clk/rockchip/clk.h | 3 + + include/dt-bindings/clock/rockchip,rk3588-cru.h | 4 + + include/soc/rockchip/rk3588_grf.h | 2 + + 15 files changed, 579 insertions(+), 24 deletions(-) +Merging samsung-krzk/for-next (47d4dc90181c arm64: dts: exynos850: Add syscon-poweroff node) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/exynos/exynos850.dtsi | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging scmi/for-linux-next (20d83b0a39f6 Merge branches 'for-next/scmi/updates' and 'for-next/ffa/fixes' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/clk/clk-scmi.c | 48 +--- + drivers/firmware/arm_scmi/base.c | 10 +- + drivers/firmware/arm_scmi/clock.c | 319 ++++++++++++++++----- + drivers/firmware/arm_scmi/common.h | 2 +- + drivers/firmware/arm_scmi/driver.c | 98 ++++--- + drivers/firmware/arm_scmi/protocols.h | 13 +- + drivers/firmware/arm_scmi/quirks.c | 15 +- + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 86 ++++++ + drivers/firmware/imx/sm-misc.c | 73 +++++ + include/linux/scmi_imx_protocol.h | 14 + + include/linux/scmi_protocol.h | 35 ++- + 11 files changed, 534 insertions(+), 179 deletions(-) +Merging sophgo/for-next (9aa6068586a9 Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (e3e433dd9aa0 riscv: dts: spacemit: Enable USB3.0/PCIe on OrangePi RV2) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/riscv/spacemit.yaml | 1 + + arch/riscv/boot/dts/spacemit/Makefile | 1 + + arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts | 217 +++++++++++++++++++++ + .../dts/spacemit/k3-deepcomputing-fml13v05.dts | 31 +++ + 4 files changed, 250 insertions(+) + create mode 100644 arch/riscv/boot/dts/spacemit/k3-deepcomputing-fml13v05.dts +Merging stm32/stm32-next (515aa8b11884 arm64: defconfig: Enable STMicroelectronics STM32 display support) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/bus/Kconfig +Auto-merging drivers/bus/Makefile +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (8245c3d4c671 Merge branches 'sunxi/drivers-for-7.2' and 'sunxi/dt-for-7.2' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + .../sram/allwinner,sun4i-a10-system-control.yaml | 5 +- + Documentation/devicetree/bindings/sram/sram.yaml | 1 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 28 ++- + drivers/soc/sunxi/sunxi_sram.c | 196 +++++++++++++-------- + 4 files changed, 151 insertions(+), 79 deletions(-) +Merging tee/next (31b40993bf57 Merge branches 'optee_fix_for_v7.0', 'tee_fix_for_v7.1', 'tee_shm_fix_for_v7.1' and 'optee_for_v7.2' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/call.c | 3 +- + drivers/tee/optee/optee_msg.h | 50 +++++++++------- + drivers/tee/optee/optee_private.h | 120 ++++++++++++++++++++------------------ + drivers/tee/optee/supp.c | 107 ++++++++++++++++++++++----------- + drivers/tee/tee_shm.c | 2 +- + include/uapi/linux/tee.h | 1 + + 6 files changed, 170 insertions(+), 113 deletions(-) +Merging tegra/for-next (6f2cabcf7749 Merge branch for-7.2/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 9 +++++++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 24 ++++++++++++++++++++---- + 2 files changed, 29 insertions(+), 4 deletions(-) +Merging tenstorrent-dt/tenstorrent-dt-for-next (ad3cb8132313 riscv: dts: tenstorrent: Add PMU node to blackhole for Linux perf support) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/tenstorrent/blackhole.dtsi | 48 ++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) +Merging thead-dt/thead-dt-for-next (74ec3d52c003 riscv: dts: thead: beaglev-ahead: enable HDMI output) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (edacbf64eedd soc: xilinx: Shutdown and free rx mailbox channel) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + drivers/soc/xilinx/zynqmp_power.c | 47 +++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 27 deletions(-) +Merging socfpga/for-next (b5a0814a2cbb ARM: dts: socfpga: remove the reg property in the pmu) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 6 ++ + arch/arm/boot/dts/intel/socfpga/socfpga.dtsi | 4 +- + .../boot/dts/intel/socfpga/socfpga_arria10.dtsi | 4 +- + arch/arm64/boot/dts/intel/Makefile | 1 + + .../boot/dts/intel/socfpga_agilex7m_socdk.dts | 103 +++++++++++++++++++++ + 5 files changed, 112 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex7m_socdk.dts +Merging clk/clk-next (9781f9635d69 Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/marvell,pxa1908.yaml | 34 ++++++--- + drivers/clk/bcm/clk-iproc-asiu.c | 27 +++----- + drivers/clk/clk-axi-clkgen.c | 5 +- + drivers/clk/clk-bulk.c | 14 ++-- + drivers/clk/clk-max77686.c | 32 ++++----- + drivers/clk/hisilicon/clk.c | 4 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 26 +++---- + drivers/clk/mediatek/clk-mt7988-infracfg.c | 80 ++++++++++------------ + drivers/clk/mediatek/clk-mt8192.c | 4 +- + drivers/clk/mediatek/clk-mux.h | 5 ++ + drivers/clk/mmp/clk-pxa1908-apbc.c | 58 ++++++++++++---- + drivers/clk/mmp/clk-pxa1908-apbcp.c | 31 ++++++++- + drivers/clk/mvebu/common.c | 21 +++--- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 14 ++-- + drivers/clk/visconti/pll.c | 17 ++--- + include/linux/adi-axi-common.h | 2 + + 16 files changed, 210 insertions(+), 164 deletions(-) +Merging clk-imx/for-next (d16f57caa787 clk: imx8mq: Correct the CSI PHY sels) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (f924a4041f4a clk: renesas: r8a7740: Add ZT/ZTR trace clocks) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/clk-r8a7740.c | 2 + + drivers/clk/renesas/r9a08g046-cpg.c | 217 ++++++++++++++++++++++++++++++++++++ + drivers/clk/renesas/r9a09g077-cpg.c | 1 + + drivers/clk/renesas/rzg2l-cpg.c | 70 +++++++++++- + drivers/clk/renesas/rzg2l-cpg.h | 10 ++ + 5 files changed, 297 insertions(+), 3 deletions(-) +Merging thead-clk/thead-clk-for-next (baf4fc7c03bd clk: thead: th1520-ap: Support CPU frequency scaling) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging tenstorrent-clk/tenstorrent-clk-for-next (23c8ebc95284 clk: tenstorrent: Add Atlantis clock controller driver) +$ git merge -m Merge branch 'tenstorrent-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk/tenstorrent-clk-for-next +Already up to date. +Merging csky/linux-next (817d21578d51 csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (4adec1b84ae4 LoongArch: KVM: Move unconditional delay into timer clear scenery) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/Kbuild | 2 +- + arch/loongarch/Kconfig | 1 + + arch/loongarch/Makefile | 2 ++ + arch/loongarch/include/asm/asm-prototypes.h | 20 +++++++++++++++ + arch/loongarch/include/asm/kvm_host.h | 3 --- + arch/loongarch/include/asm/linkage.h | 2 +- + arch/loongarch/include/asm/vdso/gettimeofday.h | 6 ----- + arch/loongarch/kvm/Makefile | 3 ++- + arch/loongarch/kvm/exit.c | 1 + + arch/loongarch/kvm/interrupt.c | 34 +++++++++++++++++-------- + arch/loongarch/kvm/main.c | 35 +++----------------------- + arch/loongarch/kvm/mmu.c | 2 +- + arch/loongarch/kvm/switch.S | 22 +++++++++++----- + arch/loongarch/kvm/timer.c | 10 ++++++-- + arch/loongarch/kvm/vm.c | 2 +- + arch/loongarch/pci/acpi.c | 5 ++++ + arch/loongarch/pci/pci.c | 3 +++ + arch/loongarch/vdso/Makefile | 2 ++ + 18 files changed, 90 insertions(+), 65 deletions(-) +Merging m68k/for-next (99a680bed604 zorro: sysfs: Replace sprintf() by sysfs_emit()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + drivers/zorro/zorro-sysfs.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) +Merging m68knommu/for-next (e1dc8af96bc4 m68k: coldfire: select legacy gpiolib interface for mcfqspi) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/Kconfig.cpu | 1 + + arch/m68k/Kconfig.machine | 8 ++++---- + arch/m68k/coldfire/amcore.c | 4 ++-- + arch/m68k/coldfire/stmark2.c | 4 ++-- + arch/m68k/configs/stmark2_defconfig | 33 ++++++++++++++++++++------------- + 5 files changed, 29 insertions(+), 21 deletions(-) +Merging microblaze/next (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (0dfffa5479d6 openrisc: define arch-specific version of nop()) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (ad02d4818f34 parisc: Fix build failure for 32-bit kernel with PA2.0 instruction set) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/Makefile | 16 +++++++++++----- + arch/parisc/kernel/Makefile | 7 +++++-- + arch/parisc/kernel/drivers.c | 21 ++++++++++----------- + drivers/parisc/led.c | 6 ++---- + 4 files changed, 28 insertions(+), 22 deletions(-) +Merging powerpc/next (b80777aef570 mailmap: Add entry for Andrew Donnellan) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (f2abc305aa93 riscv: Define __riscv_copy_{,vec_}{words,bytes}_unaligned() using SYM_TYPED_FUNC_START) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (ae488e2669f3 riscv: dts: microchip: sort pic64gx i2c nodes alphanumerically) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + .../boot/dts/microchip/pic64gx-curiosity-kit.dts | 63 +++++++++++++--------- + arch/riscv/boot/dts/microchip/pic64gx.dtsi | 40 +++++++++++--- + 2 files changed, 70 insertions(+), 33 deletions(-) +Merging riscv-soc/riscv-soc-for-next (b5865650b209 Merge branch 'riscv-soc-drivers-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + .../soc/microchip/microchip,mpfs-irqmux.yaml | 6 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 332 +++++++++++++++++++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 28 ++ + arch/riscv/boot/dts/canaan/k230-pinctrl.h | 18 ++ + arch/riscv/boot/dts/canaan/k230.dtsi | 157 ++++++++++ + 9 files changed, 551 insertions(+), 2 deletions(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-pinctrl.h + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging s390/for-next (78f6b6a1e631 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (d844152d85cf sparc: remove unused variable strtab) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (aa5903b47d4b xtensa: uapi: Reuse asm-generic ucontext.h) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging fs-next (ad345c96913e Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 229 ++++ + Documentation/netlink/specs/sunrpc_cache.yaml | 149 +++ + MAINTAINERS | 9 +- + drivers/mtd/ubi/ubi.h | 9 +- + fs/ceph/quota.c | 37 +- + fs/ceph/xattr.c | 17 + + fs/ecryptfs/keystore.c | 16 +- + fs/exfat/dir.c | 4 +- + fs/exfat/namei.c | 56 +- + fs/exfat/nls.c | 19 +- + fs/fuse/Makefile | 3 +- + fs/fuse/args.h | 65 + + fs/fuse/backing.c | 1 + + fs/fuse/control.c | 16 +- + fs/fuse/cuse.c | 28 +- + fs/fuse/dev.c | 1253 ++++++++------------ + fs/fuse/dev.h | 110 ++ + fs/fuse/dev_uring.c | 143 ++- + fs/fuse/dev_uring_i.h | 39 +- + fs/fuse/dir.c | 12 +- + fs/fuse/file.c | 146 +-- + fs/fuse/fuse_dev_i.h | 350 +++++- + fs/fuse/fuse_i.h | 860 +++++--------- + fs/fuse/fuse_trace.h | 4 +- + fs/fuse/inode.c | 263 +--- + fs/fuse/notify.c | 434 +++++++ + fs/fuse/poll.c | 141 +++ + fs/fuse/req.c | 99 ++ + fs/fuse/req_timeout.c | 148 +++ + fs/fuse/sysctl.c | 1 + + fs/fuse/sysctl.h | 9 + + fs/fuse/virtio_fs.c | 21 +- + fs/netfs/buffered_read.c | 9 +- + fs/netfs/buffered_write.c | 51 +- + fs/netfs/iterator.c | 13 +- + fs/netfs/misc.c | 8 +- + fs/netfs/read_retry.c | 11 +- + fs/nfs/dns_resolve.c | 2 +- + fs/nfsd/export.c | 713 ++++++++++- + fs/nfsd/netlink.c | 93 ++ + fs/nfsd/netlink.h | 18 + + fs/nfsd/nfs4idmap.c | 4 +- + fs/nfsd/nfs4state.c | 9 +- + fs/nfsd/nfsctl.c | 79 ++ + fs/nfsd/nfsd.h | 17 +- + fs/ntfs/bitmap.c | 19 +- + fs/ntfs/dir.c | 13 +- + fs/ntfs/index.c | 17 +- + fs/ntfs/iomap.c | 6 +- + fs/ntfs/namei.c | 13 +- + fs/ntfs/reparse.c | 5 +- + fs/ntfs/runlist.c | 24 +- + fs/smb/client/cifsproto.h | 1 - + fs/smb/client/fs_context.c | 31 - + fs/smb/client/smb2inode.c | 2 +- + fs/smb/client/smb2ops.c | 11 + + fs/smb/client/smbdirect.c | 3 +- + fs/smb/client/smbdirect.h | 2 +- + fs/smb/server/connection.c | 149 ++- + fs/smb/server/connection.h | 7 + + fs/smb/server/oplock.c | 7 +- + fs/smb/server/server.c | 12 + + fs/smb/server/smb2pdu.c | 14 +- + fs/smb/server/transport_rdma.c | 3 +- + fs/smb/server/transport_rdma.h | 2 +- + fs/smb/server/vfs_cache.c | 341 +++++- + fs/smb/server/vfs_cache.h | 4 +- + fs/smb/smbdirect/accept.c | 2 +- + fs/smb/smbdirect/connect.c | 4 +- + fs/smb/smbdirect/connection.c | 16 +- + fs/smb/smbdirect/debug.c | 2 +- + fs/smb/smbdirect/devices.c | 2 +- + fs/smb/smbdirect/internal.h | 4 +- + fs/smb/smbdirect/listen.c | 2 +- + fs/smb/smbdirect/mr.c | 27 +- + fs/smb/smbdirect/rw.c | 2 +- + fs/smb/smbdirect/smbdirect.h | 52 - + fs/smb/smbdirect/socket.c | 20 +- + fs/xfs/libxfs/xfs_dir2_data.c | 18 +- + fs/xfs/libxfs/xfs_refcount.c | 3 +- + fs/xfs/scrub/common.c | 11 + + fs/xfs/scrub/common.h | 2 + + fs/xfs/scrub/dabtree.c | 7 +- + fs/xfs/scrub/dir.c | 7 +- + fs/xfs/xfs_inode.c | 6 - + fs/xfs/xfs_trans.c | 11 + + fs/xfs/xfs_zone_alloc.c | 2 +- + fs/xfs/xfs_zone_gc.c | 2 +- + .../public.h => include/linux/smbdirect.h | 52 +- + include/linux/sunrpc/cache.h | 15 +- + include/trace/events/netfs.h | 5 + + include/uapi/linux/nfsd_netlink.h | 132 +++ + include/uapi/linux/sunrpc_netlink.h | 84 ++ + kernel/nsproxy.c | 2 +- + net/ceph/auth_x.c | 5 + + net/ceph/crush/crush.c | 6 +- + net/ceph/osdmap.c | 7 +- + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/cache.c | 127 +- + net/sunrpc/netlink.c | 97 ++ + net/sunrpc/netlink.h | 35 + + net/sunrpc/sunrpc_syms.c | 10 + + net/sunrpc/svc_xprt.c | 46 +- + net/sunrpc/svcauth_unix.c | 516 +++++++- + 105 files changed, 5462 insertions(+), 2287 deletions(-) + create mode 100644 Documentation/netlink/specs/sunrpc_cache.yaml + create mode 100644 fs/fuse/args.h + create mode 100644 fs/fuse/dev.h + create mode 100644 fs/fuse/notify.c + create mode 100644 fs/fuse/poll.c + create mode 100644 fs/fuse/req.c + create mode 100644 fs/fuse/req_timeout.c + create mode 100644 fs/fuse/sysctl.h + delete mode 100644 fs/smb/smbdirect/smbdirect.h + rename fs/smb/smbdirect/public.h => include/linux/smbdirect.h (76%) + create mode 100644 include/uapi/linux/sunrpc_netlink.h + create mode 100644 net/sunrpc/netlink.c + create mode 100644 net/sunrpc/netlink.h +Merging printk/for-next (7b6fb2472fcb Merge branch 'for-7.1-printf-kunit-build' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (64861f301c34 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/pci.c +Merge made by the 'ort' strategy. + Documentation/PCI/pci.rst | 2 +- + Documentation/PCI/pciebus-howto.rst | 2 +- + arch/alpha/include/asm/pci.h | 13 +- + arch/alpha/kernel/pci-sysfs.c | 373 ++++++++++++----------- + arch/powerpc/include/asm/pci.h | 2 - + drivers/pci/Kconfig | 57 ---- + drivers/pci/bus.c | 1 - + drivers/pci/iov.c | 6 + + drivers/pci/p2pdma.c | 6 +- + drivers/pci/pci-driver.c | 10 +- + drivers/pci/pci-sysfs.c | 577 ++++++++++++++++++++---------------- + drivers/pci/pci.c | 10 - + drivers/pci/pci.h | 16 +- + drivers/pci/probe.c | 6 - + drivers/pci/pwrctrl/core.c | 90 +++--- + drivers/pci/rebar.c | 6 + + drivers/pci/remove.c | 3 - + include/linux/pci.h | 41 ++- + 18 files changed, 650 insertions(+), 571 deletions(-) +Merging pstore/for-next/pstore (24b8f8dcb9a1 pstore/ftrace: Factor KASLR offset in the core kernel instruction addresses) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (2acc3b265f94 Merge branch 'for-7.1/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/hid-elan.c | 1 + + drivers/hid/hid-ft260.c | 16 +++++++- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lenovo-go-s.c | 44 ++++++++++++++++++++++ + drivers/hid/hid-sony.c | 15 +++----- + drivers/hid/hid-uclogic-core.c | 4 +- + .../intel-quickspi/quickspi-protocol.c | 4 +- + 7 files changed, 70 insertions(+), 15 deletions(-) +Merging i2c/i2c/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merging i2c-host/i2c/i2c-host (beec6b0a30da i2c: designware: Use PM_RUNTIME_ACQUIRE()/PM_RUNTIME_ACQUIRE_ERR()) +$ git merge -m Merge branch 'i2c/i2c-host' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/loongson,ls2x-i2c.yaml | 4 + + MAINTAINERS | 1 + + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-designware-common.c | 4 +- + drivers/i2c/busses/i2c-ls2x-v2.c | 544 +++++++++++++++++++++ + 6 files changed, 563 insertions(+), 2 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-ls2x-v2.c +Merging i2c-rust/rust-i2c-next (b388d1f9a51d MAINTAINERS: add Rust I2C tree and update Igor Korotin's email) +$ git merge -m Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux i2c-rust/rust-i2c-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (1afafbaf749d firmware/dmi: Include product_family info to modalias) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (713e899a683e docs: xforms_lists: allow __maybe_unused in func parameters) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/binfmt-misc.rst | 8 ++++---- + Documentation/block/data-integrity.rst | 2 +- + Documentation/core-api/list.rst | 2 +- + Documentation/filesystems/proc.rst | 14 +++++++------- + Documentation/gpu/drm-uapi.rst | 2 +- + Documentation/staging/crc32.rst | 2 +- + Documentation/staging/lzo.rst | 2 +- + Documentation/staging/remoteproc.rst | 2 +- + Documentation/staging/static-keys.rst | 2 +- + Documentation/trace/histogram-design.rst | 2 +- + tools/lib/python/kdoc/xforms_lists.py | 1 + + 11 files changed, 20 insertions(+), 19 deletions(-) +Merging v4l-dvb/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Already up to date. +Merging v4l-dvb-next/master (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (f876276467af Merge branch 'fixes' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/acpi_tad.c | 35 ++++++++++++++------------- + drivers/acpi/apei/einj-core.c | 55 +++++++++++++++++++++++-------------------- + drivers/acpi/cppc_acpi.c | 6 ++--- + drivers/acpi/video_detect.c | 8 +++++++ + include/acpi/acpi_bus.h | 2 ++ + include/acpi/actbl1.h | 6 +++++ + 6 files changed, 68 insertions(+), 44 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (8655a4e35cda cpufreq: tegra194: remove COMPILE_TEST) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (218ef5b34474 PM / devfreq: event: rockchip-dfi: Fix missing clk_disable_unprepare() on error) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq-event.c | 23 ++++++++++++--------- + drivers/devfreq/devfreq.c | 40 ++---------------------------------- + drivers/devfreq/event/rockchip-dfi.c | 4 +++- + 3 files changed, 18 insertions(+), 49 deletions(-) +Merging pmdomain/next (ec1fcddb3117 pmdomain: mediatek: fix use-after-free in scpsys_get_bus_protection_legacy()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (3d2398f44a2d OPP: Move break out of scoped_guard in dev_pm_opp_xlate_required_opp()) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (bf746e2a41ef thermal: renesas: rzg3e: Remove stale @trim_offset kernel-doc entry) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (28df22acc275 tcp: add tcp_mstamp_refresh_inline()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging drivers/net/ethernet/airoha/airoha_eth.c +Auto-merging drivers/net/ethernet/airoha/airoha_eth.h +Merge made by the 'ort' strategy. + Documentation/networking/smc-sysctl.rst | 8 +- + drivers/net/dummy.c | 6 +- + drivers/net/ethernet/airoha/airoha_eth.c | 10 +-- + drivers/net/ethernet/airoha/airoha_eth.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 20 ++++- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 5 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 96 ++++++++++++++-------- + drivers/net/ethernet/qualcomm/Kconfig | 4 +- + drivers/net/mdio/Kconfig | 2 +- + drivers/net/phy/aquantia/aquantia_main.c | 6 +- + drivers/net/ppp/Kconfig | 6 ++ + drivers/net/ppp/Makefile | 6 +- + drivers/net/usb/r8152.c | 23 +----- + drivers/net/wwan/Kconfig | 4 +- + include/net/act_api.h | 2 +- + include/net/sch_generic.h | 6 +- + include/net/tcp.h | 10 +++ + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_output.c | 12 +-- + net/psp/psp_main.c | 21 ++++- + net/sched/act_ife.c | 4 +- + net/sched/act_police.c | 2 +- + net/sched/act_skbmod.c | 2 +- + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 91 +++++++++++++++++++- + 24 files changed, 244 insertions(+), 106 deletions(-) +Merging bpf-next/for-next (9f5b3ffc3f1d selftests/bpf: Rename libarena malloc/free methods) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging include/linux/bpf.h +Merge made by the 'ort' strategy. + Documentation/bpf/btf.rst | 6 +- + arch/s390/net/bpf_jit_comp.c | 37 + + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 8 +- + fs/bpf_fs_kfuncs.c | 2 +- + fs/verity/measure.c | 4 +- + include/linux/bpf.h | 63 +- + include/linux/bpf_verifier.h | 72 +- + include/linux/btf.h | 4 +- + include/linux/cnum.h | 82 + + include/linux/filter.h | 5 +- + include/linux/trace_events.h | 6 + + include/trace/bpf_probe.h | 2 - + include/uapi/linux/btf.h | 26 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/btf.c | 29 +- + kernel/bpf/cnum.c | 120 + + kernel/bpf/cnum_defs.h | 247 +++ + kernel/bpf/core.c | 4 +- + kernel/bpf/helpers.c | 36 +- + kernel/bpf/log.c | 24 +- + kernel/bpf/states.c | 11 +- + kernel/bpf/syscall.c | 5 + + kernel/bpf/trampoline.c | 1 - + kernel/bpf/verifier.c | 2318 ++++++++------------ + kernel/events/core.c | 9 + + kernel/trace/bpf_trace.c | 70 +- + kernel/trace/trace_syscalls.c | 108 +- + lib/test_bpf.c | 363 ++- + net/bpf/test_run.c | 65 +- + tools/bpf/bpftool/btf.c | 17 +- + tools/bpf/bpftool/btf_dumper.c | 4 +- + tools/bpf/bpftool/gen.c | 16 +- + tools/include/uapi/linux/btf.h | 26 +- + tools/lib/bpf/btf.c | 54 +- + tools/lib/bpf/btf.h | 2 +- + tools/lib/bpf/btf_dump.c | 24 +- + tools/lib/bpf/libbpf.c | 97 +- + tools/lib/bpf/relo_core.c | 16 +- + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 56 +- + tools/testing/selftests/bpf/bpf_arena_alloc.h | 2 +- + tools/testing/selftests/bpf/bpf_arena_list.h | 2 +- + tools/testing/selftests/bpf/bpf_arena_strsearch.h | 2 +- + tools/testing/selftests/bpf/bpf_experimental.h | 84 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 8 +- + tools/testing/selftests/bpf/default.profraw | Bin 0 -> 160 bytes + tools/testing/selftests/bpf/libarena/Makefile | 92 + + .../bpf/{ => libarena/include}/bpf_arena_common.h | 0 + .../include}/bpf_arena_spin_lock.h | 11 +- + .../bpf/{ => libarena/include}/bpf_atomic.h | 4 +- + .../selftests/bpf/libarena/include/bpf_may_goto.h | 84 + + .../selftests/bpf/libarena/include/libarena/asan.h | 103 + + .../bpf/libarena/include/libarena/buddy.h | 92 + + .../bpf/libarena/include/libarena/common.h | 94 + + .../bpf/libarena/include/libarena/userspace.h | 132 ++ + .../bpf/libarena/selftests/st_asan_buddy.bpf.c | 258 +++ + .../bpf/libarena/selftests/st_asan_common.h | 52 + + .../bpf/libarena/selftests/st_buddy.bpf.c | 209 ++ + .../bpf/libarena/selftests/test_progs_compat.h | 15 + + .../testing/selftests/bpf/libarena/src/asan.bpf.c | 553 +++++ + .../testing/selftests/bpf/libarena/src/buddy.bpf.c | 903 ++++++++ + .../selftests/bpf/libarena/src/common.bpf.c | 52 + + .../selftests/bpf/prog_tests/arena_spin_lock.c | 7 - + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 22 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 8 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 51 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + tools/testing/selftests/bpf/prog_tests/cb_refs.c | 2 +- + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 15 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 17 +- + .../testing/selftests/bpf/prog_tests/file_reader.c | 22 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- + tools/testing/selftests/bpf/prog_tests/libarena.c | 66 + + .../selftests/bpf/prog_tests/libarena_asan.c | 93 + + .../testing/selftests/bpf/prog_tests/linked_list.c | 4 +- + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 90 +- + .../bpf/prog_tests/sleepable_tracepoints.c | 142 ++ + .../selftests/bpf/prog_tests/task_local_storage.c | 1 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 2 +- + .../testing/selftests/bpf/progs/arena_spin_lock.c | 2 +- + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 14 +- + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 18 + + .../selftests/bpf/progs/compute_live_registers.c | 2 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 10 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 2 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 22 +- + tools/testing/selftests/bpf/progs/dynptr_success.c | 6 +- + .../testing/selftests/bpf/progs/file_reader_fail.c | 4 +- + tools/testing/selftests/bpf/progs/irq.c | 4 +- + tools/testing/selftests/bpf/progs/iters.c | 6 +- + .../selftests/bpf/progs/iters_state_safety.c | 14 +- + tools/testing/selftests/bpf/progs/iters_testmod.c | 4 +- + .../selftests/bpf/progs/iters_testmod_seq.c | 4 +- + tools/testing/selftests/bpf/progs/lpm_trie_bench.c | 2 +- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 2 +- + .../selftests/bpf/progs/percpu_alloc_fail.c | 4 +- + tools/testing/selftests/bpf/progs/rbtree_fail.c | 6 +- + .../selftests/bpf/progs/refcounted_kptr_fail.c | 2 +- + tools/testing/selftests/bpf/progs/stream.c | 2 +- + tools/testing/selftests/bpf/progs/stream_fail.c | 2 +- + .../selftests/bpf/progs/task_kfunc_failure.c | 18 +- + .../selftests/bpf/progs/task_local_storage.c | 19 + + tools/testing/selftests/bpf/progs/task_work_fail.c | 6 +- + .../testing/selftests/bpf/progs/test_bpf_nf_fail.c | 8 +- + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 11 +- + .../bpf/progs/test_kfunc_param_nullable.c | 2 +- + .../bpf/progs/test_sleepable_tracepoints.c | 112 + + .../bpf/progs/test_sleepable_tracepoints_fail.c | 18 + + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 13 +- + tools/testing/selftests/bpf/progs/verifier_arena.c | 2 +- + .../selftests/bpf/progs/verifier_arena_globals1.c | 2 +- + .../selftests/bpf/progs/verifier_arena_globals2.c | 2 +- + .../selftests/bpf/progs/verifier_arena_large.c | 2 +- + .../selftests/bpf/progs/verifier_bits_iter.c | 4 +- + .../testing/selftests/bpf/progs/verifier_bounds.c | 116 +- + .../selftests/bpf/progs/verifier_bpf_fastcall.c | 24 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 2 +- + .../selftests/bpf/progs/verifier_may_goto_1.c | 12 +- + .../selftests/bpf/progs/verifier_ref_tracking.c | 6 +- + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 64 +- + .../testing/selftests/bpf/progs/verifier_subreg.c | 6 +- + .../selftests/bpf/progs/verifier_vfs_reject.c | 8 +- + tools/testing/selftests/bpf/progs/wq_failures.c | 2 +- + tools/testing/selftests/bpf/progs/xdp_flowtable.c | 7 +- + tools/testing/selftests/bpf/progs/xdping_kern.c | 183 -- + tools/testing/selftests/bpf/test_loader.c | 51 +- + tools/testing/selftests/bpf/test_progs.c | 2 +- + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/test_xdping.sh | 103 - + tools/testing/selftests/bpf/uprobe_multi.c | 4 +- + tools/testing/selftests/bpf/verifier/calls.c | 14 +- + tools/testing/selftests/bpf/verifier/sleepable.c | 17 +- + tools/testing/selftests/bpf/xdping.c | 254 --- + tools/testing/selftests/bpf/xdping.h | 13 - + 134 files changed, 5812 insertions(+), 2771 deletions(-) + create mode 100644 include/linux/cnum.h + create mode 100644 kernel/bpf/cnum.c + create mode 100644 kernel/bpf/cnum_defs.h + create mode 100644 tools/testing/selftests/bpf/default.profraw + create mode 100644 tools/testing/selftests/bpf/libarena/Makefile + rename tools/testing/selftests/bpf/{ => libarena/include}/bpf_arena_common.h (100%) + rename tools/testing/selftests/bpf/{progs => libarena/include}/bpf_arena_spin_lock.h (98%) + rename tools/testing/selftests/bpf/{ => libarena/include}/bpf_atomic.h (98%) + create mode 100644 tools/testing/selftests/bpf/libarena/include/bpf_may_goto.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/asan.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/buddy.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/common.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/userspace.h + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/st_asan_buddy.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/st_asan_common.h + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/st_buddy.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/test_progs_compat.h + create mode 100644 tools/testing/selftests/bpf/libarena/src/asan.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/src/buddy.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/src/common.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/libarena.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/libarena_asan.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sleepable_tracepoints.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sleepable_tracepoints.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sleepable_tracepoints_fail.c + delete mode 100644 tools/testing/selftests/bpf/progs/xdping_kern.c + delete mode 100755 tools/testing/selftests/bpf/test_xdping.sh + delete mode 100644 tools/testing/selftests/bpf/xdping.c + delete mode 100644 tools/testing/selftests/bpf/xdping.h +$ git am -3 ../patches/0001-perf-Fixup-for-btf_vlan-API-change.patch +Applying: perf: Fixup for btf_vlan() API change +$ git reset HEAD^ +Unstaged changes after reset: +M tools/perf/builtin-trace.c +M tools/perf/util/btf.c +$ git add -A . +$ git commit -v -a --amend +[master 90cf8d60697d] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git + Date: Thu Apr 30 10:17:29 2026 +0200 +Merging ipsec-next/master (790ead939486 Documentation: net/smc: correct old value of smcr_max_recv_wr) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (02c54621e81c net/mlx5: Extend query_esw_functions output for multi-function support) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Merge made by the 'ort' strategy. + drivers/infiniband/hw/mlx5/counters.c | 4 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 7 ++- + .../net/ethernet/mellanox/mlx5/core/esw/ipsec.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 36 ++++++----- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 42 ++++++++----- + .../mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h | 8 --- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 7 ++- + .../mellanox/mlx5/core/steering/hws/vport.c | 2 +- + include/linux/mlx5/eswitch.h | 2 +- + include/linux/mlx5/mlx5_ifc.h | 73 +++++++++++++++++++--- + include/linux/mlx5/vport.h | 4 +- + 12 files changed, 130 insertions(+), 59 deletions(-) +Merging netfilter-next/main (09942ddedcb9 ppp: add PPPOX symbol) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (9229cb5a941c fbnic: Set Relaxed Ordering PCIe TLP attributes for DMA engines) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (516a3ab44299 Bluetooth: btusb: Add Realtek RTL8922AE VID/PID 0bda/d923) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/Kconfig | 2 +- + drivers/bluetooth/btintel.c | 10 +- + drivers/bluetooth/btintel.h | 7 ++ + drivers/bluetooth/btintel_pcie.c | 216 +++++++++++++++++++++++++++++++++------ + drivers/bluetooth/btintel_pcie.h | 9 +- + drivers/bluetooth/btmtk.c | 38 ++++++- + drivers/bluetooth/btmtk.h | 7 ++ + drivers/bluetooth/btusb.c | 11 ++ + drivers/bluetooth/hci_ath.c | 3 + + drivers/bluetooth/hci_bcsp.c | 3 + + drivers/bluetooth/hci_h4.c | 3 + + drivers/bluetooth/hci_h5.c | 3 + + drivers/bluetooth/virtio_bt.c | 39 +++++-- + include/net/bluetooth/hci_core.h | 2 +- + net/bluetooth/6lowpan.c | 25 ++++- + net/bluetooth/bnep/core.c | 13 ++- + net/bluetooth/hci_conn.c | 124 ++++++++++++++++++---- + net/bluetooth/hci_event.c | 29 +++++- + net/bluetooth/iso.c | 56 +++++----- + net/bluetooth/l2cap_core.c | 14 +-- + net/bluetooth/l2cap_sock.c | 9 ++ + net/bluetooth/rfcomm/core.c | 7 +- + net/bluetooth/sco.c | 62 +++++++---- + 23 files changed, 554 insertions(+), 138 deletions(-) +Merging wireless-next/for-next (7baf5857e15d wifi: brcmsmac: phy_lcn: Remove dead code in wlc_lcnphy_radio_2064_channel_tune_4313()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/ath/ath12k/core.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/wireless/nl80211.c +Merge made by the 'ort' strategy. + drivers/gpio/gpio-ath79.c | 57 +++- + drivers/net/wireless/ath/ath12k/ahb.c | 25 +- + drivers/net/wireless/ath/ath12k/core.c | 6 + + drivers/net/wireless/ath/ath12k/dp_htt.c | 2 +- + drivers/net/wireless/ath/ath12k/dp_htt.h | 2 +- + drivers/net/wireless/ath/ath12k/htc.h | 8 +- + drivers/net/wireless/ath/ath12k/wifi7/hal_rx.h | 1 - + drivers/net/wireless/ath/ath12k/wmi.c | 217 +++++-------- + drivers/net/wireless/ath/ath12k/wmi.h | 3 + + drivers/net/wireless/ath/ath9k/hw.c | 33 +- + drivers/net/wireless/ath/ath9k/hw.h | 3 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 4 +- + drivers/net/wireless/realtek/rtw89/fw.c | 2 +- + include/linux/ieee80211-eht.h | 115 +++++-- + include/net/cfg80211.h | 25 +- + include/net/mac80211.h | 10 +- + include/uapi/linux/nl80211.h | 10 +- + net/mac80211/cfg.c | 136 +++++++- + net/mac80211/chan.c | 66 ++-- + net/mac80211/debugfs.c | 47 +-- + net/mac80211/eht.c | 11 +- + net/mac80211/he.c | 9 +- + net/mac80211/ht.c | 59 +--- + net/mac80211/ibss.c | 3 + + net/mac80211/ieee80211_i.h | 28 +- + net/mac80211/mesh_plink.c | 3 + + net/mac80211/mlme.c | 25 +- + net/mac80211/ocb.c | 5 +- + net/mac80211/rate.c | 4 +- + net/mac80211/sta_info.c | 294 ++++++++++++++++- + net/mac80211/sta_info.h | 16 +- + net/mac80211/tdls.c | 24 +- + net/mac80211/tx.c | 2 +- + net/mac80211/util.c | 23 +- + net/mac80211/vht.c | 350 +-------------------- + net/wireless/core.c | 21 ++ + net/wireless/core.h | 3 +- + net/wireless/nl80211.c | 260 +++++++++------ + net/wireless/util.c | 10 + + net/wireless/wext-compat.c | 3 +- + 45 files changed, 1097 insertions(+), 859 deletions(-) +Merging ath-next/for-next (7baf5857e15d wifi: brcmsmac: phy_lcn: Remove dead code in wlc_lcnphy_radio_2064_channel_tune_4313()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (709503c4a210 wifi: iwlwifi: mvm: fix race condition in PTP removal) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (a92a9a49288d mtd: mtdsuper: replace simple_strtoul with kstrtouint) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/mtdoops.c | 7 +++---- + drivers/mtd/mtdsuper.c | 8 ++++---- + drivers/mtd/nand/raw/Kconfig | 2 +- + 3 files changed, 8 insertions(+), 9 deletions(-) +Merging nand/nand/next (135ac3b84bce mtd: spinand: winbond: Fix ODTR write VCR on W35NxxJW) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (cf6788aed0cd mtd: spi-nor: micron-st: Enable die erase support for MT35XU02GCBA) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (8879a3c110cb crypto: af_alg - use sock_kmemdup in alg_setkey_by_key_serial) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging libcrypto/libcrypto-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Already up to date. +Merging drm/drm-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (a5640267d6d3 drm/nouveau: expose VBIOS via debugfs on GSP-RM systems) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/imagination/pvr_fw_trace.c +Merge made by the 'ort' strategy. + Documentation/ABI/obsolete/sysfs-driver-ivpu | 30 + + Documentation/ABI/testing/sysfs-driver-ivpu | 65 + + Documentation/accel/amdxdna/amdnpu.rst | 25 + + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/simple-bridge.yaml | 1 + + .../bindings/display/bridge/waveshare,dsi2dpi.yaml | 9 +- + .../bindings/display/panel/focaltech,ota7290b.yaml | 70 + + .../bindings/display/panel/himax,hx83102.yaml | 2 + + .../bindings/display/panel/himax,hx8394.yaml | 2 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 2 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 6 + + .../bindings/display/panel/panel-simple.yaml | 28 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 2 + + Documentation/gpu/drm-usage-stats.rst | 1 + + MAINTAINERS | 2 + + drivers/accel/amdxdna/Makefile | 10 +- + drivers/accel/amdxdna/aie.c | 119 ++ + drivers/accel/amdxdna/aie.h | 111 ++ + drivers/accel/amdxdna/aie2_ctx.c | 86 +- + drivers/accel/amdxdna/aie2_error.c | 17 +- + drivers/accel/amdxdna/aie2_message.c | 229 +-- + drivers/accel/amdxdna/aie2_msg_priv.h | 41 +- + drivers/accel/amdxdna/aie2_pci.c | 234 ++-- + drivers/accel/amdxdna/aie2_pci.h | 117 +- + drivers/accel/amdxdna/aie2_pm.c | 22 +- + drivers/accel/amdxdna/aie2_psp.c | 161 --- + drivers/accel/amdxdna/aie2_smu.c | 156 --- + drivers/accel/amdxdna/aie2_solver.c | 10 +- + drivers/accel/amdxdna/aie4_message.c | 27 + + drivers/accel/amdxdna/aie4_msg_priv.h | 49 + + drivers/accel/amdxdna/aie4_pci.c | 483 +++++++ + drivers/accel/amdxdna/aie4_pci.h | 53 + + drivers/accel/amdxdna/aie4_sriov.c | 88 ++ + drivers/accel/amdxdna/aie_psp.c | 235 ++++ + drivers/accel/amdxdna/aie_smu.c | 153 +++ + drivers/accel/amdxdna/amdxdna_ctx.c | 3 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 1 + + drivers/accel/amdxdna/amdxdna_iommu.c | 13 +- + drivers/accel/amdxdna/amdxdna_mailbox.c | 30 +- + drivers/accel/amdxdna/amdxdna_mailbox.h | 8 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 51 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 16 +- + drivers/accel/amdxdna/amdxdna_sysfs.c | 5 +- + drivers/accel/amdxdna/amdxdna_ubuf.c | 41 +- + drivers/accel/amdxdna/npu1_regs.c | 30 +- + drivers/accel/amdxdna/npu3_regs.c | 77 ++ + drivers/accel/amdxdna/npu4_regs.c | 71 +- + drivers/accel/amdxdna/npu5_regs.c | 10 +- + drivers/accel/amdxdna/npu6_regs.c | 10 +- + drivers/accel/ethosu/ethosu_job.c | 1 - + drivers/accel/ivpu/ivpu_drv.c | 8 +- + drivers/accel/ivpu/ivpu_hw.h | 16 +- + drivers/accel/ivpu/ivpu_hw_btrs.c | 112 +- + drivers/accel/ivpu/ivpu_hw_btrs.h | 10 +- + drivers/accel/ivpu/ivpu_hw_ip.c | 24 +- + drivers/accel/ivpu/ivpu_jsm_msg.c | 18 +- + drivers/accel/ivpu/ivpu_jsm_msg.h | 3 +- + drivers/accel/ivpu/ivpu_sysfs.c | 190 ++- + drivers/accel/ivpu/vpu_jsm_api.h | 34 +- + drivers/accel/qaic/mhi_controller.c | 2 +- + drivers/accel/qaic/mhi_controller.h | 9 +- + drivers/accel/qaic/qaic.h | 9 +- + drivers/accel/qaic/qaic_control.c | 2 +- + drivers/accel/qaic/qaic_data.c | 2 +- + drivers/accel/qaic/qaic_debugfs.c | 30 +- + drivers/accel/qaic/qaic_debugfs.h | 2 +- + drivers/accel/qaic/qaic_drv.c | 2 +- + drivers/accel/qaic/qaic_ras.c | 1 - + drivers/accel/qaic/qaic_ras.h | 1 + + drivers/accel/qaic/qaic_ssr.c | 2 +- + drivers/accel/qaic/qaic_ssr.h | 9 +- + drivers/accel/qaic/qaic_timesync.c | 3 +- + drivers/accel/qaic/qaic_timesync.h | 7 +- + drivers/accel/qaic/sahara.c | 2 +- + drivers/accel/qaic/sahara.h | 2 +- + drivers/accel/rocket/rocket_job.c | 1 - + drivers/dma-buf/.kunitconfig | 2 + + drivers/dma-buf/Kconfig | 11 +- + drivers/dma-buf/Makefile | 5 +- + drivers/dma-buf/dma-fence.c | 3 +- + drivers/dma-buf/selftest.c | 167 --- + drivers/dma-buf/selftest.h | 30 - + drivers/dma-buf/selftests.h | 16 - + drivers/dma-buf/st-dma-fence-chain.c | 217 ++- + drivers/dma-buf/st-dma-fence-unwrap.c | 290 ++-- + drivers/dma-buf/st-dma-fence.c | 200 ++- + drivers/dma-buf/st-dma-resv.c | 145 +- + drivers/dma-buf/udmabuf.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 8 +- + drivers/gpu/drm/ast/ast_2000.c | 61 +- + drivers/gpu/drm/ast/ast_2100.c | 292 ++-- + drivers/gpu/drm/ast/ast_2300.c | 392 +++--- + drivers/gpu/drm/ast/ast_2500.c | 327 ++--- + drivers/gpu/drm/ast/ast_dp501.c | 130 +- + drivers/gpu/drm/ast/ast_drv.c | 84 +- + drivers/gpu/drm/ast/ast_drv.h | 60 +- + drivers/gpu/drm/ast/ast_mode.c | 86 +- + drivers/gpu/drm/ast/ast_post.c | 48 +- + drivers/gpu/drm/ast/ast_post.h | 20 +- + drivers/gpu/drm/ast/ast_reg.h | 211 ++- + drivers/gpu/drm/bridge/Kconfig | 10 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 235 ++-- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 1 - + drivers/gpu/drm/bridge/imx/Kconfig | 28 +- + drivers/gpu/drm/bridge/imx/Makefile | 3 +- + drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c | 91 -- + .../bridge/imx/imx8mp-hdmi-tx-connector-fixup.c | 75 + + .../bridge/imx/imx8mp-hdmi-tx-connector-fixup.dtso | 30 + + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 1 + + drivers/gpu/drm/bridge/of-display-mode-bridge.c | 93 ++ + drivers/gpu/drm/bridge/simple-bridge.c | 5 + + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 4 - + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 49 +- + drivers/gpu/drm/bridge/waveshare-dsi.c | 5 +- + drivers/gpu/drm/drm_atomic.c | 110 +- + drivers/gpu/drm/drm_auth.c | 2 +- + drivers/gpu/drm/drm_bridge.c | 96 +- + drivers/gpu/drm/drm_colorop.c | 8 +- + drivers/gpu/drm/drm_connector.c | 9 +- + drivers/gpu/drm/drm_edid.c | 465 +++++++ + drivers/gpu/drm/drm_encoder.c | 18 +- + drivers/gpu/drm/drm_gem.c | 10 + + drivers/gpu/drm/drm_gpusvm.c | 53 +- + drivers/gpu/drm/drm_gpuvm.c | 3 + + drivers/gpu/drm/drm_mipi_dsi.c | 28 + + drivers/gpu/drm/drm_of.c | 34 + + drivers/gpu/drm/drm_pagemap.c | 229 ++- + drivers/gpu/drm/drm_panel.c | 23 + + drivers/gpu/drm/drm_vblank.c | 36 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 1 - + drivers/gpu/drm/exynos/Kconfig | 3 + + drivers/gpu/drm/exynos/exynos_dp.c | 110 +- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 2 +- + drivers/gpu/drm/imagination/pvr_fw_trace.c | 2 +- + drivers/gpu/drm/imagination/pvr_job.c | 8 +- + drivers/gpu/drm/imagination/pvr_queue.c | 155 ++- + drivers/gpu/drm/imagination/pvr_queue.h | 2 +- + .../gpu/drm/imagination/pvr_rogue_fwif_shared.h | 10 +- + drivers/gpu/drm/imagination/pvr_sync.c | 8 +- + drivers/gpu/drm/imagination/pvr_sync.h | 2 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 4 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 6 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 5 +- + drivers/gpu/drm/kmb/kmb_dsi.c | 2 +- + drivers/gpu/drm/lima/lima_sched.c | 1 - + drivers/gpu/drm/mgag200/mgag200_g200se.c | 13 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 109 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 1 + + drivers/gpu/drm/msm/msm_gem_vma.c | 1 - + drivers/gpu/drm/msm/msm_ringbuffer.c | 1 - + drivers/gpu/drm/mxsfb/Kconfig | 2 + + drivers/gpu/drm/mxsfb/lcdif_drv.c | 67 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 4 +- + drivers/gpu/drm/omapdrm/dss/output.c | 11 +- + drivers/gpu/drm/panel/Kconfig | 13 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-focaltech-ota7290b.c | 225 +++ + drivers/gpu/drm/panel/panel-himax-hx83102.c | 144 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 279 +++- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 251 +++- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 1421 ++++++++++++++++++- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 24 +- + drivers/gpu/drm/panel/panel-simple.c | 381 +++++ + drivers/gpu/drm/panfrost/panfrost_device.c | 34 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + + drivers/gpu/drm/panfrost/panfrost_job.c | 1 - + drivers/gpu/drm/panthor/Kconfig | 1 - + drivers/gpu/drm/panthor/panthor_device.c | 11 +- + drivers/gpu/drm/panthor/panthor_device.h | 73 + + drivers/gpu/drm/panthor/panthor_drv.c | 33 +- + drivers/gpu/drm/panthor/panthor_fw.c | 16 +- + drivers/gpu/drm/panthor/panthor_gem.c | 1453 +++++++++++++++++--- + drivers/gpu/drm/panthor/panthor_gem.h | 136 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 513 +++++-- + drivers/gpu/drm/panthor/panthor_mmu.h | 8 + + drivers/gpu/drm/panthor/panthor_sched.c | 85 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.c | 29 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.h | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 13 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 16 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 2 + + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 34 +- + drivers/gpu/drm/rockchip/Kconfig | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 69 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 + + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 35 +- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 13 +- + drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/scheduler/Makefile | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 175 +-- + drivers/gpu/drm/scheduler/sched_fence.c | 2 +- + drivers/gpu/drm/scheduler/sched_internal.h | 70 +- + drivers/gpu/drm/scheduler/sched_main.c | 351 +---- + drivers/gpu/drm/scheduler/sched_rq.c | 383 ++++++ + drivers/gpu/drm/scheduler/tests/Makefile | 3 +- + drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 1 - + drivers/gpu/drm/scheduler/tests/tests_scheduler.c | 882 ++++++++++++ + drivers/gpu/drm/tidss/tidss_encoder.c | 2 + + drivers/gpu/drm/tidss/tidss_kms.c | 2 - + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/v3d/Makefile | 1 + + drivers/gpu/drm/v3d/v3d_debugfs.c | 23 +- + drivers/gpu/drm/v3d/v3d_drv.c | 160 +-- + drivers/gpu/drm/v3d/v3d_drv.h | 18 + + drivers/gpu/drm/v3d/v3d_gem.c | 17 +- + drivers/gpu/drm/v3d/v3d_irq.c | 15 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 10 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 18 +- + drivers/gpu/drm/v3d/v3d_power.c | 87 ++ + drivers/gpu/drm/v3d/v3d_sched.c | 1 - + drivers/gpu/drm/v3d/v3d_submit.c | 19 +- + drivers/gpu/drm/vc4/vc4_bo.c | 1 - + drivers/gpu/drm/vc4/vc4_drv.c | 2 - + drivers/gpu/drm/vc4/vc4_gem.c | 1 - + drivers/gpu/drm/vc4/vc4_irq.c | 33 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 - + drivers/gpu/drm/vc4/vc4_render_cl.c | 1 - + drivers/gpu/drm/vc4/vc4_validate.c | 1 - + drivers/gpu/drm/xe/xe_dep_scheduler.c | 1 - + drivers/gpu/drm/xe/xe_execlist.c | 1 - + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 1 - + drivers/gpu/drm/xe/xe_svm.c | 1 - + include/drm/bridge/analogix_dp.h | 8 +- + include/drm/bridge/dw_hdmi.h | 6 + + include/drm/bridge/imx.h | 17 - + include/drm/bridge/of-display-mode-bridge.h | 17 + + include/drm/drm_bridge.h | 73 +- + include/drm/drm_connector.h | 2 +- + include/drm/drm_edid.h | 3 + + include/drm/drm_encoder.h | 4 + + include/drm/drm_gpusvm.h | 5 + + include/drm/drm_mipi_dsi.h | 1 + + include/drm/drm_of.h | 13 + + include/drm/drm_pagemap.h | 9 +- + include/drm/drm_panel.h | 1 + + include/drm/gpu_scheduler.h | 45 +- + include/trace/events/amdxdna.h | 42 +- + include/trace/events/dma_fence.h | 40 +- + include/uapi/drm/amdxdna_accel.h | 3 +- + include/uapi/drm/drm.h | 7 + + 257 files changed, 12379 insertions(+), 4285 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-driver-ivpu + create mode 100644 Documentation/ABI/testing/sysfs-driver-ivpu + create mode 100644 Documentation/devicetree/bindings/display/panel/focaltech,ota7290b.yaml + create mode 100644 drivers/accel/amdxdna/aie.c + create mode 100644 drivers/accel/amdxdna/aie.h + delete mode 100644 drivers/accel/amdxdna/aie2_psp.c + delete mode 100644 drivers/accel/amdxdna/aie2_smu.c + create mode 100644 drivers/accel/amdxdna/aie4_message.c + create mode 100644 drivers/accel/amdxdna/aie4_msg_priv.h + create mode 100644 drivers/accel/amdxdna/aie4_pci.c + create mode 100644 drivers/accel/amdxdna/aie4_pci.h + create mode 100644 drivers/accel/amdxdna/aie4_sriov.c + create mode 100644 drivers/accel/amdxdna/aie_psp.c + create mode 100644 drivers/accel/amdxdna/aie_smu.c + create mode 100644 drivers/accel/amdxdna/npu3_regs.c + create mode 100644 drivers/dma-buf/.kunitconfig + delete mode 100644 drivers/dma-buf/selftest.c + delete mode 100644 drivers/dma-buf/selftest.h + delete mode 100644 drivers/dma-buf/selftests.h + delete mode 100644 drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx-connector-fixup.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx-connector-fixup.dtso + create mode 100644 drivers/gpu/drm/bridge/of-display-mode-bridge.c + create mode 100644 drivers/gpu/drm/panel/panel-focaltech-ota7290b.c + create mode 100644 drivers/gpu/drm/scheduler/sched_rq.c + create mode 100644 drivers/gpu/drm/scheduler/tests/tests_scheduler.c + create mode 100644 drivers/gpu/drm/v3d/v3d_power.c + delete mode 100644 include/drm/bridge/imx.h + create mode 100644 include/drm/bridge/of-display-mode-bridge.h +Merging amdgpu/drm-next (399b9abc353c drm/amd/display: Use EDID from VBIOS embedded panel info) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 9 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 331 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 9 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 110 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 415 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 66 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 13 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 147 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c | 369 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.h | 31 + + drivers/gpu/drm/amd/amdgpu/nv.c | 31 +- + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 12 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 30 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 30 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 21 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 10 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 29 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 151 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- + .../amd/amdkfd/kfd_device_queue_manager_v12_1.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 370 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 36 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 70 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 60 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 44 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 26 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 244 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 13 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 143 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 28 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 27 + + .../gpu/drm/amd/display/dc/basics/custom_float.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 79 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 21 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 12 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 +- + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 39 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 13 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 14 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 14 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 15 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 15 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 16 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 40 +- + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 22 +- + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 350 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 577 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 66 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 137 +- + drivers/gpu/drm/amd/display/dc/dc_fused_io.c | 6 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 41 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 30 + + .../gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c | 4 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 20 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 24 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 16 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 23 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 4 +- + .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 2 +- + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.h | 2 - + .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 4 +- + .../drm/amd/display/dc/dml/calcs/dcn_calc_auto.c | 1824 +- + .../drm/amd/display/dc/dml/calcs/dcn_calc_math.c | 6 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 285 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 119 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 292 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 290 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 164 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 164 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 296 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 80 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 76 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 328 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 82 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 20 +- + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 16 +- + .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 16 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 26 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 354 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 76 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 8 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 358 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 80 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 328 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 174 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 324 +- + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 138 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 49 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 22 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 22 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 4 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 32 +- + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 82 +- + drivers/gpu/drm/amd/display/dc/dml2_0/README.md | 31 + + .../drm/amd/display/dc/dml2_0/display_mode_core.c | 14 +- + .../drm/amd/display/dc/dml2_0/display_mode_util.c | 20 +- + .../dc/dml2_0/dml21/dml21_translation_helper.c | 15 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 2 +- + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 - + .../dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 1 - + .../dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 - + .../dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - + .../dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 3 +- + .../dml21/src/dml2_top/dml2_top_interfaces.c | 1 - + .../drm/amd/display/dc/dml2_0/dml2_mall_phantom.c | 105 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_policy.c | 6 +- + .../display/dc/dml2_0/dml2_translation_helper.c | 4 +- + drivers/gpu/drm/amd/display/dc/dml2_0/dml2_utils.c | 40 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 15 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 16 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 33 +- + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 3 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h | 9 + + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 16 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c | 28 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h | 3 + + .../drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c | 12 +- + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 12 +- + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 12 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 4 +- + .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 4 +- + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 4 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 127 +- + .../drm/amd/display/dc/hwss/dce120/dce120_hwseq.c | 12 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 12 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 13 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 8 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 16 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 86 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 4 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 13 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 18 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 1 - + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 138 + + drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 2 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 37 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 4 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 4 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 16 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 10 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 5 +- + .../display/dc/link/protocols/link_dp_capability.c | 2 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 10 +- + .../dc/link/protocols/link_dp_irq_handler.c | 51 +- + .../dc/link/protocols/link_dp_panel_replay.c | 27 +- + .../dc/link/protocols/link_dp_training_8b_10b.c | 10 +- + .../dc/link/protocols/link_edp_panel_control.c | 41 +- + .../amd/display/dc/mmhubbub/dcn20/dcn20_mmhubbub.c | 4 +- + .../amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.c | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h | 1 - + .../display/dc/resource/dce110/dce110_resource.c | 4 +- + .../amd/display/dc/resource/dce60/dce60_resource.c | 3 +- + .../amd/display/dc/resource/dce80/dce80_resource.c | 3 +- + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 24 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 2 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 14 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 8 +- + .../display/dc/resource/dcn302/dcn302_resource.c | 4 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 4 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 4 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 4 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 4 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 4 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 20 +- + .../dc/resource/dcn32/dcn32_resource_helpers.c | 2 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 4 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 4 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 4 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 4 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 4 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 57 +- + .../dcn401/dcn401_soc_and_ip_translator.c | 42 +- + .../dcn42/dcn42_soc_and_ip_translator.c | 14 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 26 +- + .../amd/display/include/grph_object_ctrl_defs.h | 4 + + .../gpu/drm/amd/display/modules/inc/mod_power.h | 415 + + .../amd/display/modules/info_packet/info_packet.c | 2 +- + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/display/modules/power/power.c | 3024 ++ + .../drm/amd/display/modules/power/power_helpers.c | 16 +- + drivers/gpu/drm/amd/include/amd_cper.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h | 110 + + .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h | 455 + + .../drm/amd/include/asic_reg/gc/gc_12_1_1_offset.h | 149 + + .../amd/include/asic_reg/gc/gc_12_1_1_sh_mask.h | 377 + + .../amd/include/asic_reg/nbio/nbio_6_3_2_offset.h | 13149 +++++ + .../amd/include/asic_reg/nbio/nbio_6_3_2_sh_mask.h | 49475 +++++++++++++++++++ + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 5 + + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 215 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h | 34 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 13 +- + drivers/gpu/drm/radeon/radeon_ring.c | 4 +- + drivers/gpu/drm/radeon/si.c | 2 +- + include/drm/drm_fb_helper.h | 6 + + 309 files changed, 74820 insertions(+), 5835 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/README.md + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_power.h + create mode 100644 drivers/gpu/drm/amd/display/modules/power/power.c + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_1_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_3_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_3_2_sh_mask.h +Merging drm-intel/for-linux-next (16df4cc63c58 drm/i915/display: Use ceiling division for NV12 UV surface offset calculation) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/skl_watermark.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/skl_watermark.c +Resolved 'drivers/gpu/drm/i915/display/skl_watermark.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 12024c07d6f7] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/display/drm_dp_tunnel.c | 17 ++ + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/display/i9xx_display_sr.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 43 ++- + drivers/gpu/drm/i915/display/intel_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_bo.c | 27 ++ + drivers/gpu/drm/i915/display/intel_bo.h | 8 + + drivers/gpu/drm/i915/display/intel_bw.c | 58 +--- + drivers/gpu/drm/i915/display/intel_casf.c | 102 ++----- + drivers/gpu/drm/i915/display/intel_casf.h | 6 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 58 ++-- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 26 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 18 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 11 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 3 + + drivers/gpu/drm/i915/display/intel_de.c | 8 + + drivers/gpu/drm/i915/display/intel_de.h | 17 +- + drivers/gpu/drm/i915/display/intel_display.c | 46 +--- + drivers/gpu/drm/i915/display/intel_display_core.h | 5 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 7 +- + .../gpu/drm/i915/display/intel_display_device.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.h | 1 + + drivers/gpu/drm/i915/display/intel_display_power.c | 14 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 2 +- + .../drm/i915/display/intel_display_power_well.c | 65 +++-- + drivers/gpu/drm/i915/display/intel_display_regs.h | 1 + + drivers/gpu/drm/i915/display/intel_display_reset.c | 42 +-- + drivers/gpu/drm/i915/display/intel_display_reset.h | 8 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 14 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 2 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 12 +- + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 291 ++++++++++++-------- + .../gpu/drm/i915/display/intel_dp_link_training.c | 124 ++++++++- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 9 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 18 ++ + drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 6 + + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 176 ++++++------ + drivers/gpu/drm/i915/display/intel_dpll.c | 116 ++++---- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- + drivers/gpu/drm/i915/display/intel_dram.c | 48 ++-- + drivers/gpu/drm/i915/display/intel_fb.c | 49 ++-- + drivers/gpu/drm/i915/display/intel_fb.h | 3 +- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 27 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 13 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 40 +-- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 118 --------- + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 24 -- + drivers/gpu/drm/i915/display/intel_fdi.c | 3 +- + drivers/gpu/drm/i915/display/intel_flipq.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 165 +++++++----- + drivers/gpu/drm/i915/display/intel_initial_plane.c | 79 ++++-- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_mchbar.c | 78 ++++++ + drivers/gpu/drm/i915/display/intel_mchbar.h | 21 ++ + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 1 + + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- + drivers/gpu/drm/i915/display/intel_parent.c | 35 ++- + drivers/gpu/drm/i915/display/intel_parent.h | 8 +- + drivers/gpu/drm/i915/display/intel_pfit.c | 24 +- + drivers/gpu/drm/i915/display/intel_plane.c | 25 +- + drivers/gpu/drm/i915/display/intel_plane.h | 3 + + drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 27 +- + drivers/gpu/drm/i915/display/intel_rom.c | 19 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 4 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 16 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 110 +++----- + drivers/gpu/drm/i915/display/skl_scaler.h | 2 - + drivers/gpu/drm/i915/display/skl_universal_plane.c | 37 ++- + drivers/gpu/drm/i915/display/skl_watermark.c | 294 ++++++++------------- + drivers/gpu/drm/i915/display/vlv_clock.c | 13 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 20 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 38 +-- + drivers/gpu/drm/i915/display/vlv_sideband.c | 136 +++++++++- + drivers/gpu/drm/i915/display/vlv_sideband.h | 166 ++---------- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 - + drivers/gpu/drm/i915/gt/intel_llc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 40 +-- + drivers/gpu/drm/i915/gt/intel_rps.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 1 - + drivers/gpu/drm/i915/gvt/cfg_space.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 1 - + drivers/gpu/drm/i915/i915_bo.c | 114 ++++++++ + drivers/gpu/drm/i915/i915_bo.h | 6 + + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_dpt.c | 5 +- + drivers/gpu/drm/i915/i915_driver.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 2 + + .../i915/{display/intel_fb_pin.c => i915_fb_pin.c} | 157 +++++------ + drivers/gpu/drm/i915/i915_freq.c | 2 +- + drivers/gpu/drm/i915/i915_gmch.c | 2 +- + drivers/gpu/drm/i915/i915_gtt_view_types.h | 15 ++ + drivers/gpu/drm/i915/i915_hwmon.c | 2 +- + drivers/gpu/drm/i915/i915_initial_plane.c | 33 +-- + drivers/gpu/drm/i915/i915_overlay.c | 8 +- + drivers/gpu/drm/i915/i915_pci.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 10 - + drivers/gpu/drm/i915/i915_vma.h | 2 - + drivers/gpu/drm/i915/intel_clock_gating.c | 4 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 + + drivers/gpu/drm/i915/vlv_iosf_sb.c | 8 + + drivers/gpu/drm/i915/vlv_iosf_sb.h | 16 +- + drivers/gpu/drm/xe/Makefile | 6 +- + .../xe/compat-i915-headers/intel_clock_gating.h | 10 +- + .../drm/xe/compat-i915-headers/intel_mchbar_regs.h | 6 - + .../drm/xe/compat-i915-headers/intel_pci_config.h | 6 - + .../gpu/drm/xe/compat-i915-headers/intel_step.h | 13 - + .../gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h | 42 --- + .../drm/xe/compat-i915-headers/vlv_iosf_sb_reg.h | 6 - + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 120 --------- + drivers/gpu/drm/xe/display/xe_display.c | 11 +- + drivers/gpu/drm/xe/display/xe_display_bo.c | 120 +++++++++ + drivers/gpu/drm/xe/display/xe_display_bo.h | 6 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 73 +++-- + drivers/gpu/drm/xe/display/xe_initial_plane.c | 32 +-- + drivers/gpu/drm/xe/tests/xe_pci.c | 4 +- + drivers/gpu/drm/xe/xe_step.c | 2 +- + drivers/gpu/drm/xe/xe_step.h | 4 +- + drivers/gpu/drm/xe/xe_step_types.h | 61 +---- + include/drm/display/drm_dp_tunnel.h | 6 + + include/drm/intel/display_parent_interface.h | 23 +- + .../drm/intel/mchbar_regs.h | 7 +- + .../drm/intel/pci_config.h | 0 + .../drm/intel/vlv_iosf_sb_regs.h | 18 +- + 138 files changed, 2202 insertions(+), 1892 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.h + create mode 100644 drivers/gpu/drm/i915/display/intel_mchbar.c + create mode 100644 drivers/gpu/drm/i915/display/intel_mchbar.h + rename drivers/gpu/drm/i915/{display/intel_fb_pin.c => i915_fb_pin.c} (66%) + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb_reg.h + delete mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.c + rename drivers/gpu/drm/i915/intel_mchbar_regs.h => include/drm/intel/mchbar_regs.h (98%) + rename drivers/gpu/drm/i915/intel_pci_config.h => include/drm/intel/pci_config.h (100%) + rename drivers/gpu/drm/i915/vlv_iosf_sb_reg.h => include/drm/intel/vlv_iosf_sb_regs.h (95%) +Merging drm-msm/msm-next (a972d1b864e8 drm/msm: Use of_get_available_child_by_name()) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (a972d1b864e8 drm/msm: Use of_get_available_child_by_name()) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging drm-xe/drm-xe-next (d34b42ffb1dd drm/xe/ras: Introduce correctable error handling) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/drm_gpusvm.c +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/xe_debugfs.c +Auto-merging drivers/gpu/drm/xe/xe_execlist.c +Auto-merging drivers/gpu/drm/xe/xe_hw_engine.c +Auto-merging drivers/gpu/drm/xe/xe_hwmon.c +Auto-merging drivers/gpu/drm/xe/xe_svm.c +Merge made by the 'ort' strategy. + Documentation/gpu/drm-ras.rst | 8 + + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_gt_stats.rst | 11 + + Documentation/netlink/specs/drm_ras.yaml | 13 +- + drivers/gpu/drm/drm_gpusvm.c | 5 + + drivers/gpu/drm/drm_ras.c | 43 ++- + drivers/gpu/drm/drm_ras_nl.c | 13 + + drivers/gpu/drm/drm_ras_nl.h | 2 + + drivers/gpu/drm/xe/Makefile | 5 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 8 + + drivers/gpu/drm/xe/abi/xe_sysctrl_abi.h | 65 ++++ + drivers/gpu/drm/xe/display/xe_fb_pin.c | 11 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 12 +- + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 5 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 7 +- + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_sysctrl_regs.h | 36 ++ + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 21 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 3 +- + drivers/gpu/drm/xe/xe_bo.c | 29 +- + drivers/gpu/drm/xe/xe_bo_types.h | 5 +- + drivers/gpu/drm/xe/xe_debugfs.c | 43 ++- + drivers/gpu/drm/xe/xe_dep_scheduler.h | 5 + + drivers/gpu/drm/xe/xe_devcoredump.c | 10 +- + drivers/gpu/drm/xe/xe_device.c | 64 +++- + drivers/gpu/drm/xe/xe_device.h | 23 +- + drivers/gpu/drm/xe/xe_device_types.h | 22 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 1 + + drivers/gpu/drm/xe/xe_dma_buf.c | 23 +- + drivers/gpu/drm/xe/xe_drm_ras.c | 35 +- + drivers/gpu/drm/xe/xe_drm_ras.h | 4 +- + drivers/gpu/drm/xe/xe_eu_stall.c | 4 +- + drivers/gpu/drm/xe/xe_eu_stall.h | 4 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 9 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 2 +- + drivers/gpu/drm/xe/xe_execlist.c | 9 - + drivers/gpu/drm/xe/xe_ggtt.c | 8 +- + drivers/gpu/drm/xe/xe_gsc.c | 2 +- + drivers/gpu/drm/xe/xe_gt.c | 1 - + drivers/gpu/drm/xe/xe_gt_mcr.c | 23 +- + drivers/gpu/drm/xe/xe_gt_mcr.h | 1 - + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 262 ++++++++++++-- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 124 ++++--- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h | 4 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 1 - + drivers/gpu/drm/xe/xe_gt_stats.c | 41 +++ + drivers/gpu/drm/xe/xe_gt_stats_types.h | 118 ++++++ + drivers/gpu/drm/xe/xe_gt_types.h | 4 +- + drivers/gpu/drm/xe/xe_guc.c | 17 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 5 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 2 +- + drivers/gpu/drm/xe/xe_guc_capture.h | 4 +- + drivers/gpu/drm/xe/xe_guc_capture_types.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 38 +- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 8 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 4 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 42 ++- + drivers/gpu/drm/xe/xe_guc_pc.h | 2 +- + drivers/gpu/drm/xe/xe_guc_relay_types.h | 2 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 40 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 2 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 86 ++--- + drivers/gpu/drm/xe/xe_hw_engine.h | 1 - + drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 +- + drivers/gpu/drm/xe/xe_hw_error.h | 4 +- + drivers/gpu/drm/xe/xe_hwmon.c | 28 +- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lrc.c | 22 +- + drivers/gpu/drm/xe/xe_mem_pool.c | 403 +++++++++++++++++++++ + drivers/gpu/drm/xe/xe_mem_pool.h | 35 ++ + drivers/gpu/drm/xe/xe_mem_pool_types.h | 21 ++ + drivers/gpu/drm/xe/xe_migrate.c | 71 ++-- + drivers/gpu/drm/xe/xe_migrate.h | 4 +- + drivers/gpu/drm/xe/xe_nvm.h | 4 +- + drivers/gpu/drm/xe/xe_oa.c | 136 +++---- + drivers/gpu/drm/xe/xe_oa_types.h | 12 +- + drivers/gpu/drm/xe/xe_pagefault_types.h | 4 +- + drivers/gpu/drm/xe/xe_pat.c | 9 + + drivers/gpu/drm/xe/xe_pat.h | 8 + + drivers/gpu/drm/xe/xe_pci.c | 13 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 2 + + drivers/gpu/drm/xe/xe_pci_types.h | 2 +- + drivers/gpu/drm/xe/xe_pcode_api.h | 8 +- + drivers/gpu/drm/xe/xe_pm.c | 6 + + drivers/gpu/drm/xe/xe_pt.c | 3 +- + drivers/gpu/drm/xe/xe_pt_types.h | 2 +- + drivers/gpu/drm/xe/xe_pt_walk.h | 14 +- + drivers/gpu/drm/xe/xe_pxp.c | 6 + + drivers/gpu/drm/xe/xe_pxp.h | 6 +- + drivers/gpu/drm/xe/xe_pxp_debugfs.h | 6 +- + drivers/gpu/drm/xe/xe_pxp_submit.h | 6 +- + drivers/gpu/drm/xe/xe_pxp_types.h | 6 +- + drivers/gpu/drm/xe/xe_query.c | 7 + + drivers/gpu/drm/xe/xe_ras.c | 93 +++++ + drivers/gpu/drm/xe/xe_ras.h | 15 + + drivers/gpu/drm/xe/xe_ras_types.h | 73 ++++ + drivers/gpu/drm/xe/xe_reg_sr.h | 4 +- + drivers/gpu/drm/xe/xe_reg_sr_types.h | 4 +- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 2 +- + drivers/gpu/drm/xe/xe_reg_whitelist.h | 4 +- + drivers/gpu/drm/xe/xe_rtp.c | 15 + + drivers/gpu/drm/xe/xe_rtp.h | 28 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 6 +- + drivers/gpu/drm/xe/xe_rtp_types.h | 4 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 6 - + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 3 +- + drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 41 +++ + drivers/gpu/drm/xe/xe_sriov_pf_provision.h | 1 + + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 3 - + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 54 +-- + drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h | 5 +- + drivers/gpu/drm/xe/xe_svm.c | 10 +- + drivers/gpu/drm/xe/xe_sysctrl.c | 132 +++++++ + drivers/gpu/drm/xe/xe_sysctrl.h | 24 ++ + drivers/gpu/drm/xe/xe_sysctrl_event.c | 88 +++++ + drivers/gpu/drm/xe/xe_sysctrl_event_types.h | 57 +++ + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 371 +++++++++++++++++++ + drivers/gpu/drm/xe/xe_sysctrl_mailbox.h | 31 ++ + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 58 +++ + drivers/gpu/drm/xe/xe_sysctrl_types.h | 39 ++ + drivers/gpu/drm/xe/xe_tlb_inval.c | 2 +- + drivers/gpu/drm/xe/xe_tuning.c | 9 +- + drivers/gpu/drm/xe/xe_tuning.h | 4 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 11 + + drivers/gpu/drm/xe/xe_uc_fw.h | 4 + + drivers/gpu/drm/xe/xe_uc_fw_abi.h | 4 +- + drivers/gpu/drm/xe/xe_vm.c | 17 +- + drivers/gpu/drm/xe/xe_vm_madvise.c | 47 +++ + drivers/gpu/drm/xe/xe_vm_types.h | 3 +- + drivers/gpu/drm/xe/xe_vram.c | 22 ++ + drivers/gpu/drm/xe/xe_vram.h | 2 + + drivers/gpu/drm/xe/xe_wa.c | 21 +- + drivers/gpu/drm/xe/xe_wa.h | 4 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 7 + + include/drm/drm_ras.h | 11 + + include/uapi/drm/drm_ras.h | 1 + + include/uapi/drm/xe_drm.h | 206 +++++------ + 140 files changed, 3151 insertions(+), 663 deletions(-) + create mode 100644 Documentation/gpu/xe/xe_gt_stats.rst + create mode 100644 drivers/gpu/drm/xe/abi/xe_sysctrl_abi.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_sysctrl_regs.h + create mode 100644 drivers/gpu/drm/xe/xe_mem_pool.c + create mode 100644 drivers/gpu/drm/xe/xe_mem_pool.h + create mode 100644 drivers/gpu/drm/xe/xe_mem_pool_types.h + create mode 100644 drivers/gpu/drm/xe/xe_ras.c + create mode 100644 drivers/gpu/drm/xe/xe_ras.h + create mode 100644 drivers/gpu/drm/xe/xe_ras_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_event.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_event_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_mailbox.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_mailbox.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_types.h +Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging drm-rust/drm-rust-next (d9a6809478f9 drm/tyr: Add DOORBELL_BLOCK registers) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/tyr/driver.rs | 19 +- + drivers/gpu/drm/tyr/gpu.rs | 175 ++-- + drivers/gpu/drm/tyr/regs.rs | 1725 +++++++++++++++++++++++++++++++++++-- + drivers/gpu/nova-core/firmware.rs | 8 +- + 4 files changed, 1715 insertions(+), 212 deletions(-) +Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging fbdev/for-next (d237f719b272 lib/fonts: Fix bit position when rotating by 180 degrees) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/core/fb_defio.c | 1 - + include/video/imx-ipu-image-convert.h | 16 +++++++++++----- + lib/fonts/font_rotate.c | 2 +- + 3 files changed, 12 insertions(+), 7 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch +Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/hyperv/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 78011543ffae] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Thu Apr 30 10:33:01 2026 +0200 +Merging regmap/for-next (4b7774eeab8d regmap: sdw-mbq: Fix spelling mistake "undeferable" -> "undeferrable") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (d8f802ccf1fd ALSA: usb-audio: Update Babyface Pro control caches only after successful writes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/usb/mixer.c +Merge made by the 'ort' strategy. + include/sound/snd_wavefront.h | 7 + + sound/isa/opti9xx/miro.c | 268 +++++++++++++++++- + sound/isa/wavefront/wavefront.c | 61 +++- + sound/isa/wavefront/wavefront_midi.c | 47 +++- + sound/isa/wavefront/wavefront_synth.c | 96 +++++++ + sound/oss/dmasound/dmasound_core.c | 10 +- + sound/pci/ctxfi/ctmixer.c | 27 +- + sound/pci/ctxfi/ctmixer.h | 4 +- + sound/usb/mixer.c | 17 +- + sound/usb/mixer_quirks.c | 61 +++- + sound/usb/mixer_scarlett.c | 4 +- + sound/usb/mixer_scarlett2.c | 515 +++++++++++++++++++++++++++++++--- + sound/usb/mixer_us16x08.c | 127 +++++---- + 13 files changed, 1096 insertions(+), 148 deletions(-) +Merging ieee1394/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (391ca448f0b9 Merge remote-tracking branch 'asoc/for-7.2' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/fsl,sai.yaml | 7 + + .../bindings/sound/mediatek,mt6351-sound.yaml | 37 + + Documentation/devicetree/bindings/sound/mt6351.txt | 16 - + .../devicetree/bindings/sound/ti,tas67524.yaml | 280 +++ + Documentation/sound/codecs/tas675x.rst | 820 ++++++++ + MAINTAINERS | 4 + + drivers/gpio/gpiolib-of.c | 8 + + sound/soc/apple/mca.c | 14 +- + sound/soc/atmel/atmel-classd.c | 41 +- + sound/soc/atmel/mchp-spdifrx.c | 33 +- + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/rt722-sdca.c | 77 +- + sound/soc/codecs/rt722-sdca.h | 4 + + sound/soc/codecs/tas675x.c | 2194 ++++++++++++++++++++ + sound/soc/codecs/tas675x.h | 367 ++++ + sound/soc/codecs/tlv320aic3x.c | 7 + + sound/soc/codecs/wsa881x.c | 35 +- + sound/soc/fsl/fsl_micfil.c | 79 + + sound/soc/fsl/fsl_micfil.h | 1 + + sound/soc/fsl/fsl_sai.c | 7 +- + sound/soc/fsl/fsl_sai.h | 2 + + sound/soc/intel/boards/cht_bsw_rt5672.c | 73 +- + sound/soc/intel/common/sof-function-topology-lib.c | 11 +- + sound/soc/samsung/i2s.c | 118 +- + sound/soc/samsung/idma.c | 26 +- + sound/soc/samsung/odroid.c | 21 +- + sound/soc/samsung/pcm.c | 99 +- + sound/soc/samsung/spdif.c | 25 +- + sound/soc/soc-ops.c | 4 + + sound/soc/sof/topology.c | 55 + + sound/soc/tegra/tegra210_adx.c | 85 +- + sound/soc/tegra/tegra210_adx.h | 5 +- + sound/soc/tegra/tegra210_amx.c | 82 +- + sound/soc/tegra/tegra210_amx.h | 5 +- + sound/soc/tegra/tegra210_mvc.c | 3 + + sound/soc/ti/j721e-evm.c | 22 +- + 37 files changed, 4264 insertions(+), 417 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt6351-sound.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt6351.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas67524.yaml + create mode 100644 Documentation/sound/codecs/tas675x.rst + create mode 100644 sound/soc/codecs/tas675x.c + create mode 100644 sound/soc/codecs/tas675x.h +Merging modules/modules-next (663385f9155f module: Simplify warning on positive returns from module_init()) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (26b760d0f814 Input: stmfts - fix formatting issues) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../bindings/input/touchscreen/st,stmfts.yaml | 4 + + drivers/input/keyboard/lm8323.c | 2 +- + drivers/input/touchscreen/stmfts.c | 160 ++++++++++++++------- + 3 files changed, 111 insertions(+), 55 deletions(-) +Merging block/for-next (fb9d71cc0d0e Merge branch 'io_uring-7.1' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/cdrom/cdrom.c | 73 ++++++++----- + drivers/md/md-bitmap.c | 133 +++++++++++++++++++++--- + drivers/md/md-bitmap.h | 2 +- + drivers/md/md-llbitmap.c | 7 +- + drivers/md/md.c | 182 ++++++++++++++++++--------------- + drivers/md/md.h | 6 +- + drivers/md/raid1-10.c | 7 +- + drivers/md/raid1.c | 15 +-- + drivers/md/raid10.c | 2 + + drivers/md/raid5.c | 7 +- + drivers/nvme/common/auth.c | 94 +++++++++++++---- + drivers/nvme/host/apple.c | 6 +- + drivers/nvme/host/auth.c | 16 +-- + drivers/nvme/host/core.c | 16 ++- + drivers/nvme/host/fc.c | 1 + + drivers/nvme/host/multipath.c | 4 - + drivers/nvme/host/pci.c | 5 + + drivers/nvme/host/rdma.c | 9 ++ + drivers/nvme/host/sysfs.c | 19 ++++ + drivers/nvme/host/tcp.c | 29 ++++-- + drivers/nvme/target/admin-cmd.c | 8 +- + drivers/nvme/target/auth.c | 21 ++-- + drivers/nvme/target/configfs.c | 27 +++++ + drivers/nvme/target/core.c | 10 +- + drivers/nvme/target/fabrics-cmd-auth.c | 9 +- + drivers/nvme/target/nvmet.h | 13 +++ + drivers/nvme/target/tcp.c | 117 +++++++++++---------- + drivers/nvme/target/zns.c | 6 +- + drivers/scsi/sr.c | 11 +- + drivers/scsi/sr.h | 1 - + include/linux/cdrom.h | 1 + + include/linux/nvme-auth.h | 6 +- + include/uapi/linux/io_uring.h | 3 +- + io_uring/kbuf.c | 9 +- + io_uring/kbuf.h | 8 +- + io_uring/napi.c | 2 + + 37 files changed, 606 insertions(+), 280 deletions(-) +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +[master 7537a74d9c20] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Thu Apr 30 10:33:10 2026 +0200 +Merging device-mapper/for-next (0a2a383d2d44 dm vdo: use get_random_u32() where appropriate) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/dm-vdo/indexer/index-layout.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging libata/for-next (eb9c9a3a6d86 ata: ahci: fail probe if BAR too small for claimed ports) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ahci.c | 22 ++++++++++++++++++++++ + drivers/ata/libahci.c | 2 +- + 2 files changed, 23 insertions(+), 1 deletion(-) +Merging pcmcia/pcmcia-next (b3c26ea81ccc pcmcia: remove obsolete host controller drivers) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (52957cdad30f mmc: sdhci-msm: Fix the wrapped key handling) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (522d62d7aa11 mfd: bd72720: Drop BUCK11 ID) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Merge made by the 'ort' strategy. + drivers/mfd/sprd-sc27xx-spi.c | 62 ++++++++++++++++++++++++++++++++++------ + drivers/mfd/tps65219.c | 14 +++++---- + drivers/mfd/tps65910.c | 16 ++++++++++- + include/linux/mfd/rohm-bd72720.h | 1 - + 4 files changed, 76 insertions(+), 17 deletions(-) +Merging backlight/for-backlight-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (98d68b74ebb9 power: supply: qcom_smbx: allow disabling charging) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (53492c744e39 Merge remote-tracking branch 'regulator/for-7.2' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mt6360-regulator.yaml | 4 ++++ + .../bindings/regulator/qcom,rpmh-regulator.yaml | 3 +++ + drivers/regulator/qcom-rpmh-regulator.c | 19 +++++++++++++++++++ + 3 files changed, 26 insertions(+) +Merging security/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (69fc6474236d ima: return error early if file xattr cannot be changed) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/ima/ima_appraise.c | 10 ++++++++-- + security/integrity/ima/ima_policy.c | 3 ++- + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging selinux/next (d92f6f4b2bc4 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 38 +++++++++++++++++--------------------- + security/selinux/include/objsec.h | 4 +--- + security/selinux/selinuxfs.c | 13 ++++++------- + security/selinux/ss/conditional.c | 4 ++-- + 4 files changed, 26 insertions(+), 33 deletions(-) +Merging smack/next (b78fede1c69a smack: simplify write handlers of sysfs entries) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + security/smack/smackfs.c | 81 +++++++++++++--------------------------------- + 2 files changed, 23 insertions(+), 60 deletions(-) +Merging tomoyo/master (de8a048f0f6a loop: check lo->lo_backing_file in lo_rw_aio) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + drivers/block/loop.c | 39 +++++++++- + include/linux/netdevice.h | 15 ++++ + include/net/dst.h | 22 +++++- + include/net/sock.h | 8 +- + kernel/locking/lockdep.c | 2 + + kernel/softirq.c | 4 + + kernel/workqueue.c | 28 +++++++ + lib/Kconfig.debug | 7 ++ + net/bridge/br_nf_core.c | 1 + + net/core/dev.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ + net/core/dst.c | 85 +++++++++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++++-- + 13 files changed, 419 insertions(+), 13 deletions(-) +Merging tpmdd-tpm/for-next-tpm (949692da7211 tpm: tpm_tis: stop transmit if retries are exhausted) +$ git merge -m Merge branch 'for-next-tpm' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-tpm/for-next-tpm +Already up to date. +Merging tpmdd-keys/for-next-keys (4fb4ce024d06 KEYS: trusted: Debugging as a feature) +$ git merge -m Merge branch 'for-next-keys' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-keys/for-next-keys +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 16 +++++++++ + include/keys/trusted-type.h | 21 +++++++----- + security/keys/Kconfig | 1 - + security/keys/trusted-keys/Kconfig | 23 +++++++++++++ + security/keys/trusted-keys/trusted_caam.c | 7 ++-- + security/keys/trusted-keys/trusted_core.c | 6 ++++ + security/keys/trusted-keys/trusted_tpm1.c | 44 ++++++++++++++----------- + 7 files changed, 87 insertions(+), 31 deletions(-) +Merging watchdog/master (450517fa5aae dt-bindings: watchdog: qcom-wdt: Document Glymur watchdog) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (f9471dc1a717 iommu/pages: Fix iommu_pages_flush_incoherent() for non-x86) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Merge made by the 'ort' strategy. + drivers/iommu/amd/amd_iommu.h | 3 + + drivers/iommu/amd/amd_iommu_types.h | 21 +++--- + drivers/iommu/amd/init.c | 133 +++++++++++++++++++++++++----------- + drivers/iommu/amd/iommu.c | 2 +- + drivers/iommu/amd/ppr.c | 8 ++- + drivers/iommu/iommu-pages.h | 2 +- + 6 files changed, 116 insertions(+), 53 deletions(-) +Merging audit/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (a74c2e55ab66 dt-bindings: display: panel: panel-simple: Add lg,sw49410 compatible) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (6e937f4e769e mailbox: mailbox-test: make data_ready a per-instance variable) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (4f36c9feced6 Merge remote-tracking branch 'spi/for-7.2' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + drivers/spi/spi-atcspi200.c | 28 +++++++-------- + drivers/spi/spi-cadence-quadspi.c | 66 ++++++++++++++--------------------- + drivers/spi/spi-cadence.c | 37 +++++++++++++------- + drivers/spi/spi-microchip-core-qspi.c | 3 +- + drivers/spi/spi-mpc52xx.c | 26 ++++++++------ + drivers/spi/spi.c | 4 ++- + 6 files changed, 83 insertions(+), 81 deletions(-) +Merging tip/master (8f1aacb683ef Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + Documentation/arch/x86/tdx.rst | 7 --- + .../devicetree/bindings/timer/fsl,imxgpt.yaml | 1 + + arch/x86/include/asm/bug.h | 4 +- + arch/x86/include/asm/shared/tdx.h | 1 + + .../{kvm/vmx => include/asm/shared}/tdx_errno.h | 8 +-- + arch/x86/include/asm/tdx.h | 9 +-- + arch/x86/kernel/crash.c | 2 + + arch/x86/kernel/machine_kexec_64.c | 16 ------ + arch/x86/kvm/vmx/tdx.c | 10 ---- + arch/x86/kvm/vmx/tdx.h | 1 - + arch/x86/virt/vmx/tdx/tdx.c | 66 +++++++++++++++++----- + arch/x86/virt/vmx/tdx/tdx.h | 1 + + drivers/clocksource/mmio.c | 11 +++- + drivers/clocksource/timer-of.c | 24 ++++---- + drivers/clocksource/timer-of.h | 5 +- + drivers/clocksource/timer-rtl-otto.c | 2 +- + drivers/clocksource/timer-sun5i.c | 3 + + 17 files changed, 95 insertions(+), 76 deletions(-) + rename arch/x86/{kvm/vmx => include/asm/shared}/tdx_errno.h (90%) +Merging kexec/kexec-next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'kexec-next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec/kexec-next +Already up to date. +Merging liveupdate/next (7ac15eb18f91 selftests/liveupdate: add test cases for LIVEUPDATE_SESSION_GET_NAME) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next +Auto-merging kernel/liveupdate/kexec_handover.c +Auto-merging kernel/liveupdate/luo_session.c +Merge made by the 'ort' strategy. + include/linux/memblock.h | 21 ++++- + include/uapi/linux/liveupdate.h | 21 +++++ + kernel/liveupdate/Kconfig | 2 - + kernel/liveupdate/kexec_handover.c | 52 +++++------ + kernel/liveupdate/luo_session.c | 20 +++++ + mm/memblock.c | 56 +++++------- + mm/mm_init.c | 30 ++++--- + tools/testing/selftests/kho/vmtest.sh | 4 + + tools/testing/selftests/liveupdate/liveupdate.c | 113 ++++++++++++++++++++++++ + 9 files changed, 242 insertions(+), 77 deletions(-) +Merging clockevents/timers/drivers/next (0712d2137dd8 dt-bindings: timer: Add StarFive JHB100 clint) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/renesas,rz-mtu3.yaml | 26 +++++++++++++++++----- + .../devicetree/bindings/timer/sifive,clint.yaml | 17 +------------- + 2 files changed, 21 insertions(+), 22 deletions(-) +Merging edac/edac-for-next (3d63012017f1 Merge ras/edac-urgent into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (0b6bc3dbe632 Merge tag 'trace-latency-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/next (ed062c41dfda Merge branch 'rcu-nocb.20260123a') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (48f7a50c027d stop_machine: Fix the documentation for a NULL cpus argument) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (39f1c201b93f Merge tag 'kvm-x86-selftests_kernel_types-7.1' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (94b4ae79ebb4 Merge branch kvm-arm64/misc-7.1 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (9b8e8aad5896 KVM: s390: ucontrol: Fix memslot handling) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (f338e7738378 Linux 7.0-rc4) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (ddbf9c76c402 RISC-V: KVM: Fix shift-out-of-bounds in make_xfence_request()) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (85f871f6ba46 Merge branch 'selftests_kernel_types') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (3f100dd61ad4 xen/grant-table: guard gnttab_suspend/resume with CONFIG_HIBERNATE_CALLBACKS) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (20e81c64c905 workqueue: Annotate alloc_workqueue_va() with __printf(1, 0)) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 6 ++++-- + kernel/workqueue.c | 29 ++++++++++++++++++++--------- + 2 files changed, 24 insertions(+), 11 deletions(-) +Merging sched-ext/for-next (88588854c283 Merge branch 'for-7.2' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging kernel/sched/ext.c +Merge made by the 'ort' strategy. + Documentation/scheduler/sched-ext.rst | 7 +- + include/linux/sched/ext.h | 9 + + kernel/sched/build_policy.c | 5 + + kernel/sched/ext.c | 1052 ++++++++++++++++---- + kernel/sched/ext_cid.c | 409 ++++++++ + kernel/sched/ext_cid.h | 164 +++ + kernel/sched/ext_idle.c | 9 +- + kernel/sched/ext_internal.h | 229 ++++- + kernel/sched/ext_types.h | 104 ++ + tools/sched_ext/README.md | 6 +- + tools/sched_ext/include/scx/cid.bpf.h | 666 +++++++++++++ + tools/sched_ext/include/scx/common.bpf.h | 28 + + tools/sched_ext/include/scx/compat.bpf.h | 30 +- + tools/sched_ext/include/scx/compat.h | 23 +- + tools/sched_ext/include/scx/user_exit_info.bpf.h | 3 + + tools/sched_ext/include/scx/user_exit_info.h | 2 + + .../sched_ext/include/scx/user_exit_info_common.h | 5 + + tools/sched_ext/scx_central.bpf.c | 10 +- + tools/sched_ext/scx_cpu0.bpf.c | 2 - + tools/sched_ext/scx_cpu0.c | 2 - + tools/sched_ext/scx_flatcg.c | 12 +- + tools/sched_ext/scx_qmap.bpf.c | 893 ++++++++++------- + tools/sched_ext/scx_qmap.c | 109 +- + tools/sched_ext/scx_qmap.h | 73 ++ + .../selftests/sched_ext/non_scx_kfunc_deny.bpf.c | 7 +- + 25 files changed, 3212 insertions(+), 647 deletions(-) + create mode 100644 kernel/sched/ext_cid.c + create mode 100644 kernel/sched/ext_cid.h + create mode 100644 kernel/sched/ext_types.h + create mode 100644 tools/sched_ext/include/scx/cid.bpf.h + create mode 100644 tools/sched_ext/scx_qmap.h +Merging drivers-x86/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +$ git am -3 ../patches/0001-hid-Fix-up-mismerge.patch +Applying: hid: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/hid-asus.c +$ git add -A . +$ git commit -v -a --amend +[master d837b66847cc] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git + Date: Thu Apr 30 10:33:51 2026 +0200 +Merging chrome-platform/for-next (0fd0fea2525d platform/chrome: cros_kbd_led_backlight: Drop CONFIG_MFD_CROS_EC_DEV ifdeffery) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_sensorhub.c | 6 ++++- + drivers/platform/chrome/cros_ec_sysfs.c | 5 +++-- + drivers/platform/chrome/cros_kbd_led_backlight.c | 28 ++++++------------------ + include/linux/platform_data/cros_ec_proto.h | 2 ++ + 4 files changed, 17 insertions(+), 24 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (7b1a1af4556a firmware: google: Add bounds checks in coreboot_table_populate()) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Merge made by the 'ort' strategy. + drivers/firmware/google/coreboot_table.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging hsi/for-next (df5ead915b19 HSI: omap_ssi_port: remove depends on ARM) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (863ba8705529 dt-binding: leds: Publish common bindings under dual license) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/irled/ir-spi-led.yaml | 2 +- + drivers/leds/leds-pca9532.c | 8 +++++--- + drivers/leds/leds-st1202.c | 1 - + include/dt-bindings/leds/common.h | 2 +- + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging ipmi/for-next (c9ccd876a06e ipmi:kcs: Reduce the number of retries) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_kcs_sm.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 70 ++++++++++++++++++++++++++++++++-------- + drivers/char/ipmi/ipmi_ssif.c | 24 ++++++++++++-- + 3 files changed, 79 insertions(+), 17 deletions(-) +Merging driver-core/driver-core-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (babaad95670d thunderbolt: debugfs: Don't stop reading SB registers if just one fails) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging usb-serial/usb-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (971f3474f889 coresight: tpdm: fix invalid MMIO access issue) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (f63ddbcc3299 fpga: m10bmc-sec: switch show_canceled_csk() to using sysfs_emit()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (0436cd305d0b MAINTAINERS: Add interconnect kunit test entry) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (d2a4ec19d2a2 Docs: iio: ad7191 Correct clock configuration) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (30471982cd66 vfio/cdx: Consolidate MSI configured state onto cdx_irqs) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (cbf8db23fc58 counter: sysfs: remove double return in counter_sysfs_attr_add()) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (59b723cd2adb Linux 6.12-rc6) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (d69e93434a0f Merge branch 'for-7.1-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + kernel/cgroup/rdma.c | 116 +++++++++++++++++++++++++-------------------------- + 1 file changed, 57 insertions(+), 59 deletions(-) +Merging scsi/for-next (98f69975d4c0 Merge branch '7.1/scsi-queue' into 7.1/scsi-fixes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (ebcff9dacaf2 vduse: avoid adding implicit padding) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (fcdf2df56d34 Merge branch 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 3 + + drivers/remoteproc/Kconfig | 1 - + drivers/remoteproc/imx_rproc.c | 92 +++++++++++++++++++++- + drivers/remoteproc/imx_rproc.h | 2 + + 4 files changed, 95 insertions(+), 3 deletions(-) +Merging gpio-brgl/gpio/for-next (be22c0f7f2d5 gpio: sim: Replace sprintf() with sysfs_emit()) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Merge made by the 'ort' strategy. + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-ep93xx.c | 3 +-- + drivers/gpio/gpio-ixp4xx.c | 7 +------ + drivers/gpio/gpio-pca953x.c | 7 ++----- + drivers/gpio/gpio-sim.c | 24 ++++++++++++------------ + drivers/gpio/gpio-usbio.c | 1 + + drivers/gpio/gpio-xilinx.c | 6 ++---- + 7 files changed, 20 insertions(+), 30 deletions(-) +Merging gpio-intel/for-next (3bb62e3f99a5 gpiolib: acpi: Only trigger ActiveBoth interrupts on boot) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (b51d33ea8a16 pinctrl: qcom: ipq4019: mark gpio as a GPIO pin function) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/mediatek/pinctrl-moore.c | 18 ++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 5 +++++ + 3 files changed, 24 insertions(+), 1 deletion(-) +Merging pinctrl-intel/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (11873859c95b dt-bindings: pinctrl: renesas,rzg2l-pinctrl: Document reset-names) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 15 ++++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 89 +++++++++++++++++++++- + 2 files changed, 101 insertions(+), 3 deletions(-) +Merging pinctrl-samsung/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (68637b68afcc pwm: atmel-tcb: Cache clock rates and mark chip as atomic) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Already up to date. +Merging ktest/for-next (932cdaf3e273 ktest: Add logfile to failure directory) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (712c0756828b Merge branch 'for-7.1/module-function-test' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (45df9111692c dax/fsdev: fix uninitialized kaddr in fsdev_dax_zero_page_range()) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (7b3302c687ca ntb_hw_amd: Fix incorrect debug message in link disable path) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging seccomp/for-next/seccomp (41fa04327384 selftests/seccomp: Add hard-coded __NR_uprobe for x86_64) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (8d48419d141c Merge branches 'nvmem-fixes' and 'nvmem-for-7.1' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. +Merging hyperv/hyperv-next (5170a82e8921 x86/hyperv: Skip LP/VP creation on kexec) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (fdbdd0ccb30a kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (ac12b852b4ea bus: mhi: host: pci_generic: Add Telit FE912C04 modem support) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (d5759519805c x86/alternative: delay freeing of smp_locks section) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (6c724ce0ec6e Merge branch 'for-7.1/cxl-misc' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (48a428215782 efi/capsule-loader: fix incorrect sizeof in phys array reallocation) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (bcfee135d584 utf8: Remove unused utf8_normalize) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/unicode/utf8-core.c +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 22 ---------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 25 deletions(-) +Merging slab/slab/for-next (895272864130 mm/slub: defer freelist construction until after bulk allocation from a new slab) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 297 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 153 insertions(+), 144 deletions(-) +Merging random/master (bb9ff576fdff virt: vmgenid: remap memory as decrypted) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/virt/vmgenid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging landlock/next (3457a5ccacd3 landlock: Document fallocate(2) as another truncation corner case) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging sysctl/sysctl-next (f63a9df7e3f9 sysctl: fix uninitialized variable in proc_do_large_bitmap) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (9bf092c97b86 sched: update task_struct->comm comment) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (1a98b4e6043b ptp: switch to using FIELD_GET_SIGNED()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/iio/pressure/bmp280-core.c +Auto-merging lib/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + arch/riscv/Kconfig | 2 + + arch/riscv/include/asm/bitrev.h | 51 ++++++++++++++++++++++ + arch/x86/include/asm/extable_fixup_types.h | 13 ++---- + arch/x86/mm/extable.c | 2 +- + drivers/iio/adc/intel_dc_ti_adc.c | 4 +- + drivers/iio/magnetometer/yamaha-yas530.c | 12 ++--- + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/temperature/mcp9600.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 4 +- + .../net/wireless/realtek/rtw89/rtw8852b_common.c | 4 +- + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 4 +- + drivers/ptp/ptp_fc3.c | 4 +- + drivers/rtc/rtc-rv3032.c | 2 +- + include/asm-generic/bitops/__bitrev.h | 25 +++++++++++ + include/linux/bitfield.h | 16 +++++++ + include/linux/bitmap-str.h | 1 - + include/linux/bitrev.h | 20 ++------- + include/linux/cpumask.h | 17 +------- + lib/Kconfig | 18 ++++++++ + lib/Makefile | 2 +- + lib/bitmap-str.c | 42 +++--------------- + lib/bitrev.c | 3 -- + lib/cpumask.c | 17 ++++++++ + 25 files changed, 168 insertions(+), 105 deletions(-) + create mode 100644 arch/riscv/include/asm/bitrev.h + create mode 100644 include/asm-generic/bitops/__bitrev.h +Merging hte/for-next (005b25ad1171 hte: tegra194: Add Tegra264 GTE support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (e0142e0de50a Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. +Merging nolibc/for-next (266df86c4893 selftests/nolibc: test large file support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 2 + + tools/include/nolibc/alloca.h | 15 +++++ + tools/include/nolibc/arch-arm.h | 2 +- + tools/include/nolibc/arch-arm64.h | 2 +- + tools/include/nolibc/arch-loongarch.h | 2 +- + tools/include/nolibc/arch-m68k.h | 2 +- + tools/include/nolibc/arch-mips.h | 96 +++++++++++++++------------- + tools/include/nolibc/arch-powerpc.h | 8 +-- + tools/include/nolibc/arch-riscv.h | 2 +- + tools/include/nolibc/arch-s390.h | 2 +- + tools/include/nolibc/arch-sh.h | 2 +- + tools/include/nolibc/arch-sparc.h | 2 +- + tools/include/nolibc/arch-x86.h | 74 ++++++++++----------- + tools/include/nolibc/assert.h | 36 +++++++++++ + tools/include/nolibc/compiler.h | 4 +- + tools/include/nolibc/crt.h | 8 ++- + tools/include/nolibc/fcntl.h | 14 ++++ + tools/include/nolibc/nolibc.h | 2 + + tools/include/nolibc/stackprotector.h | 2 +- + tools/include/nolibc/sys.h | 32 ++++++++-- + tools/include/nolibc/sys/mman.h | 6 +- + tools/testing/selftests/nolibc/nolibc-test.c | 82 +++++++++++++++++++++++- + 22 files changed, 287 insertions(+), 110 deletions(-) + create mode 100644 tools/include/nolibc/alloca.h + create mode 100644 tools/include/nolibc/assert.h +Merging iommufd/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (73760e63ab77 tools/power turbostat: Cleanup: Remove useless assert()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 2 +- + tools/power/x86/turbostat/turbostat.c | 217 ++++++++++++++++++---------------- + 2 files changed, 114 insertions(+), 105 deletions(-) +Merging pwrseq/pwrseq/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (071588136007 ipc: don't audit capability check in ipc_permissions()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +Merging ipe/next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging keys-next/keys-next (965e9a2cf23b pkcs7: Change a pr_warn() to pr_warn_once()) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Already up to date. +Merging fwctl/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (3177779ae17d virt: coco: change tsm_class to a const struct) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (b419e155e31d Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging kthread/for-next (fa39ec4f89f2 doc: Add housekeeping documentation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. |