--- /dev/null
+$ date -R
+Tue, 25 Feb 2025 09:23:21 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 71% (4437/6217)\rUpdating files: 72% (4477/6217)\rUpdating files: 73% (4539/6217)\rUpdating files: 74% (4601/6217)\rUpdating files: 75% (4663/6217)\rUpdating files: 76% (4725/6217)\rUpdating files: 77% (4788/6217)\rUpdating files: 78% (4850/6217)\rUpdating files: 79% (4912/6217)\rUpdating files: 80% (4974/6217)\rUpdating files: 81% (5036/6217)\rUpdating files: 82% (5098/6217)\rUpdating files: 83% (5161/6217)\rUpdating files: 84% (5223/6217)\rUpdating files: 85% (5285/6217)\rUpdating files: 86% (5347/6217)\rUpdating files: 87% (5409/6217)\rUpdating files: 88% (5471/6217)\rUpdating files: 89% (5534/6217)\rUpdating files: 90% (5596/6217)\rUpdating files: 91% (5658/6217)\rUpdating files: 92% (5720/6217)\rUpdating files: 93% (5782/6217)\rUpdating files: 94% (5844/6217)\rUpdating files: 95% (5907/6217)\rUpdating files: 96% (5969/6217)\rUpdating files: 97% (6031/6217)\rUpdating files: 98% (6093/6217)\rUpdating files: 99% (6155/6217)\rUpdating files: 100% (6217/6217)\rUpdating files: 100% (6217/6217), done.
+HEAD is now at d082ecbc71e9 Linux 6.14-rc4
+Merging origin/master (d082ecbc71e9 Linux 6.14-rc4)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Already up to date.
+Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
+Already up to date.
+Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes
+Already up to date.
+Merging vfs-brauner-fixes/vfs.fixes (4c7a22bda684 Merge patch series "fixes for uncached IO")
+$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes
+Merge made by the 'ort' strategy.
+ fs/fuse/dev.c | 6 ++++++
+ fs/fuse/dir.c | 2 +-
+ fs/fuse/file.c | 13 +++++++++++--
+ fs/namei.c | 24 +++++++++++++++++++-----
+ fs/overlayfs/copy_up.c | 2 +-
+ include/linux/fs.h | 6 ++++--
+ mm/filemap.c | 2 +-
+ mm/truncate.c | 2 --
+ 8 files changed, 43 insertions(+), 14 deletions(-)
+Merging fscrypt-current/for-current (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
+Already up to date.
+Merging fsverity-current/for-current (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
+Already up to date.
+Merging btrfs-fixes/next-fixes (db9dad9dfa9a Merge branch 'misc-6.14' into next-fixes)
+$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
+Merge made by the 'ort' strategy.
+ fs/btrfs/extent_map.c | 83 ++++++++++++++++++++++++++-----------
+ fs/btrfs/file.c | 9 +++-
+ fs/btrfs/tests/delayed-refs-tests.c | 1 +
+ fs/btrfs/volumes.c | 6 ++-
+ 4 files changed, 73 insertions(+), 26 deletions(-)
+Merging vfs-fixes/fixes (60a600243244 hostfs: fix string handling in __dentry_name())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-backed mounts by default)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
+Already up to date.
+Merging nfsd-fixes/nfsd-fixes (4990d098433d NFSD: Fix CB_GETATTR status fix)
+$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
+Already up to date.
+Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
+Already up to date.
+Merging overlayfs-fixes/ovl-fixes (228a1157fb9f Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes
+Already up to date.
+Merging bcachefs/for-next (ab215af397f4 Documentation: bcachefs: SubmittingPatches: Convert footnotes to reST syntax)
+$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next
+Merge made by the 'ort' strategy.
+ .../filesystems/bcachefs/SubmittingPatches.rst | 43 +-
+ Documentation/filesystems/bcachefs/casefolding.rst | 90 ++++
+ Documentation/filesystems/bcachefs/index.rst | 20 +-
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/alloc_background.c | 159 +++++--
+ fs/bcachefs/alloc_background.h | 2 +-
+ fs/bcachefs/alloc_foreground.c | 25 +-
+ fs/bcachefs/alloc_foreground.h | 17 +
+ fs/bcachefs/alloc_types.h | 2 +
+ fs/bcachefs/backpointers.c | 140 ++----
+ fs/bcachefs/backpointers.h | 26 +-
+ fs/bcachefs/bcachefs.h | 11 +-
+ fs/bcachefs/bcachefs_format.h | 9 +-
+ fs/bcachefs/bcachefs_ioctl.h | 29 +-
+ fs/bcachefs/btree_gc.c | 18 +-
+ fs/bcachefs/btree_io.c | 207 +++++++-
+ fs/bcachefs/btree_io.h | 4 +
+ fs/bcachefs/btree_trans_commit.c | 91 ++--
+ fs/bcachefs/btree_types.h | 13 +
+ fs/bcachefs/btree_update.c | 3 +-
+ fs/bcachefs/btree_update_interior.c | 20 +
+ fs/bcachefs/btree_update_interior.h | 4 +
+ fs/bcachefs/buckets.c | 14 +-
+ fs/bcachefs/buckets.h | 27 --
+ fs/bcachefs/buckets_types.h | 27 ++
+ fs/bcachefs/chardev.c | 38 +-
+ fs/bcachefs/compress.c | 8 +-
+ fs/bcachefs/data_update.c | 221 ++++++---
+ fs/bcachefs/data_update.h | 17 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/dirent.c | 223 +++++++--
+ fs/bcachefs/dirent.h | 18 +-
+ fs/bcachefs/dirent_format.h | 20 +-
+ fs/bcachefs/ec.c | 73 ++-
+ fs/bcachefs/ec.h | 41 ++
+ fs/bcachefs/ec_types.h | 5 +-
+ fs/bcachefs/errcode.h | 6 +
+ fs/bcachefs/error.c | 60 ++-
+ fs/bcachefs/error.h | 5 +-
+ fs/bcachefs/extents.c | 9 +-
+ fs/bcachefs/extents.h | 4 +-
+ fs/bcachefs/eytzinger.c | 136 +++---
+ fs/bcachefs/eytzinger.h | 93 ++--
+ fs/bcachefs/fs-common.c | 54 ++-
+ fs/bcachefs/fs-io-buffered.c | 35 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/fs-ioctl.c | 25 +
+ fs/bcachefs/fs-ioctl.h | 20 +-
+ fs/bcachefs/fs.c | 20 +-
+ fs/bcachefs/fsck.c | 3 +-
+ fs/bcachefs/inode_format.h | 3 +-
+ fs/bcachefs/io_misc.c | 3 +-
+ fs/bcachefs/io_read.c | 523 ++++++++++-----------
+ fs/bcachefs/io_read.h | 75 +--
+ fs/bcachefs/io_write.c | 185 +++++---
+ fs/bcachefs/io_write.h | 37 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 127 ++++-
+ fs/bcachefs/journal.h | 38 +-
+ fs/bcachefs/journal_io.c | 37 +-
+ fs/bcachefs/journal_seq_blacklist.c | 7 +-
+ fs/bcachefs/journal_types.h | 19 +-
+ fs/bcachefs/lru.c | 100 ++--
+ fs/bcachefs/lru.h | 22 +-
+ fs/bcachefs/lru_format.h | 6 +-
+ fs/bcachefs/migrate.c | 26 +-
+ fs/bcachefs/move.c | 439 ++++++++++-------
+ fs/bcachefs/move_types.h | 18 +-
+ fs/bcachefs/movinggc.c | 4 +-
+ fs/bcachefs/opts.h | 2 +-
+ fs/bcachefs/progress.c | 63 +++
+ fs/bcachefs/progress.h | 29 ++
+ fs/bcachefs/rebalance.c | 4 +-
+ fs/bcachefs/reflink.c | 21 +-
+ fs/bcachefs/sb-counters.c | 90 +++-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 30 +-
+ fs/bcachefs/sb-downgrade.c | 6 +
+ fs/bcachefs/sb-errors_format.h | 4 +-
+ fs/bcachefs/sb-members.h | 12 +
+ fs/bcachefs/snapshot.c | 7 +-
+ fs/bcachefs/snapshot.h | 1 +
+ fs/bcachefs/str_hash.c | 2 +-
+ fs/bcachefs/str_hash.h | 4 +
+ fs/bcachefs/super-io.c | 9 -
+ fs/bcachefs/super.c | 19 +
+ fs/bcachefs/sysfs.c | 10 +-
+ fs/bcachefs/trace.h | 76 +--
+ fs/bcachefs/util.c | 210 +++++++--
+ 89 files changed, 3002 insertions(+), 1462 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/casefolding.rst
+ create mode 100644 fs/bcachefs/progress.c
+ create mode 100644 fs/bcachefs/progress.h
+Merging fscrypt/for-next (75eb8b9410ee Revert "fscrypt: relax Kconfig dependencies for crypto API algorithms")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
+Merge made by the 'ort' strategy.
+ fs/crypto/Kconfig | 20 ++++++++------------
+ 1 file changed, 8 insertions(+), 12 deletions(-)
+Merging btrfs/for-next (f9d3870b9957 Merge branch 'for-next-next-v6.14-20250221' into for-next-20250221)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Merge made by the 'ort' strategy.
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/accessors.h | 1 +
+ fs/btrfs/acl.h | 2 +
+ fs/btrfs/async-thread.c | 11 +-
+ fs/btrfs/backref.c | 4 +-
+ fs/btrfs/bio.c | 4 +-
+ fs/btrfs/bio.h | 3 +
+ fs/btrfs/block-group.c | 6 +-
+ fs/btrfs/btrfs_inode.h | 10 +-
+ fs/btrfs/compression.c | 21 +-
+ fs/btrfs/compression.h | 25 +--
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/defrag.c | 46 ++--
+ fs/btrfs/defrag.h | 4 +-
+ fs/btrfs/delayed-inode.c | 96 ++++----
+ fs/btrfs/delayed-inode.h | 2 +-
+ fs/btrfs/delayed-ref.h | 2 +
+ fs/btrfs/dir-item.h | 1 +
+ fs/btrfs/direct-io.c | 22 +-
+ fs/btrfs/direct-io.h | 2 +
+ fs/btrfs/discard.h | 1 +
+ fs/btrfs/disk-io.c | 21 +-
+ fs/btrfs/export.c | 26 +--
+ fs/btrfs/extent-io-tree.c | 8 +-
+ fs/btrfs/extent-tree.c | 8 +-
+ fs/btrfs/extent-tree.h | 1 -
+ fs/btrfs/extent_io.c | 495 +++++++++++++++++++++++++----------------
+ fs/btrfs/file-item.c | 13 +-
+ fs/btrfs/file-item.h | 2 +
+ fs/btrfs/file.c | 53 +++--
+ fs/btrfs/file.h | 2 +
+ fs/btrfs/free-space-cache.c | 34 +--
+ fs/btrfs/fs.c | 1 -
+ fs/btrfs/fs.h | 9 +-
+ fs/btrfs/inode-item.c | 6 +-
+ fs/btrfs/inode.c | 522 +++++++++++++++++++++++---------------------
+ fs/btrfs/ioctl.c | 7 +-
+ fs/btrfs/ioctl.h | 2 +
+ fs/btrfs/locking.c | 1 -
+ fs/btrfs/ordered-data.c | 29 ++-
+ fs/btrfs/ordered-data.h | 4 +-
+ fs/btrfs/print-tree.h | 2 +
+ fs/btrfs/props.c | 66 +++---
+ fs/btrfs/props.h | 8 +-
+ fs/btrfs/qgroup.c | 2 +-
+ fs/btrfs/qgroup.h | 3 +
+ fs/btrfs/raid-stripe-tree.h | 1 +
+ fs/btrfs/reflink.c | 100 ++++-----
+ fs/btrfs/scrub.c | 146 ++++---------
+ fs/btrfs/send.c | 498 ++++++++++++++++++++----------------------
+ fs/btrfs/space-info.c | 2 +-
+ fs/btrfs/subpage.c | 226 +++++++++++--------
+ fs/btrfs/subpage.h | 50 ++++-
+ fs/btrfs/super.c | 2 +-
+ fs/btrfs/sysfs.h | 1 +
+ fs/btrfs/transaction.c | 26 +--
+ fs/btrfs/tree-log.c | 6 +-
+ fs/btrfs/volumes.c | 18 +-
+ fs/btrfs/volumes.h | 4 +
+ fs/btrfs/xattr.h | 2 +
+ fs/btrfs/zlib.c | 83 ++++---
+ fs/btrfs/zoned.c | 3 +
+ fs/btrfs/zstd.c | 66 +++---
+ 63 files changed, 1532 insertions(+), 1293 deletions(-)
+Merging ceph/master (3981be13ec1b ceph: exchange hardcoded value on NAME_MAX)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Already up to date.
+Merging cifs/for-next (c9557b766789 smb: client: Fix netns refcount imbalance causing leaks and use-after-free)
+$ 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/connect.c | 17 +++++++++--------
+ fs/smb/client/sess.c | 10 ++++++++++
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Already up to date.
+Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
+Auto-merging fs/ecryptfs/crypto.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+Merge made by the 'ort' strategy.
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/keystore.c | 4 ++--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+Merging dlm/next (8e2bad543eca dlm: prevent NPD when writing a positive value to event_done)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Merge made by the 'ort' strategy.
+ fs/dlm/config.h | 2 +-
+ fs/dlm/lockspace.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging erofs/dev (006c44f0ba8e erofs: clean up header parsing for ztailpacking and fragments)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Merge made by the 'ort' strategy.
+ fs/erofs/data.c | 17 ++++---
+ fs/erofs/dir.c | 2 +-
+ fs/erofs/fileio.c | 2 +-
+ fs/erofs/fscache.c | 2 +-
+ fs/erofs/inode.c | 6 +--
+ fs/erofs/internal.h | 19 ++------
+ fs/erofs/namei.c | 2 +-
+ fs/erofs/super.c | 8 ++--
+ fs/erofs/xattr.c | 12 ++---
+ fs/erofs/zdata.c | 4 +-
+ fs/erofs/zmap.c | 124 +++++++++++++++++++++-------------------------------
+ 11 files changed, 80 insertions(+), 118 deletions(-)
+Merging exfat/dev (dda0407a2026 exfat: short-circuit zero-byte writes in exfat_file_write_iter)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Auto-merging fs/exfat/namei.c
+Merge made by the 'ort' strategy.
+ fs/exfat/balloc.c | 10 ++++++++--
+ fs/exfat/exfat_fs.h | 2 +-
+ fs/exfat/fatent.c | 11 +++++++----
+ fs/exfat/file.c | 2 +-
+ fs/exfat/namei.c | 2 +-
+ 5 files changed, 18 insertions(+), 9 deletions(-)
+Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
+$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next
+Already up to date.
+Merging ext3/for_next (ef51934a05d3 ext2: Remove reference to bh->b_page)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Merge made by the 'ort' strategy.
+ fs/ext2/super.c | 2 +-
+ fs/isofs/dir.c | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+Merging ext4/dev (9e28059d5664 ext4: introduce linear search for dentries)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/journalling.rst | 4 +-
+ fs/ext4/ext4.h | 4 +
+ fs/ext4/ext4_jbd2.h | 84 -----
+ fs/ext4/extents.c | 533 +++++++++++-------------------
+ fs/ext4/inode.c | 205 ++++++------
+ fs/ext4/namei.c | 14 +-
+ fs/ext4/super.c | 15 -
+ fs/jbd2/recovery.c | 58 +++-
+ fs/jbd2/revoke.c | 8 +-
+ fs/jbd2/transaction.c | 1 -
+ include/linux/fs.h | 10 +-
+ include/linux/jbd2.h | 8 +-
+ 12 files changed, 390 insertions(+), 554 deletions(-)
+Merging f2fs/dev (a907f3a68ee2 f2fs: add a sysfs entry to reclaim POSIX_FADV_NOREUSE pages)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++
+ fs/f2fs/checkpoint.c | 15 ++--
+ fs/f2fs/data.c | 8 +-
+ fs/f2fs/debug.c | 3 +
+ fs/f2fs/f2fs.h | 18 ++++-
+ fs/f2fs/file.c | 88 ++++++++++++++++++--
+ fs/f2fs/inode.c | 18 +++++
+ fs/f2fs/segment.c | 20 ++---
+ fs/f2fs/shrinker.c | 92 ++++++++++++++++++++-
+ fs/f2fs/super.c | 68 ++++++++++++----
+ fs/f2fs/sysfs.c | 137 +++++++++++++++++++++++++++-----
+ include/uapi/linux/f2fs.h | 7 ++
+ 12 files changed, 415 insertions(+), 66 deletions(-)
+Merging fsverity/for-next (a19bcde49998 Revert "fsverity: relax build time dependency on CRYPTO_SHA256")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/fsverity.rst | 16 +++++++++++-----
+ fs/verity/Kconfig | 8 ++------
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+Merging fuse/for-next (150b838b03e8 fuse: optmize missing FUSE_LINK support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Auto-merging fs/fuse/dir.c
+Merge made by the 'ort' strategy.
+ fs/fuse/dev_uring_i.h | 6 ------
+ fs/fuse/dir.c | 9 +++++++++
+ fs/fuse/fuse_i.h | 3 +++
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+Merging gfs2/for-next (1259f36ab395 gfs2: Fix additional unlikely request cancelation race)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Auto-merging fs/gfs2/glock.c
+Merge made by the 'ort' strategy.
+ fs/gfs2/glock.c | 68 ++++++++++++++++++++++++++++++----------------------
+ fs/gfs2/incore.h | 4 +++-
+ fs/gfs2/super.c | 3 ++-
+ fs/gfs2/trace_gfs2.h | 8 ++++++-
+ 4 files changed, 51 insertions(+), 32 deletions(-)
+Merging jfs/jfs-next (0d250b1c5248 fs/jfs: consolidate sanity checking in dbMount)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Merge made by the 'ort' strategy.
+ fs/jfs/inode.c | 2 +-
+ fs/jfs/jfs_dmap.c | 39 ++++++++++++---------------------------
+ fs/jfs/jfs_extent.c | 10 ++++++++++
+ fs/jfs/jfs_imap.c | 17 +++++++++++++----
+ fs/jfs/super.c | 6 +++---
+ fs/jfs/xattr.c | 13 +++++++++----
+ 6 files changed, 48 insertions(+), 39 deletions(-)
+Merging ksmbd/ksmbd-for-next (a7a8a72c7c30 ksmbd: Use str_read_write() and str_true_false() helpers)
+$ 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.
+ fs/smb/client/cifsacl.c | 51 +++++++++++++++++++++++++++++-------------
+ fs/smb/common/smbacl.h | 3 ++-
+ fs/smb/server/smbacl.c | 36 ++++++++++++++++-------------
+ fs/smb/server/smbacl.h | 2 +-
+ fs/smb/server/transport_rdma.c | 5 +++--
+ 5 files changed, 61 insertions(+), 36 deletions(-)
+Merging nfs/linux-next (0ad2507d5d93 Linux 6.14-rc3)
+$ 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 (7a2f6f7687c5 SUNRPC: Handle -ETIMEDOUT return from tlshd)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
+Merge made by the 'ort' strategy.
+ fs/nfs/delegation.c | 37 +++++++++++++++++++++++++++++++++++++
+ fs/nfs/delegation.h | 1 +
+ fs/nfs/direct.c | 23 +++++++++++++++++++++++
+ fs/nfs/nfs4proc.c | 3 +++
+ include/linux/sunrpc/sched.h | 3 +--
+ include/trace/events/sunrpc.h | 3 +--
+ net/sunrpc/sched.c | 2 --
+ net/sunrpc/xprtsock.c | 10 +++++++++-
+ 8 files changed, 75 insertions(+), 7 deletions(-)
+Merging nfsd/nfsd-next (f194595b9bd7 nfsd: eliminate special handling of NFS4ERR_SEQ_MISORDERED)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Merge made by the 'ort' strategy.
+ Documentation/netlink/specs/lockd.yaml | 45 ++++++++++
+ fs/lockd/Makefile | 2 +-
+ fs/lockd/netlink.c | 44 ++++++++++
+ fs/lockd/netlink.h | 19 ++++
+ fs/lockd/netns.h | 3 +
+ fs/lockd/svc.c | 118 +++++++++++++++++++++++--
+ fs/nfsd/nfs4callback.c | 106 +++++++++++++----------
+ fs/nfsd/nfs4state.c | 40 ++++++---
+ fs/nfsd/nfsctl.c | 53 ++++++------
+ fs/nfsd/stats.c | 4 +-
+ fs/nfsd/stats.h | 2 +-
+ fs/nfsd/trace.h | 19 +++-
+ fs/nfsd/vfs.c | 106 +++++++++++++++++------
+ include/uapi/linux/lockd_netlink.h | 29 +++++++
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 144 -------------------------------
+ net/sunrpc/auth_gss/gss_krb5_internal.h | 7 --
+ net/sunrpc/cache.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +-
+ 18 files changed, 472 insertions(+), 278 deletions(-)
+ create mode 100644 Documentation/netlink/specs/lockd.yaml
+ create mode 100644 fs/lockd/netlink.c
+ create mode 100644 fs/lockd/netlink.h
+ create mode 100644 include/uapi/linux/lockd_netlink.h
+Merging ntfs3/master (b432163ebd15 fs/ntfs3: Update inode->i_mapping->a_ops on compression state)
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Merge made by the 'ort' strategy.
+ fs/ntfs3/attrib.c | 3 +-
+ fs/ntfs3/file.c | 42 +++++++++++++++++++-------
+ fs/ntfs3/frecord.c | 6 ++--
+ fs/ntfs3/super.c | 89 ++++++++++++++++++++++++++++++++++--------------------
+ 4 files changed, 93 insertions(+), 47 deletions(-)
+Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (69146a8c893f ubi: ubi_get_ec_info: Fix compiling error 'cast specifies array type')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (a22a29655c42 net/9p/fd: support ipv6 for trans=tcp)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Merge made by the 'ort' strategy.
+ net/9p/trans_fd.c | 56 ++++++++++++++++++++++++-------------------------------
+ 1 file changed, 24 insertions(+), 32 deletions(-)
+Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
+Already up to date.
+Merging xfs/for-next (2d873efd174b xfs: flush inodegc before swapon)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Already up to date.
+Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging vfs-brauner/vfs.all (bfbcac33564f Merge branch 'vfs-6.15.sysv' into vfs.all)
+$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
+Auto-merging MAINTAINERS
+Auto-merging fs/bcachefs/fs-ioctl.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/index.rst | 1 -
+ Documentation/filesystems/iomap/design.rst | 4 +
+ Documentation/filesystems/iomap/operations.rst | 11 +-
+ Documentation/filesystems/overlayfs.rst | 24 +-
+ Documentation/filesystems/porting.rst | 21 +
+ Documentation/filesystems/sysv-fs.rst | 264 ---------
+ MAINTAINERS | 6 -
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/kernel/elfcore.c | 3 +-
+ arch/arm64/tools/syscall_32.tbl | 1 +
+ arch/loongarch/configs/loongson3_defconfig | 1 -
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/configs/malta_defconfig | 1 -
+ arch/mips/configs/malta_kvm_defconfig | 1 -
+ arch/mips/configs/maltaup_xpa_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/configs/fsl-emb-nonhw.config | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/platforms/pseries/papr-vpd.c | 7 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ drivers/base/devtmpfs.c | 146 +++--
+ drivers/vfio/group.c | 16 +-
+ fs/Kconfig | 1 -
+ fs/Makefile | 1 -
+ fs/autofs/autofs_i.h | 2 +
+ fs/bcachefs/fs-ioctl.c | 4 -
+ fs/cachefiles/ondemand.c | 7 +-
+ fs/coredump.c | 38 +-
+ fs/devpts/inode.c | 247 ++++-----
+ fs/eventfd.c | 5 +-
+ fs/eventpoll.c | 87 ++-
+ fs/file.c | 10 +
+ fs/fsopen.c | 2 +-
+ fs/gfs2/bmap.c | 3 +-
+ fs/inode.c | 44 +-
+ fs/internal.h | 6 +-
+ fs/ioctl.c | 10 +-
+ fs/iomap/Makefile | 1 +
+ fs/iomap/buffered-io.c | 269 +++-------
+ fs/iomap/direct-io.c | 132 +++--
+ fs/iomap/internal.h | 10 +
+ fs/iomap/ioend.c | 216 ++++++++
+ fs/iomap/iter.c | 102 ++--
+ fs/mnt_idmapping.c | 51 ++
+ fs/mount.h | 26 +
+ fs/namei.c | 64 +--
+ fs/namespace.c | 482 ++++++++++++-----
+ fs/nfs/dir.c | 3 +-
+ fs/notify/fanotify/fanotify.c | 38 +-
+ fs/notify/fanotify/fanotify.h | 18 +
+ fs/notify/fanotify/fanotify_user.c | 89 ++-
+ fs/notify/fdinfo.c | 5 +
+ fs/notify/fsnotify.c | 47 +-
+ fs/notify/fsnotify.h | 11 +
+ fs/notify/mark.c | 14 +-
+ fs/nsfs.c | 32 +-
+ fs/open.c | 20 +-
+ fs/overlayfs/params.c | 25 +
+ fs/overlayfs/super.c | 16 +-
+ fs/pipe.c | 117 ++--
+ fs/pnode.c | 4 +-
+ fs/pstore/inode.c | 109 ++--
+ fs/read_write.c | 13 +-
+ fs/signalfd.c | 7 +-
+ fs/smb/server/vfs.c | 26 +-
+ fs/super.c | 55 --
+ fs/sysv/Kconfig | 38 --
+ fs/sysv/Makefile | 9 -
+ fs/sysv/balloc.c | 240 ---------
+ fs/sysv/dir.c | 378 -------------
+ fs/sysv/file.c | 59 --
+ fs/sysv/ialloc.c | 235 --------
+ fs/sysv/inode.c | 354 ------------
+ fs/sysv/itree.c | 511 ------------------
+ fs/sysv/namei.c | 280 ----------
+ fs/sysv/super.c | 595 ---------------------
+ fs/sysv/sysv.h | 245 ---------
+ fs/timerfd.c | 6 +-
+ fs/xfs/xfs_aops.c | 25 +-
+ fs/xfs/xfs_file.c | 3 +-
+ fs/xfs/xfs_iomap.c | 4 +-
+ fs/zonefs/file.c | 2 +-
+ include/linux/dcache.h | 38 +-
+ include/linux/eventpoll.h | 4 +
+ include/linux/fanotify.h | 12 +-
+ include/linux/fs.h | 38 +-
+ include/linux/fs_context.h | 2 -
+ include/linux/fsnotify.h | 20 +
+ include/linux/fsnotify_backend.h | 42 ++
+ include/linux/iomap.h | 100 +++-
+ include/linux/mm.h | 2 +-
+ include/linux/mnt_idmapping.h | 5 +
+ include/linux/namei.h | 45 +-
+ include/linux/pid.h | 7 +-
+ include/linux/syscalls.h | 8 +-
+ include/linux/sysv_fs.h | 214 --------
+ include/linux/uidgid.h | 6 +
+ include/linux/vfsdebug.h | 45 ++
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/fanotify.h | 10 +
+ include/uapi/linux/mount.h | 10 +-
+ include/uapi/linux/pidfd.h | 24 +
+ kernel/audit_watch.c | 12 +-
+ kernel/exit.c | 56 +-
+ kernel/kcmp.c | 2 +-
+ kernel/pid.c | 106 ++--
+ kernel/signal.c | 117 ++--
+ kernel/sys.c | 14 +-
+ kernel/user_namespace.c | 26 +-
+ lib/Kconfig.debug | 9 +
+ mm/gup.c | 6 +-
+ samples/vfs/samples-vfs.h | 14 +-
+ samples/vfs/test-list-all-mounts.c | 35 +-
+ scripts/syscall.tbl | 1 +
+ .../selftests/filesystems/nsfs/iterate_mntns.c | 14 +
+ .../selftests/filesystems/overlayfs/Makefile | 11 +-
+ .../filesystems/overlayfs/set_layers_via_fds.c | 503 +++++++++++++++++
+ .../selftests/filesystems/overlayfs/wrappers.h | 17 +
+ tools/testing/selftests/filesystems/utils.c | 501 +++++++++++++++++
+ tools/testing/selftests/filesystems/utils.h | 45 ++
+ tools/testing/selftests/mm/guard-pages.c | 16 +-
+ tools/testing/selftests/pidfd/pidfd.h | 16 +
+ tools/testing/selftests/pidfd/pidfd_open_test.c | 6 +-
+ tools/testing/selftests/pidfd/pidfd_test.c | 80 ++-
+ virt/kvm/kvm_main.c | 11 +-
+ 150 files changed, 3569 insertions(+), 4677 deletions(-)
+ delete mode 100644 Documentation/filesystems/sysv-fs.rst
+ create mode 100644 fs/iomap/internal.h
+ create mode 100644 fs/iomap/ioend.c
+ delete mode 100644 fs/sysv/Kconfig
+ delete mode 100644 fs/sysv/Makefile
+ delete mode 100644 fs/sysv/balloc.c
+ delete mode 100644 fs/sysv/dir.c
+ delete mode 100644 fs/sysv/file.c
+ delete mode 100644 fs/sysv/ialloc.c
+ delete mode 100644 fs/sysv/inode.c
+ delete mode 100644 fs/sysv/itree.c
+ delete mode 100644 fs/sysv/namei.c
+ delete mode 100644 fs/sysv/super.c
+ delete mode 100644 fs/sysv/sysv.h
+ delete mode 100644 include/linux/sysv_fs.h
+ create mode 100644 include/linux/vfsdebug.h
+ create mode 100644 tools/testing/selftests/filesystems/utils.c
+ create mode 100644 tools/testing/selftests/filesystems/utils.h
+Merging vfs/for-next (2e72b1e0aac2 Merge branch 'work.d_revalidate' into for-next)
+$ git merge -m Merge branch 'for-next' of git://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 (dfeb60df12bc mm: page_isolation: avoid calling folio_hstate() without hugetlb_lock)
+$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
+Merge made by the 'ort' strategy.
+ arch/arm/mm/fault-armv.c | 37 ++++++++-----
+ arch/m68k/include/asm/sun3_pgalloc.h | 6 ++-
+ arch/x86/mm/init_64.c | 17 ++++--
+ include/linux/hugetlb.h | 5 ++
+ include/linux/page-flags.h | 37 +++++++++++++
+ include/linux/page_ref.h | 2 +-
+ lib/Kconfig.debug | 2 +-
+ mm/hugetlb.c | 8 +++
+ mm/internal.h | 5 +-
+ mm/kmsan/hooks.c | 1 +
+ mm/memory-failure.c | 63 +++++++++++------------
+ mm/memory_hotplug.c | 28 +++++-----
+ mm/page_isolation.c | 19 ++++++-
+ mm/swapfile.c | 12 ++++-
+ mm/vma.c | 12 +++--
+ tools/testing/selftests/damon/damos_quota_goal.py | 3 ++
+ tools/testing/selftests/mm/hugepage-mremap.c | 2 +-
+ tools/testing/selftests/mm/ksm_functional_tests.c | 8 ++-
+ tools/testing/selftests/mm/memfd_secret.c | 14 ++++-
+ tools/testing/selftests/mm/mkdirty.c | 8 ++-
+ tools/testing/selftests/mm/mlock2.h | 1 -
+ tools/testing/selftests/mm/protection_keys.c | 2 +-
+ tools/testing/selftests/mm/uffd-common.c | 4 ++
+ tools/testing/selftests/mm/uffd-stress.c | 15 +++++-
+ tools/testing/selftests/mm/uffd-unit-tests.c | 14 ++++-
+ 25 files changed, 242 insertions(+), 83 deletions(-)
+Merging fs-current (560b062b7bb8 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git)
+$ git merge -m Merge branch 'fs-current' of linux-next fs-current
+Merge made by the 'ort' strategy.
+ fs/btrfs/extent_map.c | 83 ++++++++++++++++++++++++++-----------
+ fs/btrfs/file.c | 9 +++-
+ fs/btrfs/tests/delayed-refs-tests.c | 1 +
+ fs/btrfs/volumes.c | 6 ++-
+ fs/fuse/dev.c | 6 +++
+ fs/fuse/dir.c | 2 +-
+ fs/fuse/file.c | 13 +++++-
+ fs/namei.c | 24 ++++++++---
+ fs/overlayfs/copy_up.c | 2 +-
+ include/linux/fs.h | 6 ++-
+ mm/filemap.c | 2 +-
+ mm/truncate.c | 2 -
+ 12 files changed, 116 insertions(+), 40 deletions(-)
+Merging kbuild-current/fixes (b28fb1f2ef45 modpost: Fix a few typos in a comment)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (446a8351f160 arm64: rust: clean Rust 1.85.0 warning using softfloat target)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (e31e3f6c0ce4 soc: loongson: loongson2_guts: Add check for devm_kstrdup())
+$ git merge -m Merge branch 'arm/fixes' of git://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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'davinci/for-current' of git://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 (304e6c02b76f memory: omap-gpmc: drop no compatible check)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/memory/omap-gpmc.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+Merging sophgo-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (bb2e0fb1e6aa m68k: libgcc: Fix lvalue abuse in umul_ppmm())
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (eff2eb592efd cxl: Fix cross-reference in documentation and add deprecation warning)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Merge made by the 'ort' strategy.
+ Documentation/arch/powerpc/cxl.rst | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging s390-fixes/fixes (c3a589fd9fcb s390/boot: Fix ESSA detection)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Already up to date.
+Merging net/main (29b036be1b0b selftests: drv-net: test XDP, HDS auto and the ioctl path)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +-
+ drivers/bluetooth/btusb.c | 6 +-
+ drivers/net/dsa/realtek/Kconfig | 6 +
+ drivers/net/dsa/realtek/Makefile | 3 +
+ drivers/net/dsa/realtek/rtl8366rb-leds.c | 177 ++++++++++++++
+ drivers/net/dsa/realtek/rtl8366rb.c | 258 +--------------------
+ drivers/net/dsa/realtek/rtl8366rb.h | 107 +++++++++
+ drivers/net/ethernet/cadence/macb.h | 2 +
+ drivers/net/ethernet/cadence/macb_main.c | 12 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 14 ++
+ drivers/net/ipvlan/ipvlan_core.c | 21 +-
+ drivers/net/loopback.c | 14 ++
+ drivers/net/netdevsim/ethtool.c | 2 +
+ drivers/net/phy/qcom/qca807x.c | 2 +-
+ fs/afs/server.c | 3 +
+ fs/afs/server_list.c | 4 +-
+ include/net/sock.h | 1 +
+ include/trace/events/afs.h | 2 +
+ net/bluetooth/l2cap_core.c | 9 +-
+ net/core/sock.c | 27 ++-
+ net/core/sysctl_net_core.c | 3 +-
+ net/ethtool/common.c | 16 ++
+ net/ethtool/common.h | 6 +
+ net/ethtool/ioctl.c | 4 +-
+ net/ethtool/rings.c | 9 +-
+ net/mptcp/subflow.c | 5 +-
+ net/netlink/af_netlink.c | 10 -
+ net/rds/tcp.c | 8 +-
+ net/rxrpc/ar-internal.h | 1 -
+ net/rxrpc/input.c | 2 -
+ net/rxrpc/peer_event.c | 9 +-
+ net/rxrpc/peer_object.c | 5 +-
+ net/rxrpc/rxperf.c | 12 +
+ net/smc/af_smc.c | 5 +-
+ net/sunrpc/svcsock.c | 5 +-
+ net/sunrpc/xprtsock.c | 8 +-
+ tools/testing/selftests/drivers/net/hds.py | 145 +++++++++++-
+ tools/testing/selftests/net/lib/Makefile | 3 +
+ tools/testing/selftests/net/lib/xdp_dummy.bpf.c | 13 ++
+ 39 files changed, 610 insertions(+), 331 deletions(-)
+ create mode 100644 drivers/net/dsa/realtek/rtl8366rb-leds.c
+ create mode 100644 drivers/net/dsa/realtek/rtl8366rb.h
+ create mode 100644 tools/testing/selftests/net/lib/xdp_dummy.bpf.c
+Merging bpf/master (319fc77f8f45 Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Already up to date.
+Merging ipsec/master (a1300691aed9 net: rose: lock the socket in rose_bind())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Already up to date.
+Merging netfilter/main (1438f5d07b9a rtnetlink: fix netns leak with rtnl_setlink())
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
+Already up to date.
+Merging ipvs/main (1438f5d07b9a rtnetlink: fix netns leak with rtnl_setlink())
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
+Already up to date.
+Merging wireless/for-next (3640dbc1f75c wifi: iwlwifi: Fix A-MSDU TSO preparation)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Merge made by the 'ort' strategy.
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 86 +++++++++++++++-------
+ drivers/net/wireless/intel/iwlwifi/fw/dump.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 77 ++++++++++++-------
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 7 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 8 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 20 +++--
+ net/mac80211/driver-ops.c | 10 ++-
+ net/mac80211/iface.c | 11 +--
+ net/mac80211/util.c | 5 +-
+ net/wireless/nl80211.c | 5 ++
+ 14 files changed, 167 insertions(+), 80 deletions(-)
+Merging ath/for-current (3640dbc1f75c wifi: iwlwifi: Fix A-MSDU TSO preparation)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current
+Already up to date.
+Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
+Already up to date.
+Merging rdma-fixes/for-rc (b66535356a48 RDMA/bnxt_re: Fix the page details for the srq created by kernel consumers)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 -
+ drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +
+ drivers/infiniband/hw/bnxt_re/main.c | 22 ++++----
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 8 +++
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 64 ++++++++++++++++------
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +
+ drivers/infiniband/hw/mana/main.c | 2 +-
+ drivers/infiniband/hw/mlx5/ah.c | 3 +-
+ drivers/infiniband/hw/mlx5/counters.c | 8 ++-
+ drivers/infiniband/hw/mlx5/mr.c | 16 +++++-
+ drivers/infiniband/hw/mlx5/odp.c | 1 +
+ drivers/infiniband/hw/mlx5/qp.c | 10 ++--
+ drivers/infiniband/hw/mlx5/qp.h | 1 +
+ drivers/infiniband/hw/mlx5/umr.c | 83 +++++++++++++++++++----------
+ 16 files changed, 161 insertions(+), 68 deletions(-)
+Merging sound-current/for-linus (c9ca8a4f8988 Merge tag 'asoc-fix-v6.14-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Merge made by the 'ort' strategy.
+ sound/soc/codecs/tas2764.c | 10 +++++++++-
+ sound/soc/codecs/tas2764.h | 8 +++++++-
+ sound/soc/codecs/tas2770.c | 2 +-
+ sound/usb/midi.c | 2 +-
+ sound/usb/quirks.c | 1 +
+ 5 files changed, 19 insertions(+), 4 deletions(-)
+Merging sound-asoc-fixes/for-linus (5b0c02f9b8ac ASoC: es8328: fix route from DAC to output)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Merge made by the 'ort' strategy.
+ sound/soc/codecs/es8328.c | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+Merging regmap-fixes/for-linus (32ffed055dce regmap-irq: Add missing kfree())
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (35e21de48e69 regulator: core: let dt properties override driver init_data)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (3d7a20f9ba7b MAINTAINERS: add tambarus as R for Samsung SPI)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ drivers/spi/atmel-quadspi.c | 5 +----
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+Merging pci-current/for-linus (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (78eb41f518f4 drivers: core: fix device leak in __fw_devlink_relax_cycles())
+$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
+Merge made by the 'ort' strategy.
+ drivers/base/core.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging tty.current/tty-linus (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (c783e1258f29 usb: gadget: Fix setting self-powered state on suspend)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Merge made by the 'ort' strategy.
+ drivers/usb/atm/cxacru.c | 13 +++++++------
+ drivers/usb/gadget/composite.c | 17 ++++++++++++-----
+ drivers/usb/gadget/function/u_ether.c | 4 ++--
+ drivers/usb/typec/tcpm/tcpci_rt1711h.c | 11 +++++++++++
+ drivers/usb/typec/ucsi/ucsi.c | 12 ++++++------
+ drivers/usb/typec/ucsi/ucsi.h | 2 ++
+ drivers/usb/typec/ucsi/ucsi_acpi.c | 21 ++++++++++++++-------
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 1 +
+ drivers/usb/typec/ucsi/ucsi_glink.c | 1 +
+ drivers/usb/typec/ucsi/ucsi_stm32g0.c | 1 +
+ drivers/usb/typec/ucsi/ucsi_yoga_c630.c | 1 +
+ 11 files changed, 58 insertions(+), 26 deletions(-)
+Merging usb-serial-fixes/usb-linus (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (55f1a5f7c97c phy: tegra: xusb: reset VBUS & ID OVERRIDE)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Merge made by the 'ort' strategy.
+ drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 13 ++++++--
+ drivers/phy/rockchip/Kconfig | 1 +
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 5 ++-
+ drivers/phy/samsung/phy-exynos5-usbdrd.c | 25 +++++++-------
+ drivers/phy/st/phy-stm32-combophy.c | 38 ++++++++++------------
+ drivers/phy/tegra/xusb-tegra186.c | 11 +++++++
+ drivers/phy/ti/phy-gmii-sel.c | 15 ++++++++-
+ 7 files changed, 73 insertions(+), 35 deletions(-)
+Merging staging.current/staging-linus (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (cc2c3540d947 iio: filter: admv8818: Force initialization of SDO)
+$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 1 +
+ drivers/iio/adc/ad7192.c | 2 +-
+ drivers/iio/adc/ad7606.c | 2 +-
+ drivers/iio/adc/at91-sama5d2_adc.c | 68 +++++++++++++---------
+ drivers/iio/adc/pac1921.c | 2 +-
+ drivers/iio/dac/ad3552r.c | 6 ++
+ drivers/iio/filter/admv8818.c | 14 ++---
+ drivers/iio/light/apds9306.c | 4 +-
+ drivers/iio/light/hid-sensor-prox.c | 7 ++-
+ drivers/iio/proximity/hx9023s.c | 3 +-
+ 10 files changed, 62 insertions(+), 47 deletions(-)
+Merging counter-current/counter-current (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'counter-current' of git://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 (92527e473911 ntsync: Check wait count based on byte size.)
+$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 7 ++-----
+ drivers/android/binderfs.c | 1 +
+ drivers/bus/mhi/host/pci_generic.c | 5 +++--
+ drivers/bus/simple-pm-bus.c | 22 +++++++++++++++++++++-
+ drivers/cdx/cdx.c | 6 +++++-
+ drivers/char/misc.c | 2 +-
+ drivers/hwtracing/intel_th/msu.c | 13 +++++++++++--
+ drivers/hwtracing/intel_th/pci.c | 15 +++++++++++++++
+ drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 +-
+ drivers/misc/mei/hw-me-regs.h | 2 ++
+ drivers/misc/mei/pci-me.c | 2 ++
+ drivers/misc/mei/vsc-tp.c | 2 +-
+ drivers/misc/ntsync.c | 7 ++++---
+ drivers/slimbus/messaging.c | 5 +++--
+ drivers/virt/acrn/hsm.c | 6 +++---
+ drivers/virt/vboxguest/Kconfig | 3 ++-
+ 16 files changed, 77 insertions(+), 23 deletions(-)
+Merging soundwire-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (d082ecbc71e9 Linux 6.14-rc4)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (3492321e2e60 Input: xpad - add multiple supported devices)
+$ git merge -m Merge branch 'for-linus' of git://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 | 31 ++++++++++++++++++++++++++-----
+ drivers/input/touchscreen/ads7846.c | 2 +-
+ drivers/input/touchscreen/wdt87xx_i2c.c | 2 ++
+ 3 files changed, 29 insertions(+), 6 deletions(-)
+Merging crypto-current/master (9d4f8e54cef2 rhashtable: Fix rhashtable_try_insert test)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (09dfc8a5f2ce vfio/pci: Fallback huge faults for unaligned pfn)
+$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Already up to date.
+Merging dmaengine-fixes/fixes (76ed9b7d177e dmaengine: tegra210-adma: check for adma max page)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Auto-merging drivers/dma/tegra210-adma.c
+CONFLICT (content): Merge conflict in drivers/dma/tegra210-adma.c
+Resolved 'drivers/dma/tegra210-adma.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2b9c81dc1b9c] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/dma/tegra210-adma.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
+$ git merge -m Merge branch 'for-backlight-fixes' of git://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 (1dbf60277e9b Merge tag 'spi-nor/fixes-for-6.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/fixes)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
+$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (2014c95afece Linux 6.14-rc1)
+$ 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 (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (c2a5f8c4f28f ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/arm/mach-omap1/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging kvm-fixes/master (e93d78e05abb Merge tag 'kvm-riscv-fixes-6.14-1' of https://github.com/kvm-riscv/linux into HEAD)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Merge made by the 'ort' strategy.
+ arch/arm64/include/asm/kvm_arm.h | 2 +-
+ arch/arm64/include/asm/kvm_host.h | 2 +-
+ arch/arm64/kvm/arm.c | 37 +++++++++++++++++--------------------
+ arch/arm64/kvm/vmid.c | 11 +++--------
+ arch/riscv/kvm/aia_imsic.c | 1 -
+ arch/riscv/kvm/vcpu_sbi_hsm.c | 11 ++++++-----
+ arch/riscv/kvm/vcpu_sbi_replace.c | 15 ++++++++++++---
+ arch/riscv/kvm/vcpu_sbi_system.c | 3 ++-
+ 8 files changed, 42 insertions(+), 40 deletions(-)
+Merging kvms390-fixes/master (e376d958871c KVM: s390: selftests: Add has device attr check to uc_attr_mem_limit selftest)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (f9e5312b6269 hwmon: (peci/dimmtemp) Do not provide fake thresholds data)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Merge made by the 'ort' strategy.
+ drivers/hwmon/peci/dimmtemp.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl)
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging cxl-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory)
+$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging drivers-x86-fixes/fixes (b3e127dacad6 platform/x86: thinkpad_acpi: Fix registration of tpacpi platform driver)
+$ git merge -m Merge branch 'fixes' of git://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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (038e33fcd40e dt-bindings: display: Add powertip,{st7272|hx8238a} as DT Schema description)
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Already up to date.
+Merging dt-krzk-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
+Already up to date.
+Merging scsi-fixes/fixes (f27a95845b01 scsi: ufs: core: bsg: Fix crash when arpmb command fails)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/scsi/scsi_lib.c | 14 +++++++-------
+ drivers/ufs/core/ufs_bsg.c | 6 ++++--
+ drivers/ufs/core/ufshcd.c | 38 +++++++++++++++++++-------------------
+ 3 files changed, 30 insertions(+), 28 deletions(-)
+Merging drm-fixes/drm-fixes (d082ecbc71e9 Linux 6.14-rc4)
+$ 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 (d082ecbc71e9 Linux 6.14-rc4)
+$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (3e68abf2b9ce mmc: mtk-sd: Fix register settings for hs400(es) mode)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (7241c886a717 fbdev: hyperv_fb: iounmap() the correct memory when removing a device)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Merge made by the 'ort' strategy.
+ arch/x86/hyperv/hv_vtl.c | 1 +
+ drivers/video/fbdev/hyperv_fb.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging risc-v-fixes/fixes (245aece3750d MAINTAINERS: Add myself as a riscv reviewer)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ arch/riscv/include/asm/cmpxchg.h | 2 +-
+ arch/riscv/include/asm/futex.h | 2 +-
+ arch/riscv/kernel/cacheinfo.c | 12 ++++++------
+ arch/riscv/kernel/cpufeature.c | 2 +-
+ arch/riscv/kernel/setup.c | 2 +-
+ arch/riscv/kernel/signal.c | 6 ------
+ tools/testing/selftests/rseq/rseq-riscv-bits.h | 6 +++---
+ tools/testing/selftests/rseq/rseq-riscv.h | 2 +-
+ 9 files changed, 15 insertions(+), 20 deletions(-)
+Merging riscv-dt-fixes/riscv-dt-fixes (1b133129ad6b riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions)
+$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/starfive/jh7110-pinfunc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging riscv-soc-fixes/riscv-soc-fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'riscv-soc-fixes' of git://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 (1613e604df0c Linux 6.10-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'spdx-linus' of git://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 (d082ecbc71e9 Linux 6.14-rc4)
+$ git merge -m Merge branch 'gpio/for-current' of git://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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging auxdisplay-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Already up to date.
+Merging memblock-fixes/fixes (180bbad69864 arch_numa: Restore nid checks before registering a memblock with a node)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
+Already up to date.
+Merging renesas-fixes/fixes (124f4f1a1869 MAINTAINERS: Re-add cancelled Renesas driver sections)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 30724c9ca55f] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git
+$ git diff -M --stat --summary HEAD^..
+
+Merging perf-current/perf-tools (42367eca7604 tools: Remove redundant quiet setup)
+$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
+Auto-merging tools/tracing/rtla/Makefile
+Merge made by the 'ort' strategy.
+ tools/arch/arm64/tools/Makefile | 6 -----
+ tools/bpf/Makefile | 6 -----
+ tools/bpf/bpftool/Documentation/Makefile | 6 -----
+ tools/bpf/bpftool/Makefile | 6 -----
+ tools/bpf/resolve_btfids/Makefile | 2 --
+ tools/bpf/runqslower/Makefile | 5 +---
+ tools/build/Makefile | 8 +-----
+ tools/lib/bpf/Makefile | 13 ----------
+ tools/lib/perf/Makefile | 13 ----------
+ tools/lib/thermal/Makefile | 13 ----------
+ tools/objtool/Makefile | 6 -----
+ tools/perf/Makefile.perf | 41 -------------------------------
+ tools/scripts/Makefile.include | 30 ++++++++++++++++++++++
+ tools/testing/selftests/bpf/Makefile.docs | 6 -----
+ tools/testing/selftests/hid/Makefile | 2 --
+ tools/thermal/lib/Makefile | 13 ----------
+ tools/tracing/latency/Makefile | 6 -----
+ tools/tracing/rtla/Makefile | 6 -----
+ tools/verification/rv/Makefile | 6 -----
+ 19 files changed, 32 insertions(+), 162 deletions(-)
+Merging efi-fixes/urgent (cb6ae457bc6a efivarfs: Defer PM notifier registration until .fill_super)
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Merge made by the 'ort' strategy.
+ drivers/firmware/efi/cper-arm.c | 2 +-
+ drivers/firmware/efi/cper-x86.c | 2 +-
+ fs/efivarfs/super.c | 3 ++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+Merging battery-fixes/fixes (98380110bd48 power: supply: axp20x_battery: Fix fault handling for AXP717)
+$ git merge -m Merge branch 'fixes' of git://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 (2ca704f55e22 iommu/arm-smmu-v3: Improve uAPI comment for IOMMU_HW_INFO_TYPE_ARM_SMMUV3)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
+Already up to date.
+Merging rust-fixes/rust-fixes (0ad2507d5d93 Linux 6.14-rc3)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
+Already up to date.
+Merging pmdomain-fixes/fixes (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes
+Already up to date.
+Merging i2c-host-fixes/i2c/i2c-host-fixes (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes
+Already up to date.
+Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-linus' of git://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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes
+Already up to date.
+Merging pwrseq-fixes/pwrseq/for-current (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'pwrseq/for-current' of git://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 (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes
+Already up to date.
+Merging ftrace-fixes/ftrace/fixes (2fa6a01345b5 tracing: Fix memory leak when reading set_event file)
+$ git merge -m Merge branch 'ftrace/fixes' of git://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 (97937834ae87 ring-buffer: Update pages_touched to reflect persistent buffer content)
+$ git merge -m Merge branch 'ring-buffer/fixes' of git://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 (60295b944ff6 tracing: gfp: Fix the GFP enum values shown for user space tracing tools)
+$ git merge -m Merge branch 'trace/fixes' of git://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 (8b55572e5180 tracing/selftests: Add tracefs mount options test)
+$ git merge -m Merge branch 'tracefs/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes
+Already up to date.
+Merging spacemit-fixes/fixes (2014c95afece Linux 6.14-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 (e7eac3c17dae Merge branch into tip/master: 'perf/urgent')
+$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent
+Merge made by the 'ort' strategy.
+ include/linux/rcuref.h | 9 ++++++---
+ kernel/events/core.c | 14 +++++++++++---
+ kernel/events/uprobes.c | 5 +++++
+ lib/rcuref.c | 5 ++---
+ 4 files changed, 24 insertions(+), 9 deletions(-)
+Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnreclaim for post charged objects)
+$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes
+Already up to date.
+Merging drm-msm-fixes/msm-fixes (73f69c6be2a9 drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source)
+$ 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 (96178631c3f5 um: convert irq_lock to raw spinlock)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (511a3444f72e MAINTAINERS: Add entry for DMEM cgroup controller)
+$ 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 | 11 +++++++++++
+ 2 files changed, 12 insertions(+)
+Merging linus/for-next (ffd294d346d1 Linux 6.13)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linus/for-next
+Already up to date.
+Merging mm-stable/mm-stable (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'mm-stable' of git://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 (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
+Already up to date.
+Merging mm/mm-everything (b0504a3cec10 foo)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Auto-merging arch/s390/configs/debug_defconfig
+Auto-merging arch/s390/configs/defconfig
+Auto-merging drivers/gpu/drm/nouveau/nouveau_svm.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging include/linux/mm_types.h
+Auto-merging kernel/events/uprobes.c
+Auto-merging mm/filemap.c
+Auto-merging mm/truncate.c
+Merge made by the 'ort' strategy.
+ .mailmap | 4 +-
+ CREDITS | 3 +
+ Documentation/ABI/testing/sysfs-block-zram | 8 -
+ Documentation/ABI/testing/sysfs-kernel-mm-cma | 13 +
+ Documentation/ABI/testing/sysfs-kernel-mm-damon | 14 +
+ Documentation/ABI/testing/sysfs-kernel-reboot | 8 +
+ Documentation/RCU/whatisRCU.rst | 10 +
+ Documentation/admin-guide/blockdev/zram.rst | 36 +-
+ Documentation/admin-guide/cgroup-v2.rst | 24 +
+ Documentation/admin-guide/kernel-parameters.txt | 27 +-
+ Documentation/admin-guide/mm/cma_debugfs.rst | 10 +-
+ Documentation/admin-guide/mm/damon/usage.rst | 31 +-
+ Documentation/admin-guide/mm/pagemap.rst | 3 +-
+ Documentation/admin-guide/mm/zswap.rst | 10 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 2 +
+ Documentation/admin-guide/sysctl/vm.rst | 17 +
+ Documentation/arch/arm64/ptdump.rst | 2 -
+ Documentation/core-api/refcount-vs-atomic.rst | 37 +-
+ Documentation/core-api/xarray.rst | 14 +-
+ .../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
+ Documentation/driver-api/thermal/sysfs-api.rst | 25 +-
+ Documentation/filesystems/dax.rst | 1 -
+ Documentation/filesystems/proc.rst | 10 +
+ Documentation/mm/balance.rst | 2 +-
+ Documentation/mm/damon/design.rst | 63 +-
+ .../damon/monitoring_intervals_tuning_example.rst | 8 +-
+ Documentation/mm/hmm.rst | 2 +-
+ Documentation/mm/index.rst | 1 -
+ Documentation/mm/process_addrs.rst | 44 +-
+ Documentation/mm/z3fold.rst | 28 -
+ Documentation/translations/zh_CN/mm/hmm.rst | 2 +-
+ Documentation/translations/zh_CN/mm/index.rst | 1 -
+ Documentation/translations/zh_CN/mm/z3fold.rst | 31 -
+ MAINTAINERS | 20 +-
+ arch/arc/mm/ioremap.c | 6 +-
+ arch/arm/include/asm/pgtable.h | 5 +-
+ arch/arm64/Kconfig | 2 +-
+ arch/arm64/include/asm/io.h | 6 +-
+ arch/arm64/include/asm/ptdump.h | 4 +-
+ arch/arm64/include/asm/tlbflush.h | 23 +-
+ arch/arm64/kernel/acpi.c | 2 +-
+ arch/arm64/kvm/Kconfig | 4 +-
+ arch/arm64/mm/Makefile | 2 +-
+ arch/arm64/mm/contpte.c | 2 +-
+ arch/arm64/mm/init.c | 6 +-
+ arch/arm64/mm/ioremap.c | 3 +-
+ arch/csky/include/asm/io.h | 2 +-
+ arch/loongarch/configs/loongson3_defconfig | 3 +-
+ arch/loongarch/include/asm/io.h | 10 +-
+ arch/loongarch/kernel/setup.c | 5 +-
+ arch/mips/include/asm/io.h | 8 +-
+ arch/mips/mm/ioremap.c | 4 +-
+ arch/mips/mm/ioremap64.c | 4 +-
+ arch/parisc/include/asm/io.h | 2 +-
+ arch/parisc/mm/ioremap.c | 4 +-
+ arch/powerpc/Kconfig | 5 +-
+ arch/powerpc/configs/mpc885_ads_defconfig | 1 -
+ arch/powerpc/include/asm/book3s/64/hugetlb.h | 6 +
+ arch/powerpc/include/asm/crash_reserve.h | 8 +
+ arch/powerpc/include/asm/io.h | 2 +-
+ arch/powerpc/include/asm/kexec.h | 10 +-
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kexec/core.c | 100 +-
+ arch/powerpc/kexec/file_load_64.c | 259 +---
+ arch/powerpc/mm/Makefile | 2 +-
+ arch/powerpc/mm/hugetlbpage.c | 1 +
+ arch/powerpc/mm/init_64.c | 4 +
+ arch/powerpc/mm/ioremap.c | 4 +-
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/powerpc/platforms/ps3/spu.c | 4 +-
+ arch/riscv/Kconfig | 2 +-
+ arch/riscv/include/asm/io.h | 2 +-
+ arch/riscv/include/asm/tlbflush.h | 3 +-
+ arch/riscv/kernel/acpi.c | 2 +-
+ arch/riscv/mm/Makefile | 2 +-
+ arch/riscv/mm/init.c | 6 +-
+ arch/riscv/mm/tlbflush.c | 3 +-
+ arch/s390/Kconfig | 2 +-
+ arch/s390/configs/debug_defconfig | 2 +-
+ arch/s390/configs/defconfig | 2 +-
+ arch/s390/include/asm/io.h | 4 +-
+ arch/s390/mm/Makefile | 2 +-
+ arch/s390/mm/init.c | 13 +-
+ arch/s390/pci/pci.c | 4 +-
+ arch/sh/boards/mach-landisk/setup.c | 2 +-
+ arch/sh/boards/mach-lboxre2/setup.c | 2 +-
+ arch/sh/boards/mach-sh03/setup.c | 2 +-
+ arch/sh/include/asm/io.h | 2 +-
+ arch/sh/mm/ioremap.c | 3 +-
+ arch/x86/Kconfig | 3 +-
+ arch/x86/Kconfig.debug | 2 +-
+ arch/x86/include/asm/io.h | 2 +-
+ arch/x86/include/asm/percpu.h | 33 +-
+ arch/x86/include/asm/tlbflush.h | 3 +-
+ arch/x86/kernel/kgdb.c | 2 +-
+ arch/x86/kernel/setup.c | 10 +-
+ arch/x86/mm/Makefile | 2 +-
+ arch/x86/mm/init_64.c | 18 +-
+ arch/x86/mm/ioremap.c | 4 +-
+ arch/xtensa/include/asm/io.h | 6 +-
+ arch/xtensa/mm/ioremap.c | 4 +-
+ drivers/base/memory.c | 12 +-
+ drivers/block/zram/backend_zstd.c | 11 +-
+ drivers/block/zram/zcomp.c | 48 +-
+ drivers/block/zram/zcomp.h | 8 +-
+ drivers/block/zram/zram_drv.c | 283 ++--
+ drivers/block/zram/zram_drv.h | 22 +-
+ drivers/dax/device.c | 24 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +-
+ drivers/nvdimm/pmem.c | 4 +-
+ drivers/pci/p2pdma.c | 19 +-
+ drivers/platform/chrome/cros_ec_lpc.c | 2 +-
+ drivers/regulator/core.c | 4 +-
+ drivers/regulator/irq_helpers.c | 16 +-
+ drivers/s390/block/Kconfig | 12 +-
+ drivers/s390/block/dcssblk.c | 27 +-
+ drivers/thermal/thermal_core.c | 17 +-
+ drivers/thermal/thermal_core.h | 1 +
+ drivers/thermal/thermal_of.c | 7 +-
+ drivers/video/fbdev/core/fb_defio.c | 43 +-
+ fs/bcachefs/util.h | 2 +-
+ fs/buffer.c | 14 +-
+ fs/dax.c | 364 +++--
+ fs/ext4/inline.c | 2 +-
+ fs/ext4/inode.c | 18 +-
+ fs/ext4/move_extent.c | 2 +-
+ fs/fuse/dax.c | 30 +-
+ fs/fuse/dir.c | 2 +-
+ fs/fuse/file.c | 4 +-
+ fs/fuse/virtio_fs.c | 3 +-
+ fs/iomap/buffered-io.c | 2 +-
+ fs/ocfs2/alloc.c | 8 +
+ fs/ocfs2/aops.c | 21 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/proc/task_mmu.c | 6 +-
+ fs/udf/file.c | 2 +-
+ fs/xfs/xfs_inode.c | 31 +-
+ fs/xfs/xfs_inode.h | 2 +-
+ fs/xfs/xfs_super.c | 12 +
+ include/asm-generic/io.h | 4 +-
+ include/asm-generic/percpu.h | 39 +-
+ include/asm-generic/tlb.h | 80 +-
+ include/linux/bootmem_info.h | 7 +
+ include/linux/buffer_head.h | 2 +-
+ include/linux/cma.h | 9 +
+ include/linux/compiler-clang.h | 8 +
+ include/linux/compiler-gcc.h | 8 +
+ include/linux/compiler.h | 20 +
+ include/linux/compiler_types.h | 2 +-
+ include/linux/cpu.h | 2 +-
+ include/linux/crash_reserve.h | 11 +-
+ include/linux/damon.h | 27 +
+ include/linux/dax.h | 28 +
+ include/linux/fb.h | 1 +
+ include/linux/folio_queue.h | 12 +-
+ include/linux/huge_mm.h | 44 +-
+ include/linux/hugetlb.h | 35 +
+ include/linux/kexec.h | 9 +
+ include/linux/list_nulls.h | 1 +
+ include/linux/memcontrol.h | 17 +-
+ include/linux/memremap.h | 17 +-
+ include/linux/migrate.h | 4 +-
+ include/linux/min_heap.h | 12 +-
+ include/linux/mm.h | 227 ++-
+ include/linux/mm_types.h | 91 +-
+ include/linux/mmap_lock.h | 6 -
+ include/linux/mmu_notifier.h | 2 +-
+ include/linux/mmzone.h | 47 +-
+ include/linux/page-flags.h | 6 -
+ include/linux/pagemap.h | 25 -
+ include/linux/part_stat.h | 2 +-
+ include/linux/percpu-defs.h | 6 +-
+ include/linux/pgalloc_tag.h | 75 +-
+ include/linux/pid.h | 3 +
+ include/linux/pid_namespace.h | 11 +-
+ include/linux/rcuwait.h | 13 +-
+ include/linux/reboot.h | 36 +-
+ include/linux/refcount.h | 125 ++
+ include/linux/rhashtable.h | 6 +-
+ include/linux/rmap.h | 23 +-
+ include/linux/slab.h | 15 +-
+ include/linux/swap.h | 19 +-
+ include/linux/swapops.h | 27 +-
+ include/linux/types.h | 12 +
+ include/linux/user_namespace.h | 15 +-
+ include/linux/vmstat.h | 2 +-
+ include/linux/xarray.h | 14 +
+ include/linux/zpool.h | 5 +-
+ include/linux/zsmalloc.h | 8 +
+ include/net/snmp.h | 5 +-
+ include/uapi/linux/capability.h | 1 +
+ kernel/configs/debug.config | 1 -
+ kernel/crash_reserve.c | 9 +-
+ kernel/events/uprobes.c | 13 +-
+ kernel/fork.c | 146 +-
+ kernel/kexec_elf.c | 2 +-
+ kernel/kexec_file.c | 12 +
+ kernel/locking/percpu-rwsem.c | 2 +-
+ kernel/pid.c | 137 +-
+ kernel/pid_namespace.c | 71 +-
+ kernel/reboot.c | 140 +-
+ kernel/sysctl.c | 9 +
+ kernel/trace/pid_list.c | 2 +-
+ kernel/trace/trace.h | 2 +
+ kernel/trace/trace_sched_switch.c | 2 +-
+ kernel/ucount.c | 97 +-
+ lib/alloc_tag.c | 6 +-
+ lib/maple_tree.c | 10 +-
+ lib/min_heap.c | 4 +-
+ lib/plist.c | 12 +
+ lib/test_hmm.c | 44 +-
+ lib/test_xarray.c | 47 +
+ lib/xarray.c | 163 ++-
+ lib/zlib_deflate/deflate.c | 6 +-
+ mm/Kconfig | 55 +-
+ mm/Kconfig.debug | 11 +-
+ mm/Makefile | 7 +-
+ mm/bootmem_info.c | 4 +-
+ mm/cma.c | 743 ++++++++--
+ mm/cma.h | 46 +-
+ mm/cma_debug.c | 61 +-
+ mm/cma_sysfs.c | 20 +
+ mm/compaction.c | 14 +-
+ mm/damon/core.c | 19 +-
+ mm/damon/ops-common.c | 25 +-
+ mm/damon/paddr.c | 76 +-
+ mm/damon/sysfs-schemes.c | 56 +
+ mm/debug.c | 34 +-
+ mm/filemap.c | 51 +-
+ mm/gup.c | 21 +-
+ mm/hmm.c | 2 +-
+ mm/huge_memory.c | 1073 ++++++++++-----
+ mm/hugetlb.c | 582 ++++----
+ mm/hugetlb_cma.c | 275 ++++
+ mm/hugetlb_cma.h | 57 +
+ mm/hugetlb_vmemmap.c | 199 ++-
+ mm/hugetlb_vmemmap.h | 23 +-
+ mm/init-mm.c | 1 +
+ mm/internal.h | 21 +-
+ mm/ioremap.c | 4 +-
+ mm/kmemleak.c | 54 +-
+ mm/ksm.c | 9 +-
+ mm/madvise.c | 181 ++-
+ mm/memcontrol-v1.c | 102 +-
+ mm/memcontrol-v1.h | 39 +-
+ mm/memcontrol.c | 251 ++--
+ mm/memfd.c | 4 +-
+ mm/memory-failure.c | 6 +-
+ mm/memory.c | 212 ++-
+ mm/memremap.c | 59 +-
+ mm/migrate.c | 2 +-
+ mm/migrate_device.c | 18 +-
+ mm/mincore.c | 2 +-
+ mm/mlock.c | 2 +
+ mm/mm_init.c | 113 +-
+ mm/mmap.c | 5 +-
+ mm/mmu_gather.c | 12 +-
+ mm/mprotect.c | 14 +-
+ mm/nommu.c | 4 +-
+ mm/oom_kill.c | 2 +-
+ mm/page_alloc.c | 81 +-
+ mm/page_idle.c | 9 +-
+ mm/page_table_check.c | 5 +-
+ mm/page_vma_mapped.c | 3 +-
+ mm/percpu.c | 8 +-
+ mm/rmap.c | 823 ++++++-----
+ mm/shmem.c | 121 +-
+ mm/slub.c | 51 +-
+ mm/sparse-vmemmap.c | 168 ++-
+ mm/sparse.c | 87 +-
+ mm/swap.c | 2 -
+ mm/swap_state.c | 14 +-
+ mm/swapfile.c | 97 +-
+ mm/truncate.c | 47 +-
+ mm/userfaultfd.c | 38 +-
+ mm/vma.c | 356 ++---
+ mm/vma.h | 101 +-
+ mm/vmscan.c | 153 +--
+ mm/z3fold.c | 1447 --------------------
+ mm/zbud.c | 455 ------
+ mm/zpool.c | 4 +-
+ mm/zsmalloc.c | 351 ++++-
+ net/mpls/internal.h | 4 +-
+ samples/kmemleak/kmemleak-test.c | 36 +-
+ scripts/checkpatch.pl | 96 ++
+ scripts/extract-fwblobs | 30 +
+ scripts/gdb/linux/cpus.py | 22 +-
+ scripts/get_maintainer.pl | 49 +-
+ tools/include/linux/refcount.h | 5 +
+ tools/testing/radix-tree/Makefile | 1 +
+ tools/testing/selftests/mm/.gitignore | 2 +-
+ tools/testing/selftests/mm/Makefile | 2 +-
+ .../mm/{guard-pages.c => guard-regions.c} | 968 +++++++++++--
+ tools/testing/selftests/mm/gup_longterm.c | 45 +-
+ tools/testing/selftests/mm/map_populate.c | 7 +
+ tools/testing/selftests/mm/run_vmtests.sh | 88 +-
+ tools/testing/selftests/mm/split_huge_page_test.c | 95 +-
+ tools/testing/selftests/mm/thuge-gen.c | 4 +-
+ tools/testing/selftests/mm/uffd-common.c | 12 +-
+ tools/testing/selftests/mm/uffd-common.h | 2 +-
+ tools/testing/selftests/mm/uffd-stress.c | 42 +-
+ tools/testing/selftests/mm/uffd-unit-tests.c | 2 +-
+ tools/testing/selftests/mm/uffd-wp-mremap.c | 5 +-
+ tools/testing/selftests/mm/vm_util.h | 1 +
+ tools/testing/vma/linux/atomic.h | 5 +
+ tools/testing/vma/vma.c | 105 +-
+ tools/testing/vma/vma_internal.h | 131 +-
+ 309 files changed, 8836 insertions(+), 6357 deletions(-)
+ delete mode 100644 Documentation/mm/z3fold.rst
+ delete mode 100644 Documentation/translations/zh_CN/mm/z3fold.rst
+ create mode 100644 arch/powerpc/include/asm/crash_reserve.h
+ create mode 100644 mm/hugetlb_cma.c
+ create mode 100644 mm/hugetlb_cma.h
+ delete mode 100644 mm/z3fold.c
+ delete mode 100644 mm/zbud.c
+ create mode 100755 scripts/extract-fwblobs
+ rename tools/testing/selftests/mm/{guard-pages.c => guard-regions.c} (56%)
+Merging kbuild/for-next (a77b570b6c3f modpost: use strstarts() to clean up parse_source_files())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Auto-merging scripts/checkpatch.pl
+Merge made by the 'ort' strategy.
+ Documentation/dev-tools/checkpatch.rst | 18 ----
+ Documentation/kbuild/makefiles.rst | 3 -
+ scripts/Makefile.build | 4 -
+ scripts/Makefile.lib | 5 -
+ scripts/checkpatch.pl | 14 ---
+ scripts/clang-tools/gen_compile_commands.py | 8 +-
+ scripts/gendwarfksyms/die.c | 2 +-
+ scripts/gendwarfksyms/dwarf.c | 154 +++++++++++++++-------------
+ scripts/gendwarfksyms/gendwarfksyms.h | 2 +
+ scripts/gendwarfksyms/types.c | 2 +-
+ scripts/genksyms/lex.l | 6 +-
+ scripts/kconfig/confdata.c | 19 ++--
+ scripts/kconfig/symbol.c | 2 +-
+ scripts/mod/modpost.c | 41 ++++----
+ scripts/mod/modpost.h | 1 +
+ scripts/mod/sumversion.c | 17 ++-
+ 16 files changed, 130 insertions(+), 168 deletions(-)
+Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
+$ 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 (7e05269ba8e3 perf parse-events: Tidy name token matching)
+$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
+Merge made by the 'ort' strategy.
+ tools/build/feature/test-backtrace.c | 2 +-
+ tools/build/feature/test-bpf.c | 2 +-
+ tools/build/feature/test-glibc.c | 2 +-
+ tools/build/feature/test-libdebuginfod.c | 2 +-
+ tools/build/feature/test-libdw.c | 2 +-
+ tools/build/feature/test-libelf-gelf_getnote.c | 2 +-
+ tools/build/feature/test-libelf.c | 2 +-
+ tools/build/feature/test-lzma.c | 2 +-
+ .../callchain-overhead-calculation.txt | 5 +-
+ .../Documentation/cpu-and-latency-overheads.txt | 85 +
+ tools/perf/Documentation/intel-hybrid.txt | 12 +-
+ tools/perf/Documentation/perf-list.txt | 2 +-
+ tools/perf/Documentation/perf-record.txt | 4 +
+ tools/perf/Documentation/perf-report.txt | 54 +-
+ tools/perf/Documentation/perf-trace.txt | 4 +
+ tools/perf/Documentation/tips.txt | 4 +
+ tools/perf/Makefile.config | 10 +-
+ tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/arm/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/arm64/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/csky/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/loongarch/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/powerpc/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/riscv/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/s390/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/x86/util/iostat.c | 2 +-
+ tools/perf/arch/x86/util/unwind-libdw.c | 2 +-
+ tools/perf/builtin-list.c | 9 +-
+ tools/perf/builtin-record.c | 24 +-
+ tools/perf/builtin-report.c | 72 +-
+ tools/perf/builtin-script.c | 10 +-
+ tools/perf/builtin-stat.c | 2 +-
+ tools/perf/builtin-top.c | 8 +-
+ tools/perf/builtin-trace.c | 254 +-
+ .../pmu-events/arch/arm64/arm/neoverse-n3/bus.json | 18 +
+ .../arch/arm64/arm/neoverse-n3/exception.json | 62 +
+ .../arch/arm64/arm/neoverse-n3/fp_operation.json | 22 +
+ .../arch/arm64/arm/neoverse-n3/general.json | 10 +
+ .../arch/arm64/arm/neoverse-n3/l1d_cache.json | 50 +
+ .../arch/arm64/arm/neoverse-n3/l1i_cache.json | 14 +
+ .../arch/arm64/arm/neoverse-n3/l2_cache.json | 78 +
+ .../arch/arm64/arm/neoverse-n3/l3_cache.json | 26 +
+ .../arch/arm64/arm/neoverse-n3/ll_cache.json | 22 +
+ .../arch/arm64/arm/neoverse-n3/memory.json | 54 +
+ .../arch/arm64/arm/neoverse-n3/metrics.json | 457 ++++
+ .../arch/arm64/arm/neoverse-n3/retired.json | 90 +
+ .../pmu-events/arch/arm64/arm/neoverse-n3/spe.json | 42 +
+ .../arch/arm64/arm/neoverse-n3/spec_operation.json | 90 +
+ .../arch/arm64/arm/neoverse-n3/stall.json | 86 +
+ .../pmu-events/arch/arm64/arm/neoverse-n3/sve.json | 50 +
+ .../pmu-events/arch/arm64/arm/neoverse-n3/tlb.json | 74 +
+ .../arch/arm64/arm/neoverse-n3/trace.json | 42 +
+ .../arch/arm64/arm/neoverse-v3/brbe.json | 6 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/bus.json | 18 +
+ .../arch/arm64/arm/neoverse-v3/exception.json | 62 +
+ .../arch/arm64/arm/neoverse-v3/fp_operation.json | 22 +
+ .../arch/arm64/arm/neoverse-v3/general.json | 40 +
+ .../arch/arm64/arm/neoverse-v3/l1d_cache.json | 74 +
+ .../arch/arm64/arm/neoverse-v3/l1i_cache.json | 62 +
+ .../arch/arm64/arm/neoverse-v3/l2_cache.json | 78 +
+ .../arch/arm64/arm/neoverse-v3/ll_cache.json | 10 +
+ .../arch/arm64/arm/neoverse-v3/memory.json | 58 +
+ .../arch/arm64/arm/neoverse-v3/metrics.json | 457 ++++
+ .../arch/arm64/arm/neoverse-v3/retired.json | 98 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/spe.json | 42 +
+ .../arch/arm64/arm/neoverse-v3/spec_operation.json | 126 +
+ .../arch/arm64/arm/neoverse-v3/stall.json | 124 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/sve.json | 50 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/tlb.json | 138 +
+ .../arch/arm64/common-and-microarch.json | 310 +++
+ tools/perf/pmu-events/arch/arm64/mapfile.csv | 2 +
+ .../pmu-events/arch/x86/alderlake/adl-metrics.json | 920 ++++---
+ .../perf/pmu-events/arch/x86/alderlake/cache.json | 292 ++-
+ .../arch/x86/alderlake/floating-point.json | 19 +-
+ .../pmu-events/arch/x86/alderlake/frontend.json | 19 -
+ .../perf/pmu-events/arch/x86/alderlake/memory.json | 32 +-
+ .../arch/x86/alderlake/metricgroups.json | 10 +-
+ .../perf/pmu-events/arch/x86/alderlake/other.json | 92 +-
+ .../pmu-events/arch/x86/alderlake/pipeline.json | 127 +-
+ .../arch/x86/alderlake/virtual-memory.json | 33 +
+ .../arch/x86/alderlaken/adln-metrics.json | 85 +-
+ .../perf/pmu-events/arch/x86/alderlaken/cache.json | 227 +-
+ .../arch/x86/alderlaken/floating-point.json | 17 +-
+ .../pmu-events/arch/x86/alderlaken/memory.json | 20 +
+ .../perf/pmu-events/arch/x86/alderlaken/other.json | 81 +-
+ .../pmu-events/arch/x86/alderlaken/pipeline.json | 97 +-
+ .../arch/x86/alderlaken/virtual-memory.json | 30 +
+ .../pmu-events/arch/x86/arrowlake/arl-metrics.json | 2749 ++++++++++++++++++++
+ .../perf/pmu-events/arch/x86/arrowlake/cache.json | 1491 +++++++++++
+ .../arch/x86/arrowlake/floating-point.json | 532 ++++
+ .../pmu-events/arch/x86/arrowlake/frontend.json | 609 +++++
+ .../perf/pmu-events/arch/x86/arrowlake/memory.json | 387 +++
+ .../arch/x86/arrowlake/metricgroups.json | 150 ++
+ .../perf/pmu-events/arch/x86/arrowlake/other.json | 279 ++
+ .../pmu-events/arch/x86/arrowlake/pipeline.json | 2308 ++++++++++++++++
+ .../arch/x86/arrowlake/uncore-cache.json | 20 +
+ .../arch/x86/arrowlake/uncore-interconnect.json | 47 +
+ .../arch/x86/arrowlake/uncore-memory.json | 160 ++
+ .../x86/{haswell => arrowlake}/uncore-other.json | 2 +-
+ .../arch/x86/arrowlake/virtual-memory.json | 522 ++++
+ .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 312 ++-
+ .../perf/pmu-events/arch/x86/broadwell/cache.json | 10 +-
+ .../pmu-events/arch/x86/broadwell/frontend.json | 4 +-
+ .../perf/pmu-events/arch/x86/broadwell/memory.json | 8 +-
+ .../arch/x86/broadwell/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/broadwell/pipeline.json | 10 +-
+ .../arch/x86/broadwellde/bdwde-metrics.json | 256 +-
+ .../pmu-events/arch/x86/broadwellde/cache.json | 10 +-
+ .../pmu-events/arch/x86/broadwellde/frontend.json | 4 +-
+ .../pmu-events/arch/x86/broadwellde/memory.json | 6 +-
+ .../arch/x86/broadwellde/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/broadwellde/pipeline.json | 10 +-
+ .../arch/x86/broadwellde/uncore-cache.json | 28 +-
+ .../arch/x86/broadwellde/uncore-interconnect.json | 16 +-
+ .../arch/x86/broadwellx/bdx-metrics.json | 344 +--
+ .../perf/pmu-events/arch/x86/broadwellx/cache.json | 10 +-
+ .../pmu-events/arch/x86/broadwellx/frontend.json | 4 +-
+ .../pmu-events/arch/x86/broadwellx/memory.json | 6 +-
+ .../arch/x86/broadwellx/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/broadwellx/pipeline.json | 10 +-
+ .../arch/x86/broadwellx/uncore-cache.json | 28 +-
+ .../arch/x86/broadwellx/uncore-interconnect.json | 36 +-
+ .../arch/x86/broadwellx/uncore-memory.json | 1 +
+ .../arch/x86/cascadelakex/clx-metrics.json | 767 +++---
+ .../arch/x86/cascadelakex/metricgroups.json | 9 +-
+ .../arch/x86/cascadelakex/uncore-cache.json | 60 +-
+ .../arch/x86/cascadelakex/uncore-interconnect.json | 11 -
+ .../arch/x86/clearwaterforest/cache.json | 144 +
+ .../arch/x86/clearwaterforest/counter.json | 7 +
+ .../arch/x86/clearwaterforest/frontend.json | 18 +
+ .../arch/x86/clearwaterforest/memory.json | 22 +
+ .../arch/x86/clearwaterforest/other.json | 22 +
+ .../arch/x86/clearwaterforest/pipeline.json | 113 +
+ .../arch/x86/clearwaterforest/virtual-memory.json | 29 +
+ .../pmu-events/arch/x86/emeraldrapids/cache.json | 28 +-
+ .../arch/x86/emeraldrapids/emr-metrics.json | 982 +++----
+ .../arch/x86/emeraldrapids/frontend.json | 19 -
+ .../pmu-events/arch/x86/emeraldrapids/memory.json | 15 +-
+ .../arch/x86/emeraldrapids/metricgroups.json | 10 +-
+ .../arch/x86/emeraldrapids/pipeline.json | 23 -
+ .../arch/x86/emeraldrapids/uncore-io.json | 218 +-
+ .../arch/x86/grandridge/grr-metrics.json | 286 +-
+ .../pmu-events/arch/x86/grandridge/pipeline.json | 3 +-
+ .../arch/x86/grandridge/uncore-cache.json | 4 +-
+ .../arch/x86/grandridge/uncore-interconnect.json | 60 +
+ .../pmu-events/arch/x86/grandridge/uncore-io.json | 214 +-
+ .../arch/x86/grandridge/uncore-memory.json | 2 +-
+ .../pmu-events/arch/x86/graniterapids/cache.json | 130 +-
+ .../pmu-events/arch/x86/graniterapids/counter.json | 24 +-
+ .../arch/x86/graniterapids/frontend.json | 24 +-
+ .../arch/x86/graniterapids/gnr-metrics.json | 2325 +++++++++++++++++
+ .../pmu-events/arch/x86/graniterapids/memory.json | 121 +-
+ .../arch/x86/graniterapids/metricgroups.json | 145 ++
+ .../pmu-events/arch/x86/graniterapids/other.json | 109 +
+ .../arch/x86/graniterapids/pipeline.json | 40 +-
+ .../arch/x86/graniterapids/uncore-cache.json | 48 +-
+ .../arch/x86/graniterapids/uncore-cxl.json | 2 -
+ .../x86/graniterapids/uncore-interconnect.json | 87 +
+ .../arch/x86/graniterapids/uncore-io.json | 280 +-
+ .../arch/x86/graniterapids/uncore-memory.json | 122 +-
+ .../arch/x86/graniterapids/uncore-power.json | 98 +
+ .../pmu-events/arch/x86/haswell/hsw-metrics.json | 260 +-
+ tools/perf/pmu-events/arch/x86/haswell/memory.json | 2 +-
+ .../pmu-events/arch/x86/haswell/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 296 ++-
+ .../pmu-events/arch/x86/haswellx/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/haswellx/uncore-cache.json | 28 +-
+ .../arch/x86/haswellx/uncore-interconnect.json | 38 +-
+ tools/perf/pmu-events/arch/x86/icelake/cache.json | 34 +-
+ .../perf/pmu-events/arch/x86/icelake/frontend.json | 17 -
+ .../pmu-events/arch/x86/icelake/icl-metrics.json | 849 +++---
+ tools/perf/pmu-events/arch/x86/icelake/memory.json | 13 +-
+ .../pmu-events/arch/x86/icelake/metricgroups.json | 10 +-
+ .../perf/pmu-events/arch/x86/icelake/pipeline.json | 30 +-
+ .../arch/x86/icelake/uncore-interconnect.json | 76 -
+ .../pmu-events/arch/x86/icelake/uncore-other.json | 2 +-
+ .../arch/x86/icelake/virtual-memory.json | 18 +
+ tools/perf/pmu-events/arch/x86/icelakex/cache.json | 41 +-
+ .../pmu-events/arch/x86/icelakex/frontend.json | 17 -
+ .../pmu-events/arch/x86/icelakex/icx-metrics.json | 852 +++---
+ .../perf/pmu-events/arch/x86/icelakex/memory.json | 13 +-
+ .../pmu-events/arch/x86/icelakex/metricgroups.json | 10 +-
+ .../pmu-events/arch/x86/icelakex/pipeline.json | 30 +-
+ .../perf/pmu-events/arch/x86/lunarlake/cache.json | 1288 ++++++++-
+ .../arch/x86/lunarlake/floating-point.json | 484 ++++
+ .../pmu-events/arch/x86/lunarlake/frontend.json | 654 ++++-
+ .../pmu-events/arch/x86/lunarlake/lnl-metrics.json | 2730 +++++++++++++++++++
+ .../perf/pmu-events/arch/x86/lunarlake/memory.json | 264 +-
+ .../arch/x86/lunarlake/metricgroups.json | 150 ++
+ .../perf/pmu-events/arch/x86/lunarlake/other.json | 496 +++-
+ .../pmu-events/arch/x86/lunarlake/pipeline.json | 1743 ++++++++++++-
+ .../arch/x86/lunarlake/uncore-memory.json | 36 +
+ .../arch/x86/lunarlake/virtual-memory.json | 428 +++
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 42 +-
+ .../perf/pmu-events/arch/x86/meteorlake/cache.json | 109 +-
+ .../pmu-events/arch/x86/meteorlake/frontend.json | 30 +-
+ .../pmu-events/arch/x86/meteorlake/memory.json | 22 +-
+ .../arch/x86/meteorlake/metricgroups.json | 10 +-
+ .../arch/x86/meteorlake/mtl-metrics.json | 1058 +++++---
+ .../perf/pmu-events/arch/x86/meteorlake/other.json | 54 +
+ .../pmu-events/arch/x86/meteorlake/pipeline.json | 89 +-
+ .../arch/x86/meteorlake/uncore-other.json | 2 +-
+ .../perf/pmu-events/arch/x86/rocketlake/cache.json | 34 +-
+ .../pmu-events/arch/x86/rocketlake/frontend.json | 17 -
+ .../pmu-events/arch/x86/rocketlake/memory.json | 13 +-
+ .../arch/x86/rocketlake/metricgroups.json | 10 +-
+ .../pmu-events/arch/x86/rocketlake/pipeline.json | 30 +-
+ .../arch/x86/rocketlake/rkl-metrics.json | 849 +++---
+ .../arch/x86/rocketlake/uncore-interconnect.json | 10 -
+ .../arch/x86/rocketlake/uncore-other.json | 2 +-
+ .../arch/x86/rocketlake/virtual-memory.json | 18 +
+ .../pmu-events/arch/x86/sapphirerapids/cache.json | 30 +-
+ .../arch/x86/sapphirerapids/frontend.json | 19 -
+ .../pmu-events/arch/x86/sapphirerapids/memory.json | 15 +-
+ .../arch/x86/sapphirerapids/metricgroups.json | 10 +-
+ .../arch/x86/sapphirerapids/pipeline.json | 23 -
+ .../arch/x86/sapphirerapids/spr-metrics.json | 914 ++++---
+ .../arch/x86/sapphirerapids/uncore-io.json | 138 +-
+ .../pmu-events/arch/x86/sierraforest/cache.json | 130 +-
+ .../pmu-events/arch/x86/sierraforest/counter.json | 24 +-
+ .../pmu-events/arch/x86/sierraforest/frontend.json | 8 +
+ .../pmu-events/arch/x86/sierraforest/other.json | 20 +
+ .../pmu-events/arch/x86/sierraforest/pipeline.json | 46 +-
+ .../arch/x86/sierraforest/srf-metrics.json | 310 +--
+ .../arch/x86/sierraforest/uncore-cache.json | 61 +-
+ .../arch/x86/sierraforest/uncore-cxl.json | 2 -
+ .../arch/x86/sierraforest/uncore-interconnect.json | 87 +
+ .../arch/x86/sierraforest/uncore-io.json | 280 +-
+ .../arch/x86/sierraforest/uncore-memory.json | 122 +-
+ .../arch/x86/sierraforest/uncore-power.json | 98 +
+ .../pmu-events/arch/x86/skylake/metricgroups.json | 9 +-
+ .../pmu-events/arch/x86/skylake/skl-metrics.json | 684 +++--
+ .../pmu-events/arch/x86/skylakex/metricgroups.json | 9 +-
+ .../pmu-events/arch/x86/skylakex/skx-metrics.json | 740 +++---
+ .../pmu-events/arch/x86/skylakex/uncore-cache.json | 60 +-
+ .../arch/x86/skylakex/uncore-interconnect.json | 11 -
+ .../perf/pmu-events/arch/x86/tigerlake/cache.json | 45 +-
+ .../pmu-events/arch/x86/tigerlake/frontend.json | 17 -
+ .../perf/pmu-events/arch/x86/tigerlake/memory.json | 13 +-
+ .../arch/x86/tigerlake/metricgroups.json | 10 +-
+ .../pmu-events/arch/x86/tigerlake/pipeline.json | 30 +-
+ .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 745 +++---
+ .../arch/x86/tigerlake/uncore-interconnect.json | 4 +-
+ .../arch/x86/tigerlake/uncore-other.json | 2 +-
+ .../arch/x86/tigerlake/virtual-memory.json | 18 +
+ tools/perf/pmu-events/empty-pmu-events.c | 8 +-
+ tools/perf/pmu-events/jevents.py | 8 +-
+ tools/perf/scripts/python/bin/flamegraph-report | 2 +-
+ tools/perf/tests/code-reading.c | 12 +-
+ tools/perf/tests/dwarf-unwind.c | 6 +-
+ tools/perf/tests/hwmon_pmu.c | 16 +-
+ tools/perf/tests/mmap-basic.c | 3 +
+ tools/perf/tests/openat-syscall-tp-fields.c | 4 +-
+ tools/perf/tests/parse-no-sample-id-all.c | 6 +-
+ tools/perf/tests/perf-record.c | 2 +
+ tools/perf/tests/perf-time-to-tsc.c | 2 +
+ tools/perf/tests/pmu.c | 85 +-
+ tools/perf/tests/sample-parsing.c | 58 +-
+ tools/perf/tests/shell/base_report/setup.sh | 18 +-
+ tools/perf/tests/shell/base_report/test_basic.sh | 52 +
+ tools/perf/tests/shell/record.sh | 59 +-
+ tools/perf/tests/shell/stat_all_metrics.sh | 8 +-
+ tools/perf/tests/shell/test_stat_intel_tpebs.sh | 89 +-
+ tools/perf/tests/sw-clock.c | 3 +
+ tools/perf/tests/switch-tracking.c | 14 +-
+ tools/perf/tests/tool_pmu.c | 4 +-
+ tools/perf/ui/browsers/hists.c | 27 +-
+ tools/perf/ui/hist.c | 117 +-
+ tools/perf/util/Build | 1 +
+ tools/perf/util/addr_location.c | 1 +
+ tools/perf/util/addr_location.h | 6 +-
+ tools/perf/util/arm-spe.c | 24 +-
+ .../perf/util/arm64-frame-pointer-unwind-support.c | 29 +-
+ tools/perf/util/auxtrace.c | 15 +-
+ tools/perf/util/comm.c | 2 +
+ tools/perf/util/cs-etm.c | 31 +-
+ tools/perf/util/debuginfo.c | 6 +-
+ tools/perf/util/event.c | 11 +
+ tools/perf/util/events_stats.h | 2 +
+ tools/perf/util/evsel.c | 35 +-
+ tools/perf/util/evsel.h | 2 +
+ tools/perf/util/expr.c | 2 +
+ tools/perf/util/hist.c | 90 +-
+ tools/perf/util/hist.h | 32 +-
+ tools/perf/util/hwmon_pmu.c | 14 -
+ tools/perf/util/hwmon_pmu.h | 16 +
+ tools/perf/util/intel-bts.c | 4 +-
+ tools/perf/util/intel-pt.c | 136 +-
+ tools/perf/util/jitdump.c | 10 +-
+ tools/perf/util/machine.c | 49 +-
+ tools/perf/util/machine.h | 8 +-
+ tools/perf/util/mem-events.c | 2 +-
+ tools/perf/util/mmap.c | 11 -
+ tools/perf/util/mmap.h | 3 -
+ tools/perf/util/parse-events.c | 2 +-
+ tools/perf/util/parse-events.l | 51 +-
+ tools/perf/util/pmu.c | 262 +-
+ tools/perf/util/pmu.h | 7 +-
+ tools/perf/util/pmus.c | 168 +-
+ tools/perf/util/python.c | 9 +
+ tools/perf/util/rb_resort.h | 146 --
+ tools/perf/util/s390-cpumsf.c | 6 +-
+ tools/perf/util/sample.c | 43 +
+ tools/perf/util/sample.h | 11 +-
+ .../util/scripting-engines/trace-event-python.c | 29 +-
+ tools/perf/util/session.c | 106 +-
+ tools/perf/util/session.h | 1 +
+ tools/perf/util/sort.c | 69 +-
+ tools/perf/util/sort.h | 3 +-
+ tools/perf/util/stat-display.c | 111 +-
+ tools/perf/util/stat-shadow.c | 3 +-
+ tools/perf/util/stat.c | 13 +-
+ tools/perf/util/symbol.c | 34 +
+ tools/perf/util/symbol_conf.h | 8 +-
+ tools/perf/util/synthetic-events.c | 24 +-
+ tools/perf/util/tool_pmu.c | 3 +-
+ tools/perf/util/unwind-libdw.c | 9 +-
+ 320 files changed, 35127 insertions(+), 7959 deletions(-)
+ create mode 100644 tools/perf/Documentation/cpu-and-latency-overheads.txt
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/fp_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/general.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l1d_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l1i_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l2_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l3_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/ll_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/retired.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/spe.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/spec_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/stall.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/sve.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/tlb.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/trace.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/brbe.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/fp_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/general.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l1d_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l1i_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l2_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/ll_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/retired.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/spe.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/spec_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/stall.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/sve.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/tlb.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/arl-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/metricgroups.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/uncore-cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/uncore-interconnect.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/uncore-memory.json
+ rename tools/perf/pmu-events/arch/x86/{haswell => arrowlake}/uncore-other.json (90%)
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/counter.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/gnr-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/metricgroups.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/lnl-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/metricgroups.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/uncore-memory.json
+ delete mode 100644 tools/perf/util/rb_resort.h
+ create mode 100644 tools/perf/util/sample.c
+Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
+$ 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/for-next (aef7ee7649e0 dma-debug: fix physical address calculation for struct dma_debug_entry)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (0af8e32343f8 empty include/asm-generic/vga.h)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+Already up to date.
+Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
+$ git merge -m Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next
+Already up to date.
+Merging arm/for-next (f520fab580c9 ARM: 9440/1: cacheinfo fix format field mask)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next
+Already up to date.
+Merging arm64/for-next/core (a1c24ab82279 Merge branch 'for-next/el2-enable-feat-pmuv3p9' into for-next/core)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Auto-merging tools/testing/selftests/mm/protection_keys.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/pm/cpufreq.rst | 17 ++-
+ Documentation/arch/arm64/booting.rst | 18 +++
+ arch/arm64/include/asm/el2_setup.h | 25 ++++
+ arch/arm64/kernel/topology.c | 128 +++++++++++++++++++--
+ arch/arm64/tools/sysreg | 103 +++++++++++++++++
+ arch/x86/kernel/cpu/aperfmperf.c | 2 +-
+ arch/x86/kernel/cpu/proc.c | 7 +-
+ drivers/base/arch_topology.c | 8 +-
+ drivers/cpufreq/Kconfig.x86 | 12 ++
+ drivers/cpufreq/cpufreq.c | 38 +++++-
+ include/linux/cpufreq.h | 2 +-
+ include/uapi/asm-generic/mman-common.h | 1 +
+ tools/testing/selftests/mm/mseal_test.c | 6 +-
+ tools/testing/selftests/mm/pkey-helpers.h | 3 +-
+ tools/testing/selftests/mm/pkey_sighandler_tests.c | 4 +-
+ tools/testing/selftests/mm/protection_keys.c | 2 +-
+ tools/testing/selftests/powerpc/include/pkeys.h | 2 +-
+ .../testing/selftests/powerpc/mm/pkey_exec_prot.c | 2 +-
+ tools/testing/selftests/powerpc/mm/pkey_siginfo.c | 2 +-
+ tools/testing/selftests/powerpc/ptrace/core-pkey.c | 6 +-
+ .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 6 +-
+ 21 files changed, 355 insertions(+), 39 deletions(-)
+Merging arm-perf/for-next/perf (ba113ecad81a perf docs: arm_spe: Document new discard mode)
+$ git merge -m Merge branch 'for-next/perf' of git://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 (e31e3f6c0ce4 soc: loongson: loongson2_guts: Add check for devm_kstrdup())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Already up to date.
+Merging amlogic/for-next (953913df9c3a Merge branch 'v6.15/arm64-dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/amlogic/meson8.dtsi | 18 ++++++++++--
+ arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 --
+ arch/arm/boot/dts/amlogic/meson8b-mxq.dts | 2 --
+ arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 2 --
+ arch/arm/boot/dts/amlogic/meson8b.dtsi | 18 ++++++++++--
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 +++++++++++++---
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 33 ++++++++++++++++++----
+ arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 ---
+ .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 --
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 4 ---
+ .../dts/amlogic/meson-g12b-a311d-libretech-cc.dts | 2 --
+ .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 ---
+ .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 ---
+ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 4 ---
+ .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 8 ------
+ arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 6 ----
+ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 6 ----
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 +++---
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 --
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 --
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 ++++++++++++++++
+ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 --
+ .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 --
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 2 --
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 --
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 --
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 ++++++++++++++++
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 --
+ .../dts/amlogic/meson-libretech-cottonwood.dtsi | 6 ----
+ arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 6 ----
+ .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 --
+ .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 --
+ arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 6 ----
+ 43 files changed, 132 insertions(+), 135 deletions(-)
+Merging asahi-soc/asahi-soc/for-next (ef3903f59a49 Merge branch 'asahi-soc/soc' 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
+Auto-merging drivers/nvme/host/apple.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/apple.yaml | 41 +
+ .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 5 +
+ .../bindings/power/apple,pmgr-pwrstate.yaml | 5 +
+ arch/arm64/boot/dts/apple/Makefile | 16 +
+ arch/arm64/boot/dts/apple/s5l8960x-5s.dtsi | 5 +
+ arch/arm64/boot/dts/apple/s5l8960x-air1.dtsi | 5 +
+ arch/arm64/boot/dts/apple/s5l8960x-mini2.dtsi | 5 +
+ arch/arm64/boot/dts/apple/s5l8960x-opp.dtsi | 45 +
+ arch/arm64/boot/dts/apple/s5l8960x-pmgr.dtsi | 610 ++++++++++++++
+ arch/arm64/boot/dts/apple/s5l8960x.dtsi | 23 +
+ arch/arm64/boot/dts/apple/s5l8965x-opp.dtsi | 45 +
+ arch/arm64/boot/dts/apple/s800-0-3-pmgr.dtsi | 757 +++++++++++++++++
+ arch/arm64/boot/dts/apple/s800-0-3.dtsi | 172 ++++
+ arch/arm64/boot/dts/apple/s8000.dtsi | 162 +---
+ arch/arm64/boot/dts/apple/s8001-common.dtsi | 1 +
+ arch/arm64/boot/dts/apple/s8001-j98a-j99a.dtsi | 26 +
+ arch/arm64/boot/dts/apple/s8001-j98a.dts | 1 +
+ arch/arm64/boot/dts/apple/s8001-j99a.dts | 1 +
+ arch/arm64/boot/dts/apple/s8001-pmgr.dtsi | 822 ++++++++++++++++++
+ arch/arm64/boot/dts/apple/s8001.dtsi | 81 ++
+ arch/arm64/boot/dts/apple/s8003.dtsi | 63 +-
+ arch/arm64/boot/dts/apple/s800x-6s.dtsi | 4 +
+ arch/arm64/boot/dts/apple/s800x-ipad5.dtsi | 4 +
+ arch/arm64/boot/dts/apple/s800x-se.dtsi | 4 +
+ arch/arm64/boot/dts/apple/spi1-nvram.dtsi | 39 +
+ arch/arm64/boot/dts/apple/t600x-common.dtsi | 7 +
+ arch/arm64/boot/dts/apple/t600x-die0.dtsi | 28 +
+ arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi | 14 +
+ arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t600x-j375.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t7000-6.dtsi | 8 +
+ arch/arm64/boot/dts/apple/t7000-j42d.dts | 5 +
+ arch/arm64/boot/dts/apple/t7000-mini4.dtsi | 12 +
+ arch/arm64/boot/dts/apple/t7000-n102.dts | 4 +
+ arch/arm64/boot/dts/apple/t7000-pmgr.dtsi | 641 ++++++++++++++
+ arch/arm64/boot/dts/apple/t7000.dtsi | 66 ++
+ arch/arm64/boot/dts/apple/t7001-air2.dtsi | 1 +
+ arch/arm64/boot/dts/apple/t7001-pmgr.dtsi | 650 ++++++++++++++
+ arch/arm64/boot/dts/apple/t7001.dtsi | 65 ++
+ arch/arm64/boot/dts/apple/t8010-7.dtsi | 12 +
+ arch/arm64/boot/dts/apple/t8010-ipad6.dtsi | 12 +
+ arch/arm64/boot/dts/apple/t8010-n112.dts | 4 +
+ arch/arm64/boot/dts/apple/t8010-pmgr.dtsi | 772 +++++++++++++++++
+ arch/arm64/boot/dts/apple/t8010.dtsi | 108 +++
+ arch/arm64/boot/dts/apple/t8011-common.dtsi | 1 +
+ arch/arm64/boot/dts/apple/t8011-pmgr.dtsi | 806 ++++++++++++++++++
+ arch/arm64/boot/dts/apple/t8011-pro2.dtsi | 8 +
+ arch/arm64/boot/dts/apple/t8011.dtsi | 101 +++
+ arch/arm64/boot/dts/apple/t8012-j132.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j137.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j140a.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j140k.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j152f.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j160.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j174.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j185.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j185f.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j213.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j214k.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j215.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j223.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j230k.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j680.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j780.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-jxxx.dtsi | 44 +
+ arch/arm64/boot/dts/apple/t8012-pmgr.dtsi | 837 ++++++++++++++++++
+ arch/arm64/boot/dts/apple/t8012-touchbar.dtsi | 20 +
+ arch/arm64/boot/dts/apple/t8012.dtsi | 281 +++++++
+ arch/arm64/boot/dts/apple/t8015-common.dtsi | 1 +
+ arch/arm64/boot/dts/apple/t8015-pmgr.dtsi | 931 +++++++++++++++++++++
+ arch/arm64/boot/dts/apple/t8015.dtsi | 144 ++++
+ arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 18 +-
+ arch/arm64/boot/dts/apple/t8103.dtsi | 76 ++
+ arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t8112.dtsi | 44 +-
+ drivers/nvme/host/apple.c | 2 +-
+ drivers/soc/apple/rtkit.c | 49 +-
+ include/linux/soc/apple/rtkit.h | 2 +-
+ 79 files changed, 8804 insertions(+), 151 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/apple/s5l8960x-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s5l8960x-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s5l8965x-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s800-0-3-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s800-0-3.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s8001-j98a-j99a.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s8001-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/spi1-nvram.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t7000-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t7001-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8010-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8011-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j132.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j137.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j140a.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j140k.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j152f.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j160.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j174.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j185.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j185f.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j213.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j214k.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j215.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j223.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j230k.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j680.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j780.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-jxxx.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-touchbar.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8015-pmgr.dtsi
+Merging aspeed/for-next (3540adcccc71 ARM: dts: aspeed: yosemite4: adjust secondary flash name)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Already up to date.
+Merging at91/at91-next (22ae29e60958 Merge branch 'at91-dt' into at91-next)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/atmel-sysregs.txt | 1 +
+ .../boot/dts/microchip/at91-sama7d65_curiosity.dts | 64 ++++++++++++++++++++++
+ arch/arm/boot/dts/microchip/sama7d65.dtsi | 58 ++++++++++++++++++++
+ arch/arm/boot/dts/microchip/tny_a9260.dts | 2 +-
+ arch/arm/boot/dts/microchip/tny_a9260_common.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/tny_a9263.dts | 2 +-
+ arch/arm/boot/dts/microchip/tny_a9g20.dts | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9260.dts | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9260_common.dtsi | 9 +--
+ arch/arm/boot/dts/microchip/usb_a9263.dts | 7 +--
+ arch/arm/boot/dts/microchip/usb_a9g20-dab-mmx.dtsi | 10 ++--
+ arch/arm/boot/dts/microchip/usb_a9g20.dts | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts | 4 +-
+ drivers/soc/atmel/soc.c | 5 ++
+ drivers/soc/atmel/soc.h | 3 +
+ 16 files changed, 149 insertions(+), 26 deletions(-)
+Merging broadcom/next (bdac656f1bb5 Merge branch 'devicetree/fixes' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 5 -
+ arch/arm/boot/dts/broadcom/bcm2711.dtsi | 1 +
+ arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 8 ++
+ arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 147 +++++++++++++++++++++++
+ 4 files changed, 156 insertions(+), 5 deletions(-)
+Merging davinci/davinci/for-next (58abc69e479c ARM: dts: ti: davinci: Align GPIO hog name with bindings)
+$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging drivers-memory/for-next (b9c791c65ced Merge branch 'mem-ctrl-next' into for-next)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/memory/tegra/tegra20-emc.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Merging imx-mxs/for-next (6b85642caf39 Merge branch 'imx/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 1 +
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/nxp/imx/imx50.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx51.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx53-ppd.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx53.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 10 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 32 +++
+ arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 32 +++
+ arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 56 ++--
+ arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/mxs/Makefile | 3 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3-0.dts | 12 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3-1.dts | 8 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3-2.dts | 39 +++
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3.dtsi | 313 +++++++++++++++++++++
+ arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts | 13 +-
+ arch/arm/boot/dts/nxp/vf/vf610-bk4.dts | 4 +-
+ arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-c.dts | 4 +-
+ arch/arm/boot/dts/nxp/vf/vfxxx.dtsi | 4 +-
+ arch/arm64/boot/dts/freescale/Makefile | 17 ++
+ .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 16 ++
+ arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi | 30 +-
+ arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 42 +++
+ .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 10 +-
+ .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +-
+ .../freescale/imx8mm-phyboard-polis-peb-av-10.dtso | 237 ++++++++++++++++
+ .../imx8mm-phyboard-polis-peb-eval-01.dtso | 72 +++++
+ .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 17 +-
+ .../boot/dts/freescale/imx8mm-phycore-no-eth.dtso | 12 +
+ .../dts/freescale/imx8mm-phycore-no-spiflash.dtso | 16 ++
+ .../boot/dts/freescale/imx8mm-phycore-rpmsg.dtso | 58 ++++
+ .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 22 +-
+ .../boot/dts/freescale/imx8mm-phygate-tauri-l.dts | 11 +
+ .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 1 +
+ .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 21 --
+ .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 1 -
+ .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 22 ++
+ .../boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 7 +-
+ .../arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi | 68 +++--
+ .../boot/dts/freescale/imx8mp-skov-revb-hdmi.dts | 45 ++-
+ .../boot/dts/freescale/imx8mp-skov-revb-lt6.dts | 60 ++++
+ .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 17 +-
+ .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 112 ++++++++
+ arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi | 19 ++
+ .../boot/dts/freescale/imx8qxp-mek-pcie-ep.dtso | 22 ++
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 32 +++
+ arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 4 +-
+ .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 5 +-
+ .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 56 ++--
+ .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 6 +-
+ arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 83 ++++++
+ arch/arm64/boot/dts/freescale/imx95.dtsi | 56 ++++
+ arch/arm64/boot/dts/freescale/mba8xx.dtsi | 32 ++-
+ arch/arm64/boot/dts/freescale/s32g2.dtsi | 89 ++++++
+ arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 1 +
+ arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 1 +
+ arch/arm64/boot/dts/freescale/s32g3.dtsi | 94 +++++++
+ arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts | 9 +
+ arch/arm64/boot/dts/freescale/s32gxxxa-evb.dtsi | 150 ++++++++++
+ arch/arm64/boot/dts/freescale/s32gxxxa-rdb.dtsi | 122 ++++++++
+ arch/arm64/boot/dts/freescale/tqma8xx.dtsi | 12 +-
+ drivers/firmware/imx/imx-scu.c | 1 +
+ drivers/soc/imx/soc-imx8m.c | 26 +-
+ 71 files changed, 2112 insertions(+), 190 deletions(-)
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3-0.dts
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3-1.dts
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3-2.dts
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-av-10.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-eval-01.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-no-eth.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-no-spiflash.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-rpmsg.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-mek-pcie-ep.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/s32gxxxa-evb.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/s32gxxxa-rdb.dtsi
+Merging mediatek/for-next (e08b8fd2f129 Merge branch 'v6.14-next/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/mediatek.yaml | 5 +
+ .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +
+ .../devicetree/bindings/usb/mediatek,mtu3.yaml | 12 +
+ arch/arm64/boot/dts/airoha/en7581-evb.dts | 40 +
+ arch/arm64/boot/dts/airoha/en7581.dtsi | 31 +
+ arch/arm64/boot/dts/mediatek/Makefile | 1 +
+ arch/arm64/boot/dts/mediatek/mt6359.dtsi | 3 +-
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 2 -
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 12 +-
+ .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 9 +-
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 8 +-
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 8 +-
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 8 +-
+ arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 173 ++-
+ arch/arm64/boot/dts/mediatek/mt8188.dtsi | 307 ++++-
+ arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 245 +++-
+ arch/arm64/boot/dts/mediatek/mt8365.dtsi | 336 +++++
+ .../boot/dts/mediatek/mt8370-genio-510-evk.dts | 19 +
+ arch/arm64/boot/dts/mediatek/mt8370.dtsi | 64 +
+ .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 1033 +--------------
+ .../boot/dts/mediatek/mt8390-genio-common.dtsi | 1333 ++++++++++++++++++++
+ .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 102 ++
+ drivers/mailbox/mtk-cmdq-mailbox.c | 41 +-
+ drivers/soc/mediatek/mtk-socinfo.c | 19 +-
+ 24 files changed, 2665 insertions(+), 1150 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8370-genio-510-evk.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8370.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi
+Merging mvebu/for-next (960766b45fa2 arm64: dts: marvell: Add missing board compatible for IEI-Puzzle-M801)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/arm/marvell/armada-37xx.yaml | 1 +
+ .../bindings/arm/marvell/armada-7k-8k.yaml | 25 ++++++++++++++++++++++
+ .../devicetree/bindings/arm/marvell/armada-8kp.txt | 15 -------------
+ arch/arm64/boot/dts/marvell/armada-371x.dtsi | 17 ---------------
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
+ .../marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
+ .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 2 +-
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-372x.dtsi | 3 ---
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 --
+ arch/arm64/boot/dts/marvell/armada-7020.dtsi | 6 ------
+ arch/arm64/boot/dts/marvell/armada-7040.dtsi | 6 ------
+ arch/arm64/boot/dts/marvell/armada-8020.dtsi | 6 ------
+ .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-8040.dtsi | 6 ------
+ arch/arm64/boot/dts/marvell/armada-8080.dtsi | 6 ------
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 3 ---
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 3 ---
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 5 -----
+ arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 3 ---
+ arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 5 -----
+ .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 1 -
+ arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 2 --
+ arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi | 3 ---
+ 28 files changed, 35 insertions(+), 101 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt
+ delete mode 100644 arch/arm64/boot/dts/marvell/armada-371x.dtsi
+Merging omap/for-next (065f3bd4f22b Merge branch 'omap-for-v6.15/dt' into tmp/omap-next-20250205.163245)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/ti/omap.yaml | 7 +++++++
+ arch/arm/boot/dts/ti/omap/omap3-evm-processor-common.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 8 ++++----
+ arch/arm/boot/dts/ti/omap/omap4-panda-a4.dts | 5 +++++
+ 4 files changed, 17 insertions(+), 5 deletions(-)
+Merging qcom/for-next (c177fed7617d Merge branches 'arm64-for-6.15', 'clk-for-6.15', 'drivers-fixes-for-6.14' and 'drivers-for-6.15' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 +
+ .../bindings/soc/qcom/qcom,pmic-glink.yaml | 1 +
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 58 ++++-
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi | 236 ++++++++++-----------
+ drivers/clk/qcom/Kconfig | 2 +-
+ drivers/clk/qcom/camcc-sa8775p.c | 1 -
+ drivers/clk/qcom/camcc-sc7180.c | 2 +-
+ drivers/clk/qcom/camcc-sc7280.c | 2 +-
+ drivers/clk/qcom/camcc-sdm845.c | 1 +
+ drivers/clk/qcom/camcc-sm4450.c | 1 -
+ drivers/clk/qcom/camcc-sm6350.c | 1 +
+ drivers/clk/qcom/camcc-sm7150.c | 1 -
+ drivers/clk/qcom/camcc-sm8150.c | 2 +-
+ drivers/clk/qcom/camcc-sm8250.c | 58 ++---
+ drivers/clk/qcom/clk-alpha-pll.c | 52 +++--
+ drivers/clk/qcom/clk-branch.c | 4 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 32 +++
+ drivers/clk/qcom/common.c | 6 +
+ drivers/clk/qcom/dispcc-qcm2290.c | 3 +-
+ drivers/clk/qcom/dispcc-sc7180.c | 1 +
+ drivers/clk/qcom/dispcc-sc7280.c | 1 +
+ drivers/clk/qcom/dispcc-sc8280xp.c | 3 +-
+ drivers/clk/qcom/dispcc-sdm845.c | 2 +-
+ drivers/clk/qcom/dispcc-sm4450.c | 1 -
+ drivers/clk/qcom/dispcc-sm6115.c | 3 +-
+ drivers/clk/qcom/dispcc-sm6125.c | 1 +
+ drivers/clk/qcom/dispcc-sm6350.c | 1 +
+ drivers/clk/qcom/dispcc-sm6375.c | 1 +
+ drivers/clk/qcom/dispcc-sm7150.c | 1 -
+ drivers/clk/qcom/dispcc-sm8250.c | 2 +-
+ drivers/clk/qcom/dispcc-sm8450.c | 3 +-
+ drivers/clk/qcom/dispcc-sm8550.c | 3 +-
+ drivers/clk/qcom/dispcc-sm8750.c | 2 +-
+ drivers/clk/qcom/dispcc0-sa8775p.c | 1 -
+ drivers/clk/qcom/dispcc1-sa8775p.c | 1 -
+ drivers/clk/qcom/gcc-ipq5424.c | 16 +-
+ drivers/clk/qcom/gcc-msm8960.c | 1 -
+ drivers/clk/qcom/gcc-msm8974.c | 1 -
+ drivers/clk/qcom/gcc-sdm660.c | 2 +
+ drivers/clk/qcom/gcc-x1e80100.c | 30 ---
+ drivers/clk/qcom/gdsc.c | 75 +++++--
+ drivers/clk/qcom/gdsc.h | 1 +
+ drivers/clk/qcom/gpucc-msm8998.c | 3 +-
+ drivers/clk/qcom/gpucc-sa8775p.c | 49 ++++-
+ drivers/clk/qcom/gpucc-sar2130p.c | 1 +
+ drivers/clk/qcom/gpucc-sc7180.c | 1 +
+ drivers/clk/qcom/gpucc-sc7280.c | 1 +
+ drivers/clk/qcom/gpucc-sc8280xp.c | 1 +
+ drivers/clk/qcom/gpucc-sdm660.c | 5 +-
+ drivers/clk/qcom/gpucc-sdm845.c | 1 +
+ drivers/clk/qcom/gpucc-sm4450.c | 1 -
+ drivers/clk/qcom/gpucc-sm6350.c | 1 +
+ drivers/clk/qcom/gpucc-sm8150.c | 1 +
+ drivers/clk/qcom/gpucc-sm8250.c | 1 +
+ drivers/clk/qcom/gpucc-sm8350.c | 2 +-
+ drivers/clk/qcom/kpss-xcc.c | 1 -
+ drivers/clk/qcom/krait-cc.c | 1 -
+ drivers/clk/qcom/lpasscc-sdm845.c | 1 -
+ drivers/clk/qcom/lpasscorecc-sc7180.c | 1 -
+ drivers/clk/qcom/lpasscorecc-sc7280.c | 1 -
+ drivers/clk/qcom/mmcc-apq8084.c | 2 +-
+ drivers/clk/qcom/mmcc-msm8960.c | 4 +-
+ drivers/clk/qcom/mmcc-msm8974.c | 2 +-
+ drivers/clk/qcom/mmcc-msm8994.c | 3 +-
+ drivers/clk/qcom/mmcc-msm8996.c | 4 +-
+ drivers/clk/qcom/mmcc-msm8998.c | 3 +-
+ drivers/clk/qcom/mmcc-sdm660.c | 6 +-
+ drivers/clk/qcom/videocc-sa8775p.c | 8 +
+ drivers/firmware/qcom/qcom_qseecom_uefisecapp.c | 18 +-
+ drivers/firmware/qcom/qcom_scm.c | 4 +-
+ drivers/mmc/host/sdhci-msm.c | 2 +-
+ drivers/soc/qcom/ice.c | 51 ++++-
+ drivers/soc/qcom/pdr_interface.c | 8 +-
+ drivers/soc/qcom/pdr_internal.h | 1 -
+ drivers/soc/qcom/pmic_glink.c | 2 +-
+ drivers/soc/qcom/qcom_aoss.c | 3 +-
+ drivers/soc/qcom/qcom_pdr_msg.c | 3 +-
+ drivers/ufs/host/ufs-qcom.c | 2 +-
+ include/dt-bindings/clock/qcom,gcc-sdm660.h | 2 +
+ include/dt-bindings/clock/qcom,rpmcc.h | 4 +
+ include/soc/qcom/ice.h | 3 +-
+ 81 files changed, 530 insertions(+), 296 deletions(-)
+Merging renesas/next (b91c46c79497 Merge branches 'renesas-arm-defconfig-for-v6.15', 'renesas-arm-soc-for-v6.15', 'renesas-drivers-for-v6.15', 'renesas-dt-bindings-for-v6.15' and 'renesas-dts-for-v6.15' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Merge made by the 'ort' strategy.
+ .../soc/renesas/renesas,r9a09g057-sys.yaml | 5 +-
+ .../devicetree/bindings/soc/renesas/renesas.yaml | 16 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/renesas/r8a7790-lager.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7790-stout.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7790.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7791-porter.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7791.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7792.dtsi | 6 +
+ arch/arm/boot/dts/renesas/r8a7793-gose.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7793.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r8a7794-alt.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7794-silk.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7794.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r9a06g032.dtsi | 20 +-
+ arch/arm/configs/shmobile_defconfig | 1 +
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 -----
+ arch/arm64/boot/dts/renesas/Makefile | 5 +
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/condor-common.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/draak.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/ebisu.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 11 +
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 +
+ .../renesas/r8a77970-eagle-function-expansion.dtso | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 7 +
+ .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 88 ++++++
+ .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 1 +
+ .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 108 ++++---
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 17 +-
+ arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 69 ++---
+ arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 88 +++---
+ .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 154 ++++++++--
+ arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 34 ++-
+ .../arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts | 339 +++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 29 +-
+ .../renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso | 48 +++
+ arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 37 +++
+ arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 1 -
+ arch/arm64/boot/dts/renesas/r9a09g057h48-kakip.dts | 136 +++++++++
+ arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 4 +
+ arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 20 +-
+ arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h | 40 +++
+ arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 13 +
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 +
+ .../ulcb-kf-audio-graph-card-mix+split.dtsi | 73 ++++-
+ .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 66 +++-
+ .../ulcb-kf-simple-audio-card-mix+split.dtsi | 53 +++-
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 +
+ .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 1 +
+ .../arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi | 8 +-
+ drivers/soc/renesas/Kconfig | 18 ++
+ drivers/soc/renesas/Makefile | 4 +
+ drivers/soc/renesas/r9a08g045-sysc.c | 23 ++
+ drivers/soc/renesas/r9a09g047-sys.c | 67 ++++
+ drivers/soc/renesas/r9a09g057-sys.c | 67 ++++
+ drivers/soc/renesas/renesas-soc.c | 33 +-
+ drivers/soc/renesas/rz-sysc.c | 137 +++++++++
+ drivers/soc/renesas/rz-sysc.h | 46 +++
+ 77 files changed, 1770 insertions(+), 332 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g057h48-kakip.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h
+ create mode 100644 drivers/soc/renesas/r9a08g045-sysc.c
+ create mode 100644 drivers/soc/renesas/r9a09g047-sys.c
+ create mode 100644 drivers/soc/renesas/r9a09g057-sys.c
+ create mode 100644 drivers/soc/renesas/rz-sysc.c
+ create mode 100644 drivers/soc/renesas/rz-sysc.h
+Merging reset/reset/next (2014c95afece Linux 6.14-rc1)
+$ 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 (4e09afea6eb9 Merge branch 'v6.15-armsoc/dts64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 15 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 61 ++
+ .../px30-ringneck-haikou-lvds-9904379.dtso | 130 ++++
+ .../rockchip/px30-ringneck-haikou-video-demo.dtso | 190 ++++++
+ .../boot/dts/rockchip/px30-ringneck-haikou.dts | 2 +
+ arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 4 -
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 8 +
+ .../rockchip/rk3399-puma-haikou-video-demo.dtso | 166 +++++
+ .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 26 +-
+ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 10 +-
+ arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 8 +-
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 8 +-
+ arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts | 588 ++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 5 +
+ arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts | 736 +++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 689 +++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3576.dtsi | 39 ++
+ .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 47 ++
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 91 ++-
+ .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 2 +-
+ .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 2 +-
+ .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 47 ++
+ arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 92 +++
+ .../boot/dts/rockchip/rk3588-firefly-itx-3588j.dts | 2 +-
+ .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 2 +-
+ .../arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 26 +-
+ .../dts/rockchip/rk3588-jaguar-pre-ict-tester.dtso | 171 +++++
+ arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 2 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-max.dts | 43 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 46 +-
+ .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 2 -
+ arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 2 +-
+ .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 2 +-
+ .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 2 +-
+ .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 38 +-
+ drivers/clk/rockchip/clk-rk3188.c | 4 +-
+ include/dt-bindings/clock/rk3188-cru-common.h | 2 +
+ 46 files changed, 3282 insertions(+), 51 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-lvds-9904379.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-video-demo.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou-video-demo.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-jaguar-pre-ict-tester.dtso
+Merging samsung-krzk/for-next (db9af58db84e Merge branch 'next/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging drivers/firmware/Kconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/google.yaml | 3 +-
+ .../bindings/clock/samsung,exynos990-clock.yaml | 19 +
+ .../bindings/firmware/google,gs101-acpm-ipc.yaml | 50 ++
+ .../bindings/hwinfo/samsung,exynos-chipid.yaml | 2 +
+ .../bindings/soc/samsung/exynos-pmu.yaml | 1 +
+ .../bindings/soc/samsung/exynos-usi.yaml | 99 ++-
+ .../soc/samsung/samsung,exynos-sysreg.yaml | 5 +
+ MAINTAINERS | 10 +
+ arch/arm/mach-s3c/devs.c | 1 -
+ arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c | 1 -
+ arch/arm64/boot/dts/exynos/exynos8895-dreamlte.dts | 72 ++
+ arch/arm64/boot/dts/exynos/exynos8895.dtsi | 956 ++++++++++++++++++++-
+ arch/arm64/boot/dts/exynos/exynos990.dtsi | 92 +-
+ arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 138 +++
+ arch/arm64/boot/dts/exynos/google/Makefile | 1 +
+ arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 267 +-----
+ .../boot/dts/exynos/google/gs101-pixel-common.dtsi | 294 +++++++
+ arch/arm64/boot/dts/exynos/google/gs101-raven.dts | 29 +
+ arch/arm64/boot/dts/exynos/google/gs101.dtsi | 44 +-
+ arch/arm64/configs/defconfig | 2 +
+ drivers/clk/samsung/clk-cpu.c | 2 +-
+ drivers/clk/samsung/clk-exynos990.c | 180 +++-
+ drivers/clk/samsung/clk.c | 2 +-
+ drivers/firmware/Kconfig | 1 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/samsung/Kconfig | 14 +
+ drivers/firmware/samsung/Makefile | 4 +
+ drivers/firmware/samsung/exynos-acpm-pmic.c | 224 +++++
+ drivers/firmware/samsung/exynos-acpm-pmic.h | 29 +
+ drivers/firmware/samsung/exynos-acpm.c | 769 +++++++++++++++++
+ drivers/firmware/samsung/exynos-acpm.h | 23 +
+ drivers/soc/samsung/exynos-chipid.c | 3 +
+ drivers/soc/samsung/exynos-usi.c | 107 ++-
+ include/dt-bindings/clock/samsung,exynos990.h | 21 +
+ include/dt-bindings/soc/samsung,exynos-usi.h | 17 +-
+ .../linux/firmware/samsung/exynos-acpm-protocol.h | 49 ++
+ 36 files changed, 3153 insertions(+), 379 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/firmware/google,gs101-acpm-ipc.yaml
+ create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-pixel-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-raven.dts
+ create mode 100644 drivers/firmware/samsung/Kconfig
+ create mode 100644 drivers/firmware/samsung/Makefile
+ create mode 100644 drivers/firmware/samsung/exynos-acpm-pmic.c
+ create mode 100644 drivers/firmware/samsung/exynos-acpm-pmic.h
+ create mode 100644 drivers/firmware/samsung/exynos-acpm.c
+ create mode 100644 drivers/firmware/samsung/exynos-acpm.h
+ create mode 100644 include/linux/firmware/samsung/exynos-acpm-protocol.h
+Merging scmi/for-linux-next (a3c7c02d3db2 Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' 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 git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/firmware/arm_ffa/bus.c | 13 +-
+ drivers/firmware/arm_ffa/driver.c | 568 +++++++++++++++++++++++++++-----------
+ drivers/firmware/arm_scmi/bus.c | 69 ++++-
+ include/linux/arm_ffa.h | 22 +-
+ 4 files changed, 495 insertions(+), 177 deletions(-)
+Merging sophgo/for-next (f047a9285f9f riscv: sophgo: dts: add cooling maps for Milk-V Pioneer)
+$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 4 ++-
+ .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 36 ++++++++++++++++++++++
+ arch/riscv/boot/dts/sophgo/sg2042.dtsi | 9 ++++++
+ 3 files changed, 48 insertions(+), 1 deletion(-)
+Merging spacemit/for-next (5b90a3d6092d riscv: dts: spacemit: Add Milk-V Jupiter board device tree)
+$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/riscv/spacemit.yaml | 1 +
+ MAINTAINERS | 3 +++
+ arch/riscv/boot/dts/spacemit/Makefile | 1 +
+ arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 27 ++++++++++++++++++++++
+ 4 files changed, 32 insertions(+)
+ create mode 100644 arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
+Merging stm32/stm32-next (8c6d469f5249 ARM: dts: stm32: lxa-fairytux2: add Linux Automation GmbH FairyTux 2)
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 2 +
+ arch/arm/boot/dts/st/Makefile | 2 +
+ .../boot/dts/st/stm32mp153c-lxa-fairytux2-gen1.dts | 103 ++++++
+ .../boot/dts/st/stm32mp153c-lxa-fairytux2-gen2.dts | 147 ++++++++
+ .../arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi | 397 +++++++++++++++++++++
+ 5 files changed, 651 insertions(+)
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2-gen1.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2-gen2.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi
+Merging sunxi/sunxi/for-next (e2d0b639a4d9 Merge branch 'sunxi/clk-for-6.15' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/allwinner/Makefile | 2 +
+ .../dts/allwinner/sun8i-v3s-netcube-kumquat.dts | 276 +++++++++++++++++++++
+ arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi | 6 +
+ .../dts/allwinner/sun50i-a100-allwinner-perf1.dts | 5 +
+ .../boot/dts/allwinner/sun50i-a100-cpu-opp.dtsi | 90 +++++++
+ arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 8 +
+ .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 18 +-
+ .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 23 ++
+ drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 60 ++++-
+ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 2 +-
+ include/dt-bindings/clock/sun50i-h616-ccu.h | 4 +
+ include/dt-bindings/reset/sun50i-h616-ccu.h | 2 +
+ 14 files changed, 500 insertions(+), 3 deletions(-)
+ create mode 100644 arch/arm/boot/dts/allwinner/sun8i-v3s-netcube-kumquat.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100-cpu-opp.dtsi
+Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' into next)
+$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
+Merge made by the 'ort' strategy.
+Merging tegra/for-next (0a891b9fcd9b Merge branch for-6.14/arm64/dt into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
+Merge made by the 'ort' strategy.
+Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node)
+$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next
+Already up to date.
+Merging ti/ti-next (c7691aec5e99 arm64: defconfig: Enable TISCI Interrupt Router and Aggregator)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Already up to date.
+Merging xilinx/for-next (d6ccf528cb3c Merge branch 'zynqmp/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/ata/ceva,ahci-1v84.yaml | 4 +-
+ .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 3 +-
+ .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 3 +-
+ .../devicetree/bindings/net/cdns,macb.yaml | 7 +-
+ .../devicetree/bindings/soc/xilinx/xilinx.yaml | 11 +-
+ .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 3 +-
+ .../devicetree/bindings/usb/dwc3-xilinx.yaml | 3 +-
+ arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 33 +-
+ arch/arm/boot/dts/xilinx/zynq-cc108.dts | 41 +-
+ arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts | 2 +
+ arch/arm/boot/dts/xilinx/zynq-microzed.dts | 10 +-
+ arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 -
+ arch/arm/boot/dts/xilinx/zynq-zc702.dts | 85 ++-
+ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 67 +-
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 39 +-
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 31 +
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 35 +
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 41 +-
+ arch/arm/boot/dts/xilinx/zynq-zed.dts | 43 +-
+ arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi | 8 +
+ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 10 +-
+ arch/arm/boot/dts/xilinx/zynq-zybo.dts | 9 +-
+ arch/arm64/boot/dts/xilinx/Makefile | 2 +
+ arch/arm64/boot/dts/xilinx/versal-net-clk.dtsi | 231 +++++++
+ .../dts/xilinx/versal-net-vn-x-b2197-01-revA.dts | 116 ++++
+ arch/arm64/boot/dts/xilinx/versal-net.dtsi | 752 +++++++++++++++++++++
+ arch/arm64/boot/dts/xilinx/xlnx-zynqmp-clk.h | 126 ++++
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 17 +-
+ drivers/firmware/xilinx/zynqmp.c | 6 +-
+ include/dt-bindings/clock/xlnx-zynqmp-clk.h | 7 +
+ 30 files changed, 1667 insertions(+), 79 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/xilinx/versal-net-clk.dtsi
+ create mode 100644 arch/arm64/boot/dts/xilinx/versal-net-vn-x-b2197-01-revA.dts
+ create mode 100644 arch/arm64/boot/dts/xilinx/versal-net.dtsi
+ create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-zynqmp-clk.h
+Merging clk/clk-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Already up to date.
+Merging clk-imx/for-next (48806be08636 clk: imx: Apply some clks only for i.MX93)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (9b12504e8c8c clk: renesas: r9a09g047: Add CANFD clocks and resets)
+$ git merge -m Merge branch 'renesas-clk' of git://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/r8a779a0-cpg-mssr.c | 8 +++
+ drivers/clk/renesas/r8a779g0-cpg-mssr.c | 2 +
+ drivers/clk/renesas/r8a779h0-cpg-mssr.c | 3 +
+ drivers/clk/renesas/r9a07g043-cpg.c | 7 ++
+ drivers/clk/renesas/r9a07g044-cpg.c | 55 +++++++++++++-
+ drivers/clk/renesas/r9a08g045-cpg.c | 9 ++-
+ drivers/clk/renesas/r9a09g047-cpg.c | 83 +++++++++++++++++++++
+ drivers/clk/renesas/rzg2l-cpg.c | 123 ++++++++++++++++++--------------
+ drivers/clk/renesas/rzg2l-cpg.h | 12 +++-
+ drivers/clk/renesas/rzv2h-cpg.c | 4 +-
+ 10 files changed, 244 insertions(+), 62 deletions(-)
+Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Merge made by the 'ort' strategy.
+ arch/csky/mm/fault.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging loongarch/loongarch-next (3011b29ec5a3 LoongArch: KVM: Set host with kernel mode when switch to VM mode)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Already up to date.
+Merging m68k/for-next (723be3c6ab31 m68k: sun3: Fix DEBUG_MMU_EMU build)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/include/asm/processor.h | 14 ++++++++++++++
+ arch/m68k/sun3/mmu_emu.c | 7 ++++---
+ 2 files changed, 18 insertions(+), 3 deletions(-)
+Merging m68knommu/for-next (63014a9e119f m68k: mm: Replace deprecated strncpy() with strscpy())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/kernel/setup_mm.c | 3 +--
+ arch/m68k/kernel/setup_no.c | 1 -
+ arch/m68k/kernel/uboot.c | 1 -
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+Merging microblaze/next (920354d7818b microblaze: Use of_property_present() for non-boolean properties)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Merge made by the 'ort' strategy.
+ arch/microblaze/kernel/timer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging mips/mips-next (e64d19ed82fd mips: dts: ralink: mt7620a: update system controller node and its consumers)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Merge made by the 'ort' strategy.
+ .../bindings/clock/mediatek,mtmips-sysc.yaml | 11 +-
+ .../devicetree/bindings/mips/mti,mips-cm.yaml | 57 ++++
+ arch/mips/boot/dts/ingenic/gcw0.dts | 2 +-
+ arch/mips/boot/dts/ingenic/rs90.dts | 2 +-
+ arch/mips/boot/dts/mobileye/eyeq6h.dtsi | 4 +
+ arch/mips/boot/dts/ralink/mt7620a.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/mt7620a_eval.dts | 2 +-
+ arch/mips/boot/dts/ralink/rt2880.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/rt2880_eval.dts | 2 +-
+ arch/mips/boot/dts/ralink/rt3050.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/rt3883.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/rt3883_eval.dts | 2 +-
+ arch/mips/boot/dts/realtek/cisco_sg220-26.dts | 10 +-
+ arch/mips/boot/dts/realtek/rtl838x.dtsi | 111 +++++++-
+ arch/mips/boot/dts/realtek/rtl83xx.dtsi | 59 -----
+ arch/mips/boot/dts/realtek/rtl930x.dtsi | 148 ++++++-----
+ arch/mips/include/asm/ftrace.h | 16 ++
+ arch/mips/include/asm/mips-cm.h | 40 +++
+ arch/mips/include/asm/smp-cps.h | 7 +-
+ arch/mips/kernel/asm-offsets.c | 3 +
+ arch/mips/kernel/cps-vec.S | 19 +-
+ arch/mips/kernel/mips-cm.c | 18 +-
+ arch/mips/kernel/pm-cps.c | 35 ++-
+ arch/mips/kernel/smp-cps.c | 290 +++++++++++++++++----
+ arch/mips/sni/setup.c | 1 -
+ drivers/clocksource/mips-gic-timer.c | 6 +-
+ include/dt-bindings/clock/mediatek,mtmips-sysc.h | 130 +++++++++
+ 27 files changed, 809 insertions(+), 206 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/mti,mips-cm.yaml
+ delete mode 100644 arch/mips/boot/dts/realtek/rtl83xx.dtsi
+ create mode 100644 include/dt-bindings/clock/mediatek,mtmips-sysc.h
+Merging openrisc/for-next (ea1413e5b53a rseq/selftests: Add support for OpenRISC)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (4e3ff3c5854f parisc: Remove memcpy_fromio)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
+Auto-merging arch/parisc/include/asm/io.h
+Merge made by the 'ort' strategy.
+ arch/parisc/include/asm/io.h | 3 -
+ arch/parisc/kernel/parisc_ksyms.c | 1 -
+ arch/parisc/lib/io.c | 119 ++++++++++----------------------------
+ 3 files changed, 29 insertions(+), 94 deletions(-)
+Merging powerpc/next (6aa989ab2bd0 powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-kernel-fadump | 3 +-
+ .../arch/powerpc/firmware-assisted-dump.rst | 22 ++++
+ Documentation/arch/powerpc/papr_hcalls.rst | 11 ++
+ arch/powerpc/include/asm/hvcall.h | 34 +++++
+ arch/powerpc/include/asm/mmzone.h | 1 +
+ arch/powerpc/include/asm/plpar_wrappers.h | 21 ++++
+ arch/powerpc/include/asm/prom.h | 2 +
+ arch/powerpc/kernel/fadump.c | 21 ++--
+ arch/powerpc/kernel/prom_init.c | 2 +-
+ arch/powerpc/mm/numa.c | 2 +-
+ arch/powerpc/perf/core-book3s.c | 20 +++
+ arch/powerpc/perf/isa207-common.c | 18 ++-
+ arch/powerpc/platforms/pseries/Kconfig | 9 ++
+ arch/powerpc/platforms/pseries/Makefile | 1 +
+ arch/powerpc/platforms/pseries/htmdump.c | 121 ++++++++++++++++++
+ arch/powerpc/platforms/pseries/iommu.c | 139 ++++++++++++++++-----
+ .../event_alternatives_tests_p10.c | 3 +-
+ .../event_code_tests/generic_events_valid_test.c | 3 +-
+ .../group_constraint_l2l3_sel_test.c | 2 +-
+ .../group_constraint_radix_scope_qual_test.c | 2 +-
+ .../group_constraint_thresh_cmp_test.c | 2 +-
+ .../pmu/event_code_tests/invalid_event_code_test.c | 4 +-
+ .../reserved_bits_mmcra_sample_elig_mode_test.c | 5 +-
+ .../selftests/powerpc/pmu/sampling_tests/Makefile | 3 +-
+ .../pmu/sampling_tests/bhrb_filter_map_test.c | 17 +--
+ .../pmu/sampling_tests/check_extended_reg_test.c | 35 ++++++
+ .../selftests/powerpc/pmu/sampling_tests/misc.c | 20 ++-
+ .../selftests/powerpc/pmu/sampling_tests/misc.h | 12 +-
+ .../pmu/sampling_tests/mmcra_bhrb_cond_test.c | 2 +-
+ .../mmcra_bhrb_disable_no_branch_test.c | 2 +-
+ .../pmu/sampling_tests/mmcra_bhrb_disable_test.c | 2 +-
+ .../pmu/sampling_tests/mmcra_bhrb_ind_call_test.c | 2 +-
+ 32 files changed, 471 insertions(+), 72 deletions(-)
+ create mode 100644 arch/powerpc/platforms/pseries/htmdump.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/check_extended_reg_test.c
+Merging risc-v/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://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 (38818f7c9c17 riscv: dts: starfive: jh7110-pine64-star64: enable USB 3.0 port)
+$ git merge -m Merge branch 'riscv-dt-for-next' of git://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/mpfs-icicle-kit-fabric.dtsi | 5 ++--
+ .../boot/dts/microchip/mpfs-m100pfs-fabric.dtsi | 5 ++--
+ .../boot/dts/microchip/mpfs-polarberry-fabric.dtsi | 5 ++--
+ arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 8 +----
+ .../dts/starfive/jh7110-deepcomputing-fml13v01.dts | 34 ++++++++++++++++++++++
+ .../boot/dts/starfive/jh7110-pine64-star64.dts | 5 ++++
+ arch/riscv/boot/dts/starfive/jh7110.dtsi | 2 ++
+ 7 files changed, 51 insertions(+), 13 deletions(-)
+Merging riscv-soc/riscv-soc-for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
+Already up to date.
+Merging s390/for-next (aa6b9c1da333 Merge branch 'features' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/configs/debug_defconfig
+Merge made by the 'ort' strategy.
+ arch/s390/Kconfig | 1 +
+ arch/s390/configs/debug_defconfig | 1 +
+ arch/s390/mm/fault.c | 13 +-------
+ drivers/s390/cio/crw.c | 5 ++-
+ drivers/s390/cio/vfio_ccw_drv.c | 6 ++--
+ drivers/s390/cio/vfio_ccw_private.h | 2 +-
+ drivers/s390/crypto/vfio_ap_ops.c | 60 ++++++++++++++++++++++++++++++++---
+ drivers/s390/crypto/vfio_ap_private.h | 4 ++-
+ include/uapi/linux/vfio.h | 1 +
+ 9 files changed, 68 insertions(+), 25 deletions(-)
+Merging sh/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
+Already up to date.
+Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next
+Already up to date.
+Merging uml/next (2d2b61ae38bd um: Remove unused asm/archparam.h header)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
+Already up to date.
+Merging xtensa/xtensa-for-next (dbef257ab7fa xtensa: ptrace: Remove zero-length alignment array)
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Merge made by the 'ort' strategy.
+ arch/xtensa/include/asm/ptrace.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Merging fs-next (752dcde51683 Merge branch 'for-next' of git://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
+Auto-merging arch/loongarch/configs/loongson3_defconfig
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/pid.h
+Auto-merging kernel/pid.c
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/gup.c
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging tools/testing/selftests/mm/guard-regions.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 7 +
+ .../filesystems/bcachefs/SubmittingPatches.rst | 43 +-
+ Documentation/filesystems/bcachefs/casefolding.rst | 90 ++++
+ Documentation/filesystems/bcachefs/index.rst | 20 +-
+ Documentation/filesystems/fsverity.rst | 16 +-
+ Documentation/filesystems/index.rst | 1 -
+ Documentation/filesystems/iomap/design.rst | 4 +
+ Documentation/filesystems/iomap/operations.rst | 11 +-
+ Documentation/filesystems/journalling.rst | 4 +-
+ Documentation/filesystems/overlayfs.rst | 24 +-
+ Documentation/filesystems/porting.rst | 21 +
+ Documentation/filesystems/sysv-fs.rst | 264 ---------
+ Documentation/netlink/specs/lockd.yaml | 45 ++
+ MAINTAINERS | 6 -
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/kernel/elfcore.c | 3 +-
+ arch/arm64/tools/syscall_32.tbl | 1 +
+ arch/loongarch/configs/loongson3_defconfig | 1 -
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/configs/malta_defconfig | 1 -
+ arch/mips/configs/malta_kvm_defconfig | 1 -
+ arch/mips/configs/maltaup_xpa_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/configs/fsl-emb-nonhw.config | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/platforms/pseries/papr-vpd.c | 7 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ drivers/base/devtmpfs.c | 146 +++--
+ drivers/vfio/group.c | 16 +-
+ fs/Kconfig | 1 -
+ fs/Makefile | 1 -
+ fs/autofs/autofs_i.h | 2 +
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/alloc_background.c | 159 ++++--
+ fs/bcachefs/alloc_background.h | 2 +-
+ fs/bcachefs/alloc_foreground.c | 25 +-
+ fs/bcachefs/alloc_foreground.h | 17 +
+ fs/bcachefs/alloc_types.h | 2 +
+ fs/bcachefs/backpointers.c | 140 ++---
+ fs/bcachefs/backpointers.h | 26 +-
+ fs/bcachefs/bcachefs.h | 11 +-
+ fs/bcachefs/bcachefs_format.h | 9 +-
+ fs/bcachefs/bcachefs_ioctl.h | 29 +-
+ fs/bcachefs/btree_gc.c | 18 +-
+ fs/bcachefs/btree_io.c | 207 ++++++-
+ fs/bcachefs/btree_io.h | 4 +
+ fs/bcachefs/btree_trans_commit.c | 91 ++--
+ fs/bcachefs/btree_types.h | 13 +
+ fs/bcachefs/btree_update.c | 3 +-
+ fs/bcachefs/btree_update_interior.c | 20 +
+ fs/bcachefs/btree_update_interior.h | 4 +
+ fs/bcachefs/buckets.c | 14 +-
+ fs/bcachefs/buckets.h | 27 -
+ fs/bcachefs/buckets_types.h | 27 +
+ fs/bcachefs/chardev.c | 38 +-
+ fs/bcachefs/compress.c | 8 +-
+ fs/bcachefs/data_update.c | 221 ++++++--
+ fs/bcachefs/data_update.h | 17 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/dirent.c | 223 ++++++--
+ fs/bcachefs/dirent.h | 18 +-
+ fs/bcachefs/dirent_format.h | 20 +-
+ fs/bcachefs/ec.c | 73 ++-
+ fs/bcachefs/ec.h | 41 ++
+ fs/bcachefs/ec_types.h | 5 +-
+ fs/bcachefs/errcode.h | 6 +
+ fs/bcachefs/error.c | 60 ++-
+ fs/bcachefs/error.h | 5 +-
+ fs/bcachefs/extents.c | 9 +-
+ fs/bcachefs/extents.h | 4 +-
+ fs/bcachefs/eytzinger.c | 136 ++---
+ fs/bcachefs/eytzinger.h | 93 ++--
+ fs/bcachefs/fs-common.c | 54 +-
+ fs/bcachefs/fs-io-buffered.c | 35 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/fs-ioctl.c | 29 +-
+ fs/bcachefs/fs-ioctl.h | 20 +-
+ fs/bcachefs/fs.c | 20 +-
+ fs/bcachefs/fsck.c | 3 +-
+ fs/bcachefs/inode_format.h | 3 +-
+ fs/bcachefs/io_misc.c | 3 +-
+ fs/bcachefs/io_read.c | 523 +++++++++---------
+ fs/bcachefs/io_read.h | 75 ++-
+ fs/bcachefs/io_write.c | 185 ++++---
+ fs/bcachefs/io_write.h | 37 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 127 ++++-
+ fs/bcachefs/journal.h | 38 +-
+ fs/bcachefs/journal_io.c | 37 +-
+ fs/bcachefs/journal_seq_blacklist.c | 7 +-
+ fs/bcachefs/journal_types.h | 19 +-
+ fs/bcachefs/lru.c | 100 ++--
+ fs/bcachefs/lru.h | 22 +-
+ fs/bcachefs/lru_format.h | 6 +-
+ fs/bcachefs/migrate.c | 26 +-
+ fs/bcachefs/move.c | 439 ++++++++-------
+ fs/bcachefs/move_types.h | 18 +-
+ fs/bcachefs/movinggc.c | 4 +-
+ fs/bcachefs/opts.h | 2 +-
+ fs/bcachefs/progress.c | 63 +++
+ fs/bcachefs/progress.h | 29 +
+ fs/bcachefs/rebalance.c | 4 +-
+ fs/bcachefs/reflink.c | 21 +-
+ fs/bcachefs/sb-counters.c | 90 +++-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 30 +-
+ fs/bcachefs/sb-downgrade.c | 6 +
+ fs/bcachefs/sb-errors_format.h | 4 +-
+ fs/bcachefs/sb-members.h | 12 +
+ fs/bcachefs/snapshot.c | 7 +-
+ fs/bcachefs/snapshot.h | 1 +
+ fs/bcachefs/str_hash.c | 2 +-
+ fs/bcachefs/str_hash.h | 4 +
+ fs/bcachefs/super-io.c | 9 -
+ fs/bcachefs/super.c | 19 +
+ fs/bcachefs/sysfs.c | 10 +-
+ fs/bcachefs/trace.h | 76 +--
+ fs/bcachefs/util.c | 210 ++++++--
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/accessors.h | 1 +
+ fs/btrfs/acl.h | 2 +
+ fs/btrfs/async-thread.c | 11 +-
+ fs/btrfs/backref.c | 4 +-
+ fs/btrfs/bio.c | 4 +-
+ fs/btrfs/bio.h | 3 +
+ fs/btrfs/block-group.c | 6 +-
+ fs/btrfs/btrfs_inode.h | 10 +-
+ fs/btrfs/compression.c | 21 +-
+ fs/btrfs/compression.h | 25 +-
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/defrag.c | 46 +-
+ fs/btrfs/defrag.h | 4 +-
+ fs/btrfs/delayed-inode.c | 96 ++--
+ fs/btrfs/delayed-inode.h | 2 +-
+ fs/btrfs/delayed-ref.h | 2 +
+ fs/btrfs/dir-item.h | 1 +
+ fs/btrfs/direct-io.c | 22 +-
+ fs/btrfs/direct-io.h | 2 +
+ fs/btrfs/discard.h | 1 +
+ fs/btrfs/disk-io.c | 21 +-
+ fs/btrfs/export.c | 26 +-
+ fs/btrfs/extent-io-tree.c | 8 +-
+ fs/btrfs/extent-tree.c | 8 +-
+ fs/btrfs/extent-tree.h | 1 -
+ fs/btrfs/extent_io.c | 495 ++++++++++-------
+ fs/btrfs/file-item.c | 13 +-
+ fs/btrfs/file-item.h | 2 +
+ fs/btrfs/file.c | 53 +-
+ fs/btrfs/file.h | 2 +
+ fs/btrfs/free-space-cache.c | 34 +-
+ fs/btrfs/fs.c | 1 -
+ fs/btrfs/fs.h | 9 +-
+ fs/btrfs/inode-item.c | 6 +-
+ fs/btrfs/inode.c | 522 +++++++++---------
+ fs/btrfs/ioctl.c | 7 +-
+ fs/btrfs/ioctl.h | 2 +
+ fs/btrfs/locking.c | 1 -
+ fs/btrfs/ordered-data.c | 29 +-
+ fs/btrfs/ordered-data.h | 4 +-
+ fs/btrfs/print-tree.h | 2 +
+ fs/btrfs/props.c | 66 +--
+ fs/btrfs/props.h | 8 +-
+ fs/btrfs/qgroup.c | 2 +-
+ fs/btrfs/qgroup.h | 3 +
+ fs/btrfs/raid-stripe-tree.h | 1 +
+ fs/btrfs/reflink.c | 100 ++--
+ fs/btrfs/scrub.c | 146 ++---
+ fs/btrfs/send.c | 498 ++++++++---------
+ fs/btrfs/space-info.c | 2 +-
+ fs/btrfs/subpage.c | 226 +++++---
+ fs/btrfs/subpage.h | 50 +-
+ fs/btrfs/super.c | 2 +-
+ fs/btrfs/sysfs.h | 1 +
+ fs/btrfs/transaction.c | 26 +-
+ fs/btrfs/tree-log.c | 6 +-
+ fs/btrfs/volumes.c | 18 +-
+ fs/btrfs/volumes.h | 4 +
+ fs/btrfs/xattr.h | 2 +
+ fs/btrfs/zlib.c | 83 ++-
+ fs/btrfs/zoned.c | 3 +
+ fs/btrfs/zstd.c | 66 +--
+ fs/cachefiles/ondemand.c | 7 +-
+ fs/coredump.c | 38 +-
+ fs/crypto/Kconfig | 20 +-
+ fs/devpts/inode.c | 247 ++++-----
+ fs/dlm/config.h | 2 +-
+ fs/dlm/lockspace.c | 2 +-
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/keystore.c | 4 +-
+ fs/erofs/data.c | 17 +-
+ fs/erofs/dir.c | 2 +-
+ fs/erofs/fileio.c | 2 +-
+ fs/erofs/fscache.c | 2 +-
+ fs/erofs/inode.c | 6 +-
+ fs/erofs/internal.h | 19 +-
+ fs/erofs/namei.c | 2 +-
+ fs/erofs/super.c | 8 +-
+ fs/erofs/xattr.c | 12 +-
+ fs/erofs/zdata.c | 4 +-
+ fs/erofs/zmap.c | 124 ++---
+ fs/eventfd.c | 5 +-
+ fs/eventpoll.c | 87 ++-
+ fs/exfat/balloc.c | 10 +-
+ fs/exfat/exfat_fs.h | 2 +-
+ fs/exfat/fatent.c | 11 +-
+ fs/exfat/file.c | 2 +-
+ fs/exfat/namei.c | 2 +-
+ fs/ext2/super.c | 2 +-
+ fs/ext4/ext4.h | 4 +
+ fs/ext4/ext4_jbd2.h | 84 ---
+ fs/ext4/extents.c | 533 +++++++-----------
+ fs/ext4/inode.c | 205 +++----
+ fs/ext4/namei.c | 14 +-
+ fs/ext4/super.c | 15 -
+ fs/f2fs/checkpoint.c | 15 +-
+ fs/f2fs/data.c | 8 +-
+ fs/f2fs/debug.c | 3 +
+ fs/f2fs/f2fs.h | 18 +-
+ fs/f2fs/file.c | 88 ++-
+ fs/f2fs/inode.c | 18 +
+ fs/f2fs/segment.c | 20 +-
+ fs/f2fs/shrinker.c | 92 +++-
+ fs/f2fs/super.c | 68 ++-
+ fs/f2fs/sysfs.c | 137 ++++-
+ fs/file.c | 10 +
+ fs/fsopen.c | 2 +-
+ fs/fuse/dev_uring_i.h | 6 -
+ fs/fuse/dir.c | 9 +
+ fs/fuse/fuse_i.h | 3 +
+ fs/gfs2/bmap.c | 3 +-
+ fs/gfs2/glock.c | 68 ++-
+ fs/gfs2/incore.h | 4 +-
+ fs/gfs2/super.c | 3 +-
+ fs/gfs2/trace_gfs2.h | 8 +-
+ fs/inode.c | 44 +-
+ fs/internal.h | 6 +-
+ fs/ioctl.c | 10 +-
+ fs/iomap/Makefile | 1 +
+ fs/iomap/buffered-io.c | 269 +++-------
+ fs/iomap/direct-io.c | 132 +++--
+ fs/iomap/internal.h | 10 +
+ fs/iomap/ioend.c | 216 ++++++++
+ fs/iomap/iter.c | 102 ++--
+ fs/isofs/dir.c | 3 +-
+ fs/jbd2/recovery.c | 58 +-
+ fs/jbd2/revoke.c | 8 +-
+ fs/jbd2/transaction.c | 1 -
+ fs/jfs/inode.c | 2 +-
+ fs/jfs/jfs_dmap.c | 39 +-
+ fs/jfs/jfs_extent.c | 10 +
+ fs/jfs/jfs_imap.c | 17 +-
+ fs/jfs/super.c | 6 +-
+ fs/jfs/xattr.c | 13 +-
+ fs/lockd/Makefile | 2 +-
+ fs/lockd/netlink.c | 44 ++
+ fs/lockd/netlink.h | 19 +
+ fs/lockd/netns.h | 3 +
+ fs/lockd/svc.c | 118 +++-
+ fs/mnt_idmapping.c | 51 ++
+ fs/mount.h | 26 +
+ fs/namei.c | 64 +--
+ fs/namespace.c | 482 ++++++++++++-----
+ fs/nfs/delegation.c | 37 ++
+ fs/nfs/delegation.h | 1 +
+ fs/nfs/dir.c | 3 +-
+ fs/nfs/direct.c | 23 +
+ fs/nfs/nfs4proc.c | 3 +
+ fs/nfsd/nfs4callback.c | 106 ++--
+ fs/nfsd/nfs4state.c | 40 +-
+ fs/nfsd/nfsctl.c | 53 +-
+ fs/nfsd/stats.c | 4 +-
+ fs/nfsd/stats.h | 2 +-
+ fs/nfsd/trace.h | 19 +-
+ fs/nfsd/vfs.c | 106 +++-
+ fs/notify/fanotify/fanotify.c | 38 +-
+ fs/notify/fanotify/fanotify.h | 18 +
+ fs/notify/fanotify/fanotify_user.c | 89 ++-
+ fs/notify/fdinfo.c | 5 +
+ fs/notify/fsnotify.c | 47 +-
+ fs/notify/fsnotify.h | 11 +
+ fs/notify/mark.c | 14 +-
+ fs/nsfs.c | 32 +-
+ fs/ntfs3/attrib.c | 3 +-
+ fs/ntfs3/file.c | 42 +-
+ fs/ntfs3/frecord.c | 6 +-
+ fs/ntfs3/super.c | 89 +--
+ fs/open.c | 20 +-
+ fs/overlayfs/params.c | 25 +
+ fs/overlayfs/super.c | 16 +-
+ fs/pipe.c | 117 ++--
+ fs/pnode.c | 4 +-
+ fs/pstore/inode.c | 109 ++--
+ fs/read_write.c | 13 +-
+ fs/signalfd.c | 7 +-
+ fs/smb/client/cifsacl.c | 51 +-
+ fs/smb/client/connect.c | 17 +-
+ fs/smb/client/sess.c | 10 +
+ fs/smb/common/smbacl.h | 3 +-
+ fs/smb/server/smbacl.c | 36 +-
+ fs/smb/server/smbacl.h | 2 +-
+ fs/smb/server/transport_rdma.c | 5 +-
+ fs/smb/server/vfs.c | 26 +-
+ fs/super.c | 55 --
+ fs/sysv/Kconfig | 38 --
+ fs/sysv/Makefile | 9 -
+ fs/sysv/balloc.c | 240 ---------
+ fs/sysv/dir.c | 378 -------------
+ fs/sysv/file.c | 59 --
+ fs/sysv/ialloc.c | 235 --------
+ fs/sysv/inode.c | 354 ------------
+ fs/sysv/itree.c | 511 ------------------
+ fs/sysv/namei.c | 280 ----------
+ fs/sysv/super.c | 595 ---------------------
+ fs/sysv/sysv.h | 245 ---------
+ fs/timerfd.c | 6 +-
+ fs/verity/Kconfig | 8 +-
+ fs/xfs/xfs_aops.c | 25 +-
+ fs/xfs/xfs_file.c | 3 +-
+ fs/xfs/xfs_iomap.c | 4 +-
+ fs/zonefs/file.c | 2 +-
+ include/linux/dcache.h | 38 +-
+ include/linux/eventpoll.h | 4 +
+ include/linux/fanotify.h | 12 +-
+ include/linux/fs.h | 48 +-
+ include/linux/fs_context.h | 2 -
+ include/linux/fsnotify.h | 20 +
+ include/linux/fsnotify_backend.h | 42 ++
+ include/linux/iomap.h | 100 +++-
+ include/linux/jbd2.h | 8 +-
+ include/linux/mm.h | 2 +-
+ include/linux/mnt_idmapping.h | 5 +
+ include/linux/namei.h | 45 +-
+ include/linux/pid.h | 7 +-
+ include/linux/sunrpc/sched.h | 3 +-
+ include/linux/syscalls.h | 8 +-
+ include/linux/sysv_fs.h | 214 --------
+ include/linux/uidgid.h | 6 +
+ include/linux/vfsdebug.h | 45 ++
+ include/trace/events/sunrpc.h | 3 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/f2fs.h | 7 +
+ include/uapi/linux/fanotify.h | 10 +
+ include/uapi/linux/lockd_netlink.h | 29 +
+ include/uapi/linux/mount.h | 10 +-
+ include/uapi/linux/pidfd.h | 24 +
+ kernel/audit_watch.c | 12 +-
+ kernel/exit.c | 56 +-
+ kernel/kcmp.c | 2 +-
+ kernel/pid.c | 106 ++--
+ kernel/signal.c | 117 ++--
+ kernel/sys.c | 14 +-
+ kernel/user_namespace.c | 26 +-
+ lib/Kconfig.debug | 9 +
+ mm/gup.c | 6 +-
+ net/9p/trans_fd.c | 56 +-
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 144 -----
+ net/sunrpc/auth_gss/gss_krb5_internal.h | 7 -
+ net/sunrpc/cache.c | 6 +-
+ net/sunrpc/sched.c | 2 -
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +-
+ net/sunrpc/xprtsock.c | 10 +-
+ samples/vfs/samples-vfs.h | 14 +-
+ samples/vfs/test-list-all-mounts.c | 35 +-
+ scripts/syscall.tbl | 1 +
+ .../selftests/filesystems/nsfs/iterate_mntns.c | 14 +
+ .../selftests/filesystems/overlayfs/Makefile | 11 +-
+ .../filesystems/overlayfs/set_layers_via_fds.c | 503 +++++++++++++++++
+ .../selftests/filesystems/overlayfs/wrappers.h | 17 +
+ tools/testing/selftests/filesystems/utils.c | 501 +++++++++++++++++
+ tools/testing/selftests/filesystems/utils.h | 45 ++
+ tools/testing/selftests/mm/guard-regions.c | 16 +-
+ tools/testing/selftests/pidfd/pidfd.h | 16 +
+ tools/testing/selftests/pidfd/pidfd_open_test.c | 6 +-
+ tools/testing/selftests/pidfd/pidfd_test.c | 80 ++-
+ virt/kvm/kvm_main.c | 11 +-
+ 401 files changed, 9890 insertions(+), 8695 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/casefolding.rst
+ delete mode 100644 Documentation/filesystems/sysv-fs.rst
+ create mode 100644 Documentation/netlink/specs/lockd.yaml
+ create mode 100644 fs/bcachefs/progress.c
+ create mode 100644 fs/bcachefs/progress.h
+ create mode 100644 fs/iomap/internal.h
+ create mode 100644 fs/iomap/ioend.c
+ create mode 100644 fs/lockd/netlink.c
+ create mode 100644 fs/lockd/netlink.h
+ delete mode 100644 fs/sysv/Kconfig
+ delete mode 100644 fs/sysv/Makefile
+ delete mode 100644 fs/sysv/balloc.c
+ delete mode 100644 fs/sysv/dir.c
+ delete mode 100644 fs/sysv/file.c
+ delete mode 100644 fs/sysv/ialloc.c
+ delete mode 100644 fs/sysv/inode.c
+ delete mode 100644 fs/sysv/itree.c
+ delete mode 100644 fs/sysv/namei.c
+ delete mode 100644 fs/sysv/super.c
+ delete mode 100644 fs/sysv/sysv.h
+ delete mode 100644 include/linux/sysv_fs.h
+ create mode 100644 include/linux/vfsdebug.h
+ create mode 100644 include/uapi/linux/lockd_netlink.h
+ create mode 100644 tools/testing/selftests/filesystems/utils.c
+ create mode 100644 tools/testing/selftests/filesystems/utils.h
+Merging printk/for-next (9022df7f5e05 Merge branch 'for-6.14-cpu_sync-fixup' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Merge made by the 'ort' strategy.
+Merging pci/next (3bdee909e45d Merge branch 'pci/misc')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging include/linux/pci_ids.h
+Merge made by the 'ort' strategy.
+ Documentation/PCI/endpoint/pci-endpoint.rst | 7 +-
+ drivers/misc/pci_endpoint_test.c | 31 +-
+ drivers/pci/controller/dwc/pci-keystone.c | 6 +-
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 218 ++++++--
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 22 +-
+ drivers/pci/controller/pcie-rockchip-host.c | 2 +-
+ drivers/pci/controller/pcie-rockchip.h | 1 -
+ drivers/pci/endpoint/functions/pci-epf-test.c | 128 +++--
+ drivers/pci/endpoint/pci-epc-core.c | 56 +-
+ drivers/pci/endpoint/pci-epf-core.c | 4 +
+ drivers/pci/iov.c | 2 +-
+ drivers/pci/pci.c | 2 +-
+ drivers/pci/pci.h | 44 +-
+ drivers/pci/pcie/aer.c | 10 +-
+ drivers/pci/pcie/aspm.c | 17 +-
+ drivers/pci/quirks.c | 4 +-
+ drivers/pci/setup-bus.c | 571 ++++++++++++---------
+ drivers/pci/setup-res.c | 20 +-
+ include/linux/pci-epc.h | 6 +-
+ include/linux/pci_ids.h | 2 +
+ tools/Makefile | 13 +-
+ .../selftests/pci_endpoint/pci_endpoint_test.c | 2 +
+ 22 files changed, 737 insertions(+), 431 deletions(-)
+Merging pstore/for-next/pstore (5674609535ba pstore: Change kmsg_bytes storage size to u32)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Auto-merging fs/pstore/inode.c
+Merge made by the 'ort' strategy.
+ fs/pstore/inode.c | 2 +-
+ fs/pstore/internal.h | 4 ++--
+ fs/pstore/platform.c | 11 ++++++-----
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+Merging hid/for-next (8fabf47931ed Merge branch 'for-6.15/bpf' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-driver-hid-appletb-kbd | 13 +
+ MAINTAINERS | 8 +
+ drivers/hid/Kconfig | 40 ++
+ drivers/hid/Makefile | 3 +
+ drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 75 ++-
+ drivers/hid/bpf/progs/Huion__KeydialK20.bpf.c | 531 ++++++++++++++++++++
+ .../progs/TUXEDO__Sirius-16-Gen1-and-Gen2.bpf.c | 47 ++
+ drivers/hid/bpf/progs/XPPen__ACK05.bpf.c | 330 ++++++++++++
+ drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c | 44 +-
+ drivers/hid/bpf/progs/hid_bpf_async.h | 219 ++++++++
+ drivers/hid/bpf/progs/hid_bpf_helpers.h | 19 +
+ drivers/hid/hid-appletb-bl.c | 204 ++++++++
+ drivers/hid/hid-appletb-kbd.c | 507 +++++++++++++++++++
+ drivers/hid/hid-core.c | 6 +-
+ drivers/hid/hid-corsair-void.c | 83 +--
+ drivers/hid/hid-google-hammer.c | 3 +-
+ drivers/hid/hid-ids.h | 37 ++
+ drivers/hid/hid-lg-g15.c | 146 +++---
+ drivers/hid/hid-nintendo.c | 14 +-
+ drivers/hid/hid-plantronics.c | 144 +++---
+ drivers/hid/hid-quirks.c | 24 +-
+ drivers/hid/hid-steam.c | 7 +-
+ drivers/hid/hid-universal-pidff.c | 202 ++++++++
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c | 2 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 4 +-
+ .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 14 +-
+ .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 14 +-
+ .../hid/intel-thc-hid/intel-thc/intel-thc-dma.c | 2 +-
+ drivers/hid/usbhid/hid-core.c | 1 +
+ drivers/hid/usbhid/hid-pidff.c | 557 +++++++++++++--------
+ drivers/hid/usbhid/hid-pidff.h | 33 ++
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ include/linux/hid.h | 8 +-
+ sound/usb/mixer_quirks.c | 51 ++
+ 34 files changed, 2942 insertions(+), 452 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd
+ create mode 100644 drivers/hid/bpf/progs/Huion__KeydialK20.bpf.c
+ create mode 100644 drivers/hid/bpf/progs/TUXEDO__Sirius-16-Gen1-and-Gen2.bpf.c
+ create mode 100644 drivers/hid/bpf/progs/XPPen__ACK05.bpf.c
+ create mode 100644 drivers/hid/bpf/progs/hid_bpf_async.h
+ create mode 100644 drivers/hid/hid-appletb-bl.c
+ create mode 100644 drivers/hid/hid-appletb-kbd.c
+ create mode 100644 drivers/hid/hid-universal-pidff.c
+ create mode 100644 drivers/hid/usbhid/hid-pidff.h
+Merging i2c/i2c/for-next (ef8c53714894 Merge branch 'i2c/for-current' into i2c/for-next)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Merge made by the 'ort' strategy.
+ drivers/i2c/i2c-core-of.c | 1 -
+ drivers/i2c/i2c-core.h | 9 +++++++++
+ drivers/power/supply/ip5xxx_power.c | 7 ++-----
+ include/linux/i2c.h | 11 -----------
+ 4 files changed, 11 insertions(+), 17 deletions(-)
+Merging i2c-host/i2c/i2c-host (3c59e2039afc i2c: amd-asf: Set cmd variable when encountering an error)
+$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/i2c-exynos5.yaml | 1 +
+ .../bindings/i2c/samsung,s3c2410-i2c.yaml | 1 +
+ drivers/i2c/busses/i2c-amd-asf-plat.c | 8 +-
+ drivers/i2c/busses/i2c-designware-amdpsp.c | 26 +++----
+ drivers/i2c/busses/i2c-designware-master.c | 2 +-
+ drivers/i2c/busses/i2c-octeon-core.c | 86 ++++++++++++----------
+ drivers/i2c/busses/i2c-pxa.c | 5 +-
+ 7 files changed, 69 insertions(+), 60 deletions(-)
+Merging i3c/i3c/next (a892ee4cf22a i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA))
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Auto-merging CREDITS
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ CREDITS | 4 ++++
+ MAINTAINERS | 4 +++-
+ drivers/i3c/master/dw-i3c-master.c | 2 +-
+ drivers/i3c/master/i3c-master-cdns.c | 2 +-
+ drivers/i3c/master/mipi-i3c-hci/core.c | 10 ++++------
+ drivers/i3c/master/svc-i3c-master.c | 4 +++-
+ include/linux/i3c/master.h | 2 +-
+ 7 files changed, 17 insertions(+), 11 deletions(-)
+Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
+$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (8df0f002827e hwmon: (xgene-hwmon) use appropriate type for the latency value)
+$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/hwmon/lltc,ltc2978.yaml | 2 +
+ .../devicetree/bindings/hwmon/national,lm90.yaml | 6 ++
+ Documentation/hwmon/abituguru-datasheet.rst | 8 +--
+ Documentation/hwmon/abituguru.rst | 2 +-
+ Documentation/hwmon/lm90.rst | 43 ++++++++++++
+ Documentation/hwmon/ltc2978.rst | 8 +++
+ drivers/hwmon/Kconfig | 2 +-
+ drivers/hwmon/gsc-hwmon.c | 1 -
+ drivers/hwmon/ina3221.c | 9 +--
+ drivers/hwmon/isl28022.c | 44 +-----------
+ drivers/hwmon/lm90.c | 82 +++++++++++++++++++++-
+ drivers/hwmon/ltc4282.c | 44 +++---------
+ drivers/hwmon/pmbus/Kconfig | 4 +-
+ drivers/hwmon/pmbus/ltc2978.c | 25 ++++++-
+ drivers/hwmon/sg2042-mcu.c | 42 ++---------
+ drivers/hwmon/sht3x.c | 67 +++---------------
+ drivers/hwmon/tps23861.c | 31 +-------
+ drivers/hwmon/xgene-hwmon.c | 2 +-
+ 18 files changed, 202 insertions(+), 220 deletions(-)
+Merging jc_docs/docs-next (76a6782284df Documentation: input: Add section pertaining to polled input devices)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Auto-merging Documentation/ABI/testing/sysfs-fs-f2fs
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/filesystems/bcachefs/SubmittingPatches.rst
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/README | 3 +-
+ Documentation/ABI/removed/sysfs-class-rfkill | 2 +-
+ Documentation/ABI/stable/sysfs-class-rfkill | 12 +-
+ Documentation/ABI/stable/sysfs-devices-system-cpu | 10 -
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 4 +-
+ .../ABI/testing/configfs-usb-gadget-midi2 | 2 +-
+ .../ABI/testing/sysfs-bus-coresight-devices-cti | 78 +-
+ .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 52 +-
+ Documentation/ABI/testing/sysfs-fs-f2fs | 4 +-
+ Documentation/ABI/testing/sysfs-power | 2 +-
+ Documentation/Makefile | 2 +-
+ Documentation/admin-guide/README.rst | 2 +-
+ Documentation/admin-guide/abi-obsolete-files.rst | 7 +
+ Documentation/admin-guide/abi-obsolete.rst | 6 +-
+ Documentation/admin-guide/abi-removed-files.rst | 7 +
+ Documentation/admin-guide/abi-removed.rst | 6 +-
+ Documentation/admin-guide/abi-stable-files.rst | 7 +
+ Documentation/admin-guide/abi-stable.rst | 6 +-
+ Documentation/admin-guide/abi-testing-files.rst | 7 +
+ Documentation/admin-guide/abi-testing.rst | 6 +-
+ Documentation/admin-guide/abi.rst | 18 +
+ Documentation/admin-guide/gpio/gpio-sim.rst | 2 +-
+ Documentation/admin-guide/gpio/gpio-virtuser.rst | 2 +-
+ Documentation/admin-guide/iostats.rst | 75 +-
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ Documentation/admin-guide/thunderbolt.rst | 2 +-
+ Documentation/arch/arm64/asymmetric-32bit.rst | 2 +-
+ Documentation/conf.py | 2 +-
+ Documentation/core-api/min_heap.rst | 4 +-
+ .../bindings/net/can/microchip,mcp251xfd.yaml | 2 +-
+ Documentation/driver-api/generic-counter.rst | 4 +-
+ Documentation/driver-api/iio/core.rst | 2 +-
+ Documentation/driver-api/media/drivers/zoran.rst | 2 +-
+ .../driver-api/media/maintainer-entry-profile.rst | 2 +-
+ Documentation/driver-api/nvdimm/nvdimm.rst | 6 +-
+ Documentation/driver-api/pm/devices.rst | 2 +-
+ .../debug/kprobes-on-ftrace/arch-support.txt | 2 +-
+ Documentation/filesystems/9p.rst | 2 +-
+ .../filesystems/bcachefs/SubmittingPatches.rst | 4 +-
+ Documentation/filesystems/coda.rst | 2 +-
+ Documentation/filesystems/debugfs.rst | 2 +-
+ Documentation/filesystems/netfs_library.rst | 2 +-
+ .../filesystems/xfs/xfs-delayed-logging-design.rst | 2 +-
+ .../xfs/xfs-maintainer-entry-profile.rst | 2 +-
+ .../filesystems/xfs/xfs-online-fsck-design.rst | 4 +-
+ Documentation/iio/iio_devbuf.rst | 2 +-
+ Documentation/input/devices/elantech.rst | 2 +-
+ Documentation/input/input-programming.rst | 19 +
+ Documentation/mm/split_page_table_lock.rst | 2 +-
+ Documentation/networking/statistics.rst | 2 +-
+ Documentation/nvme/nvme-pci-endpoint-target.rst | 2 +-
+ Documentation/process/changes.rst | 4 +-
+ Documentation/process/kernel-docs.rst | 11 +
+ Documentation/process/submit-checklist.rst | 11 +-
+ Documentation/process/submitting-patches.rst | 6 +
+ Documentation/scheduler/sched-bwc.rst | 2 +-
+ Documentation/sound/soc/machine.rst | 2 +-
+ Documentation/sphinx/automarkup.py | 82 +-
+ Documentation/sphinx/cdomain.py | 7 +-
+ Documentation/sphinx/kernel_abi.py | 164 +--
+ Documentation/sphinx/kernel_feat.py | 4 +-
+ Documentation/sphinx/kernel_include.py | 4 +-
+ Documentation/sphinx/kerneldoc.py | 19 +-
+ Documentation/sphinx/kernellog.py | 22 -
+ Documentation/sphinx/kfigure.py | 91 +-
+ Documentation/sphinx/load_config.py | 2 +-
+ Documentation/sphinx/maintainers_include.py | 4 +-
+ Documentation/sphinx/rstFlatTable.py | 10 +-
+ Documentation/trace/postprocess/decode_msr.py | 2 +-
+ .../it_IT/process/submit-checklist.rst | 2 +-
+ Documentation/translations/ja_JP/SubmitChecklist | 105 --
+ .../translations/ja_JP/disclaimer-ja_JP.rst | 24 +
+ Documentation/translations/ja_JP/index.rst | 2 +
+ Documentation/translations/ja_JP/process/howto.rst | 37 +-
+ .../ja_JP/process/submit-checklist.rst | 162 +++
+ .../sp_SP/process/submit-checklist.rst | 2 +-
+ .../translations/zh_CN/admin-guide/README.rst | 2 +-
+ .../translations/zh_CN/dev-tools/ubsan.rst | 33 +-
+ Documentation/translations/zh_CN/index.rst | 8 +-
+ .../zh_CN/process/submit-checklist.rst | 2 +-
+ .../translations/zh_CN/security/credentials.rst | 479 +++++++++
+ .../translations/zh_CN/security/index.rst | 6 +-
+ .../translations/zh_CN/security/keys/index.rst | 22 +
+ .../translations/zh_CN/security/secrets/index.rst | 17 +
+ .../zh_CN/security/self-protection.rst | 271 +++++
+ .../translations/zh_CN/security/tpm/index.rst | 20 +
+ .../zh_CN/security/tpm/tpm-security.rst | 151 +++
+ .../zh_CN/security/tpm/tpm_event_log.rst | 49 +
+ .../zh_CN/security/tpm/tpm_ftpm_tee.rst | 31 +
+ .../translations/zh_CN/security/tpm/tpm_tis.rst | 43 +
+ .../zh_CN/security/tpm/tpm_vtpm_proxy.rst | 51 +
+ .../zh_CN/security/tpm/xen-tpmfront.rst | 114 ++
+ .../translations/zh_TW/admin-guide/README.rst | 2 +-
+ .../zh_TW/process/submit-checklist.rst | 2 +-
+ Documentation/usb/gadget-testing.rst | 2 +-
+ .../userspace-api/media/rc/rc-sysfs-nodes.rst | 2 +-
+ MAINTAINERS | 2 +
+ scripts/documentation-file-ref-check | 2 +-
+ scripts/get_abi.pl | 1103 --------------------
+ scripts/get_abi.py | 214 ++++
+ scripts/kernel-doc | 148 +--
+ scripts/lib/abi/abi_parser.py | 628 +++++++++++
+ scripts/lib/abi/abi_regex.py | 234 +++++
+ scripts/lib/abi/helpers.py | 38 +
+ scripts/lib/abi/system_symbols.py | 378 +++++++
+ 105 files changed, 3469 insertions(+), 1771 deletions(-)
+ create mode 100644 Documentation/admin-guide/abi-obsolete-files.rst
+ create mode 100644 Documentation/admin-guide/abi-removed-files.rst
+ create mode 100644 Documentation/admin-guide/abi-stable-files.rst
+ create mode 100644 Documentation/admin-guide/abi-testing-files.rst
+ delete mode 100644 Documentation/sphinx/kernellog.py
+ delete mode 100644 Documentation/translations/ja_JP/SubmitChecklist
+ create mode 100644 Documentation/translations/ja_JP/disclaimer-ja_JP.rst
+ create mode 100644 Documentation/translations/ja_JP/process/submit-checklist.rst
+ create mode 100644 Documentation/translations/zh_CN/security/credentials.rst
+ create mode 100644 Documentation/translations/zh_CN/security/keys/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/secrets/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/self-protection.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm-security.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_event_log.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_ftpm_tee.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_tis.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_vtpm_proxy.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/xen-tpmfront.rst
+ delete mode 100755 scripts/get_abi.pl
+ create mode 100755 scripts/get_abi.py
+ create mode 100644 scripts/lib/abi/abi_parser.py
+ create mode 100644 scripts/lib/abi/abi_regex.py
+ create mode 100644 scripts/lib/abi/helpers.py
+ create mode 100644 scripts/lib/abi/system_symbols.py
+Merging v4l-dvb/next (c2b96a681815 media: platform: allgro-dvt: unregister v4l2_device on the error path)
+$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/media/cec.rst | 2 +-
+ Documentation/admin-guide/media/mgb4.rst | 4 +-
+ .../bindings/media/aspeed,video-engine.yaml | 70 ++
+ .../devicetree/bindings/media/aspeed-video.txt | 33 -
+ .../devicetree/bindings/media/i2c/adv7180.yaml | 4 +
+ .../bindings/media/i2c/st,st-mipid02.yaml | 2 +-
+ .../bindings/media/qcom,sc7280-camss.yaml | 10 +-
+ .../bindings/media/qcom,sdm670-camss.yaml | 318 +++++
+ .../bindings/media/qcom,sm8550-camss.yaml | 597 ++++++++++
+ .../bindings/media/qcom,sm8550-iris.yaml | 158 +++
+ .../bindings/media/st,stm32mp25-csi.yaml | 5 +-
+ Documentation/driver-api/media/tx-rx.rst | 26 +-
+ MAINTAINERS | 12 +-
+ drivers/media/dvb-frontends/dibx000_common.c | 10 +-
+ drivers/media/i2c/Kconfig | 1 +
+ drivers/media/i2c/adv748x/adv748x.h | 2 +-
+ drivers/media/i2c/adv7511-v4l2.c | 6 +-
+ drivers/media/i2c/ccs/ccs-core.c | 6 +-
+ drivers/media/i2c/dw9719.c | 113 +-
+ drivers/media/i2c/hi556.c | 45 +-
+ drivers/media/i2c/imx214.c | 1241 ++++++++++++--------
+ drivers/media/i2c/imx219.c | 313 +++--
+ drivers/media/i2c/imx319.c | 9 +-
+ drivers/media/i2c/imx415.c | 183 +--
+ drivers/media/i2c/ov08x40.c | 185 +--
+ drivers/media/i2c/ov2740.c | 27 +-
+ drivers/media/i2c/ov7251.c | 4 +-
+ drivers/media/i2c/st-mipid02.c | 5 +-
+ drivers/media/i2c/tc358746.c | 4 +-
+ drivers/media/i2c/video-i2c.c | 12 +-
+ drivers/media/pci/cx23885/cx23885-core.c | 33 +-
+ drivers/media/pci/intel/ipu3/ipu3-cio2.c | 11 +-
+ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 12 +-
+ drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 2 -
+ drivers/media/pci/intel/ivsc/mei_csi.c | 78 +-
+ drivers/media/pci/mgb4/mgb4_core.c | 13 +-
+ drivers/media/pci/mgb4/mgb4_core.h | 8 +-
+ drivers/media/platform/allegro-dvt/allegro-core.c | 1 +
+ drivers/media/platform/cadence/cdns-csi2rx.c | 4 +-
+ .../media/platform/chips-media/coda/coda-common.c | 1 +
+ .../media/platform/chips-media/wave5/wave5-hw.c | 2 +-
+ .../platform/chips-media/wave5/wave5-vpu-dec.c | 31 +-
+ .../media/platform/chips-media/wave5/wave5-vpu.c | 4 +-
+ .../platform/chips-media/wave5/wave5-vpuapi.c | 10 +
+ .../mediatek/vcodec/common/mtk_vcodec_fw_scp.c | 5 +-
+ .../mediatek/vcodec/encoder/venc/venc_h264_if.c | 6 +-
+ drivers/media/platform/nxp/imx-mipi-csis.c | 5 +-
+ drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 11 +-
+ drivers/media/platform/qcom/Kconfig | 1 +
+ drivers/media/platform/qcom/Makefile | 1 +
+ drivers/media/platform/qcom/camss/Makefile | 2 +
+ drivers/media/platform/qcom/camss/camss-csid-4-1.c | 19 -
+ drivers/media/platform/qcom/camss/camss-csid-4-7.c | 42 -
+ drivers/media/platform/qcom/camss/camss-csid-780.c | 337 ++++++
+ drivers/media/platform/qcom/camss/camss-csid-780.h | 25 +
+ .../media/platform/qcom/camss/camss-csid-gen2.c | 60 -
+ drivers/media/platform/qcom/camss/camss-csid.c | 262 +++--
+ drivers/media/platform/qcom/camss/camss-csid.h | 54 +-
+ .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 6 +
+ .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 796 +++++++------
+ drivers/media/platform/qcom/camss/camss-csiphy.c | 4 +
+ drivers/media/platform/qcom/camss/camss-csiphy.h | 8 +
+ drivers/media/platform/qcom/camss/camss-vfe-17x.c | 112 +-
+ drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 9 -
+ drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 11 -
+ drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 11 -
+ drivers/media/platform/qcom/camss/camss-vfe-480.c | 276 +----
+ drivers/media/platform/qcom/camss/camss-vfe-780.c | 159 +++
+ drivers/media/platform/qcom/camss/camss-vfe-gen1.c | 9 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c | 275 +++++
+ drivers/media/platform/qcom/camss/camss-vfe.h | 59 +-
+ drivers/media/platform/qcom/camss/camss.c | 595 +++++++++-
+ drivers/media/platform/qcom/camss/camss.h | 6 +-
+ drivers/media/platform/qcom/iris/Kconfig | 13 +
+ drivers/media/platform/qcom/iris/Makefile | 31 +
+ drivers/media/platform/qcom/iris/iris_buffer.c | 623 ++++++++++
+ drivers/media/platform/qcom/iris/iris_buffer.h | 117 ++
+ drivers/media/platform/qcom/iris/iris_core.c | 96 ++
+ drivers/media/platform/qcom/iris/iris_core.h | 111 ++
+ drivers/media/platform/qcom/iris/iris_ctrls.c | 259 ++++
+ drivers/media/platform/qcom/iris/iris_ctrls.h | 22 +
+ drivers/media/platform/qcom/iris/iris_firmware.c | 116 ++
+ drivers/media/platform/qcom/iris/iris_firmware.h | 15 +
+ drivers/media/platform/qcom/iris/iris_hfi_common.c | 176 +++
+ drivers/media/platform/qcom/iris/iris_hfi_common.h | 155 +++
+ drivers/media/platform/qcom/iris/iris_hfi_gen1.h | 16 +
+ .../platform/qcom/iris/iris_hfi_gen1_command.c | 826 +++++++++++++
+ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 448 +++++++
+ .../platform/qcom/iris/iris_hfi_gen1_response.c | 666 +++++++++++
+ drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 41 +
+ .../platform/qcom/iris/iris_hfi_gen2_command.c | 957 +++++++++++++++
+ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 161 +++
+ .../platform/qcom/iris/iris_hfi_gen2_packet.c | 292 +++++
+ .../platform/qcom/iris/iris_hfi_gen2_packet.h | 125 ++
+ .../platform/qcom/iris/iris_hfi_gen2_response.c | 934 +++++++++++++++
+ drivers/media/platform/qcom/iris/iris_hfi_queue.c | 318 +++++
+ drivers/media/platform/qcom/iris/iris_hfi_queue.h | 182 +++
+ drivers/media/platform/qcom/iris/iris_instance.h | 77 ++
+ .../platform/qcom/iris/iris_platform_common.h | 186 +++
+ .../platform/qcom/iris/iris_platform_sm8250.c | 149 +++
+ .../platform/qcom/iris/iris_platform_sm8550.c | 266 +++++
+ drivers/media/platform/qcom/iris/iris_power.c | 140 +++
+ drivers/media/platform/qcom/iris/iris_power.h | 13 +
+ drivers/media/platform/qcom/iris/iris_probe.c | 349 ++++++
+ drivers/media/platform/qcom/iris/iris_resources.c | 131 +++
+ drivers/media/platform/qcom/iris/iris_resources.h | 18 +
+ drivers/media/platform/qcom/iris/iris_state.c | 276 +++++
+ drivers/media/platform/qcom/iris/iris_state.h | 144 +++
+ drivers/media/platform/qcom/iris/iris_utils.c | 90 ++
+ drivers/media/platform/qcom/iris/iris_utils.h | 53 +
+ drivers/media/platform/qcom/iris/iris_vb2.c | 335 ++++++
+ drivers/media/platform/qcom/iris/iris_vb2.h | 19 +
+ drivers/media/platform/qcom/iris/iris_vdec.c | 659 +++++++++++
+ drivers/media/platform/qcom/iris/iris_vdec.h | 25 +
+ drivers/media/platform/qcom/iris/iris_vidc.c | 453 +++++++
+ drivers/media/platform/qcom/iris/iris_vidc.h | 15 +
+ drivers/media/platform/qcom/iris/iris_vpu2.c | 38 +
+ drivers/media/platform/qcom/iris/iris_vpu3.c | 122 ++
+ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 270 +++++
+ drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 91 ++
+ drivers/media/platform/qcom/iris/iris_vpu_common.c | 369 ++++++
+ drivers/media/platform/qcom/iris/iris_vpu_common.h | 28 +
+ .../platform/qcom/iris/iris_vpu_register_defines.h | 17 +
+ drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 6 +-
+ drivers/media/platform/st/stm32/stm32-csi.c | 106 +-
+ .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 23 +-
+ drivers/media/platform/ti/cal/cal-camerarx.c | 3 +-
+ drivers/media/platform/ti/cal/cal.c | 4 +-
+ drivers/media/platform/ti/cal/cal.h | 1 +
+ .../platform/verisilicon/hantro_g2_hevc_dec.c | 1 +
+ .../media/platform/verisilicon/hantro_g2_vp9_dec.c | 8 +-
+ drivers/media/radio/radio-aztech.c | 2 +-
+ drivers/media/rc/keymaps/Makefile | 1 +
+ drivers/media/rc/keymaps/rc-siemens-gigaset-rc20.c | 71 ++
+ drivers/media/rc/streamzap.c | 70 +-
+ .../media/test-drivers/vivid/vivid-kthread-cap.c | 11 +-
+ .../media/test-drivers/vivid/vivid-kthread-out.c | 11 +-
+ .../media/test-drivers/vivid/vivid-kthread-touch.c | 11 +-
+ drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 11 +-
+ drivers/media/tuners/tuner-simple.c | 20 +-
+ drivers/media/tuners/tuner-types.c | 296 ++---
+ drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 18 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/anysee.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/au6610.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/az6007.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/ce6230.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/ec168.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/gl861.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 2 +-
+ drivers/media/usb/dvb-usb/af9005.c | 4 +-
+ drivers/media/usb/dvb-usb/az6027.c | 4 +-
+ drivers/media/usb/dvb-usb/cinergyT2-core.c | 2 +-
+ drivers/media/usb/dvb-usb/cxusb-analog.c | 4 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb-mb.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb-mc.c | 2 +-
+ drivers/media/usb/dvb-usb/digitv.c | 4 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 2 +-
+ drivers/media/usb/dvb-usb/dtv5100.c | 4 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 6 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 16 +-
+ drivers/media/usb/dvb-usb/gp8psk.c | 2 +-
+ drivers/media/usb/dvb-usb/m920x.c | 4 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 2 +-
+ drivers/media/usb/dvb-usb/opera1.c | 4 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 6 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 4 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 4 +-
+ drivers/media/usb/dvb-usb/umt-010.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045.c | 2 +-
+ drivers/media/usb/pwc/pwc-if.c | 1 -
+ drivers/media/v4l2-core/v4l2-common.c | 32 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 36 +
+ drivers/media/v4l2-core/v4l2-subdev.c | 2 +
+ drivers/staging/media/imx/imx-media-vdic.c | 54 -
+ include/media/rc-map.h | 1 +
+ include/media/tuner-types.h | 6 +-
+ include/media/v4l2-common.h | 19 +-
+ include/media/v4l2-dv-timings.h | 1 +
+ include/media/v4l2-mediabus.h | 2 +
+ include/media/v4l2-subdev.h | 4 +-
+ include/uapi/linux/rkisp1-config.h | 2 +-
+ 190 files changed, 16341 insertions(+), 2425 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/aspeed,video-engine.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/aspeed-video.txt
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8550-camss.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml
+ create mode 100644 drivers/media/platform/qcom/camss/camss-csid-780.c
+ create mode 100644 drivers/media/platform/qcom/camss/camss-csid-780.h
+ create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-780.c
+ create mode 100644 drivers/media/platform/qcom/iris/Kconfig
+ create mode 100644 drivers/media/platform/qcom/iris/Makefile
+ create mode 100644 drivers/media/platform/qcom/iris/iris_buffer.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_buffer.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_core.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_core.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_ctrls.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_ctrls.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_firmware.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_firmware.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_common.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_common.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_queue.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_queue.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_instance.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_platform_common.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_platform_sm8250.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_platform_sm8550.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_power.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_power.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_probe.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_resources.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_resources.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_state.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_state.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_utils.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_utils.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vb2.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vb2.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vdec.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vdec.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vidc.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vidc.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu2.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu3.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_buffer.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_buffer.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_common.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_common.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_register_defines.h
+ create mode 100644 drivers/media/rc/keymaps/rc-siemens-gigaset-rc20.c
+Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
+$ 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 (ee3f0ada079d Merge branch 'fixes' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 3 +
+ Documentation/admin-guide/pm/intel_idle.rst | 18 +++--
+ Documentation/admin-guide/pm/intel_pstate.rst | 3 +
+ MAINTAINERS | 11 ++-
+ arch/x86/kernel/acpi/cppc.c | 2 +
+ drivers/acpi/Kconfig | 2 +-
+ drivers/acpi/acpi_video.c | 7 +-
+ drivers/acpi/hed.c | 7 +-
+ drivers/acpi/platform_profile.c | 45 ++++++-----
+ drivers/acpi/power.c | 5 +-
+ drivers/acpi/thermal.c | 2 +-
+ drivers/base/power/main.c | 4 +
+ drivers/base/power/runtime.c | 14 ----
+ drivers/cpufreq/cpufreq_governor.c | 45 +++++------
+ drivers/cpufreq/intel_pstate.c | 9 +++
+ drivers/cpuidle/governors/menu.c | 100 ++++++++++++++----------
+ drivers/idle/intel_idle.c | 35 +++++++--
+ drivers/thermal/gov_power_allocator.c | 2 +-
+ include/linux/platform_profile.h | 2 +-
+ include/linux/pm_runtime.h | 15 +++-
+ kernel/power/energy_model.c | 19 ++---
+ kernel/power/snapshot.c | 16 ++--
+ 22 files changed, 214 insertions(+), 152 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (f2d32942026c cpufreq: enable 1200Mhz clock speed for armada-37xx)
+$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
+Auto-merging drivers/cpufreq/amd-pstate.c
+Auto-merging drivers/cpufreq/cpufreq.c
+Auto-merging include/linux/cpufreq.h
+Merge made by the 'ort' strategy.
+ drivers/cpufreq/acpi-cpufreq.c | 4 ++-
+ drivers/cpufreq/amd-pstate.c | 5 ++--
+ drivers/cpufreq/apple-soc-cpufreq.c | 18 +------------
+ drivers/cpufreq/armada-37xx-cpufreq.c | 6 +----
+ drivers/cpufreq/bmips-cpufreq.c | 1 -
+ drivers/cpufreq/brcmstb-avs-cpufreq.c | 1 -
+ drivers/cpufreq/cppc_cpufreq.c | 9 +------
+ drivers/cpufreq/cpufreq-dt.c | 22 +---------------
+ drivers/cpufreq/cpufreq.c | 46 ++++++++++++++++++++--------------
+ drivers/cpufreq/davinci-cpufreq.c | 1 -
+ drivers/cpufreq/e_powersaver.c | 1 -
+ drivers/cpufreq/elanfreq.c | 1 -
+ drivers/cpufreq/freq_table.c | 15 ++++-------
+ drivers/cpufreq/imx6q-cpufreq.c | 1 -
+ drivers/cpufreq/kirkwood-cpufreq.c | 1 -
+ drivers/cpufreq/longhaul.c | 1 -
+ drivers/cpufreq/loongson2_cpufreq.c | 1 -
+ drivers/cpufreq/loongson3_cpufreq.c | 11 +-------
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 1 -
+ drivers/cpufreq/mediatek-cpufreq.c | 1 -
+ drivers/cpufreq/omap-cpufreq.c | 1 -
+ drivers/cpufreq/p4-clockmod.c | 1 -
+ drivers/cpufreq/pasemi-cpufreq.c | 1 -
+ drivers/cpufreq/pmac32-cpufreq.c | 1 -
+ drivers/cpufreq/pmac64-cpufreq.c | 1 -
+ drivers/cpufreq/powernow-k6.c | 1 -
+ drivers/cpufreq/powernow-k7.c | 1 -
+ drivers/cpufreq/powernow-k8.c | 1 -
+ drivers/cpufreq/powernv-cpufreq.c | 11 +-------
+ drivers/cpufreq/qcom-cpufreq-hw.c | 14 +----------
+ drivers/cpufreq/qoriq-cpufreq.c | 1 -
+ drivers/cpufreq/sc520_freq.c | 1 -
+ drivers/cpufreq/scmi-cpufreq.c | 19 +-------------
+ drivers/cpufreq/scpi-cpufreq.c | 6 ++---
+ drivers/cpufreq/sh-cpufreq.c | 1 -
+ drivers/cpufreq/spear-cpufreq.c | 1 -
+ drivers/cpufreq/speedstep-centrino.c | 1 -
+ drivers/cpufreq/speedstep-ich.c | 1 -
+ drivers/cpufreq/speedstep-smi.c | 1 -
+ drivers/cpufreq/tegra186-cpufreq.c | 1 -
+ drivers/cpufreq/tegra194-cpufreq.c | 1 -
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 1 -
+ drivers/cpufreq/virtual-cpufreq.c | 1 -
+ include/linux/cpufreq.h | 21 +++++-----------
+ 44 files changed, 54 insertions(+), 183 deletions(-)
+Merging cpupower/cpupower (80d3175a7e07 cpupower: monitor: Exit with error status if execvp() fail)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Merge made by the 'ort' strategy.
+ tools/power/cpupower/bench/parse.c | 4 ++++
+ tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 6 +++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+Merging devfreq/devfreq-next (f3253b23535f PM / devfreq: exynos: remove unused function parameter)
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Already up to date.
+Merging pmdomain/next (36ccabe59dda pmdomain: Merge branch rockchip into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/power/allwinner,sun20i-d1-ppu.yaml | 1 +
+ MAINTAINERS | 2 ++
+ drivers/cpuidle/cpuidle-psci.c | 3 ++
+ drivers/pmdomain/bcm/bcm2835-power.c | 1 +
+ drivers/pmdomain/core.c | 35 ++++++++++++++++++++
+ drivers/pmdomain/imx/gpcv2.c | 2 +-
+ drivers/pmdomain/renesas/rcar-sysc.c | 2 --
+ drivers/pmdomain/rockchip/Kconfig | 1 +
+ drivers/pmdomain/rockchip/pm-domains.c | 9 ++++++
+ drivers/pmdomain/sunxi/sun20i-ppu.c | 15 +++++++++
+ drivers/pmdomain/ti/omap_prm.c | 2 +-
+ .../dt-bindings/power/allwinner,sun8i-v853-ppu.h | 10 ++++++
+ include/dt-bindings/power/qcom-rpmpd.h | 2 +-
+ include/linux/pm_domain.h | 7 ++++
+ include/soc/rockchip/rockchip_sip.h | 3 ++
+ include/trace/events/power.h | 37 ++++++++++++++++++++++
+ 16 files changed, 127 insertions(+), 5 deletions(-)
+ create mode 100644 include/dt-bindings/power/allwinner,sun8i-v853-ppu.h
+Merging opp/opp/linux-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (ecb642900deb dt-bindings: thermal: Correct indentation and style in DTS example)
+$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
+Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+Auto-merging include/linux/thermal.h
+Merge made by the 'ort' strategy.
+ .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 48 +++---
+ .../devicetree/bindings/thermal/brcm,avs-tmon.yaml | 1 +
+ .../devicetree/bindings/thermal/imx-thermal.yaml | 36 ++---
+ .../bindings/thermal/imx8mm-thermal.yaml | 8 +-
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 18 +++
+ drivers/thermal/broadcom/brcmstb_thermal.c | 11 +-
+ drivers/thermal/mediatek/lvts_thermal.c | 103 ++++++++----
+ drivers/thermal/qcom/tsens-v2.c | 178 +++++++++++++++++++++
+ drivers/thermal/qcom/tsens.c | 8 +-
+ drivers/thermal/qcom/tsens.h | 3 +
+ drivers/thermal/qoriq_thermal.c | 47 +++---
+ drivers/thermal/rockchip_thermal.c | 1 +
+ include/linux/thermal.h | 2 -
+ 13 files changed, 358 insertions(+), 106 deletions(-)
+Merging rdma/for-next (be35a3127d60 RDMA/mana_ib: Ensure variable err is initialized)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Auto-merging drivers/infiniband/hw/bnxt_re/bnxt_re.h
+Auto-merging drivers/infiniband/hw/mana/main.c
+Merge made by the 'ort' strategy.
+ drivers/infiniband/core/cache.c | 6 +
+ drivers/infiniband/core/cma.c | 24 +-
+ drivers/infiniband/core/sysfs.c | 14 +-
+ drivers/infiniband/core/umem.c | 36 ++-
+ drivers/infiniband/core/verbs.c | 11 +-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +
+ drivers/infiniband/hw/bnxt_re/debugfs.c | 215 +++++++++++++++-
+ drivers/infiniband/hw/bnxt_re/debugfs.h | 15 ++
+ drivers/infiniband/hw/hfi1/chip.c | 18 --
+ drivers/infiniband/hw/hfi1/chip.h | 1 -
+ drivers/infiniband/hw/hfi1/driver.c | 2 +-
+ drivers/infiniband/hw/hfi1/mad.c | 4 +-
+ drivers/infiniband/hw/irdma/Kconfig | 1 +
+ drivers/infiniband/hw/irdma/main.h | 1 -
+ drivers/infiniband/hw/irdma/osdep.h | 6 +-
+ drivers/infiniband/hw/irdma/puda.c | 19 +-
+ drivers/infiniband/hw/irdma/puda.h | 5 +-
+ drivers/infiniband/hw/irdma/utils.c | 47 +---
+ drivers/infiniband/hw/mana/Makefile | 2 +-
+ drivers/infiniband/hw/mana/ah.c | 58 +++++
+ drivers/infiniband/hw/mana/counters.c | 105 ++++++++
+ drivers/infiniband/hw/mana/counters.h | 44 ++++
+ drivers/infiniband/hw/mana/cq.c | 233 ++++++++++++++---
+ drivers/infiniband/hw/mana/device.c | 28 +-
+ drivers/infiniband/hw/mana/main.c | 103 +++++++-
+ drivers/infiniband/hw/mana/mana_ib.h | 208 ++++++++++++++-
+ drivers/infiniband/hw/mana/mr.c | 105 ++++++++
+ drivers/infiniband/hw/mana/qp.c | 245 +++++++++++++++++-
+ drivers/infiniband/hw/mana/shadow_queue.h | 115 +++++++++
+ drivers/infiniband/hw/mana/wr.c | 168 ++++++++++++
+ drivers/infiniband/sw/rxe/Kconfig | 3 +-
+ drivers/infiniband/sw/rxe/Makefile | 2 +
+ drivers/infiniband/sw/rxe/rxe.c | 36 ++-
+ drivers/infiniband/sw/rxe/rxe.h | 38 ---
+ drivers/infiniband/sw/rxe/rxe_icrc.c | 40 +--
+ drivers/infiniband/sw/rxe/rxe_loc.h | 35 ++-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 13 +-
+ drivers/infiniband/sw/rxe/rxe_odp.c | 324 ++++++++++++++++++++++++
+ drivers/infiniband/sw/rxe/rxe_req.c | 1 -
+ drivers/infiniband/sw/rxe/rxe_resp.c | 18 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 24 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 42 ++-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 8 +-
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 7 +-
+ include/net/mana/gdma.h | 7 +
+ include/rdma/ib_verbs.h | 17 ++
+ 46 files changed, 2185 insertions(+), 271 deletions(-)
+ create mode 100644 drivers/infiniband/hw/mana/ah.c
+ create mode 100644 drivers/infiniband/hw/mana/counters.c
+ create mode 100644 drivers/infiniband/hw/mana/counters.h
+ create mode 100644 drivers/infiniband/hw/mana/shadow_queue.h
+ create mode 100644 drivers/infiniband/hw/mana/wr.c
+ create mode 100644 drivers/infiniband/sw/rxe/rxe_odp.c
+Merging net-next/main (7183877d6853 net: Remove shadow variable in netdev_run_todo())
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
+Auto-merging MAINTAINERS
+Auto-merging drivers/infiniband/hw/irdma/main.h
+Auto-merging drivers/net/ethernet/cadence/macb.h
+Auto-merging drivers/net/ethernet/cadence/macb_main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb_main.c
+Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+Auto-merging fs/eventpoll.c
+Auto-merging include/net/sock.h
+Auto-merging include/net/tcp.h
+Auto-merging kernel/bpf/btf.c
+Auto-merging lib/Kconfig.debug
+Auto-merging net/core/sock.c
+Auto-merging net/ethtool/common.c
+Auto-merging net/ethtool/ioctl.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/mptcp/subflow.c
+Auto-merging net/netlink/af_netlink.c
+Resolved 'drivers/net/ethernet/cadence/macb_main.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 296201a1a682] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arch/s390/driver-model.rst | 2 +-
+ .../devicetree/bindings/net/can/fsl,flexcan.yaml | 44 +-
+ .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 +
+ .../devicetree/bindings/net/ethernet-phy.yaml | 6 +
+ .../devicetree/bindings/net/faraday,ftgmac100.yaml | 3 +
+ .../bindings/net/realtek,rtl9301-mdio.yaml | 86 +
+ .../{mfd => net}/realtek,rtl9301-switch.yaml | 63 +-
+ Documentation/netlink/genetlink-c.yaml | 7 +-
+ Documentation/netlink/genetlink-legacy.yaml | 10 +-
+ Documentation/netlink/genetlink.yaml | 7 +-
+ Documentation/netlink/specs/conntrack.yaml | 643 ++++++
+ Documentation/netlink/specs/netdev.yaml | 34 +-
+ Documentation/netlink/specs/nl80211.yaml | 2000 ++++++++++++++++
+ Documentation/netlink/specs/rt_addr.yaml | 23 +
+ Documentation/netlink/specs/rt_rule.yaml | 15 +
+ .../ethernet/freescale/dpaa2/switch-driver.rst | 2 +-
+ Documentation/networking/devlink/ice.rst | 11 +
+ Documentation/networking/devlink/mlx5.rst | 4 +
+ Documentation/networking/devlink/sfc.rst | 16 +-
+ Documentation/networking/ip-sysctl.rst | 13 +
+ Documentation/networking/j1939.rst | 675 ++++++
+ Documentation/networking/napi.rst | 33 +-
+ .../net_cachelines/inet_connection_sock.rst | 1 +
+ .../net_cachelines/netns_ipv4_sysctl.rst | 1 +
+ Documentation/networking/netconsole.rst | 45 +
+ Documentation/networking/xsk-tx-metadata.rst | 62 +
+ MAINTAINERS | 3 +-
+ arch/s390/include/asm/irq.h | 1 -
+ arch/s390/kernel/irq.c | 1 -
+ drivers/infiniband/hw/irdma/hw.c | 2 -
+ drivers/infiniband/hw/irdma/main.c | 46 +-
+ drivers/infiniband/hw/irdma/main.h | 3 +
+ drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 9 +-
+ drivers/net/amt.c | 11 +-
+ drivers/net/bareudp.c | 9 +-
+ drivers/net/bonding/bond_main.c | 5 +-
+ drivers/net/bonding/bond_netlink.c | 6 +-
+ drivers/net/can/c_can/c_can_platform.c | 51 +-
+ drivers/net/can/dev/netlink.c | 4 +-
+ drivers/net/can/flexcan/flexcan-core.c | 35 +-
+ drivers/net/can/flexcan/flexcan.h | 5 +
+ drivers/net/can/rockchip/rockchip_canfd-core.c | 5 -
+ drivers/net/can/usb/gs_usb.c | 5 +
+ drivers/net/can/vxcan.c | 7 +-
+ drivers/net/dsa/b53/b53_common.c | 14 +
+ drivers/net/dsa/b53/b53_mdio.c | 1 +
+ drivers/net/dsa/b53/b53_priv.h | 2 +
+ drivers/net/dsa/b53/b53_serdes.c | 1 -
+ drivers/net/dsa/mt7530.c | 69 +-
+ drivers/net/dsa/mv88e6xxx/pcs-6185.c | 1 -
+ drivers/net/dsa/mv88e6xxx/pcs-6352.c | 1 -
+ drivers/net/dsa/mv88e6xxx/pcs-639x.c | 4 -
+ drivers/net/dsa/qca/qca8k-8xxx.c | 1 -
+ drivers/net/dsa/rzn1_a5psw.c | 8 +-
+ drivers/net/dsa/sja1105/sja1105_mdio.c | 6 +-
+ drivers/net/ethernet/actions/owl-emac.c | 7 +-
+ drivers/net/ethernet/apm/xgene-v2/mdio.c | 16 +-
+ .../net/ethernet/aquantia/atlantic/aq_drvinfo.c | 14 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 1 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 556 +++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 8 +
+ drivers/net/ethernet/cadence/macb.h | 130 +-
+ drivers/net/ethernet/cadence/macb_main.c | 212 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.c | 16 -
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 7 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 7 +-
+ drivers/net/ethernet/cisco/enic/Makefile | 2 +-
+ drivers/net/ethernet/cisco/enic/enic.h | 4 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 39 -
+ drivers/net/ethernet/cisco/enic/enic_main.c | 274 +--
+ drivers/net/ethernet/cisco/enic/enic_rq.c | 242 ++
+ drivers/net/ethernet/cisco/enic/enic_rq.h | 10 +
+ drivers/net/ethernet/cisco/enic/vnic_rq.h | 2 +
+ drivers/net/ethernet/freescale/fec_main.c | 52 +-
+ drivers/net/ethernet/freescale/fman/fman_dtsec.c | 1 -
+ drivers/net/ethernet/freescale/gianfar.c | 14 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
+ drivers/net/ethernet/freescale/ucc_geth.h | 2 -
+ drivers/net/ethernet/google/gve/gve.h | 16 +-
+ drivers/net/ethernet/google/gve/gve_adminq.c | 66 +-
+ drivers/net/ethernet/google/gve/gve_ethtool.c | 60 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 86 +-
+ drivers/net/ethernet/ibm/emac/core.c | 7 +-
+ drivers/net/ethernet/intel/Kconfig | 3 +-
+ drivers/net/ethernet/intel/e1000e/mac.c | 15 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.h | 10 +-
+ drivers/net/ethernet/intel/iavf/Makefile | 2 +
+ drivers/net/ethernet/intel/iavf/iavf.h | 35 +-
+ drivers/net/ethernet/intel/iavf/iavf_main.c | 228 +-
+ drivers/net/ethernet/intel/iavf/iavf_ptp.c | 485 ++++
+ drivers/net/ethernet/intel/iavf/iavf_ptp.h | 47 +
+ drivers/net/ethernet/intel/iavf/iavf_trace.h | 6 +-
+ drivers/net/ethernet/intel/iavf/iavf_txrx.c | 437 +++-
+ drivers/net/ethernet/intel/iavf/iavf_txrx.h | 24 +-
+ drivers/net/ethernet/intel/iavf/iavf_type.h | 235 +-
+ drivers/net/ethernet/intel/iavf/iavf_types.h | 34 +
+ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 203 ++
+ drivers/net/ethernet/intel/ice/devlink/devlink.c | 102 +
+ drivers/net/ethernet/intel/ice/ice.h | 26 +-
+ drivers/net/ethernet/intel/ice/ice_base.c | 13 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 208 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 7 +-
+ drivers/net/ethernet/intel/ice/ice_ddp.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 9 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 21 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.c | 31 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.h | 4 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 12 +
+ drivers/net/ethernet/intel/ice/ice_idc.c | 64 +-
+ drivers/net/ethernet/intel/ice/ice_irq.c | 275 +--
+ drivers/net/ethernet/intel/ice/ice_irq.h | 13 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 42 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 31 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.c | 511 +++--
+ drivers/net/ethernet/intel/ice/ice_ptp.h | 17 +-
+ drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 413 ++--
+ drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 28 +-
+ drivers/net/ethernet/intel/ice/ice_sriov.c | 154 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 9 -
+ drivers/net/ethernet/intel/ice/ice_vf_lib.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_virtchnl.c | 80 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl.h | 6 +
+ .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 7 +
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 8 -
+ .../net/ethernet/intel/idpf/idpf_singleq_txrx.c | 51 +-
+ drivers/net/ethernet/intel/idpf/idpf_txrx.c | 16 +-
+ drivers/net/ethernet/intel/idpf/idpf_txrx.h | 19 -
+ drivers/net/ethernet/intel/igc/igc.h | 1 +
+ drivers/net/ethernet/intel/igc/igc_main.c | 143 +-
+ drivers/net/ethernet/intel/igc/igc_xdp.c | 19 +-
+ drivers/net/ethernet/marvell/mvneta.c | 1 -
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 -
+ .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +-
+ drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 7 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 122 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 17 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 6 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 34 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 188 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 9 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 14 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.c | 225 ++
+ .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.h | 24 +
+ .../net/ethernet/marvell/octeontx2/nic/qos_sq.c | 2 +-
+ .../net/ethernet/marvell/prestera/prestera_main.c | 1 -
+ drivers/net/ethernet/mediatek/airoha_eth.c | 10 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 74 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 11 +
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/alloc.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 119 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 6 -
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 15 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 20 -
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 4 +-
+ .../mellanox/mlx5/core/diag/reporter_vnic.c | 46 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 -
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/en/params.h | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 64 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 4 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 121 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 15 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 3 +
+ .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 9 +-
+ .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 5 +
+ .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 5 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 57 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 84 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 40 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +
+ .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 29 +-
+ drivers/net/ethernet/mellanox/mlx5/core/events.c | 36 +-
+ drivers/net/ethernet/mellanox/mlx5/core/hwmon.c | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/hwmon.h | 1 +
+ .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 586 ++++-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 39 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 1 +
+ .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 19 +
+ .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 3 +
+ .../mellanox/mlx5/core/steering/sws/dr_domain.c | 24 -
+ .../mellanox/mlx5/core/steering/sws/dr_send.c | 33 -
+ .../mellanox/mlx5/core/steering/sws/dr_types.h | 1 -
+ .../mellanox/mlx5/core/steering/sws/mlx5dr.h | 2 -
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 25 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 5 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 -
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 48 -
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 -
+ drivers/net/ethernet/meta/fbnic/Makefile | 3 +-
+ drivers/net/ethernet/meta/fbnic/fbnic.h | 9 +
+ drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 6 +
+ drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c | 174 ++
+ drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 773 ++++++-
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 48 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 9 +
+ drivers/net/ethernet/meta/fbnic/fbnic_phylink.c | 1 -
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 356 ++-
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.h | 35 +
+ drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 265 ++-
+ drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 20 +-
+ .../net/ethernet/microchip/lan966x/lan966x_main.c | 1 -
+ .../net/ethernet/microchip/sparx5/sparx5_main.c | 1 -
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 50 +-
+ drivers/net/ethernet/microsoft/mana/hw_channel.c | 6 +-
+ drivers/net/ethernet/microsoft/mana/mana_en.c | 63 +-
+ drivers/net/ethernet/netronome/nfp/nfp_hwmon.c | 40 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 8 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 9 +-
+ drivers/net/ethernet/realtek/Kconfig | 3 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 40 +-
+ drivers/net/ethernet/renesas/rswitch.c | 7 +-
+ drivers/net/ethernet/sfc/Kconfig | 5 +-
+ drivers/net/ethernet/sfc/Makefile | 2 +-
+ drivers/net/ethernet/sfc/ef10.c | 7 +-
+ drivers/net/ethernet/sfc/efx_common.c | 1 +
+ drivers/net/ethernet/sfc/efx_devlink.c | 13 +
+ drivers/net/ethernet/sfc/efx_reflash.c | 514 +++++
+ drivers/net/ethernet/sfc/efx_reflash.h | 20 +
+ drivers/net/ethernet/sfc/fw_formats.h | 114 +
+ drivers/net/ethernet/sfc/mcdi.c | 115 +-
+ drivers/net/ethernet/sfc/mcdi.h | 22 +-
+ drivers/net/ethernet/sfc/net_driver.h | 2 +
+ drivers/net/ethernet/stmicro/stmmac/common.h | 18 +-
+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 135 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 8 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 8 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 2 +-
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 29 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 32 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 13 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 35 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 12 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 98 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 9 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 49 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 12 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 180 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 211 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 8 +
+ drivers/net/ethernet/wangxun/Kconfig | 1 +
+ drivers/net/ethernet/wangxun/libwx/Makefile | 2 +-
+ drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 53 +
+ drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 4 +
+ drivers/net/ethernet/wangxun/libwx/wx_hw.c | 19 +
+ drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 +
+ drivers/net/ethernet/wangxun/libwx/wx_lib.c | 52 +-
+ drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 883 ++++++++
+ drivers/net/ethernet/wangxun/libwx/wx_ptp.h | 20 +
+ drivers/net/ethernet/wangxun/libwx/wx_type.h | 105 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 2 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 20 +-
+ drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 11 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 5 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 2 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 11 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 10 +
+ drivers/net/ethernet/xilinx/Kconfig | 1 +
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 29 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 319 ++-
+ drivers/net/geneve.c | 9 +-
+ drivers/net/gtp.c | 10 +-
+ drivers/net/hamradio/baycom_par.c | 4 +-
+ drivers/net/hamradio/baycom_ser_fdx.c | 2 +-
+ drivers/net/hamradio/baycom_ser_hdx.c | 4 +-
+ drivers/net/hyperv/hyperv_net.h | 2 +
+ drivers/net/hyperv/netvsc_drv.c | 15 +
+ drivers/net/hyperv/rndis_filter.c | 13 +-
+ drivers/net/ipvlan/ipvlan.h | 3 +-
+ drivers/net/ipvlan/ipvlan_main.c | 8 +-
+ drivers/net/ipvlan/ipvtap.c | 6 +-
+ drivers/net/macsec.c | 9 +-
+ drivers/net/macvlan.c | 21 +-
+ drivers/net/macvtap.c | 6 +-
+ drivers/net/mctp/Kconfig | 10 +
+ drivers/net/mctp/Makefile | 1 +
+ drivers/net/mctp/mctp-usb.c | 385 ++++
+ drivers/net/netconsole.c | 261 ++-
+ drivers/net/netdevsim/netdev.c | 31 +-
+ drivers/net/netdevsim/netdevsim.h | 1 +
+ drivers/net/netkit.c | 14 +-
+ drivers/net/pcs/pcs-lynx.c | 1 -
+ drivers/net/pcs/pcs-mtk-lynxi.c | 1 -
+ drivers/net/pcs/pcs-rzn1-miic.c | 22 +-
+ drivers/net/pcs/pcs-xpcs.c | 90 +-
+ drivers/net/pcs/pcs-xpcs.h | 26 +-
+ drivers/net/pfcp.c | 9 +-
+ drivers/net/phy/aquantia/aquantia_hwmon.c | 32 +-
+ drivers/net/phy/broadcom.c | 2 +-
+ drivers/net/phy/dp83822.c | 38 +
+ drivers/net/phy/dp83td510.c | 187 ++
+ drivers/net/phy/dp83tg720.c | 78 +
+ drivers/net/phy/marvell-88q2xxx.c | 274 ++-
+ drivers/net/phy/marvell.c | 24 +-
+ drivers/net/phy/marvell10g.c | 24 +-
+ drivers/net/phy/mediatek/mtk-ge-soc.c | 270 ++-
+ drivers/net/phy/mediatek/mtk-ge.c | 76 +-
+ drivers/net/phy/mediatek/mtk-phy-lib.c | 77 +
+ drivers/net/phy/mediatek/mtk.h | 15 +
+ drivers/net/phy/phy-c45.c | 48 +-
+ drivers/net/phy/phy-core.c | 22 +-
+ drivers/net/phy/phy.c | 31 +-
+ drivers/net/phy/phy_device.c | 118 +-
+ drivers/net/phy/phylink.c | 58 +-
+ drivers/net/phy/qt2025.rs | 2 +-
+ drivers/net/phy/realtek/Kconfig | 8 +-
+ drivers/net/phy/realtek/realtek_main.c | 119 +-
+ drivers/net/phy/sfp.c | 2 +
+ drivers/net/ppp/ppp_generic.c | 9 +-
+ drivers/net/tap.c | 166 +-
+ drivers/net/team/team_core.c | 6 +-
+ drivers/net/tun.c | 193 +-
+ drivers/net/tun_vnet.h | 186 ++
+ drivers/net/usb/asix_devices.c | 17 +
+ drivers/net/usb/cdc_mbim.c | 2 +-
+ drivers/net/usb/qmi_wwan.c | 3 +-
+ drivers/net/usb/r8152.c | 1 +
+ drivers/net/veth.c | 7 +-
+ drivers/net/virtio_net.c | 45 +-
+ drivers/net/vrf.c | 11 +-
+ drivers/net/vxlan/vxlan_core.c | 67 +-
+ drivers/net/wireguard/device.c | 7 +-
+ drivers/net/wireless/virtual/virt_wifi.c | 8 +-
+ drivers/net/wwan/t7xx/t7xx_pci.c | 1 -
+ drivers/net/wwan/wwan_core.c | 16 +-
+ drivers/of/base.c | 27 +
+ drivers/s390/net/Kconfig | 11 +-
+ drivers/s390/net/Makefile | 1 -
+ drivers/s390/net/lcs.c | 2385 --------------------
+ drivers/s390/net/lcs.h | 342 ---
+ fs/eventpoll.c | 8 +-
+ include/linux/avf/virtchnl.h | 135 +-
+ include/linux/filter.h | 1 +
+ include/linux/if_macvlan.h | 6 +-
+ include/linux/mlx4/device.h | 3 +-
+ include/linux/mlx5/driver.h | 33 +-
+ include/linux/mlx5/port.h | 3 +
+ include/linux/net/intel/iidc.h | 2 +
+ include/linux/netdevice.h | 1 +
+ include/linux/of.h | 9 +
+ include/linux/pcs/pcs-xpcs.h | 3 +-
+ include/linux/phy.h | 82 +-
+ include/linux/phylink.h | 36 +-
+ include/linux/rtnetlink.h | 1 +
+ include/linux/sctp.h | 1 -
+ include/linux/skbuff.h | 22 +-
+ include/linux/stmmac.h | 4 +-
+ include/linux/unroll.h | 44 +
+ include/linux/usb/mctp-usb.h | 30 +
+ include/linux/usb/r8152.h | 1 +
+ include/net/busy_poll.h | 9 +-
+ include/net/dst_metadata.h | 7 +-
+ include/net/fib_rules.h | 27 +-
+ include/net/inet_connection_sock.h | 4 +-
+ include/net/ip.h | 24 +-
+ include/net/ip_tunnels.h | 12 +-
+ include/net/ipv6.h | 11 +-
+ include/net/libeth/rx.h | 47 +
+ include/net/netdev_queues.h | 5 +
+ include/net/netdev_rx_queue.h | 1 +
+ include/net/netlink.h | 15 +
+ include/net/netmem.h | 21 +-
+ include/net/netns/ipv4.h | 1 +
+ include/net/page_pool/memory_provider.h | 45 +
+ include/net/page_pool/types.h | 4 +
+ include/net/rtnetlink.h | 40 +-
+ include/net/sock.h | 33 +-
+ include/net/tcp.h | 31 +-
+ include/net/xdp_sock.h | 10 +
+ include/net/xdp_sock_drv.h | 44 +-
+ include/net/xsk_buff_pool.h | 8 +
+ include/trace/events/tcp.h | 6 +
+ include/uapi/linux/bpf.h | 30 +
+ include/uapi/linux/can.h | 3 +-
+ include/uapi/linux/ethtool.h | 18 +
+ include/uapi/linux/fib_rules.h | 3 +
+ include/uapi/linux/if_xdp.h | 10 +
+ include/uapi/linux/netdev.h | 16 +
+ include/uapi/linux/tcp.h | 1 +
+ include/uapi/linux/usb/ch9.h | 1 +
+ io_uring/napi.c | 4 +-
+ kernel/bpf/btf.c | 1 +
+ lib/Kconfig.debug | 20 +-
+ lib/Makefile | 2 +-
+ ...{test_blackhole_dev.c => blackhole_dev_kunit.c} | 47 +-
+ net/8021q/vlan_netlink.c | 9 +-
+ net/batman-adv/soft-interface.c | 9 +-
+ net/bridge/br_mdb.c | 2 +-
+ net/bridge/br_netlink.c | 6 +-
+ net/caif/chnl_net.c | 5 +-
+ net/can/raw.c | 2 +-
+ net/core/dev.c | 47 +-
+ net/core/dev.h | 12 +
+ net/core/devmem.c | 93 +-
+ net/core/devmem.h | 51 +-
+ net/core/dst.c | 6 +-
+ net/core/fib_rules.c | 223 +-
+ net/core/filter.c | 80 +-
+ net/core/flow_dissector.c | 10 +-
+ net/core/neighbour.c | 13 +-
+ net/core/net-sysfs.c | 399 +++-
+ net/core/netdev-genl.c | 38 +-
+ net/core/netdev_rx_queue.c | 106 +-
+ net/core/page_pool.c | 66 +-
+ net/core/page_pool_user.c | 9 +-
+ net/core/pktgen.c | 39 +-
+ net/core/rtnetlink.c | 39 +-
+ net/core/secure_seq.c | 2 +-
+ net/core/skbuff.c | 53 +
+ net/core/sock.c | 19 +-
+ net/dccp/ipv4.c | 3 -
+ net/dccp/ipv6.c | 9 +-
+ net/dsa/user.c | 27 +-
+ net/ethtool/common.c | 42 +
+ net/ethtool/ioctl.c | 16 +-
+ net/hsr/hsr_netlink.c | 12 +-
+ net/ieee802154/6lowpan/core.c | 7 +-
+ net/ipv4/af_inet.c | 2 +-
+ net/ipv4/arp.c | 12 +-
+ net/ipv4/devinet.c | 77 +-
+ net/ipv4/fib_rules.c | 59 +-
+ net/ipv4/icmp.c | 6 +-
+ net/ipv4/igmp.c | 14 +-
+ net/ipv4/igmp_internal.h | 17 +
+ net/ipv4/inet_connection_sock.c | 78 +-
+ net/ipv4/inet_diag.c | 2 +-
+ net/ipv4/inetpeer.c | 8 +-
+ net/ipv4/ip_gre.c | 38 +-
+ net/ipv4/ip_tunnel.c | 7 +-
+ net/ipv4/ip_vti.c | 9 +-
+ net/ipv4/ipip.c | 9 +-
+ net/ipv4/ping.c | 6 +-
+ net/ipv4/raw.c | 6 +-
+ net/ipv4/syncookies.c | 8 +-
+ net/ipv4/sysctl_net_ipv4.c | 10 +
+ net/ipv4/tcp.c | 77 +-
+ net/ipv4/tcp_fastopen.c | 6 +-
+ net/ipv4/tcp_input.c | 44 +-
+ net/ipv4/tcp_ipv4.c | 57 +-
+ net/ipv4/tcp_minisocks.c | 14 +-
+ net/ipv4/tcp_output.c | 32 +-
+ net/ipv4/tcp_timer.c | 56 +-
+ net/ipv4/udp.c | 69 +-
+ net/ipv6/fib6_rules.c | 57 +-
+ net/ipv6/ip6_gre.c | 26 +-
+ net/ipv6/ip6_tunnel.c | 18 +-
+ net/ipv6/ip6_vti.c | 14 +-
+ net/ipv6/ndisc.c | 8 +-
+ net/ipv6/ping.c | 3 -
+ net/ipv6/raw.c | 15 +-
+ net/ipv6/sit.c | 20 +-
+ net/ipv6/tcp_ipv6.c | 8 +-
+ net/ipv6/udp.c | 10 +-
+ net/l2tp/l2tp_ip6.c | 8 +-
+ net/mptcp/fastopen.c | 27 +-
+ net/mptcp/pm.c | 86 +-
+ net/mptcp/pm_netlink.c | 129 +-
+ net/mptcp/pm_userspace.c | 209 +-
+ net/mptcp/protocol.c | 317 +--
+ net/mptcp/protocol.h | 36 +-
+ net/mptcp/subflow.c | 36 +-
+ net/netlink/af_netlink.c | 1 +
+ net/nfc/hci/llc.c | 11 -
+ net/nfc/hci/llc.h | 1 -
+ net/packet/af_packet.c | 9 +-
+ net/rds/stats.c | 3 +-
+ net/sched/act_tunnel_key.c | 8 +-
+ net/sched/em_meta.c | 2 +-
+ net/socket.c | 2 +-
+ net/unix/af_unix.c | 1 -
+ net/xdp/xsk.c | 5 +-
+ net/xdp/xsk_buff_pool.c | 46 +-
+ net/xfrm/xfrm_interface_core.c | 15 +-
+ tools/include/uapi/linux/bpf.h | 30 +
+ tools/include/uapi/linux/if_xdp.h | 10 +
+ tools/include/uapi/linux/netdev.h | 16 +
+ tools/net/ynl/Makefile.deps | 5 +-
+ tools/net/ynl/pyynl/lib/ynl.py | 46 +-
+ tools/net/ynl/pyynl/ynl_gen_c.py | 36 +-
+ .../selftests/bpf/prog_tests/net_timestamping.c | 239 ++
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 1 +
+ .../testing/selftests/bpf/progs/net_timestamping.c | 248 ++
+ tools/testing/selftests/bpf/progs/setget_sockopt.c | 1 +
+ tools/testing/selftests/bpf/xdp_hw_metadata.c | 168 +-
+ tools/testing/selftests/drivers/net/.gitignore | 2 +
+ tools/testing/selftests/drivers/net/Makefile | 5 +
+ tools/testing/selftests/drivers/net/config | 1 +
+ tools/testing/selftests/drivers/net/hw/Makefile | 1 +
+ tools/testing/selftests/drivers/net/hw/csum.py | 50 +-
+ tools/testing/selftests/drivers/net/hw/devmem.py | 6 +-
+ tools/testing/selftests/drivers/net/hw/ncdevmem.c | 1 -
+ tools/testing/selftests/drivers/net/hw/rss_ctx.py | 46 +-
+ tools/testing/selftests/drivers/net/hw/tso.py | 241 ++
+ tools/testing/selftests/drivers/net/lib/py/env.py | 129 +-
+ .../selftests/drivers/net/lib/sh/lib_netcons.sh | 24 +
+ .../drivers/net/netcons_fragmented_msg.sh | 122 +
+ .../selftests/drivers/net/netcons_sysdata.sh | 167 ++
+ tools/testing/selftests/drivers/net/ping.py | 12 +-
+ tools/testing/selftests/drivers/net/queues.py | 45 +-
+ tools/testing/selftests/drivers/net/xdp_helper.c | 151 ++
+ tools/testing/selftests/net/.gitignore | 1 +
+ tools/testing/selftests/net/Makefile | 6 +-
+ tools/testing/selftests/net/config | 5 +
+ tools/testing/selftests/net/fcnal-test.sh | 4 +-
+ tools/testing/selftests/net/fdb_flush.sh | 2 +-
+ tools/testing/selftests/net/fib_nexthops.sh | 9 +-
+ tools/testing/selftests/net/fib_rule_tests.sh | 74 +
+ .../testing/selftests/net/forwarding/bridge_mdb.sh | 2 +-
+ tools/testing/selftests/net/forwarding/lib.sh | 10 -
+ .../selftests/net/forwarding/vxlan_bridge_1d.sh | 2 +
+ tools/testing/selftests/net/lib.sh | 19 +
+ tools/testing/selftests/net/lib/py/__init__.py | 4 +-
+ tools/testing/selftests/net/lib/py/ksft.py | 5 +
+ tools/testing/selftests/net/lib/py/netns.py | 18 +
+ tools/testing/selftests/net/lib/py/utils.py | 72 +-
+ tools/testing/selftests/net/lib/py/ynl.py | 4 +
+ tools/testing/selftests/net/link_netns.py | 141 ++
+ tools/testing/selftests/net/mptcp/simult_flows.sh | 2 +-
+ tools/testing/selftests/net/netns-name.sh | 10 +
+ tools/testing/selftests/net/nl_netdev.py | 18 +-
+ tools/testing/selftests/net/psock_tpacket.c | 2 +-
+ .../selftests/net/reuseaddr_ports_exhausted.c | 2 +-
+ tools/testing/selftests/net/rtnetlink.py | 30 +
+ tools/testing/selftests/net/so_rcv_listener.c | 168 ++
+ tools/testing/selftests/net/test_blackhole_dev.sh | 11 -
+ tools/testing/selftests/net/test_so_rcv.sh | 73 +
+ .../selftests/net/test_vxlan_fdb_changelink.sh | 111 +-
+ tools/testing/selftests/net/ynl.mk | 3 +-
+ 553 files changed, 21530 insertions(+), 8998 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl9301-mdio.yaml
+ rename Documentation/devicetree/bindings/{mfd => net}/realtek,rtl9301-switch.yaml (66%)
+ create mode 100644 Documentation/netlink/specs/conntrack.yaml
+ create mode 100644 Documentation/netlink/specs/nl80211.yaml
+ create mode 100644 drivers/net/ethernet/cisco/enic/enic_rq.c
+ create mode 100644 drivers/net/ethernet/cisco/enic/enic_rq.h
+ create mode 100644 drivers/net/ethernet/intel/iavf/iavf_ptp.c
+ create mode 100644 drivers/net/ethernet/intel/iavf/iavf_ptp.h
+ create mode 100644 drivers/net/ethernet/intel/iavf/iavf_types.h
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h
+ create mode 100644 drivers/net/ethernet/sfc/efx_reflash.c
+ create mode 100644 drivers/net/ethernet/sfc/efx_reflash.h
+ create mode 100644 drivers/net/ethernet/sfc/fw_formats.h
+ create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_ptp.c
+ create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_ptp.h
+ create mode 100644 drivers/net/mctp/mctp-usb.c
+ create mode 100644 drivers/net/tun_vnet.h
+ delete mode 100644 drivers/s390/net/lcs.c
+ delete mode 100644 drivers/s390/net/lcs.h
+ create mode 100644 include/linux/usb/mctp-usb.h
+ create mode 100644 include/net/page_pool/memory_provider.h
+ rename lib/{test_blackhole_dev.c => blackhole_dev_kunit.c} (68%)
+ create mode 100644 net/ipv4/igmp_internal.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/net_timestamping.c
+ create mode 100644 tools/testing/selftests/bpf/progs/net_timestamping.c
+ create mode 100644 tools/testing/selftests/drivers/net/.gitignore
+ create mode 100755 tools/testing/selftests/drivers/net/hw/tso.py
+ create mode 100755 tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh
+ create mode 100755 tools/testing/selftests/drivers/net/netcons_sysdata.sh
+ create mode 100644 tools/testing/selftests/drivers/net/xdp_helper.c
+ create mode 100755 tools/testing/selftests/net/link_netns.py
+ create mode 100755 tools/testing/selftests/net/rtnetlink.py
+ create mode 100644 tools/testing/selftests/net/so_rcv_listener.c
+ delete mode 100755 tools/testing/selftests/net/test_blackhole_dev.sh
+ create mode 100755 tools/testing/selftests/net/test_so_rcv.sh
+Merging bpf-next/for-next (d806176814b4 Merge branch 'bpf-next/net' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Auto-merging include/linux/mm.h
+Auto-merging mm/memory.c
+Auto-merging mm/nommu.c
+Auto-merging tools/bpf/runqslower/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/bpf/btf.rst | 25 +-
+ fs/bpf_fs_kfuncs.c | 225 ++++++-
+ include/linux/bpf.h | 10 +-
+ include/linux/bpf_lsm.h | 18 +
+ include/linux/bpf_verifier.h | 25 +-
+ include/linux/btf.h | 3 +
+ include/linux/mm.h | 5 +
+ include/uapi/linux/bpf.h | 5 +-
+ include/uapi/linux/btf.h | 3 +-
+ include/uapi/linux/xattr.h | 4 +
+ kernel/bpf/arena.c | 4 +-
+ kernel/bpf/bpf_iter.c | 13 +-
+ kernel/bpf/bpf_lsm.c | 2 +
+ kernel/bpf/bpf_struct_ops.c | 135 +++--
+ kernel/bpf/btf.c | 126 +++-
+ kernel/bpf/core.c | 19 +-
+ kernel/bpf/helpers.c | 45 ++
+ kernel/bpf/syscall.c | 1 +
+ kernel/bpf/verifier.c | 406 ++++++++-----
+ kernel/trace/bpf_trace.c | 2 +-
+ mm/memory.c | 118 ++++
+ mm/nommu.c | 79 +++
+ samples/bpf/Makefile | 2 +-
+ tools/bpf/bpftool/common.c | 3 +-
+ tools/bpf/bpftool/gen.c | 12 +-
+ tools/bpf/bpftool/link.c | 14 +-
+ tools/bpf/bpftool/main.c | 8 +-
+ tools/bpf/bpftool/map.c | 14 +-
+ tools/bpf/runqslower/Makefile | 3 +-
+ tools/include/uapi/linux/bpf.h | 5 +-
+ tools/include/uapi/linux/btf.h | 3 +-
+ tools/lib/bpf/btf.c | 90 ++-
+ tools/lib/bpf/btf.h | 3 +
+ tools/lib/bpf/btf_dump.c | 5 +-
+ tools/lib/bpf/libbpf.c | 26 +-
+ tools/lib/bpf/libbpf.map | 2 +
+ tools/lib/bpf/linker.c | 2 +-
+ tools/lib/bpf/relo_core.c | 24 +-
+ tools/testing/selftests/bpf/DENYLIST.aarch64 | 9 -
+ tools/testing/selftests/bpf/Makefile | 18 +-
+ tools/testing/selftests/bpf/bpf_kfuncs.h | 5 +
+ tools/testing/selftests/bpf/network_helpers.c | 50 +-
+ tools/testing/selftests/bpf/network_helpers.h | 12 +
+ .../selftests/bpf/prog_tests/bloom_filter_map.c | 5 +
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 68 +++
+ tools/testing/selftests/bpf/prog_tests/btf.c | 23 +-
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c | 147 +++--
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 6 +-
+ tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c | 162 ++++-
+ .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 49 +-
+ .../selftests/bpf/prog_tests/read_vsyscall.c | 1 +
+ .../selftests/bpf/prog_tests/setget_sockopt.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 1 +
+ tools/testing/selftests/bpf/prog_tests/tc_links.c | 28 +-
+ tools/testing/selftests/bpf/prog_tests/tc_opts.c | 40 +-
+ .../bpf/prog_tests/test_struct_ops_kptr_return.c | 16 +
+ .../bpf/prog_tests/test_struct_ops_refcounted.c | 14 +
+ .../selftests/bpf/prog_tests/test_xdp_veth.c | 658 ++++++++++++++++-----
+ tools/testing/selftests/bpf/progs/bpf_iter_tasks.c | 110 ++++
+ tools/testing/selftests/bpf/progs/bpf_misc.h | 5 +
+ ...ore_reloc_arrays___err_bad_signed_arr_elem_sz.c | 3 +
+ .../testing/selftests/bpf/progs/core_reloc_types.h | 10 +
+ tools/testing/selftests/bpf/progs/iters.c | 139 +++++
+ tools/testing/selftests/bpf/progs/read_vsyscall.c | 11 +-
+ .../selftests/bpf/progs/struct_ops_kptr_return.c | 30 +
+ .../struct_ops_kptr_return_fail__invalid_scalar.c | 26 +
+ .../struct_ops_kptr_return_fail__local_kptr.c | 34 ++
+ .../struct_ops_kptr_return_fail__nonzero_offset.c | 25 +
+ .../struct_ops_kptr_return_fail__wrong_type.c | 30 +
+ .../selftests/bpf/progs/struct_ops_refcounted.c | 31 +
+ .../struct_ops_refcounted_fail__global_subprog.c | 39 ++
+ .../progs/struct_ops_refcounted_fail__ref_leak.c | 22 +
+ .../progs/struct_ops_refcounted_fail__tail_call.c | 36 ++
+ .../selftests/bpf/progs/test_core_reloc_arrays.c | 5 +
+ tools/testing/selftests/bpf/progs/test_get_xattr.c | 28 +-
+ .../selftests/bpf/progs/test_set_remove_xattr.c | 133 +++++
+ .../selftests/bpf/progs/verifier_stack_ptr.c | 52 ++
+ .../testing/selftests/bpf/progs/xdp_redirect_map.c | 88 +++
+ .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 39 +-
+ tools/testing/selftests/bpf/test_btf.h | 6 +
+ .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 16 +
+ .../testing/selftests/bpf/test_kmods/bpf_testmod.h | 6 +
+ tools/testing/selftests/bpf/test_loader.c | 26 +
+ tools/testing/selftests/bpf/test_progs.c | 12 +
+ .../selftests/bpf/test_xdp_redirect_multi.sh | 214 -------
+ tools/testing/selftests/bpf/with_addr.sh | 54 --
+ tools/testing/selftests/bpf/with_tunnels.sh | 36 --
+ tools/testing/selftests/bpf/xdp_redirect_multi.c | 226 -------
+ 88 files changed, 3138 insertions(+), 1157 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_set_remove_xattr.c
+ delete mode 100755 tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+ delete mode 100755 tools/testing/selftests/bpf/with_addr.sh
+ delete mode 100755 tools/testing/selftests/bpf/with_tunnels.sh
+ delete mode 100644 tools/testing/selftests/bpf/xdp_redirect_multi.c
+Merging ipsec-next/master (e3aa43a50a64 xfrm: prevent high SEQ input in non-ESN mode)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Merge made by the 'ort' strategy.
+ net/xfrm/xfrm_user.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+Merging mlx5-next/mlx5-next (80df31f384b4 net/mlx5: Change POOL_NEXT_SIZE define value and make it global)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Merge made by the 'ort' strategy.
+ drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c | 6 ++++--
+ drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h | 2 --
+ drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 ++-
+ include/linux/mlx5/device.h | 1 +
+ include/linux/mlx5/fs.h | 2 ++
+ include/linux/mlx5/mlx5_ifc.h | 1 +
+ 7 files changed, 11 insertions(+), 6 deletions(-)
+Merging netfilter-next/main (4e41231249f4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
+Already up to date.
+Merging ipvs-next/main (4e41231249f4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
+Already up to date.
+Merging bluetooth/master (a4ce2f1cceba Bluetooth: Add check for mgmt_alloc_skb() in mgmt_device_connected())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Auto-merging drivers/bluetooth/btusb.c
+Auto-merging net/bluetooth/l2cap_core.c
+Merge made by the 'ort' strategy.
+ .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 12 +++++
+ .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 2 +
+ drivers/bluetooth/bfusb.c | 3 +-
+ drivers/bluetooth/btintel.c | 8 ++++
+ drivers/bluetooth/btintel.h | 1 +
+ drivers/bluetooth/btintel_pcie.c | 2 +
+ drivers/bluetooth/btnxpuart.c | 32 ++++++++++++--
+ drivers/bluetooth/btqca.c | 27 +++++++++---
+ drivers/bluetooth/btqca.h | 4 ++
+ drivers/bluetooth/btusb.c | 35 ++++++++++++++-
+ drivers/bluetooth/hci_ldisc.c | 19 +++++---
+ drivers/bluetooth/hci_qca.c | 27 +++++++++++-
+ drivers/bluetooth/hci_uart.h | 1 +
+ drivers/bluetooth/hci_vhci.c | 4 +-
+ include/net/bluetooth/hci_core.h | 2 -
+ include/net/bluetooth/l2cap.h | 4 +-
+ net/bluetooth/hci_sync.c | 2 +-
+ net/bluetooth/l2cap_core.c | 4 +-
+ net/bluetooth/mgmt.c | 51 ++++------------------
+ net/bluetooth/mgmt_util.c | 17 --------
+ net/bluetooth/mgmt_util.h | 4 --
+ net/bluetooth/smp.c | 2 +-
+ 22 files changed, 169 insertions(+), 94 deletions(-)
+Merging wireless-next/for-next (c61da149b9c2 Merge tag 'rtw-next-2025-02-10-v2' of https://github.com/pkshih/rtw)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
+Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
+Auto-merging net/mac80211/iface.c
+Auto-merging net/wireless/nl80211.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/net/rfkill-gpio.yaml | 5 +
+ drivers/net/wireless/broadcom/b43/main.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/libipw.h | 2 -
+ drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 91 -
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 1 -
+ drivers/net/wireless/intel/iwlwifi/cfg/ax210.c | 1 -
+ drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/tt.c | 11 -
+ drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 1 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 4 +-
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h | 2 +-
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 9 +-
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 91 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 18 +-
+ .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 42 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 108 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 3 -
+ drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 49 +
+ drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 23 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 24 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mld/roc.c | 224 ++
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 101 -
+ .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 86 -
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 54 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 23 -
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 12 -
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 61 -
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 -
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 237 +-
+ .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 15 +-
+ drivers/net/wireless/marvell/libertas/cmd.c | 143 +-
+ drivers/net/wireless/marvell/libertas/cmd.h | 10 -
+ drivers/net/wireless/marvell/libertas/cmdresp.c | 1 -
+ drivers/net/wireless/marvell/libertas/decl.h | 4 -
+ drivers/net/wireless/marvell/libertas/dev.h | 4 -
+ drivers/net/wireless/marvell/libertas/main.c | 88 +-
+ drivers/net/wireless/marvell/mwifiex/main.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/main.h | 4 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/uap_event.c | 16 -
+ drivers/net/wireless/marvell/mwifiex/usb.c | 4 +-
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h | 21 +-
+ drivers/net/wireless/realtek/rtl8xxxu/8192c.c | 2 +
+ drivers/net/wireless/realtek/rtl8xxxu/core.c | 17 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 6 +-
+ drivers/net/wireless/realtek/rtw88/fw.c | 15 +
+ drivers/net/wireless/realtek/rtw88/fw.h | 1 +
+ drivers/net/wireless/realtek/rtw88/mac.c | 6 +-
+ drivers/net/wireless/realtek/rtw88/main.c | 18 +-
+ drivers/net/wireless/realtek/rtw88/main.h | 36 +-
+ drivers/net/wireless/realtek/rtw88/pci.c | 4 +-
+ drivers/net/wireless/realtek/rtw88/phy.c | 191 +-
+ drivers/net/wireless/realtek/rtw88/phy.h | 20 +-
+ drivers/net/wireless/realtek/rtw88/reg.h | 3 +-
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 4 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 16 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 16 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/sar.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/sdio.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/usb.c | 2 +-
+ drivers/net/wireless/realtek/rtw89/Kconfig | 2 +-
+ drivers/net/wireless/realtek/rtw89/chan.c | 28 +-
+ drivers/net/wireless/realtek/rtw89/chan.h | 2 +-
+ drivers/net/wireless/realtek/rtw89/coex.c | 2829 +++++++++++---------
+ drivers/net/wireless/realtek/rtw89/coex.h | 18 +-
+ drivers/net/wireless/realtek/rtw89/core.c | 192 +-
+ drivers/net/wireless/realtek/rtw89/core.h | 169 +-
+ drivers/net/wireless/realtek/rtw89/debug.c | 2054 ++++++++------
+ drivers/net/wireless/realtek/rtw89/fw.c | 189 +-
+ drivers/net/wireless/realtek/rtw89/fw.h | 46 +-
+ drivers/net/wireless/realtek/rtw89/mac.c | 31 +-
+ drivers/net/wireless/realtek/rtw89/mac.h | 1 +
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 283 +-
+ drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +-
+ drivers/net/wireless/realtek/rtw89/phy.c | 746 +++---
+ drivers/net/wireless/realtek/rtw89/phy.h | 15 +-
+ drivers/net/wireless/realtek/rtw89/ps.c | 6 +-
+ drivers/net/wireless/realtek/rtw89/reg.h | 5 +
+ drivers/net/wireless/realtek/rtw89/regd.c | 574 ++--
+ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 15 +-
+ drivers/net/wireless/realtek/rtw89/sar.c | 63 +-
+ drivers/net/wireless/realtek/rtw89/sar.h | 5 +-
+ drivers/net/wireless/realtek/rtw89/ser.c | 17 +-
+ drivers/net/wireless/realtek/rtw89/util.c | 11 +
+ drivers/net/wireless/realtek/rtw89/util.h | 5 +-
+ drivers/net/wireless/realtek/rtw89/wow.c | 7 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 1 +
+ include/linux/ieee80211.h | 12 +
+ include/net/cfg80211.h | 2 +-
+ include/net/dropreason.h | 6 -
+ include/net/mac80211.h | 13 +-
+ include/uapi/linux/nl80211.h | 4 +-
+ net/mac80211/agg-rx.c | 22 +-
+ net/mac80211/agg-tx.c | 9 +-
+ net/mac80211/cfg.c | 18 +-
+ net/mac80211/debugfs.c | 44 +-
+ net/mac80211/driver-ops.h | 3 +-
+ net/mac80211/drop.h | 21 +-
+ net/mac80211/ieee80211_i.h | 30 +-
+ net/mac80211/iface.c | 66 +-
+ net/mac80211/main.c | 16 +-
+ net/mac80211/mlme.c | 582 +++-
+ net/mac80211/rx.c | 219 +-
+ net/mac80211/status.c | 34 +-
+ net/mac80211/tests/Makefile | 2 +-
+ net/mac80211/tests/chan-mode.c | 254 ++
+ net/mac80211/tests/util.c | 6 +-
+ net/mac80211/tx.c | 5 +-
+ net/rfkill/rfkill-gpio.c | 3 +
+ net/wireless/nl80211.c | 4 +
+ net/wireless/trace.h | 2 +-
+ 130 files changed, 6185 insertions(+), 4648 deletions(-)
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/roc.c
+ create mode 100644 net/mac80211/tests/chan-mode.c
+Merging ath-next/for-next (e180a01bf2c4 wifi: ath12k: Add NULL check to validate tpc_stats)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next
+Auto-merging drivers/net/wireless/ath/ath12k/wmi.c
+Auto-merging drivers/net/wireless/ath/ath12k/wmi.h
+Merge made by the 'ort' strategy.
+ drivers/net/wireless/ath/ath11k/Makefile | 1 +
+ drivers/net/wireless/ath/ath11k/ahb.c | 4 +-
+ drivers/net/wireless/ath/ath11k/core.c | 6 +-
+ drivers/net/wireless/ath/ath11k/core.h | 13 +-
+ drivers/net/wireless/ath/ath11k/coredump.c | 52 +
+ drivers/net/wireless/ath/ath11k/coredump.h | 79 ++
+ drivers/net/wireless/ath/ath11k/dp.c | 35 +-
+ drivers/net/wireless/ath/ath11k/dp.h | 6 +-
+ drivers/net/wireless/ath/ath11k/dp_rx.c | 133 +-
+ drivers/net/wireless/ath/ath11k/fw.c | 3 +-
+ drivers/net/wireless/ath/ath11k/hif.h | 7 +
+ drivers/net/wireless/ath/ath11k/mac.c | 72 +-
+ drivers/net/wireless/ath/ath11k/mhi.c | 5 +
+ drivers/net/wireless/ath/ath11k/mhi.h | 1 +
+ drivers/net/wireless/ath/ath11k/pci.c | 191 ++-
+ drivers/net/wireless/ath/ath11k/qmi.c | 19 +-
+ drivers/net/wireless/ath/ath11k/qmi.h | 10 +-
+ drivers/net/wireless/ath/ath11k/reg.c | 107 +-
+ drivers/net/wireless/ath/ath11k/reg.h | 3 +-
+ drivers/net/wireless/ath/ath11k/testmode.c | 80 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 11 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 11 +-
+ drivers/net/wireless/ath/ath12k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath12k/acpi.c | 202 ++-
+ drivers/net/wireless/ath/ath12k/acpi.h | 40 +-
+ drivers/net/wireless/ath/ath12k/core.c | 103 +-
+ drivers/net/wireless/ath/ath12k/core.h | 139 +-
+ drivers/net/wireless/ath/ath12k/debug.c | 6 +-
+ drivers/net/wireless/ath/ath12k/debug.h | 10 +-
+ drivers/net/wireless/ath/ath12k/debugfs.c | 1191 +++++++++++++++-
+ drivers/net/wireless/ath/ath12k/debugfs.h | 115 +-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 1238 ++++++++++++++++-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 453 ++++++-
+ drivers/net/wireless/ath/ath12k/debugfs_sta.c | 337 +++++
+ drivers/net/wireless/ath/ath12k/debugfs_sta.h | 24 +
+ drivers/net/wireless/ath/ath12k/dp.c | 5 +-
+ drivers/net/wireless/ath/ath12k/dp.h | 82 +-
+ drivers/net/wireless/ath/ath12k/dp_mon.c | 1425 ++++++++++++++++----
+ drivers/net/wireless/ath/ath12k/dp_mon.h | 11 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.c | 24 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.h | 8 +-
+ drivers/net/wireless/ath/ath12k/dp_tx.c | 249 +++-
+ drivers/net/wireless/ath/ath12k/dp_tx.h | 4 +-
+ drivers/net/wireless/ath/ath12k/hal_desc.h | 5 +-
+ drivers/net/wireless/ath/ath12k/hal_rx.h | 442 +++++-
+ drivers/net/wireless/ath/ath12k/hal_tx.h | 10 +-
+ drivers/net/wireless/ath/ath12k/hw.c | 8 +-
+ drivers/net/wireless/ath/ath12k/mac.c | 789 +++++++----
+ drivers/net/wireless/ath/ath12k/mac.h | 10 +-
+ drivers/net/wireless/ath/ath12k/pci.c | 18 +-
+ drivers/net/wireless/ath/ath12k/qmi.c | 23 +-
+ drivers/net/wireless/ath/ath12k/reg.h | 5 +-
+ drivers/net/wireless/ath/ath12k/rx_desc.h | 12 +-
+ drivers/net/wireless/ath/ath12k/testmode.c | 395 ++++++
+ drivers/net/wireless/ath/ath12k/testmode.h | 40 +
+ drivers/net/wireless/ath/ath12k/wmi.c | 1172 +++++++++++++++-
+ drivers/net/wireless/ath/ath12k/wmi.h | 290 +++-
+ drivers/net/wireless/ath/ath12k/wow.c | 3 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
+ drivers/net/wireless/ath/ath9k/common-spectral.c | 4 +-
+ drivers/net/wireless/ath/ath9k/init.c | 4 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 9 -
+ drivers/net/wireless/ath/{ath11k => }/testmode_i.h | 54 +-
+ 63 files changed, 8825 insertions(+), 989 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ath11k/coredump.c
+ create mode 100644 drivers/net/wireless/ath/ath11k/coredump.h
+ create mode 100644 drivers/net/wireless/ath/ath12k/debugfs_sta.c
+ create mode 100644 drivers/net/wireless/ath/ath12k/debugfs_sta.h
+ create mode 100644 drivers/net/wireless/ath/ath12k/testmode.c
+ create mode 100644 drivers/net/wireless/ath/ath12k/testmode.h
+ rename drivers/net/wireless/ath/{ath11k => }/testmode_i.h (50%)
+Merging wpan-next/master (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master
+Already up to date.
+Merging wpan-staging/staging (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
+$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
+Already up to date.
+Merging mtd/mtd/next (3f930a52d715 mtd: capture device name setting failure when adding mtd)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/mtd/mtd-physmap.yaml | 5 +++--
+ drivers/mtd/mtdcore.c | 5 ++++-
+ drivers/mtd/mtdpstore.c | 12 ++++++------
+ 3 files changed, 13 insertions(+), 9 deletions(-)
+Merging nand/nand/next (1db50b96b059 mtd: rawnand: qcom: finish converting register to FIELD_PREP)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Auto-merging drivers/mtd/nand/raw/qcom_nandc.c
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/arasan,nand-controller.yaml | 2 +-
+ drivers/mtd/nand/raw/qcom_nandc.c | 36 +-
+ drivers/mtd/nand/spi/Makefile | 3 +-
+ drivers/mtd/nand/spi/core.c | 50 ++-
+ drivers/mtd/nand/spi/esmt.c | 90 ++++-
+ drivers/mtd/nand/spi/micron.c | 135 +++++++-
+ drivers/mtd/nand/spi/otp.c | 362 +++++++++++++++++++++
+ include/linux/mtd/nand-qpic-common.h | 6 +-
+ include/linux/mtd/spinand.h | 110 +++++++
+ 9 files changed, 762 insertions(+), 32 deletions(-)
+ create mode 100644 drivers/mtd/nand/spi/otp.c
+Merging spi-nor/spi-nor/next (03e7bb864d9a mtd: spi-nor: use scope-based mutex cleanup helpers)
+$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
+Merge made by the 'ort' strategy.
+ drivers/mtd/spi-nor/core.c | 75 ++++++++++++------------------------
+ drivers/mtd/spi-nor/winbond.c | 88 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 112 insertions(+), 51 deletions(-)
+Merging crypto/master (b9874a66e404 crypto: ahash - Set default reqsize from ahash_alg)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../crypto/inside-secure,safexcel-eip93.yaml | 67 ++
+ .../devicetree/bindings/crypto/qcom-qce.yaml | 1 +
+ .../bindings/rng/rockchip,rk3588-rng.yaml | 60 ++
+ MAINTAINERS | 10 +
+ arch/arm/crypto/Kconfig | 6 +-
+ arch/powerpc/crypto/Kconfig | 4 +-
+ arch/x86/crypto/Kconfig | 6 +-
+ arch/x86/crypto/Makefile | 2 +-
+ arch/x86/crypto/aes-ctr-avx-x86_64.S | 592 ++++++++++++++
+ arch/x86/crypto/aes-xts-avx-x86_64.S | 55 +-
+ arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 597 --------------
+ arch/x86/crypto/aesni-intel_glue.c | 434 ++++++-----
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 23 +-
+ crypto/aead.c | 5 +-
+ crypto/ahash.c | 717 +++++++++++++----
+ crypto/algapi.c | 2 +-
+ crypto/api.c | 17 +-
+ crypto/asymmetric_keys/public_key.c | 9 +-
+ crypto/crypto_null.c | 37 +-
+ crypto/ecc.c | 2 +-
+ crypto/ecdsa-p1363.c | 2 +-
+ crypto/ecdsa-x962.c | 4 +-
+ crypto/rsassa-pkcs1.c | 2 +-
+ crypto/skcipher.c | 4 +-
+ crypto/tcrypt.c | 231 ++++++
+ crypto/testmgr.c | 7 +-
+ drivers/char/hw_random/Kconfig | 13 +-
+ drivers/char/hw_random/imx-rngc.c | 69 +-
+ drivers/char/hw_random/rockchip-rng.c | 254 +++++-
+ drivers/crypto/Kconfig | 1 +
+ drivers/crypto/Makefile | 2 +-
+ drivers/crypto/bcm/cipher.c | 27 +-
+ drivers/crypto/bcm/spu2.c | 3 +-
+ drivers/crypto/caam/caamalg_qi2.c | 3 +-
+ drivers/crypto/ccp/sp-pci.c | 16 +-
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 7 +
+ drivers/crypto/hisilicon/sec2/sec.h | 1 -
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 125 ++-
+ drivers/crypto/inside-secure/Makefile | 1 +
+ drivers/crypto/inside-secure/eip93/Kconfig | 20 +
+ drivers/crypto/inside-secure/eip93/Makefile | 5 +
+ drivers/crypto/inside-secure/eip93/eip93-aead.c | 711 +++++++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-aead.h | 38 +
+ drivers/crypto/inside-secure/eip93/eip93-aes.h | 16 +
+ drivers/crypto/inside-secure/eip93/eip93-cipher.c | 413 ++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-cipher.h | 60 ++
+ drivers/crypto/inside-secure/eip93/eip93-common.c | 822 +++++++++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-common.h | 24 +
+ drivers/crypto/inside-secure/eip93/eip93-des.h | 16 +
+ drivers/crypto/inside-secure/eip93/eip93-hash.c | 866 +++++++++++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-hash.h | 82 ++
+ drivers/crypto/inside-secure/eip93/eip93-main.c | 501 ++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-main.h | 151 ++++
+ drivers/crypto/inside-secure/eip93/eip93-regs.h | 335 ++++++++
+ drivers/crypto/intel/qat/qat_420xx/Makefile | 2 +-
+ .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 16 +-
+ drivers/crypto/intel/qat/qat_4xxx/Makefile | 2 +-
+ .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 11 +-
+ drivers/crypto/intel/qat/qat_c3xxx/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_c3xxxvf/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_c62x/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_c62xvf/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_common/Makefile | 68 +-
+ .../intel/qat/qat_common/adf_accel_devices.h | 1 +
+ .../crypto/intel/qat/qat_common/adf_cfg_services.c | 167 +++-
+ .../crypto/intel/qat/qat_common/adf_cfg_services.h | 28 +-
+ .../crypto/intel/qat/qat_common/adf_cfg_strings.h | 6 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_config.c | 15 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 26 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 1 +
+ drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 22 +-
+ .../crypto/intel/qat/qat_common/icp_qat_fw_comp.h | 4 +-
+ drivers/crypto/intel/qat/qat_dh895xcc/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_dh895xccvf/Makefile | 2 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 5 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 3 +-
+ .../crypto/virtio/virtio_crypto_akcipher_algs.c | 41 +-
+ drivers/crypto/virtio/virtio_crypto_mgr.c | 2 +-
+ .../crypto/virtio/virtio_crypto_skcipher_algs.c | 17 +-
+ include/crypto/algapi.h | 11 +
+ include/crypto/hash.h | 72 +-
+ include/crypto/internal/hash.h | 38 +
+ include/crypto/sig.h | 5 +-
+ include/crypto/skcipher.h | 19 +-
+ include/dt-bindings/reset/rockchip,rk3588-cru.h | 41 +-
+ include/linux/crypto.h | 24 +
+ include/linux/math.h | 12 +
+ include/linux/spinlock.h | 13 +
+ lib/842/842_compress.c | 2 +
+ lib/crypto/Kconfig | 26 +-
+ 90 files changed, 6793 insertions(+), 1397 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/inside-secure,safexcel-eip93.yaml
+ create mode 100644 Documentation/devicetree/bindings/rng/rockchip,rk3588-rng.yaml
+ create mode 100644 arch/x86/crypto/aes-ctr-avx-x86_64.S
+ delete mode 100644 arch/x86/crypto/aes_ctrby8_avx-x86_64.S
+ create mode 100644 drivers/crypto/inside-secure/eip93/Kconfig
+ create mode 100644 drivers/crypto/inside-secure/eip93/Makefile
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-aead.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-aead.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-aes.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-cipher.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-cipher.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-common.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-common.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-des.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-hash.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-hash.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-main.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-main.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-regs.h
+Merging drm/drm-next (7b91683e7de7 Merge tag 'drm-misc-next-2025-02-20' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
+Auto-merging CREDITS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/parisc/configs/generic-64bit_defconfig
+Auto-merging drivers/accel/amdxdna/amdxdna_mailbox.c
+Auto-merging drivers/gpu/drm/display/drm_dp_helper.c
+Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_display.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_drm.c
+Auto-merging drivers/gpu/drm/panthor/panthor_drv.c
+Auto-merging include/drm/display/drm_dp.h
+Merge made by the 'ort' strategy.
+ CREDITS | 4 +
+ .../bindings/display/bridge/ti,sn65dsi83.yaml | 3 +
+ .../bindings/display/panel/himax,hx83102.yaml | 6 +
+ .../devicetree/bindings/display/renesas,du.yaml | 36 +-
+ .../rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 3 +-
+ .../bindings/display/rockchip/rockchip-vop2.yaml | 4 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/gpu/drivers.rst | 1 +
+ Documentation/gpu/drm-uapi.rst | 116 +++-
+ Documentation/gpu/drm-usage-stats.rst | 5 +-
+ Documentation/gpu/nouveau.rst | 29 +
+ Documentation/gpu/panthor.rst | 10 +
+ Kbuild | 1 +
+ MAINTAINERS | 33 +-
+ arch/arm/configs/multi_v7_defconfig | 4 +-
+ arch/parisc/configs/generic-32bit_defconfig | 4 +-
+ arch/parisc/configs/generic-64bit_defconfig | 4 +-
+ drivers/accel/amdxdna/aie2_ctx.c | 73 +-
+ drivers/accel/amdxdna/aie2_error.c | 8 +-
+ drivers/accel/amdxdna/aie2_message.c | 10 +-
+ drivers/accel/amdxdna/aie2_pci.h | 10 +-
+ drivers/accel/amdxdna/aie2_smu.c | 2 +
+ drivers/accel/amdxdna/amdxdna_ctx.c | 2 +
+ drivers/accel/amdxdna/amdxdna_ctx.h | 3 +
+ drivers/accel/amdxdna/amdxdna_mailbox.c | 6 +-
+ drivers/accel/amdxdna/amdxdna_mailbox.h | 2 +-
+ drivers/accel/amdxdna/amdxdna_mailbox_helper.c | 6 +-
+ drivers/accel/amdxdna/amdxdna_mailbox_helper.h | 2 +-
+ drivers/accel/ivpu/ivpu_debugfs.c | 89 +++
+ drivers/accel/ivpu/ivpu_drv.c | 90 +--
+ drivers/accel/ivpu/ivpu_drv.h | 14 +-
+ drivers/accel/ivpu/ivpu_fw.c | 9 +-
+ drivers/accel/ivpu/ivpu_gem.c | 43 ++
+ drivers/accel/ivpu/ivpu_gem.h | 1 +
+ drivers/accel/ivpu/ivpu_hw.c | 110 +--
+ drivers/accel/ivpu/ivpu_hw.h | 14 +-
+ drivers/accel/ivpu/ivpu_hw_btrs.c | 10 +-
+ drivers/accel/ivpu/ivpu_hw_btrs.h | 1 +
+ drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h | 1 +
+ drivers/accel/ivpu/ivpu_hw_ip.c | 4 +-
+ drivers/accel/ivpu/ivpu_hw_reg_io.h | 62 +-
+ drivers/accel/ivpu/ivpu_ipc.c | 7 +-
+ drivers/accel/ivpu/ivpu_ipc.h | 2 +-
+ drivers/accel/ivpu/ivpu_job.c | 522 +++++++++++----
+ drivers/accel/ivpu/ivpu_job.h | 8 +-
+ drivers/accel/ivpu/ivpu_jsm_msg.c | 29 +-
+ drivers/accel/ivpu/ivpu_mmu.c | 121 +++-
+ drivers/accel/ivpu/ivpu_mmu.h | 2 +
+ drivers/accel/ivpu/ivpu_mmu_context.c | 13 -
+ drivers/accel/ivpu/ivpu_mmu_context.h | 2 -
+ drivers/accel/ivpu/ivpu_pm.c | 10 +-
+ drivers/accel/ivpu/ivpu_pm.h | 2 +-
+ drivers/accel/ivpu/ivpu_sysfs.c | 35 +-
+ drivers/accel/qaic/mhi_controller.c | 360 +++++++++-
+ drivers/accel/qaic/mhi_controller.h | 2 +-
+ drivers/accel/qaic/qaic.h | 14 +-
+ drivers/accel/qaic/qaic_drv.c | 97 ++-
+ drivers/accel/qaic/qaic_timesync.c | 2 +-
+ drivers/accel/qaic/sahara.c | 43 +-
+ drivers/bus/mhi/host/boot.c | 203 ++++--
+ drivers/bus/mhi/host/init.c | 2 +-
+ drivers/bus/mhi/host/internal.h | 7 +
+ drivers/dma-buf/dma-fence-unwrap.c | 11 +-
+ drivers/dma-buf/st-dma-fence-unwrap.c | 268 +++++++-
+ drivers/gpu/drm/Kconfig | 13 +-
+ drivers/gpu/drm/Makefile | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.h | 2 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 11 +-
+ drivers/gpu/drm/arm/Kconfig | 1 +
+ .../drm/arm/display/komeda/komeda_wb_connector.c | 2 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 2 +-
+ drivers/gpu/drm/ast/Makefile | 2 +
+ drivers/gpu/drm/ast/ast_cursor.c | 309 +++++++++
+ drivers/gpu/drm/ast/ast_dp.c | 269 +++++---
+ drivers/gpu/drm/ast/ast_drv.c | 8 +-
+ drivers/gpu/drm/ast/ast_drv.h | 73 +-
+ drivers/gpu/drm/ast/ast_main.c | 215 ++++--
+ drivers/gpu/drm/ast/ast_mode.c | 588 +++--------------
+ drivers/gpu/drm/ast/ast_post.c | 51 +-
+ drivers/gpu/drm/ast/ast_reg.h | 31 +-
+ drivers/gpu/drm/ast/ast_tables.h | 187 +-----
+ drivers/gpu/drm/ast/ast_vbios.c | 241 +++++++
+ drivers/gpu/drm/ast/ast_vbios.h | 108 +++
+ drivers/gpu/drm/bridge/Kconfig | 8 +
+ drivers/gpu/drm/bridge/Makefile | 4 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 5 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 16 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 29 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 8 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 19 +-
+ drivers/gpu/drm/bridge/chipone-icn6211.c | 7 +-
+ drivers/gpu/drm/bridge/fsl-ldb.c | 5 +-
+ drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 7 +-
+ drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 10 +-
+ drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 21 +-
+ .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 +-
+ drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 10 +-
+ drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 8 +-
+ drivers/gpu/drm/bridge/ite-it6263.c | 11 +-
+ drivers/gpu/drm/bridge/ite-it6505.c | 16 +-
+ drivers/gpu/drm/bridge/ite-it66121.c | 5 +-
+ drivers/gpu/drm/bridge/lontium-lt9211.c | 5 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 18 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 7 -
+ drivers/gpu/drm/bridge/microchip-lvds.c | 3 +-
+ drivers/gpu/drm/bridge/nwl-dsi.c | 11 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
+ drivers/gpu/drm/bridge/panel.c | 16 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
+ drivers/gpu/drm/bridge/parade-ps8640.c | 5 +-
+ drivers/gpu/drm/bridge/samsung-dsim.c | 8 +-
+ drivers/gpu/drm/bridge/sii902x.c | 4 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 5 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 6 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 6 +-
+ drivers/gpu/drm/bridge/tc358762.c | 11 +-
+ drivers/gpu/drm/bridge/tc358767.c | 20 +-
+ drivers/gpu/drm/bridge/tc358775.c | 1 -
+ drivers/gpu/drm/{i2c => bridge}/tda998x_drv.c | 49 +-
+ drivers/gpu/drm/bridge/ti-dlpc3433.c | 6 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 151 ++++-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 13 +-
+ drivers/gpu/drm/bridge/ti-tdp158.c | 6 +-
+ drivers/gpu/drm/ci/build.sh | 2 +-
+ drivers/gpu/drm/ci/build.yml | 104 ++-
+ drivers/gpu/drm/ci/container.yml | 22 +-
+ drivers/gpu/drm/ci/gitlab-ci.yml | 197 +++---
+ drivers/gpu/drm/ci/igt_runner.sh | 13 +-
+ drivers/gpu/drm/ci/image-tags.yml | 11 +-
+ drivers/gpu/drm/ci/lava-submit.sh | 100 ++-
+ drivers/gpu/drm/ci/test.yml | 37 +-
+ drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 8 +-
+ drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 21 +-
+ drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 20 +-
+ drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt | 14 +
+ drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 1 +
+ drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 8 +-
+ drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 22 +-
+ drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 7 +
+ drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 1 +
+ drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 31 +-
+ drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 7 +
+ drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 298 +++++++++
+ drivers/gpu/drm/ci/xfails/i915-jsl-fails.txt | 18 +-
+ drivers/gpu/drm/ci/xfails/i915-jsl-flakes.txt | 15 +-
+ drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 112 ++++
+ drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 55 +-
+ drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 13 +
+ drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 15 +-
+ drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 7 +
+ .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 7 +-
+ .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 7 +
+ .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 5 +
+ .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt | 12 +-
+ .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 3 +
+ .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 1 -
+ .../msm-sc7180-trogdor-kingoftown-flakes.txt | 14 +
+ .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 5 +
+ .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 1 -
+ .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 2 -
+ drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/msm-sm8350-hdk-fails.txt | 5 -
+ .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 26 +-
+ .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 13 +-
+ .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 56 ++
+ .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 5 +
+ .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 10 +-
+ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 543 ++++++++++++++-
+ drivers/gpu/drm/display/drm_bridge_connector.c | 2 +-
+ drivers/gpu/drm/display/drm_dp_helper.c | 58 ++
+ drivers/gpu/drm/display/drm_dp_mst_topology.c | 31 +-
+ drivers/gpu/drm/display/drm_hdmi_state_helper.c | 2 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 329 +++++----
+ drivers/gpu/drm/drm_atomic_uapi.c | 37 +-
+ drivers/gpu/drm/drm_bridge.c | 79 +--
+ drivers/gpu/drm/drm_buddy.c | 11 +-
+ drivers/gpu/drm/drm_crtc.c | 20 +
+ drivers/gpu/drm/drm_crtc_helper_internal.h | 2 +-
+ drivers/gpu/drm/drm_debugfs.c | 2 +-
+ drivers/gpu/drm/drm_drv.c | 68 ++
+ drivers/gpu/drm/drm_file.c | 26 +-
+ drivers/gpu/drm/drm_format_helper.c | 69 ++
+ drivers/gpu/drm/drm_managed.c | 8 +
+ drivers/gpu/drm/drm_of.c | 2 +-
+ drivers/gpu/drm/drm_panel.c | 5 +-
+ drivers/gpu/drm/drm_panel_orientation_quirks.c | 46 +-
+ drivers/gpu/drm/drm_panic.c | 2 +-
+ drivers/gpu/drm/drm_panic_qr.rs | 108 +--
+ drivers/gpu/drm/drm_probe_helper.c | 35 +-
+ drivers/gpu/drm/drm_writeback.c | 222 +++++--
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 20 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
+ drivers/gpu/drm/i2c/Kconfig | 36 -
+ drivers/gpu/drm/i2c/Makefile | 10 -
+ drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 4 +
+ drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dsi.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dsi.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 2 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 3 +
+ drivers/gpu/drm/imagination/pvr_job.c | 12 +-
+ drivers/gpu/drm/imagination/pvr_queue.c | 18 +-
+ drivers/gpu/drm/imx/ipuv3/imx-tve.c | 2 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +-
+ drivers/gpu/drm/lima/lima_sched.c | 16 +-
+ drivers/gpu/drm/loongson/lsdc_plane.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_dp.c | 6 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 9 +-
+ drivers/gpu/drm/mediatek/mtk_plane.c | 2 +-
+ drivers/gpu/drm/meson/meson_encoder_cvbs.c | 5 +-
+ drivers/gpu/drm/meson/meson_encoder_dsi.c | 5 +-
+ drivers/gpu/drm/meson/meson_encoder_hdmi.c | 5 +-
+ drivers/gpu/drm/mgag200/Makefile | 1 +
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 3 +
+ drivers/gpu/drm/mgag200/mgag200_g200eh5.c | 204 ++++++
+ .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 +-
+ drivers/gpu/drm/msm/dp/dp_display.c | 28 +-
+ drivers/gpu/drm/msm/dp/dp_drm.c | 19 +-
+ drivers/gpu/drm/msm/dp/dp_drm.h | 6 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 17 +-
+ drivers/gpu/drm/nouveau/Kconfig | 18 +
+ drivers/gpu/drm/nouveau/dispnv04/Kbuild | 3 +
+ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 17 +-
+ drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild | 5 +
+ .../drm/{ => nouveau/dispnv04}/i2c/ch7006_drv.c | 32 +-
+ .../drm/{ => nouveau/dispnv04}/i2c/ch7006_mode.c | 8 +-
+ .../drm/{ => nouveau/dispnv04}/i2c/ch7006_priv.h | 11 +-
+ .../drm/{ => nouveau/dispnv04}/i2c/sil164_drv.c | 35 +-
+ .../dispnv04/nouveau_i2c_encoder.c} | 95 +--
+ drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 24 +-
+ drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
+ .../gpu/drm/nouveau/include/dispnv04}/i2c/ch7006.h | 4 +-
+ .../drm/nouveau/include/dispnv04/i2c/encoder_i2c.h | 123 ++--
+ .../gpu/drm/nouveau/include/dispnv04}/i2c/sil164.h | 4 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 12 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 13 +-
+ drivers/gpu/drm/nouveau/nouveau_sched.c | 16 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 735 ++++++++++++++-------
+ drivers/gpu/drm/omapdrm/dss/dss.c | 14 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 17 -
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.h | 1 -
+ drivers/gpu/drm/panel/panel-ebbg-ft8719.c | 67 +-
+ drivers/gpu/drm/panel/panel-edp.c | 23 +
+ drivers/gpu/drm/panel/panel-himax-hx83102.c | 380 +++++++++++
+ .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 91 +--
+ drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 59 +-
+ drivers/gpu/drm/panel/panel-visionox-r66451.c | 181 +++--
+ drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 174 +++--
+ drivers/gpu/drm/panfrost/panfrost_job.c | 20 +-
+ drivers/gpu/drm/panthor/panthor_device.c | 22 +-
+ drivers/gpu/drm/panthor/panthor_drv.c | 14 +
+ drivers/gpu/drm/panthor/panthor_fw.c | 1 -
+ drivers/gpu/drm/panthor/panthor_gem.h | 5 -
+ drivers/gpu/drm/panthor/panthor_heap.c | 26 +
+ drivers/gpu/drm/panthor/panthor_heap.h | 2 +
+ drivers/gpu/drm/panthor/panthor_mmu.c | 120 ++--
+ drivers/gpu/drm/panthor/panthor_mmu.h | 3 +
+ drivers/gpu/drm/panthor/panthor_sched.c | 89 ++-
+ drivers/gpu/drm/panthor/panthor_sched.h | 3 +
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 5 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 4 +-
+ drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 5 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
+ drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 234 +++++--
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 36 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 92 ++-
+ drivers/gpu/drm/solomon/ssd130x-spi.c | 7 +-
+ drivers/gpu/drm/solomon/ssd130x.c | 6 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 2 +-
+ drivers/gpu/drm/sti/sti_hda.c | 12 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
+ drivers/gpu/drm/stm/lvds.c | 5 +-
+ drivers/gpu/drm/tegra/dc.c | 3 +-
+ drivers/gpu/drm/tegra/dsi.c | 2 +-
+ drivers/gpu/drm/tegra/hdmi.c | 2 +-
+ drivers/gpu/drm/tegra/sor.c | 2 +-
+ drivers/gpu/drm/tests/Makefile | 1 +
+ drivers/gpu/drm/tests/drm_atomic_state_test.c | 375 +++++++++++
+ drivers/gpu/drm/tests/drm_buddy_test.c | 30 +-
+ drivers/gpu/drm/tidss/tidss_dispc_regs.h | 2 +-
+ drivers/gpu/drm/tidss/tidss_plane.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_pool.c | 183 ++---
+ drivers/gpu/drm/ttm/ttm_resource.c | 50 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 25 +-
+ drivers/gpu/drm/v3d/v3d_drv.h | 1 -
+ drivers/gpu/drm/v3d/v3d_sched.c | 67 +-
+ drivers/gpu/drm/vc4/Kconfig | 1 +
+ drivers/gpu/drm/vc4/vc4_crtc.c | 33 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 27 -
+ drivers/gpu/drm/vc4/vc4_dsi.c | 9 +-
+ drivers/gpu/drm/vc4/vc4_gem.c | 183 ++---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 30 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_validate.c | 11 -
+ drivers/gpu/drm/virtio/virtgpu_display.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 41 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 11 +
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 14 +
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 96 +++
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 36 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 154 +++++
+ drivers/gpu/drm/virtio/virtgpu_vram.c | 9 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 35 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 24 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 11 +-
+ drivers/gpu/drm/vkms/vkms_formats.c | 32 +
+ drivers/gpu/drm/vkms/vkms_output.c | 61 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 1 +
+ drivers/gpu/drm/vkms/vkms_writeback.c | 37 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
+ drivers/gpu/drm/xe/xe_device.c | 7 +-
+ drivers/gpu/drm/xe/xe_execlist.c | 15 +-
+ drivers/gpu/drm/xe/xe_gpu_scheduler.c | 17 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 165 ++---
+ drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 4 +
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +
+ drivers/media/cec/i2c/Kconfig | 9 +
+ drivers/media/cec/i2c/Makefile | 1 +
+ drivers/{gpu/drm => media/cec}/i2c/tda9950.c | 0
+ include/Kbuild | 1 +
+ include/drm/Makefile | 18 +
+ include/drm/display/drm_dp.h | 14 +
+ include/drm/display/drm_dp_helper.h | 1 +
+ include/drm/display/drm_dp_mst_helper.h | 7 +
+ include/drm/display/drm_hdmi_state_helper.h | 2 +-
+ include/drm/drm_atomic.h | 54 +-
+ include/drm/drm_atomic_helper.h | 2 +
+ include/drm/drm_bridge.h | 8 +-
+ include/drm/drm_client_event.h | 2 +
+ include/drm/drm_crtc.h | 2 +-
+ include/drm/drm_device.h | 8 +
+ include/drm/drm_drv.h | 1 +
+ include/drm/drm_file.h | 5 +
+ include/drm/drm_format_helper.h | 3 +
+ include/drm/drm_managed.h | 12 +
+ include/drm/drm_mode_object.h | 2 +-
+ include/drm/drm_modeset_helper_vtables.h | 11 +-
+ include/drm/drm_panel.h | 1 -
+ include/drm/drm_writeback.h | 6 +
+ include/drm/gpu_scheduler.h | 56 +-
+ include/drm/i2c/tda998x.h | 40 --
+ include/drm/ttm/ttm_resource.h | 11 +-
+ include/sound/hdmi-codec.h | 1 +
+ include/uapi/drm/drm_fourcc.h | 41 ++
+ include/uapi/drm/ivpu_accel.h | 84 +++
+ include/uapi/drm/panthor_drm.h | 86 +--
+ sound/soc/codecs/hdmi-codec.c | 4 +
+ 403 files changed, 9707 insertions(+), 4458 deletions(-)
+ create mode 100644 Documentation/gpu/nouveau.rst
+ create mode 100644 drivers/gpu/drm/ast/ast_cursor.c
+ create mode 100644 drivers/gpu/drm/ast/ast_vbios.c
+ create mode 100644 drivers/gpu/drm/ast/ast_vbios.h
+ rename drivers/gpu/drm/{i2c => bridge}/tda998x_drv.c (97%)
+ delete mode 100644 drivers/gpu/drm/i2c/Kconfig
+ delete mode 100644 drivers/gpu/drm/i2c/Makefile
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh5.c
+ create mode 100644 drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/ch7006_drv.c (94%)
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/ch7006_mode.c (98%)
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/ch7006_priv.h (97%)
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/sil164_drv.c (92%)
+ rename drivers/gpu/drm/{drm_encoder_slave.c => nouveau/dispnv04/nouveau_i2c_encoder.c} (54%)
+ rename {include/drm => drivers/gpu/drm/nouveau/include/dispnv04}/i2c/ch7006.h (97%)
+ rename include/drm/drm_encoder_slave.h => drivers/gpu/drm/nouveau/include/dispnv04/i2c/encoder_i2c.h (59%)
+ rename {include/drm => drivers/gpu/drm/nouveau/include/dispnv04}/i2c/sil164.h (96%)
+ create mode 100644 drivers/gpu/drm/tests/drm_atomic_state_test.c
+ rename drivers/{gpu/drm => media/cec}/i2c/tda9950.c (100%)
+ create mode 100644 include/Kbuild
+ create mode 100644 include/drm/Makefile
+ delete mode 100644 include/drm/i2c/tda998x.h
+Merging drm-exynos/for-linux-next (81a50378559b drm/exynos: Remove unnecessary checking)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging drm-misc/for-linux-next (4d098000ac19 drm/repaper: fix integer overflows in repeat functions)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .mailmap | 3 +-
+ MAINTAINERS | 2 +-
+ drivers/bus/mhi/host/boot.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 22 ++++-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 4 +
+ drivers/gpu/drm/drm_writeback.c | 2 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 2 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 23 ++---
+ drivers/gpu/drm/scheduler/sched_fence.c | 2 +
+ drivers/gpu/drm/scheduler/sched_internal.h | 91 +++++++++++++++++++
+ drivers/gpu/drm/scheduler/sched_main.c | 7 +-
+ drivers/gpu/drm/tiny/repaper.c | 4 +-
+ include/drm/gpu_scheduler.h | 124 +++++++++++---------------
+ 14 files changed, 187 insertions(+), 107 deletions(-)
+ create mode 100644 drivers/gpu/drm/scheduler/sched_internal.h
+Merging amdgpu/drm-next (3521276ad14f drm/amdgpu: update the handle ptr in get_clockgating_state)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 372f0f77557d] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 46 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 58 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 564 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h | 105 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 102 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 116 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 19 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 84 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 16 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 95 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 42 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 465 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 100 +-
+ .../gpu/drm/amd/amdgpu/gfx_v10_0_cleaner_shader.h | 35 +
+ .../drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm | 126 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 74 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 92 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 142 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 346 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 22 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 61 +
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 19 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 25 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 31 +
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nv.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/nvd.h | 208 +
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 10 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/soc15d.h | 139 +
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/soc24.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 821 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 6 -
+ drivers/gpu/drm/amd/amdgpu/vi.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 18 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 25 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 14 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 9 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 87 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 43 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 24 -
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 14 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 121 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 23 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 62 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 17 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 141 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 20 +
+ drivers/gpu/drm/amd/display/dc/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 15 +-
+ .../amd/display/dc/bios/command_table_helper2.c | 1 +
+ .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 17 +-
+ .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 2 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 169 +-
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 5 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 27 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 6 +
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 299 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 31 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 19 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 50 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 12 +
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_plane.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 12 -
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 7 +
+ .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 24 +-
+ .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 40 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 +
+ .../drm/amd/display/dc/dce110/dce110_compressor.c | 13 -
+ .../drm/amd/display/dc/dce110/dce110_compressor.h | 2 -
+ .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 1 +
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 7 +-
+ .../display/dc/dio/dcn10/dcn10_stream_encoder.c | 3 +-
+ .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 2 +-
+ .../dc/dio/dcn30/dcn30_dio_stream_encoder.h | 6 +-
+ .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 15 +-
+ .../dc/dio/dcn401/dcn401_dio_stream_encoder.h | 18 +
+ .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 3 +
+ .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 2 +
+ .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 1 +
+ .../display/dc/dml2/display_mode_core_structs.h | 1 +
+ .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 1 -
+ .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 14 +
+ .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 10 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 32 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 3 -
+ .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 126 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 12413 ----
+ .../dml21/src/dml2_core/dml2_core_shared_types.h | 12 +
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.c | 3 +-
+ .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 4 +-
+ .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 2 -
+ .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 2 +-
+ .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 20 +
+ .../dml2/dml21/src/dml2_top/dml2_top_interfaces.c | 1 -
+ .../dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c | 8 -
+ .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 354 -
+ .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 5 -
+ .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 6 +-
+ .../dml21/src/inc/dml2_internal_shared_types.h | 6 -
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c | 1 +
+ .../amd/display/dc/dml2/dml2_translation_helper.c | 3 +
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 1 +
+ .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 1 -
+ .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 1 -
+ .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 19 +-
+ .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 7 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 +
+ .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 3 +-
+ .../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.c | 2 +-
+ .../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.h | 1 +
+ .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 18 -
+ .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 3 -
+ .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 14 +-
+ .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h | 16 +
+ .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 5 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 2 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 2 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.h | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 8 +
+ .../drm/amd/display/dc/hwss/dce100/dce100_hwseq.c | 30 +
+ .../drm/amd/display/dc/hwss/dce100/dce100_hwseq.h | 4 +
+ .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 3 +
+ .../drm/amd/display/dc/hwss/dce120/dce120_hwseq.c | 2 +
+ .../drm/amd/display/dc/hwss/dce80/dce80_hwseq.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 102 +-
+ .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h | 4 +
+ .../gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 17 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn201/dcn201_init.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 5 +
+ .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 5 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 84 +-
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 7 +
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +-
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 30 +-
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 30 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 5 -
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 +
+ .../amd/display/dc/irq/dcn36/irq_service_dcn36.c | 408 +
+ .../amd/display/dc/irq/dcn36/irq_service_dcn36.h | 12 +
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 1 +
+ .../display/dc/link/protocols/link_dp_capability.c | 12 +-
+ .../amd/display/dc/link/protocols/link_dp_phy.c | 8 +-
+ .../display/dc/link/protocols/link_dp_training.c | 2 +
+ .../dc/link/protocols/link_dp_training_8b_10b.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/mpc/Makefile | 2 +-
+ .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 16 -
+ .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.h | 4 -
+ .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 4 +-
+ .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 5 +-
+ .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 7 +-
+ .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 16 +-
+ .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 1 +
+ .../drm/amd/display/dc/optc/dcn201/dcn201_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.c | 1 +
+ .../drm/amd/display/dc/optc/dcn301/dcn301_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 71 +
+ .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h | 7 +-
+ .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 1 +
+ .../drm/amd/display/dc/optc/dcn314/dcn314_optc.h | 4 +-
+ .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h | 3 +-
+ .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 3 +-
+ .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 23 +-
+ .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 22 +-
+ drivers/gpu/drm/amd/display/dc/resource/Makefile | 8 +
+ .../display/dc/resource/dce120/dce120_resource.c | 17 +
+ .../amd/display/dc/resource/dcn21/dcn21_resource.c | 6 +-
+ .../amd/display/dc/resource/dcn32/dcn32_resource.h | 3 +-
+ .../amd/display/dc/resource/dcn35/dcn35_resource.c | 7 +-
+ .../amd/display/dc/resource/dcn35/dcn35_resource.h | 3 +-
+ .../display/dc/resource/dcn351/dcn351_resource.c | 7 +-
+ .../amd/display/dc/resource/dcn36/dcn36_resource.c | 2171 +
+ .../amd/display/dc/resource/dcn36/dcn36_resource.h | 73 +
+ .../display/dc/resource/dcn401/dcn401_resource.c | 12 +-
+ .../display/dc/resource/dcn401/dcn401_resource.h | 3 +-
+ .../drm/amd/display/dc/spl/dc_spl_scl_filters.h | 22 -
+ .../gpu/drm/amd/display/dc/{spl => sspl}/Makefile | 2 +-
+ .../gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c | 31 +-
+ .../gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.h | 0
+ .../amd/display/dc/{spl => sspl}/dc_spl_filters.c | 0
+ .../amd/display/dc/{spl => sspl}/dc_spl_filters.h | 0
+ .../dc/{spl => sspl}/dc_spl_isharp_filters.c | 458 +-
+ .../dc/{spl => sspl}/dc_spl_isharp_filters.h | 18 +-
+ .../dc/{spl => sspl}/dc_spl_scl_easf_filters.c | 1056 +-
+ .../dc/{spl => sspl}/dc_spl_scl_easf_filters.h | 9 +-
+ .../display/dc/{spl => sspl}/dc_spl_scl_filters.c | 232 +-
+ .../drm/amd/display/dc/sspl/dc_spl_scl_filters.h | 13 +
+ .../amd/display/dc/{spl => sspl}/dc_spl_types.h | 0
+ .../display/dc/{spl => sspl}/spl_custom_float.c | 0
+ .../display/dc/{spl => sspl}/spl_custom_float.h | 0
+ .../drm/amd/display/dc/{spl => sspl}/spl_debug.h | 0
+ .../amd/display/dc/{spl => sspl}/spl_fixpt31_32.c | 0
+ .../amd/display/dc/{spl => sspl}/spl_fixpt31_32.h | 0
+ .../amd/display/dc/{spl => sspl}/spl_os_types.h | 0
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 6 +
+ drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.c | 34 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.h | 13 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 +
+ drivers/gpu/drm/amd/display/include/dal_types.h | 1 +
+ drivers/gpu/drm/amd/display/include/logger_types.h | 1 +
+ .../drm/amd/display/modules/freesync/freesync.c | 137 -
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 26 -
+ .../amd/display/modules/info_packet/info_packet.c | 4 +-
+ drivers/gpu/drm/amd/include/amd_cper.h | 269 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 2 +-
+ .../amd/include/asic_reg/dcn/dcn_3_6_0_offset.h | 15485 +++++
+ .../amd/include/asic_reg/dcn/dcn_3_6_0_sh_mask.h | 61940 +++++++++++++++++++
+ .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 32 +
+ .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 48 +
+ .../amd/include/asic_reg/vcn/vcn_4_0_3_offset.h | 37 +-
+ drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +-
+ drivers/gpu/drm/amd/include/mes_v12_api_def.h | 42 +-
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 3 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 641 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 26 +-
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 138 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 115 +-
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 5 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 6 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 101 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 238 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 8 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 +-
+ drivers/gpu/drm/radeon/ci_dpm.c | 34 +-
+ include/uapi/drm/amdgpu_drm.h | 10 +
+ 361 files changed, 87605 insertions(+), 16753 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/Makefile (96%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c (98%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.c (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.c (62%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.h (61%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.c (60%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.h (79%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.c (87%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.h
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_types.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.c (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_debug.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.c (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_os_types.h (100%)
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.h
+ create mode 100644 drivers/gpu/drm/amd/include/amd_cper.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_6_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_6_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
+Merging drm-intel/for-linux-next (5b99dd12fe53 drm/i915/hdcp: Create force_hdcp14 debug fs entry)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/i915/display/dvo_ns2501.c
+Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c
+Auto-merging drivers/gpu/drm/i915/display/intel_crt.c
+Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dsi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dvo.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dvo_dev.h
+Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c
+Auto-merging drivers/gpu/drm/i915/display/intel_tv.c
+Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c
+Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+Auto-merging include/drm/display/drm_dp.h
+Resolved 'drivers/gpu/drm/i915/display/intel_dp.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/display/intel_dp_mst.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ecff667181c4] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 2 +-
+ drivers/gpu/drm/display/drm_dp_dual_mode_helper.c | 4 +-
+ drivers/gpu/drm/i915/Makefile | 2 +
+ drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c | 112 +--
+ drivers/gpu/drm/i915/display/g4x_dp.h | 14 +-
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 170 ++--
+ drivers/gpu/drm/i915/display/g4x_hdmi.h | 6 +-
+ drivers/gpu/drm/i915/display/hsw_ips.c | 26 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 372 ++++---
+ drivers/gpu/drm/i915/display/i9xx_plane.h | 10 +-
+ drivers/gpu/drm/i915/display/i9xx_wm.c | 6 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 36 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 352 ++++++-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 7 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 498 +++++-----
+ drivers/gpu/drm/i915/display/intel_audio.h | 14 +-
+ drivers/gpu/drm/i915/display/intel_backlight.c | 496 +++++-----
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 174 ++--
+ drivers/gpu/drm/i915/display/intel_cmtg.c | 189 ++++
+ drivers/gpu/drm/i915/display/intel_cmtg.h | 13 +
+ drivers/gpu/drm/i915/display/intel_cmtg_regs.h | 21 +
+ drivers/gpu/drm/i915/display/intel_color.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 180 ++--
+ drivers/gpu/drm/i915/display/intel_combo_phy.h | 8 +-
+ drivers/gpu/drm/i915/display/intel_connector.c | 42 +
+ drivers/gpu/drm/i915/display/intel_connector.h | 2 +
+ drivers/gpu/drm/i915/display/intel_crt.c | 43 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 78 +-
+ drivers/gpu/drm/i915/display/intel_crtc.h | 7 +-
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 212 ++--
+ drivers/gpu/drm/i915/display/intel_cursor.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 299 ++++--
+ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 33 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 488 +++++----
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 58 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 904 ++++++-----------
+ drivers/gpu/drm/i915/display/intel_display.h | 33 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 261 ++---
+ .../gpu/drm/i915/display/intel_display_device.c | 13 +
+ .../gpu/drm/i915/display/intel_display_device.h | 13 +
+ .../gpu/drm/i915/display/intel_display_driver.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 789 +++++++++++----
+ drivers/gpu/drm/i915/display/intel_display_irq.h | 8 +-
+ .../gpu/drm/i915/display/intel_display_params.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 129 +--
+ drivers/gpu/drm/i915/display/intel_display_power.h | 71 +-
+ .../drm/i915/display/intel_display_power_well.c | 19 +-
+ .../drm/i915/display/intel_display_power_well.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_reset.c | 2 +
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 150 ++-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 45 +-
+ drivers/gpu/drm/i915/display/intel_dkl_phy.c | 54 +-
+ drivers/gpu/drm/i915/display/intel_dkl_phy.h | 9 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_dmc_wl.c | 76 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 324 +++---
+ drivers/gpu/drm/i915/display/intel_dp.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 5 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 181 +++-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 391 ++++----
+ drivers/gpu/drm/i915/display/intel_dp_mst.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_dp_test.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 36 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.h | 6 +
+ drivers/gpu/drm/i915/display/intel_dpll.c | 41 +-
+ drivers/gpu/drm/i915/display/intel_dpll.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1044 ++++++++++----------
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 29 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 126 ++-
+ drivers/gpu/drm/i915/display/intel_dsb.h | 3 +
+ drivers/gpu/drm/i915/display/intel_dsi.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_fb.c | 410 +++++---
+ drivers/gpu/drm/i915/display/intel_fb.h | 31 +-
+ drivers/gpu/drm/i915/display/intel_fb_bo.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_fb_bo.h | 8 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.c | 23 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.h | 8 +
+ drivers/gpu/drm/i915/display/intel_fdi.c | 21 +-
+ drivers/gpu/drm/i915/display/intel_fdi.h | 7 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 183 ++--
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 18 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 199 +++-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 11 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 9 +
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 31 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_link_bw.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_lpe_audio.c | 118 +--
+ drivers/gpu/drm/i915/display/intel_lpe_audio.h | 18 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 30 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.h | 25 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_pch_display.c | 49 +-
+ drivers/gpu/drm/i915/display/intel_pch_refclk.c | 34 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 34 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 230 +++--
+ drivers/gpu/drm/i915/display/intel_psr.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_psr_regs.h | 10 +
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 300 +++---
+ drivers/gpu/drm/i915/display/intel_sdvo.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 364 +++++++
+ drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.h | 17 +
+ drivers/gpu/drm/i915/display/intel_snps_phy.c | 39 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.h | 1 -
+ drivers/gpu/drm/i915/display/intel_sprite.c | 178 ++--
+ drivers/gpu/drm/i915/display/intel_sprite.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 90 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_vblank.c | 86 +-
+ drivers/gpu/drm/i915/display/intel_vblank.h | 6 +
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 67 +-
+ drivers/gpu/drm/i915/display/intel_vga.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_vrr.c | 172 +++-
+ drivers/gpu/drm/i915/display/intel_vrr.h | 9 +-
+ drivers/gpu/drm/i915/display/skl_scaler.c | 330 ++++---
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 652 +++++++-----
+ drivers/gpu/drm/i915/display/skl_universal_plane.h | 14 +-
+ drivers/gpu/drm/i915/display/skl_watermark.c | 113 ++-
+ drivers/gpu/drm/i915/display/skl_watermark.h | 3 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 14 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 14 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 10 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 17 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +-
+ drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 8 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_migrate.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_rps_types.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_sa_media.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_rc6.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_rps.c | 2 +-
+ drivers/gpu/drm/i915/gt/shaders/README | 6 +-
+ .../gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm | 2 +-
+ .../gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm | 2 +-
+ drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 39 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +-
+ .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 15 +-
+ drivers/gpu/drm/i915/gvt/display.c | 2 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/gvt/edid.c | 2 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 117 ---
+ drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 -
+ drivers/gpu/drm/i915/gvt/gtt.c | 68 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 14 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 23 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
+ drivers/gpu/drm/i915/gvt/mmio.h | 3 -
+ drivers/gpu/drm/i915/gvt/mmio_context.c | 6 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 11 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 6 +-
+ drivers/gpu/drm/i915/i915_driver.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.h | 1 -
+ drivers/gpu/drm/i915/i915_gem.c | 6 +-
+ drivers/gpu/drm/i915/i915_irq.c | 69 +-
+ drivers/gpu/drm/i915/i915_irq.h | 4 +
+ drivers/gpu/drm/i915/i915_module.c | 2 +-
+ drivers/gpu/drm/i915/i915_perf.c | 19 +-
+ drivers/gpu/drm/i915/i915_pmu.h | 2 +-
+ drivers/gpu/drm/i915/i915_reg.h | 71 +-
+ drivers/gpu/drm/i915/i915_reg_defs.h | 8 +
+ drivers/gpu/drm/i915/i915_request.c | 2 +-
+ drivers/gpu/drm/i915/i915_request.h | 4 +-
+ drivers/gpu/drm/i915/i915_vma.c | 10 +-
+ drivers/gpu/drm/i915/intel_clock_gating.c | 2 +-
+ drivers/gpu/drm/i915/intel_gvt.c | 2 +-
+ drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 2 +-
+ .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h | 2 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 21 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 15 +-
+ drivers/gpu/drm/i915/soc/intel_pch.c | 44 +-
+ drivers/gpu/drm/i915/soc/intel_pch.h | 45 +-
+ drivers/gpu/drm/xe/Kconfig | 14 +
+ drivers/gpu/drm/xe/Makefile | 5 +
+ drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h | 3 +
+ drivers/gpu/drm/xe/display/ext/i915_irq.c | 23 +
+ drivers/gpu/drm/xe/display/intel_fb_bo.c | 7 +-
+ drivers/gpu/drm/xe/display/xe_display.c | 2 +-
+ drivers/gpu/drm/xe/display/xe_fb_pin.c | 49 +-
+ drivers/gpu/drm/xe/display/xe_plane_initial.c | 12 +-
+ drivers/gpu/drm/xe/xe_device_types.h | 1 -
+ include/drm/display/drm_dp.h | 3 +-
+ include/drm/display/drm_dp_dual_mode_helper.h | 2 +-
+ include/drm/intel/pciids.h | 7 +-
+ 237 files changed, 8191 insertions(+), 5759 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_cmtg.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_cmtg.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_cmtg_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.h
+Merging drm-msm/msm-next (866e43b945bf drm/msm: UAPI error reporting)
+$ 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 (ca3524d40556 drm/msm/dpu: rate limit snapshot capture for mmu faults)
+$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_display.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_drm.c
+Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c
+Auto-merging drivers/gpu/drm/msm/msm_atomic.c
+Auto-merging drivers/gpu/drm/msm/msm_kms.c
+Merge made by the 'ort' strategy.
+ .../bindings/display/msm/dsi-phy-common.yaml | 2 +
+ .../bindings/display/msm/qcom,sm8550-mdss.yaml | 14 +-
+ .../bindings/display/msm/qcom,sm8650-mdss.yaml | 13 +-
+ MAINTAINERS | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 18 ++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 164 +++++++++--------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 +
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 26 +++
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 3 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 25 +--
+ drivers/gpu/drm/msm/dp/dp_display.c | 4 +-
+ drivers/gpu/drm/msm/dp/dp_drm.c | 5 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 193 ++++++++++-----------
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 32 ++--
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 21 +--
+ drivers/gpu/drm/msm/msm_atomic.c | 15 +-
+ drivers/gpu/drm/msm/msm_dsc_helper.h | 11 --
+ drivers/gpu/drm/msm/msm_iommu.c | 32 +++-
+ drivers/gpu/drm/msm/msm_kms.c | 18 +-
+ drivers/gpu/drm/msm/msm_kms.h | 10 ++
+ drivers/gpu/drm/msm/msm_mmu.h | 1 +
+ .../gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 1 +
+ include/dt-bindings/clock/qcom,dsi-phy-28nm.h | 9 +
+ 30 files changed, 403 insertions(+), 237 deletions(-)
+ create mode 100644 include/dt-bindings/clock/qcom,dsi-phy-28nm.h
+Merging drm-xe/drm-xe-next (30341f0b8ea7 drm/xe/oa: Allow oa_exponent value of 0)
+$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.c
+Auto-merging drivers/gpu/drm/i915/i915_driver.c
+Auto-merging drivers/gpu/drm/xe/Makefile
+Auto-merging drivers/gpu/drm/xe/display/intel_fb_bo.c
+Auto-merging drivers/gpu/drm/xe/display/xe_display.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c
+Auto-merging drivers/gpu/drm/xe/display/xe_plane_initial.c
+Auto-merging drivers/gpu/drm/xe/xe_devcoredump.c
+Auto-merging drivers/gpu/drm/xe/xe_device.c
+Auto-merging drivers/gpu/drm/xe/xe_device_types.h
+Auto-merging drivers/gpu/drm/xe/xe_drm_client.c
+Auto-merging drivers/gpu/drm/xe/xe_execlist.c
+Auto-merging drivers/gpu/drm/xe/xe_gt.c
+Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_sriov_pf.c
+Auto-merging drivers/gpu/drm/xe/xe_guc_log.c
+Auto-merging drivers/gpu/drm/xe/xe_irq.c
+Auto-merging drivers/gpu/drm/xe/xe_oa.c
+Auto-merging drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
+Auto-merging include/drm/intel/pciids.h
+Resolved 'drivers/gpu/drm/xe/display/xe_display.c' using previous resolution.
+Resolved 'drivers/gpu/drm/xe/xe_gt_sriov_pf.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e294f6bef1cf] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-driver-intel-xe-hwmon | 16 +
+ MAINTAINERS | 1 +
+ drivers/gpu/drm/i915/display/intel_display.c | 6 +-
+ .../gpu/drm/i915/display/intel_display_driver.c | 4 +
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.h | 2 +
+ drivers/gpu/drm/i915/i915_driver.c | 5 -
+ drivers/gpu/drm/xe/Kconfig.profile | 1 +
+ drivers/gpu/drm/xe/Makefile | 20 +-
+ drivers/gpu/drm/xe/abi/gsc_pxp_commands_abi.h | 41 +
+ drivers/gpu/drm/xe/abi/guc_actions_abi.h | 1 +
+ .../xe/compat-i915-headers/gem/i915_gem_stolen.h | 5 +
+ .../gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h | 18 +-
+ drivers/gpu/drm/xe/display/intel_bo.c | 2 +-
+ drivers/gpu/drm/xe/display/intel_fb_bo.c | 4 +-
+ drivers/gpu/drm/xe/display/xe_display.c | 181 ++--
+ drivers/gpu/drm/xe/display/xe_display.h | 10 +-
+ drivers/gpu/drm/xe/display/xe_plane_initial.c | 19 +-
+ drivers/gpu/drm/xe/instructions/xe_instr_defs.h | 1 +
+ drivers/gpu/drm/xe/instructions/xe_mfx_commands.h | 28 +
+ drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 5 +
+ drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 +
+ drivers/gpu/drm/xe/regs/xe_gt_regs.h | 8 +
+ drivers/gpu/drm/xe/regs/xe_irq_regs.h | 8 +
+ drivers/gpu/drm/xe/regs/xe_mchbar_regs.h | 3 +
+ drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 2 +
+ drivers/gpu/drm/xe/regs/xe_pxp_regs.h | 23 +
+ drivers/gpu/drm/xe/regs/xe_reg_defs.h | 28 +-
+ drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 334 ++++++++
+ drivers/gpu/drm/xe/xe_bo.c | 175 +++-
+ drivers/gpu/drm/xe/xe_bo.h | 8 +
+ drivers/gpu/drm/xe/xe_bo_types.h | 6 +
+ drivers/gpu/drm/xe/xe_debugfs.c | 6 +-
+ drivers/gpu/drm/xe/xe_devcoredump.c | 8 +-
+ drivers/gpu/drm/xe/xe_device.c | 283 +++++--
+ drivers/gpu/drm/xe/xe_device.h | 8 +
+ drivers/gpu/drm/xe/xe_device_types.h | 55 +-
+ drivers/gpu/drm/xe/xe_drm_client.c | 8 +
+ drivers/gpu/drm/xe/xe_exec.c | 6 +
+ drivers/gpu/drm/xe/xe_exec_queue.c | 66 +-
+ drivers/gpu/drm/xe/xe_exec_queue.h | 5 +
+ drivers/gpu/drm/xe/xe_exec_queue_types.h | 8 +
+ drivers/gpu/drm/xe/xe_execlist.c | 2 +-
+ drivers/gpu/drm/xe/xe_gsc.c | 9 -
+ drivers/gpu/drm/xe/xe_gsc.h | 1 -
+ drivers/gpu/drm/xe/xe_gsc_proxy.c | 63 +-
+ drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 -
+ drivers/gpu/drm/xe/xe_gsc_types.h | 1 +
+ drivers/gpu/drm/xe/xe_gt.c | 64 +-
+ drivers/gpu/drm/xe/xe_gt.h | 1 -
+ drivers/gpu/drm/xe/xe_gt_idle.c | 23 +-
+ drivers/gpu/drm/xe/xe_gt_idle.h | 1 +
+ drivers/gpu/drm/xe/xe_gt_idle_types.h | 3 +
+ drivers/gpu/drm/xe/xe_gt_mcr.c | 8 +-
+ drivers/gpu/drm/xe/xe_gt_pagefault.c | 15 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 49 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 161 ++--
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 1 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 50 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 23 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 10 +
+ drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 19 +
+ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 +
+ drivers/gpu/drm/xe/xe_gt_stats.c | 2 +
+ drivers/gpu/drm/xe/xe_gt_stats_types.h | 2 +
+ drivers/gpu/drm/xe/xe_gt_topology.c | 16 +-
+ drivers/gpu/drm/xe/xe_guc.c | 10 +
+ drivers/gpu/drm/xe/xe_guc_buf.c | 176 ++++
+ drivers/gpu/drm/xe/xe_guc_buf.h | 47 ++
+ drivers/gpu/drm/xe/xe_guc_buf_types.h | 28 +
+ drivers/gpu/drm/xe/xe_guc_debugfs.c | 28 +
+ drivers/gpu/drm/xe/xe_guc_engine_activity.c | 373 +++++++++
+ drivers/gpu/drm/xe/xe_guc_engine_activity.h | 19 +
+ drivers/gpu/drm/xe/xe_guc_engine_activity_types.h | 92 +++
+ drivers/gpu/drm/xe/xe_guc_fwif.h | 19 +
+ drivers/gpu/drm/xe/xe_guc_log.c | 8 +-
+ drivers/gpu/drm/xe/xe_guc_pc.c | 81 +-
+ drivers/gpu/drm/xe/xe_guc_pc.h | 2 +
+ drivers/gpu/drm/xe/xe_guc_relay.c | 2 +-
+ drivers/gpu/drm/xe/xe_guc_types.h | 7 +
+ drivers/gpu/drm/xe/xe_heci_gsc.c | 3 +-
+ drivers/gpu/drm/xe/xe_hwmon.c | 91 ++-
+ drivers/gpu/drm/xe/xe_hwmon.h | 4 +-
+ drivers/gpu/drm/xe/xe_irq.c | 20 +-
+ drivers/gpu/drm/xe/xe_lmtt.c | 4 +-
+ drivers/gpu/drm/xe/xe_lrc.c | 18 +-
+ drivers/gpu/drm/xe/xe_lrc.h | 7 +-
+ drivers/gpu/drm/xe/xe_mmio.c | 77 +-
+ drivers/gpu/drm/xe/xe_mmio.h | 4 +-
+ drivers/gpu/drm/xe/xe_module.c | 5 -
+ drivers/gpu/drm/xe/xe_oa.c | 100 +--
+ drivers/gpu/drm/xe/xe_oa.h | 4 +-
+ drivers/gpu/drm/xe/xe_pci.c | 79 +-
+ drivers/gpu/drm/xe/xe_pci_types.h | 5 -
+ drivers/gpu/drm/xe/xe_pcode_api.h | 14 +
+ drivers/gpu/drm/xe/xe_pm.c | 41 +-
+ drivers/gpu/drm/xe/xe_pmu.c | 531 ++++++++++++
+ drivers/gpu/drm/xe/xe_pmu.h | 18 +
+ drivers/gpu/drm/xe/xe_pmu_types.h | 39 +
+ drivers/gpu/drm/xe/xe_pxp.c | 906 +++++++++++++++++++++
+ drivers/gpu/drm/xe/xe_pxp.h | 35 +
+ drivers/gpu/drm/xe/xe_pxp_debugfs.c | 120 +++
+ drivers/gpu/drm/xe/xe_pxp_debugfs.h | 13 +
+ drivers/gpu/drm/xe/xe_pxp_submit.c | 588 +++++++++++++
+ drivers/gpu/drm/xe/xe_pxp_submit.h | 22 +
+ drivers/gpu/drm/xe/xe_pxp_types.h | 135 +++
+ drivers/gpu/drm/xe/xe_query.c | 32 +
+ drivers/gpu/drm/xe/xe_ring_ops.c | 4 +-
+ drivers/gpu/drm/xe/xe_sa.c | 51 +-
+ drivers/gpu/drm/xe/xe_sa.h | 30 +-
+ drivers/gpu/drm/xe/xe_sched_job_types.h | 4 +-
+ drivers/gpu/drm/xe/xe_sriov.c | 2 +-
+ drivers/gpu/drm/xe/xe_survivability_mode.c | 238 ++++++
+ drivers/gpu/drm/xe/xe_survivability_mode.h | 18 +
+ drivers/gpu/drm/xe/xe_survivability_mode_types.h | 35 +
+ drivers/gpu/drm/xe/xe_sync.c | 1 +
+ drivers/gpu/drm/xe/xe_tile.c | 18 +-
+ drivers/gpu/drm/xe/xe_tile.h | 1 +
+ drivers/gpu/drm/xe/xe_trace_bo.h | 19 +-
+ drivers/gpu/drm/xe/xe_trace_guc.h | 49 ++
+ drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 17 +-
+ drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h | 2 +-
+ drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 3 +-
+ drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 4 -
+ drivers/gpu/drm/xe/xe_uc.c | 16 +-
+ drivers/gpu/drm/xe/xe_uc.h | 1 -
+ drivers/gpu/drm/xe/xe_vm.c | 210 ++++-
+ drivers/gpu/drm/xe/xe_vm.h | 8 +
+ drivers/gpu/drm/xe/xe_vm_doc.h | 2 +-
+ drivers/gpu/drm/xe/xe_vm_types.h | 1 +
+ drivers/gpu/drm/xe/xe_wa.c | 8 +-
+ drivers/gpu/drm/xe/xe_wa_oob.rules | 1 +
+ include/drm/intel/pciids.h | 11 +-
+ include/uapi/drm/xe_drm.h | 123 ++-
+ 134 files changed, 5932 insertions(+), 704 deletions(-)
+ create mode 100644 drivers/gpu/drm/xe/instructions/xe_mfx_commands.h
+ create mode 100644 drivers/gpu/drm/xe/regs/xe_pxp_regs.h
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_buf.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_buf.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_buf_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_engine_activity.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_engine_activity.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_engine_activity_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pmu.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pmu.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pmu_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_debugfs.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_debugfs.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_submit.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_submit.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_survivability_mode.c
+ create mode 100644 drivers/gpu/drm/xe/xe_survivability_mode.h
+ create mode 100644 drivers/gpu/drm/xe/xe_survivability_mode_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 fbdev/for-next (c454bc716854 fbcon: Use correct erase colour for clearing in fbcon)
+$ git merge -m Merge branch 'for-next' of git://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/bitblit.c | 5 ++--
+ drivers/video/fbdev/core/fbcon.c | 10 ++++----
+ drivers/video/fbdev/core/fbcon.h | 38 +-----------------------------
+ drivers/video/fbdev/core/fbcon_ccw.c | 5 ++--
+ drivers/video/fbdev/core/fbcon_cw.c | 5 ++--
+ drivers/video/fbdev/core/fbcon_ud.c | 5 ++--
+ drivers/video/fbdev/core/tileblit.c | 45 +++++++++++++++++++++++++++++++-----
+ 7 files changed, 54 insertions(+), 59 deletions(-)
+Merging regmap/for-next (14b33926f576 Merge remote-tracking branch 'regmap/for-6.15' into regmap-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/internal.h | 12 ++++++------
+ drivers/base/regmap/regmap-irq.c | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+Merging sound/for-next (0f1f26c59196 ALSA: arm: aaci: Constify amba_id table)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Auto-merging sound/pci/hda/hda_intel.c
+Auto-merging sound/soc/codecs/hdmi-codec.c
+Merge made by the 'ort' strategy.
+ Documentation/sound/alsa-configuration.rst | 2 +-
+ Documentation/sound/designs/powersave.rst | 6 +-
+ include/sound/pcm_drm_eld.h | 91 +++++++
+ sound/arm/aaci.c | 2 +-
+ sound/core/pcm_drm_eld.c | 387 +++++++++++++++++++++++++++++
+ sound/pci/hda/Kconfig | 1 +
+ sound/pci/hda/hda_eld.c | 383 +---------------------------
+ sound/pci/hda/hda_intel.c | 44 +++-
+ sound/pci/hda/hda_local.h | 49 +---
+ sound/pci/hda/patch_hdmi.c | 6 +-
+ sound/pci/lola/lola.h | 2 -
+ sound/pci/lola/lola_mixer.c | 43 ----
+ sound/soc/codecs/hdmi-codec.c | 68 +++++
+ 13 files changed, 609 insertions(+), 475 deletions(-)
+Merging ieee1394/for-next (1c745720bec2 drivers: firewire: firewire-cdev.h: fix identation on a kernel-doc markup)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
+Merge made by the 'ort' strategy.
+ include/uapi/linux/firewire-cdev.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging sound-asoc/for-next (d9317ac6e280 Merge remote-tracking branch 'asoc/for-6.15' into asoc-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Auto-merging MAINTAINERS
+Auto-merging sound/hda/intel-dsp-config.c
+Auto-merging sound/pci/hda/tas2781_hda_spi.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mfd/motorola-cpcap.txt | 6 +
+ .../devicetree/bindings/misc/atmel-ssc.txt | 50 -
+ .../devicetree/bindings/sound/atmel,at91-ssc.yaml | 104 ++
+ .../bindings/sound/atmel,at91sam9g20ek-wm8731.yaml | 72 +
+ .../sound/atmel-at91sam9g20ek-wm8731-audio.txt | 26 -
+ .../bindings/sound/qcom,wcd937x-sdw.yaml | 36 +
+ .../devicetree/bindings/sound/rockchip-spdif.yaml | 4 +
+ .../devicetree/bindings/sound/wlf,wm8960.yaml | 4 +
+ MAINTAINERS | 3 +-
+ arch/x86/entry/common.c | 2 +-
+ arch/x86/include/asm/amd_nb.h | 1 -
+ arch/x86/include/asm/amd_node.h | 24 +
+ arch/x86/kernel/amd_nb.c | 1 -
+ arch/x86/kernel/amd_node.c | 149 +++
+ arch/x86/kernel/cpu/mtrr/generic.c | 13 +-
+ .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 13 +-
+ .../cirrus/test/cs_dsp_test_control_parse.c | 51 +-
+ drivers/platform/x86/amd/hsmp/Kconfig | 2 +-
+ drivers/platform/x86/amd/hsmp/acpi.c | 7 +-
+ drivers/platform/x86/amd/hsmp/hsmp.c | 1 -
+ drivers/platform/x86/amd/hsmp/hsmp.h | 3 -
+ drivers/platform/x86/amd/hsmp/plat.c | 36 +-
+ drivers/soundwire/qcom.c | 26 +
+ include/dt-bindings/sound/qcom,wcd934x.h | 16 +
+ include/linux/gpio/consumer.h | 11 +
+ include/sound/sdca.h | 22 +-
+ include/sound/sdca_function.h | 1089 ++++++++++++++-
+ include/sound/simple_card_utils.h | 8 +-
+ include/sound/soc-dapm.h | 2 -
+ include/sound/soc-dpcm.h | 8 +-
+ include/sound/soc.h | 12 +-
+ include/sound/tas2781.h | 1 -
+ include/uapi/sound/intel/avs/tokens.h | 7 +
+ sound/hda/intel-dsp-config.c | 4 +
+ sound/pci/hda/tas2781-spi.h | 1 -
+ sound/pci/hda/tas2781_hda_i2c.c | 8 +-
+ sound/pci/hda/tas2781_hda_spi.c | 3 -
+ sound/soc/amd/Kconfig | 10 +-
+ sound/soc/amd/acp/Kconfig | 4 +
+ sound/soc/amd/acp/Makefile | 2 +-
+ sound/soc/amd/acp/acp-legacy-common.c | 18 -
+ sound/soc/amd/acp/acp-rembrandt.c | 28 +-
+ sound/soc/amd/acp/acp-sdw-legacy-mach.c | 45 +
+ sound/soc/amd/acp/acp-sdw-mach-common.c | 34 +
+ sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 5 +-
+ sound/soc/amd/acp/acp63.c | 55 +-
+ sound/soc/amd/acp/acp70.c | 28 +-
+ sound/soc/amd/acp/amd-acp70-acpi-match.c | 160 +++
+ sound/soc/amd/acp/amd.h | 3 -
+ sound/soc/amd/acp/soc_amd_sdw_common.h | 12 +
+ sound/soc/amd/mach-config.h | 1 +
+ sound/soc/amd/ps/Makefile | 2 +-
+ sound/soc/amd/ps/acp63.h | 246 +++-
+ sound/soc/amd/ps/pci-ps.c | 448 +++----
+ sound/soc/amd/ps/ps-common.c | 475 +++++++
+ sound/soc/amd/ps/ps-pdm-dma.c | 6 +-
+ sound/soc/amd/ps/ps-sdw-dma.c | 375 +++++-
+ sound/soc/codecs/adau1701.c | 4 +-
+ sound/soc/codecs/cpcap.c | 200 ++-
+ sound/soc/codecs/dmic.c | 4 +-
+ sound/soc/codecs/mt6358.c | 104 --
+ sound/soc/codecs/mt6358.h | 4 -
+ sound/soc/codecs/pcm3168a-i2c.c | 9 +
+ sound/soc/codecs/pcm3168a.c | 11 +-
+ sound/soc/codecs/rt722-sdca-sdw.c | 130 +-
+ sound/soc/codecs/rt722-sdca-sdw.h | 99 +-
+ sound/soc/codecs/rt722-sdca.c | 135 +-
+ sound/soc/codecs/rt722-sdca.h | 4 +-
+ sound/soc/codecs/tas2764.c | 61 +-
+ sound/soc/codecs/tscs454.c | 5 +-
+ sound/soc/codecs/wcd934x.c | 16 +-
+ sound/soc/codecs/wcd937x-sdw.c | 41 +-
+ sound/soc/codecs/wcd937x.c | 53 +-
+ sound/soc/codecs/wcd937x.h | 7 +-
+ sound/soc/codecs/wcd938x-sdw.c | 2 +-
+ sound/soc/codecs/wcd939x-sdw.c | 2 +-
+ sound/soc/codecs/wm_hubs.c | 3 +-
+ sound/soc/fsl/fsl_micfil.c | 49 +-
+ sound/soc/fsl/fsl_micfil.h | 1 +
+ sound/soc/generic/audio-graph-card.c | 97 +-
+ sound/soc/generic/audio-graph-card2.c | 95 +-
+ sound/soc/generic/simple-card-utils.c | 170 ++-
+ sound/soc/generic/simple-card.c | 132 +-
+ sound/soc/intel/avs/avs.h | 1 +
+ sound/soc/intel/avs/board_selection.c | 17 +-
+ sound/soc/intel/avs/boards/Kconfig | 10 +
+ sound/soc/intel/avs/boards/Makefile | 2 +
+ sound/soc/intel/avs/boards/pcm3168a.c | 143 ++
+ sound/soc/intel/avs/dsp.c | 3 +-
+ sound/soc/intel/avs/loader.c | 74 +-
+ sound/soc/intel/avs/messages.c | 38 +
+ sound/soc/intel/avs/messages.h | 22 +
+ sound/soc/intel/avs/path.c | 279 ++--
+ sound/soc/intel/avs/tgl.c | 33 +
+ sound/soc/intel/avs/topology.c | 42 +
+ sound/soc/intel/avs/topology.h | 11 +-
+ sound/soc/mediatek/common/mtk-afe-fe-dai.c | 20 -
+ sound/soc/mediatek/common/mtk-afe-fe-dai.h | 2 -
+ sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 55 -
+ sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 2 -
+ sound/soc/qcom/sdw.c | 34 +-
+ sound/soc/sdca/sdca_device.c | 3 +-
+ sound/soc/sdca/sdca_functions.c | 1407 +++++++++++++++++++-
+ sound/soc/soc-card.c | 14 +-
+ sound/soc/soc-component.c | 36 +-
+ sound/soc/soc-compress.c | 2 +-
+ sound/soc/soc-core.c | 50 +-
+ sound/soc/soc-dai.c | 26 +-
+ sound/soc/soc-dapm.c | 51 +-
+ sound/soc/soc-link.c | 18 +-
+ sound/soc/soc-ops.c | 53 +-
+ sound/soc/soc-pcm.c | 226 ++--
+ sound/soc/soc-utils.c | 27 +
+ sound/soc/sof/amd/Kconfig | 6 +
+ sound/soc/sof/amd/acp.c | 56 +-
+ sound/soc/sof/amd/acp.h | 2 -
+ sound/soc/sof/amd/pci-acp63.c | 1 -
+ sound/soc/sof/amd/pci-acp70.c | 1 -
+ sound/soc/sof/amd/pci-rmb.c | 1 -
+ sound/soc/sof/amd/pci-rn.c | 1 -
+ sound/soc/sof/amd/pci-vangogh.c | 1 -
+ sound/soc/sof/imx/Kconfig | 17 +-
+ sound/soc/sof/imx/Makefile | 6 +-
+ sound/soc/sof/imx/imx-common.c | 430 +++++-
+ sound/soc/sof/imx/imx-common.h | 151 +++
+ sound/soc/sof/imx/imx8.c | 803 ++++-------
+ sound/soc/sof/imx/imx8m.c | 567 --------
+ sound/soc/sof/imx/imx8ulp.c | 520 --------
+ sound/soc/sof/imx/imx9.c | 137 ++
+ sound/soc/sof/intel/bdw.c | 1 -
+ sound/soc/sof/intel/byt.c | 1 -
+ sound/soc/sof/intel/mtl.c | 7 +-
+ sound/soc/sof/intel/pci-tng.c | 1 -
+ sound/soc/sof/ipc3-pcm.c | 13 +-
+ sound/soc/sof/ipc3-topology.c | 20 +-
+ sound/soc/sof/ipc3.c | 12 +-
+ sound/soc/sof/ipc4-loader.c | 143 +-
+ sound/soc/sof/ipc4-pcm.c | 21 +-
+ sound/soc/sof/ipc4-priv.h | 1 +
+ sound/soc/sof/ipc4-topology.c | 40 +-
+ sound/soc/sof/ipc4.c | 8 +-
+ sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 3 +-
+ sound/soc/sof/pcm.c | 169 ++-
+ sound/soc/sof/sof-audio.c | 49 -
+ sound/soc/sof/sof-audio.h | 17 +-
+ sound/soc/sof/topology.c | 4 +-
+ sound/soc/tegra/Makefile | 2 +-
+ sound/soc/tegra/tegra210_admaif.c | 24 +-
+ sound/soc/tegra/tegra210_admaif.h | 9 +-
+ sound/soc/tegra/tegra_isomgr_bw.c | 129 ++
+ sound/soc/tegra/tegra_isomgr_bw.h | 31 +
+ 151 files changed, 7657 insertions(+), 3670 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/misc/atmel-ssc.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel,at91-ssc.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel,at91sam9g20ek-wm8731.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt
+ create mode 100644 include/dt-bindings/sound/qcom,wcd934x.h
+ create mode 100644 sound/soc/amd/acp/amd-acp70-acpi-match.c
+ create mode 100644 sound/soc/amd/ps/ps-common.c
+ create mode 100644 sound/soc/intel/avs/boards/pcm3168a.c
+ delete mode 100644 sound/soc/sof/imx/imx8m.c
+ delete mode 100644 sound/soc/sof/imx/imx8ulp.c
+ create mode 100644 sound/soc/sof/imx/imx9.c
+ create mode 100644 sound/soc/tegra/tegra_isomgr_bw.c
+ create mode 100644 sound/soc/tegra/tegra_isomgr_bw.h
+Merging modules/modules-next (afa92869776a params: Annotate struct module_param_attrs with __counted_by())
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next
+Auto-merging kernel/trace/bpf_trace.c
+Merge made by the 'ort' strategy.
+ arch/arm/kernel/module-plts.c | 4 +-
+ arch/arm64/kernel/ftrace.c | 7 +--
+ arch/loongarch/kernel/ftrace_dyn.c | 9 ++-
+ arch/loongarch/kernel/unwind_orc.c | 4 +-
+ arch/powerpc/kernel/trace/ftrace.c | 6 +-
+ arch/powerpc/kernel/trace/ftrace_64_pg.c | 6 +-
+ arch/x86/kernel/callthunks.c | 3 +-
+ arch/x86/kernel/unwind_orc.c | 4 +-
+ include/linux/kallsyms.h | 3 +-
+ include/linux/module.h | 2 +-
+ kernel/cfi.c | 5 +-
+ kernel/jump_label.c | 31 +++++-----
+ kernel/kprobes.c | 2 +-
+ kernel/livepatch/core.c | 4 +-
+ kernel/module/internal.h | 11 ----
+ kernel/module/kallsyms.c | 73 ++++++++--------------
+ kernel/module/main.c | 103 +++++++++++--------------------
+ kernel/module/tracking.c | 2 -
+ kernel/module/tree_lookup.c | 8 +--
+ kernel/module/version.c | 14 ++---
+ kernel/params.c | 29 ++++-----
+ kernel/static_call_inline.c | 13 ++--
+ kernel/trace/bpf_trace.c | 24 +++----
+ kernel/trace/trace_kprobe.c | 9 +--
+ lib/bug.c | 22 +++----
+ lib/tests/module/gen_test_kallsyms.sh | 2 +-
+ 26 files changed, 154 insertions(+), 246 deletions(-)
+Merging input/next (9995b98a4b2a MAINTAINERS: Add entries for Apple Z2 touchscreen driver)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../input/touchscreen/apple,z2-multitouch.yaml | 70 +++
+ MAINTAINERS | 2 +
+ drivers/input/joystick/walkera0701.c | 3 +-
+ drivers/input/keyboard/gpio_keys.c | 10 +-
+ drivers/input/rmi4/rmi_f54.c | 2 -
+ drivers/input/touchscreen/Kconfig | 13 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/apple_z2.c | 477 +++++++++++++++++++++
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 -
+ drivers/input/touchscreen/sur40.c | 2 -
+ 10 files changed, 568 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml
+ create mode 100644 drivers/input/touchscreen/apple_z2.c
+Merging block/for-next (b6d5b717ca06 Merge branch 'for-6.15/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging drivers/mmc/host/sdhci-msm.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+Auto-merging tools/testing/selftests/drivers/net/hw/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/ABI/stable/sysfs-block | 20 +
+ Documentation/block/inline-encryption.rst | 255 +++++-
+ Documentation/networking/index.rst | 1 +
+ Documentation/networking/iou-zcrx.rst | 202 +++++
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +
+ Kconfig | 2 +
+ block/blk-crypto-fallback.c | 7 +-
+ block/blk-crypto-internal.h | 10 +
+ block/blk-crypto-profile.c | 101 +++
+ block/blk-crypto-sysfs.c | 35 +
+ block/blk-crypto.c | 204 ++++-
+ block/blk-iocost.c | 3 +-
+ block/blk-rq-qos.c | 82 +-
+ block/ioctl.c | 5 +
+ block/partitions/sgi.c | 2 -
+ block/partitions/sun.c | 2 -
+ drivers/block/loop.c | 84 +-
+ drivers/md/dm-table.c | 1 +
+ drivers/mmc/host/cqhci-crypto.c | 8 +-
+ drivers/mmc/host/sdhci-msm.c | 3 +-
+ drivers/ufs/core/ufshcd-crypto.c | 7 +-
+ drivers/ufs/host/ufs-exynos.c | 3 +-
+ drivers/ufs/host/ufs-qcom.c | 3 +-
+ fs/crypto/inline_crypt.c | 4 +-
+ include/linux/blk-crypto-profile.h | 73 ++
+ include/linux/blk-crypto.h | 73 +-
+ include/linux/io_uring_types.h | 18 +-
+ include/linux/wait.h | 6 +-
+ include/uapi/linux/blk-crypto.h | 44 +
+ include/uapi/linux/fs.h | 6 +-
+ include/uapi/linux/io_uring.h | 55 +-
+ io_uring/Kconfig | 10 +
+ io_uring/Makefile | 10 +-
+ io_uring/cancel.c | 42 +
+ io_uring/cancel.h | 8 +
+ io_uring/epoll.c | 35 +-
+ io_uring/epoll.h | 2 +
+ io_uring/futex.c | 58 +-
+ io_uring/io-wq.c | 230 ++---
+ io_uring/io-wq.h | 7 +-
+ io_uring/io_uring.c | 216 +++--
+ io_uring/io_uring.h | 24 +-
+ io_uring/kbuf.c | 172 ++--
+ io_uring/kbuf.h | 100 +--
+ io_uring/memmap.c | 2 +
+ io_uring/memmap.h | 1 +
+ io_uring/msg_ring.c | 2 +-
+ io_uring/net.c | 136 ++-
+ io_uring/notif.c | 4 +-
+ io_uring/opdef.c | 30 +
+ io_uring/poll.c | 18 +-
+ io_uring/poll.h | 4 +-
+ io_uring/register.c | 7 +
+ io_uring/rsrc.c | 2 +-
+ io_uring/rsrc.h | 3 +-
+ io_uring/rw.c | 26 +-
+ io_uring/rw.h | 3 +-
+ io_uring/splice.c | 3 +-
+ io_uring/timeout.c | 16 +-
+ io_uring/uring_cmd.c | 4 +-
+ io_uring/waitid.c | 56 +-
+ io_uring/zcrx.c | 960 +++++++++++++++++++++
+ io_uring/zcrx.h | 73 ++
+ tools/testing/selftests/drivers/net/hw/.gitignore | 2 +
+ tools/testing/selftests/drivers/net/hw/Makefile | 5 +
+ tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 457 ++++++++++
+ tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 87 ++
+ 67 files changed, 3470 insertions(+), 666 deletions(-)
+ create mode 100644 Documentation/networking/iou-zcrx.rst
+ create mode 100644 include/uapi/linux/blk-crypto.h
+ create mode 100644 io_uring/Kconfig
+ create mode 100644 io_uring/zcrx.c
+ create mode 100644 io_uring/zcrx.h
+ create mode 100644 tools/testing/selftests/drivers/net/hw/iou-zcrx.c
+ create mode 100755 tools/testing/selftests/drivers/net/hw/iou-zcrx.py
+Merging device-mapper/for-next (88f7f56d16f5 dm: fix unconditional IO throttle caused by REQ_PREFLUSH)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
+Merge made by the 'ort' strategy.
+ .../admin-guide/device-mapper/dm-crypt.rst | 5 +
+ .../admin-guide/device-mapper/dm-integrity.rst | 5 +
+ Documentation/admin-guide/device-mapper/verity.rst | 9 +
+ drivers/md/Kconfig | 1 +
+ drivers/md/dm-bufio.c | 4 +-
+ drivers/md/dm-crypt.c | 41 ++---
+ drivers/md/dm-integrity.c | 3 +
+ drivers/md/dm-stripe.c | 2 +-
+ drivers/md/dm-vdo/block-map.c | 13 +-
+ drivers/md/dm-vdo/constants.h | 3 -
+ drivers/md/dm-vdo/dedupe.c | 20 +--
+ drivers/md/dm-vdo/encodings.c | 20 +--
+ drivers/md/dm-vdo/indexer/index-layout.c | 5 +-
+ drivers/md/dm-vdo/io-submitter.c | 6 +-
+ drivers/md/dm-vdo/io-submitter.h | 18 +-
+ drivers/md/dm-vdo/packer.h | 2 +-
+ drivers/md/dm-vdo/priority-table.c | 2 +-
+ drivers/md/dm-vdo/recovery-journal.h | 6 +-
+ drivers/md/dm-vdo/slab-depot.c | 197 +++++++++++++++------
+ drivers/md/dm-vdo/slab-depot.h | 13 +-
+ drivers/md/dm-vdo/types.h | 3 +
+ drivers/md/dm-vdo/vdo.c | 11 +-
+ drivers/md/dm-vdo/vio.c | 54 +++---
+ drivers/md/dm-vdo/vio.h | 13 +-
+ drivers/md/dm-vdo/wait-queue.c | 2 +-
+ drivers/md/dm-verity-target.c | 25 ++-
+ drivers/md/dm.c | 8 +-
+ 27 files changed, 309 insertions(+), 182 deletions(-)
+Merging libata/for-next (91ec84f8eadd ata: libata-eh: Do not use ATAPI DMA for a device limited to PIO mode)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +
+ .../devicetree/bindings/ata/fsl,pq-sata.yaml | 60 ++++++++++++++++++++++
+ Documentation/devicetree/bindings/ata/fsl-sata.txt | 28 ----------
+ drivers/ata/libata-core.c | 38 ++++++++++++++
+ drivers/ata/libata-eh.c | 11 +++-
+ drivers/ata/sata_via.c | 3 +-
+ 6 files changed, 111 insertions(+), 31 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ata/fsl,pq-sata.yaml
+ delete mode 100644 Documentation/devicetree/bindings/ata/fsl-sata.txt
+Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (cb71db3b2cea mmc: Merge branch fixes into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Merge made by the 'ort' strategy.
+ drivers/mmc/core/slot-gpio.c | 12 ------------
+ include/linux/mmc/slot-gpio.h | 1 -
+ 2 files changed, 13 deletions(-)
+Merging mfd/for-mfd-next (bd3152428217 dt-bindings: mfd: qcom,tcsr: Add compatible for MSM8937)
+$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
+Auto-merging drivers/mfd/syscon.c
+Merge made by the 'ort' strategy.
+ .../bindings/mfd/fsl,mcu-mpc8349emitx.yaml | 53 +++
+ .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
+ .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 13 +
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 18 +-
+ .../bindings/powerpc/fsl/mcu-mpc8349emitx.txt | 17 -
+ .../devicetree/bindings/regulator/ti,tps65219.yaml | 27 +-
+ drivers/mfd/Kconfig | 2 +-
+ drivers/mfd/axp20x.c | 1 +
+ drivers/mfd/intel_soc_pmic_chtdc_ti.c | 1 -
+ drivers/mfd/intel_soc_pmic_crc.c | 1 -
+ drivers/mfd/ipaq-micro.c | 3 +-
+ drivers/mfd/max8997-irq.c | 15 +-
+ drivers/mfd/mt6397-core.c | 43 ++
+ drivers/mfd/mt6397-irq.c | 8 +
+ drivers/mfd/sm501.c | 6 +-
+ drivers/mfd/stm32-timers.c | 31 +-
+ drivers/mfd/syscon.c | 9 +-
+ drivers/mfd/tps65010.c | 13 +-
+ drivers/mfd/tps65219.c | 279 +++++++++++-
+ drivers/mfd/upboard-fpga.c | 3 +-
+ include/linux/mfd/axp20x.h | 1 +
+ include/linux/mfd/lp3943.h | 1 -
+ include/linux/mfd/max8997-private.h | 1 -
+ include/linux/mfd/mt6392/core.h | 42 ++
+ include/linux/mfd/mt6392/registers.h | 487 +++++++++++++++++++++
+ include/linux/mfd/mt6397/core.h | 1 +
+ include/linux/mfd/stm32-timers.h | 9 +
+ include/linux/mfd/tps65219.h | 136 +++++-
+ 28 files changed, 1146 insertions(+), 76 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/fsl,mcu-mpc8349emitx.yaml
+ delete mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mcu-mpc8349emitx.txt
+ create mode 100644 include/linux/mfd/mt6392/core.h
+ create mode 100644 include/linux/mfd/mt6392/registers.h
+Merging backlight/for-backlight-next (d1ebaf003a06 MAINTAINERS: Add entries for Apple DWI backlight controller)
+$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/leds/backlight/apple,dwi-bl.yaml | 57 ++++++++++
+ MAINTAINERS | 2 +
+ drivers/video/backlight/88pm860x_bl.c | 1 -
+ drivers/video/backlight/Kconfig | 11 ++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/adp5520_bl.c | 1 -
+ drivers/video/backlight/adp8860_bl.c | 1 -
+ drivers/video/backlight/adp8870_bl.c | 1 -
+ drivers/video/backlight/apple_dwi_bl.c | 123 +++++++++++++++++++++
+ drivers/video/backlight/as3711_bl.c | 1 -
+ drivers/video/backlight/bd6107.c | 1 -
+ drivers/video/backlight/da903x_bl.c | 1 -
+ drivers/video/backlight/da9052_bl.c | 1 -
+ drivers/video/backlight/ep93xx_bl.c | 1 -
+ drivers/video/backlight/hp680_bl.c | 1 -
+ drivers/video/backlight/led_bl.c | 5 +-
+ drivers/video/backlight/locomolcd.c | 1 -
+ drivers/video/backlight/lv5207lp.c | 1 -
+ drivers/video/backlight/max8925_bl.c | 1 -
+ drivers/video/backlight/tps65217_bl.c | 1 -
+ drivers/video/backlight/vgg2432a4.c | 1 -
+ drivers/video/backlight/wm831x_bl.c | 1 -
+ 22 files changed, 198 insertions(+), 17 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/apple,dwi-bl.yaml
+ create mode 100644 drivers/video/backlight/apple_dwi_bl.c
+Merging battery/for-next (76d5fb0e58d8 power: supply: sc27xx: use devm_kmemdup_array())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Auto-merging drivers/power/supply/axp20x_battery.c
+Merge made by the 'ort' strategy.
+ .../bindings/power/reset/atmel,sama5d2-shdwc.yaml | 5 +
+ .../bindings/power/reset/xlnx,zynqmp-power.yaml | 1 -
+ .../x-powers,axp20x-battery-power-supply.yaml | 20 +++-
+ drivers/iio/adc/xilinx-xadc-core.c | 4 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 2 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 2 +-
+ drivers/input/keyboard/ipaq-micro-keys.c | 5 +-
+ drivers/input/sparse-keymap.c | 3 +-
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 6 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
+ drivers/pinctrl/intel/pinctrl-tangier.c | 5 +-
+ drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 8 +-
+ drivers/power/supply/axp20x_battery.c | 21 ++++
+ drivers/power/supply/axp20x_usb_power.c | 2 +-
+ drivers/power/supply/bq27xxx_battery.c | 55 ++++++++-
+ drivers/power/supply/max1720x_battery.c | 49 +++++++-
+ drivers/power/supply/sc27xx_fuel_gauge.c | 5 +-
+ include/linux/device.h | 119 +------------------
+ include/linux/device/devres.h | 129 +++++++++++++++++++++
+ include/linux/err.h | 3 +
+ include/linux/io.h | 2 -
+ include/linux/power/bq27xxx_battery.h | 1 +
+ 23 files changed, 299 insertions(+), 159 deletions(-)
+ create mode 100644 include/linux/device/devres.h
+Merging regulator/for-next (c80657ac85dc Merge remote-tracking branch 'regulator/for-6.15' into regulator-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
+Auto-merging arch/arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi
+Merge made by the 'ort' strategy.
+ .../bindings/regulator/nxp,pca9450-regulator.yaml | 29 ++++++--
+ drivers/regulator/ad5398.c | 30 +++++---
+ drivers/regulator/pca9450-regulator.c | 86 ++++++++++++++++++----
+ 3 files changed, 113 insertions(+), 32 deletions(-)
+Merging security/next (4632cd0ec3fa lsm: fix a missing security_uring_allowed() prototype)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging io_uring/io_uring.c
+Merge made by the 'ort' strategy.
+ include/linux/lsm_hook_defs.h | 1 +
+ include/linux/security.h | 5 +++++
+ io_uring/io_uring.c | 21 ++++++++++++++-------
+ security/security.c | 12 ++++++++++++
+ security/selinux/hooks.c | 14 ++++++++++++++
+ security/selinux/include/classmap.h | 2 +-
+ 6 files changed, 47 insertions(+), 8 deletions(-)
+Merging apparmor/apparmor-next (3e45553acb14 apparmor: Remove unused variable 'sock' in __file_sock_perm())
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Auto-merging security/apparmor/apparmorfs.c
+Auto-merging security/apparmor/lsm.c
+Merge made by the 'ort' strategy.
+ security/apparmor/Makefile | 2 +-
+ security/apparmor/af_unix.c | 702 +++++++++++++++++++++++++++++++++
+ security/apparmor/apparmorfs.c | 36 +-
+ security/apparmor/audit.c | 2 +-
+ security/apparmor/capability.c | 56 +++
+ security/apparmor/domain.c | 118 +++---
+ security/apparmor/file.c | 61 +--
+ security/apparmor/include/af_unix.h | 57 +++
+ security/apparmor/include/apparmor.h | 4 +-
+ security/apparmor/include/capability.h | 1 +
+ security/apparmor/include/file.h | 9 +-
+ security/apparmor/include/ipc.h | 3 +
+ security/apparmor/include/label.h | 24 +-
+ security/apparmor/include/lib.h | 43 +-
+ security/apparmor/include/net.h | 31 +-
+ security/apparmor/include/path.h | 1 +
+ security/apparmor/include/policy.h | 46 ++-
+ security/apparmor/include/sig_names.h | 6 +-
+ security/apparmor/include/signal.h | 19 +
+ security/apparmor/ipc.c | 10 +-
+ security/apparmor/label.c | 37 +-
+ security/apparmor/lib.c | 91 +++++
+ security/apparmor/lsm.c | 249 ++++++++++--
+ security/apparmor/net.c | 180 ++++++++-
+ security/apparmor/policy.c | 39 +-
+ security/apparmor/policy_compat.c | 6 +-
+ security/apparmor/policy_ns.c | 2 +-
+ security/apparmor/policy_unpack.c | 29 +-
+ security/apparmor/procattr.c | 6 +-
+ 29 files changed, 1637 insertions(+), 233 deletions(-)
+ create mode 100644 security/apparmor/af_unix.c
+ create mode 100644 security/apparmor/include/af_unix.h
+ create mode 100644 security/apparmor/include/signal.h
+Merging integrity/next-integrity (57a0ef02fefa ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Merge made by the 'ort' strategy.
+ security/integrity/evm/evm_crypto.c | 2 +-
+ security/integrity/evm/evm_main.c | 2 +-
+ security/integrity/ima/ima.h | 3 +++
+ security/integrity/ima/ima_main.c | 13 ++++++++-----
+ 4 files changed, 13 insertions(+), 7 deletions(-)
+Merging selinux/next (5fc80fb5b776 selinux: always check the file label in selinux_kernel_read_file())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ security/selinux/avc.c | 2 +-
+ security/selinux/hooks.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging smack/next (a158a937d864 smack: recognize ipv4 CIPSO w/o categories)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Merge made by the 'ort' strategy.
+ security/smack/smack.h | 20 +++++++++++++-------
+ security/smack/smack_access.c | 6 ++++--
+ security/smack/smack_lsm.c | 40 ++++++++++++----------------------------
+ security/smack/smackfs.c | 29 ++++++++++++++---------------
+ 4 files changed, 43 insertions(+), 52 deletions(-)
+Merging tomoyo/master (09fbf3d50205 Merge tag 'tomoyo-pr-20250211' of git://git.code.sf.net/p/tomoyo/tomoyo)
+$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master
+Already up to date.
+Merging tpmdd/next (34c26c5e1cb0 tpm: do not start chip while suspended)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Merge made by the 'ort' strategy.
+ drivers/char/tpm/tpm-chip.c | 5 +++++
+ drivers/char/tpm/tpm-interface.c | 7 -------
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+Merging watchdog/master (0ad2507d5d93 Linux 6.14-rc3)
+$ 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 (1485fa1aadcd Merge branches 'apple/dart' and 's390' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
+Auto-merging arch/s390/pci/pci.c
+Merge made by the 'ort' strategy.
+ arch/s390/include/asm/pci.h | 4 +-
+ arch/s390/include/asm/pci_clp.h | 4 +-
+ arch/s390/kvm/pci.c | 17 +----
+ arch/s390/pci/pci.c | 35 +++++-----
+ arch/s390/pci/pci_bus.c | 25 ++++++++
+ arch/s390/pci/pci_clp.c | 1 +
+ arch/s390/pci/pci_sysfs.c | 11 +---
+ drivers/iommu/io-pgtable-dart.c | 2 +-
+ drivers/iommu/s390-iommu.c | 138 ++++++++++++++++++++++++++++++++--------
+ 9 files changed, 169 insertions(+), 68 deletions(-)
+Merging audit/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Already up to date.
+Merging devicetree/for-next (cd726b80a9b2 of: resolver: Fix device node refcount leakage in of_resolve_phandles())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 3 +
+ .../bindings/memory-controllers/exynos-srom.yaml | 35 ---------
+ .../memory-controllers/mc-peripheral-props.yaml | 2 +
+ .../qcom,ebi2-peripheral-props.yaml | 91 ++++++++++++++++++++++
+ .../{bus => memory-controllers}/qcom,ebi2.yaml | 86 +-------------------
+ .../samsung,exynos4210-srom-peripheral-props.yaml | 35 +++++++++
+ .../devicetree/bindings/net/smsc,lan9115.yaml | 6 +-
+ .../devicetree/bindings/soc/imx/fsl,aips-bus.yaml | 5 +-
+ .../devicetree/bindings/trivial-devices.yaml | 3 +
+ Documentation/devicetree/bindings/xilinx.txt | 26 -------
+ drivers/of/irq.c | 82 ++++++++++---------
+ drivers/of/resolver.c | 37 ++++-----
+ drivers/of/unittest-data/tests-interrupts.dtsi | 13 ++++
+ drivers/of/unittest.c | 67 ++++++++++++++++
+ 14 files changed, 281 insertions(+), 210 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/qcom,ebi2-peripheral-props.yaml
+ rename Documentation/devicetree/bindings/{bus => memory-controllers}/qcom,ebi2.yaml (63%)
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/samsung,exynos4210-srom-peripheral-props.yaml
+Merging dt-krzk/for-next (854a080f0b73 loongarch: dts: remove non-existent DAC from 2k1000-ref)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/cirrus/ep7211-edb7211.dts | 2 +-
+ arch/loongarch/boot/dts/loongson-2k1000-ref.dts | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+Merging mailbox/for-next (4783ce32b080 riscv: export __cpuid_to_hartid_map)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next
+Already up to date.
+Merging spi/for-next (155caaddc3e2 Merge remote-tracking branch 'spi/for-6.15' into spi-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/spi/adi,axi-spi-engine.yaml | 24 ++
+ .../devicetree/bindings/spi/fsl,espi.yaml | 65 +++
+ Documentation/devicetree/bindings/spi/fsl,spi.yaml | 74 ++++
+ Documentation/devicetree/bindings/spi/fsl-spi.txt | 62 ---
+ .../bindings/trigger-source/pwm-trigger.yaml | 37 ++
+ MAINTAINERS | 12 +
+ drivers/spi/Kconfig | 16 +
+ drivers/spi/Makefile | 4 +
+ drivers/spi/spi-axi-spi-engine.c | 315 +++++++++++++-
+ drivers/spi/spi-fsi.c | 13 +
+ drivers/spi/spi-gpio.c | 45 +-
+ drivers/spi/spi-offload-trigger-pwm.c | 169 ++++++++
+ drivers/spi/spi-offload.c | 468 +++++++++++++++++++++
+ drivers/spi/spi-realtek-rtl-snand.c | 1 -
+ drivers/spi/spi-s3c64xx.c | 4 +-
+ drivers/spi/spi-zynqmp-gqspi.c | 169 ++++----
+ drivers/spi/spi.c | 15 +-
+ include/linux/spi/offload/consumer.h | 39 ++
+ include/linux/spi/offload/provider.h | 47 +++
+ include/linux/spi/offload/types.h | 100 +++++
+ include/linux/spi/spi.h | 22 +
+ 21 files changed, 1496 insertions(+), 205 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/fsl,espi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/fsl,spi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/fsl-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml
+ create mode 100644 drivers/spi/spi-offload-trigger-pwm.c
+ create mode 100644 drivers/spi/spi-offload.c
+ create mode 100644 include/linux/spi/offload/consumer.h
+ create mode 100644 include/linux/spi/offload/provider.h
+ create mode 100644 include/linux/spi/offload/types.h
+Merging tip/master (b29a74b37150 Merge branch into tip/master: 'x86/platform')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/include/asm/io.h
+CONFLICT (content): Merge conflict in arch/riscv/include/asm/io.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
+Auto-merging arch/x86/include/asm/io.h
+Auto-merging arch/x86/include/asm/percpu.h
+Auto-merging arch/x86/include/asm/tlbflush.h
+Auto-merging arch/x86/kernel/callthunks.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/mm/init_64.c
+Auto-merging arch/x86/mm/ioremap.c
+Auto-merging block/blk-iocost.c
+Auto-merging drivers/base/power/runtime.c
+Auto-merging drivers/gpu/drm/i915/gvt/display.c
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_request.c
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/vkms/vkms_crtc.c
+Auto-merging drivers/gpu/drm/xe/xe_oa.c
+Auto-merging drivers/idle/intel_idle.c
+Auto-merging drivers/media/platform/chips-media/wave5/wave5-vpu.c
+Auto-merging drivers/net/ethernet/intel/igc/igc_main.c
+Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/ti/am65-cpsw-nuss.c
+Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c
+Auto-merging fs/timerfd.c
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/percpu-defs.h
+Auto-merging io_uring/io_uring.c
+Auto-merging io_uring/timeout.c
+Auto-merging kernel/bpf/helpers.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/module/main.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging lib/Makefile
+Auto-merging mm/percpu.c
+Auto-merging net/core/dev.c
+Auto-merging net/ipv4/tcp_timer.c
+Resolved 'arch/riscv/include/asm/io.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ea4fb82b087c] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arch/arm64/silicon-errata.rst | 2 +
+ .../bindings/interrupt-controller/riscv,aplic.yaml | 8 +
+ arch/Kconfig | 4 +
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/include/asm/vdso.h | 2 +
+ arch/arm/include/asm/vdso/gettimeofday.h | 7 +-
+ arch/arm/include/asm/vdso/vsyscall.h | 12 +-
+ arch/arm/kernel/asm-offsets.c | 4 -
+ arch/arm/kernel/vdso.c | 34 +--
+ arch/arm/mach-imx/mmdc.c | 5 +-
+ arch/arm/mm/Kconfig | 1 +
+ arch/arm/mm/cache-l2x0-pmu.c | 3 +-
+ arch/arm/mm/ioremap.c | 2 +-
+ arch/arm/mm/nommu.c | 2 +-
+ arch/arm/vdso/Makefile | 2 +-
+ arch/arm/vdso/vdso.lds.S | 4 +-
+ arch/arm64/Kconfig | 10 +
+ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 14 +-
+ arch/arm64/include/asm/vdso.h | 2 +-
+ arch/arm64/include/asm/vdso/compat_gettimeofday.h | 36 +--
+ arch/arm64/include/asm/vdso/getrandom.h | 12 -
+ arch/arm64/include/asm/vdso/gettimeofday.h | 16 +-
+ arch/arm64/include/asm/vdso/vsyscall.h | 25 +-
+ arch/arm64/kernel/vdso.c | 90 +------
+ arch/arm64/kernel/vdso/Makefile | 2 +-
+ arch/arm64/kernel/vdso/vdso.lds.S | 7 +-
+ arch/arm64/kernel/vdso32/Makefile | 2 +-
+ arch/arm64/kernel/vdso32/vdso.lds.S | 7 +-
+ arch/arm64/kvm/arch_timer.c | 7 +-
+ arch/csky/kernel/vdso/Makefile | 2 +-
+ arch/loongarch/Kconfig | 2 +
+ arch/loongarch/include/asm/vdso.h | 1 -
+ arch/loongarch/include/asm/vdso/arch_data.h | 25 ++
+ arch/loongarch/include/asm/vdso/getrandom.h | 5 -
+ arch/loongarch/include/asm/vdso/gettimeofday.h | 14 +-
+ arch/loongarch/include/asm/vdso/vdso.h | 38 +--
+ arch/loongarch/include/asm/vdso/vsyscall.h | 17 --
+ arch/loongarch/kernel/asm-offsets.c | 2 +-
+ arch/loongarch/kernel/vdso.c | 92 +------
+ arch/loongarch/kvm/vcpu.c | 4 +-
+ arch/loongarch/vdso/Makefile | 2 +-
+ arch/loongarch/vdso/vdso.lds.S | 8 +-
+ arch/loongarch/vdso/vgetcpu.c | 12 +-
+ arch/mips/Kconfig | 1 +
+ arch/mips/include/asm/vdso/gettimeofday.h | 9 +-
+ arch/mips/include/asm/vdso/vdso.h | 19 +-
+ arch/mips/include/asm/vdso/vsyscall.h | 14 +-
+ arch/mips/kernel/vdso.c | 47 ++--
+ arch/mips/kvm/mips.c | 5 +-
+ arch/mips/vdso/Makefile | 2 +-
+ arch/mips/vdso/vdso.lds.S | 5 +-
+ arch/parisc/include/asm/vdso.h | 2 -
+ arch/parisc/kernel/vdso32/Makefile | 2 +-
+ arch/parisc/kernel/vdso64/Makefile | 2 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/include/asm/vdso.h | 1 +
+ arch/powerpc/include/asm/vdso/arch_data.h | 37 +++
+ arch/powerpc/include/asm/vdso/getrandom.h | 11 +-
+ arch/powerpc/include/asm/vdso/gettimeofday.h | 29 +--
+ arch/powerpc/include/asm/vdso/vsyscall.h | 13 -
+ arch/powerpc/include/asm/vdso_datapage.h | 44 +---
+ arch/powerpc/kernel/asm-offsets.c | 1 -
+ arch/powerpc/kernel/time.c | 2 +-
+ arch/powerpc/kernel/vdso.c | 115 +--------
+ arch/powerpc/kernel/vdso/Makefile | 2 +-
+ arch/powerpc/kernel/vdso/cacheflush.S | 2 +-
+ arch/powerpc/kernel/vdso/datapage.S | 4 +-
+ arch/powerpc/kernel/vdso/gettimeofday.S | 4 +-
+ arch/powerpc/kernel/vdso/vdso32.lds.S | 4 +-
+ arch/powerpc/kernel/vdso/vdso64.lds.S | 4 +-
+ arch/powerpc/kernel/vdso/vgettimeofday.c | 14 +-
+ arch/powerpc/kernel/watchdog.c | 3 +-
+ arch/powerpc/kvm/powerpc.c | 4 +-
+ arch/riscv/Kconfig | 4 +-
+ arch/riscv/include/asm/io.h | 2 +-
+ arch/riscv/include/asm/vdso.h | 2 +-
+ .../include/asm/vdso/{time_data.h => arch_data.h} | 8 +-
+ arch/riscv/include/asm/vdso/gettimeofday.h | 14 +-
+ arch/riscv/include/asm/vdso/vsyscall.h | 9 -
+ arch/riscv/kernel/sys_hwprobe.c | 3 +-
+ arch/riscv/kernel/vdso.c | 90 +------
+ arch/riscv/kernel/vdso/Makefile | 2 +-
+ arch/riscv/kernel/vdso/hwprobe.c | 6 +-
+ arch/riscv/kernel/vdso/vdso.lds.S | 7 +-
+ arch/riscv/kvm/vcpu_timer.c | 7 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/vdso.h | 4 +-
+ arch/s390/include/asm/vdso/getrandom.h | 12 -
+ arch/s390/include/asm/vdso/gettimeofday.h | 15 +-
+ arch/s390/include/asm/vdso/vsyscall.h | 20 --
+ arch/s390/kernel/time.c | 6 +-
+ arch/s390/kernel/vdso.c | 97 +-------
+ arch/s390/kernel/vdso32/Makefile | 2 +-
+ arch/s390/kernel/vdso32/vdso32.lds.S | 7 +-
+ arch/s390/kernel/vdso64/Makefile | 2 +-
+ arch/s390/kernel/vdso64/vdso64.lds.S | 8 +-
+ arch/s390/kvm/interrupt.c | 3 +-
+ arch/s390/kvm/kvm-s390.c | 4 +-
+ arch/um/kernel/um_arch.c | 11 +-
+ arch/x86/Kconfig | 15 +-
+ arch/x86/Makefile | 20 +-
+ arch/x86/boot/compressed/misc.c | 14 +-
+ arch/x86/crypto/aesni-intel_asm.S | 2 +
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 7 +-
+ arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 1 +
+ arch/x86/crypto/camellia-x86_64-asm_64.S | 9 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 7 +-
+ arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 5 +-
+ arch/x86/crypto/twofish-x86_64-asm_64.S | 5 +-
+ arch/x86/entry/calling.h | 1 +
+ arch/x86/entry/entry.S | 4 +-
+ arch/x86/entry/entry_64.S | 5 +-
+ arch/x86/entry/entry_64_fred.S | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/entry/vdso/Makefile | 3 +-
+ arch/x86/entry/vdso/vdso-layout.lds.S | 10 +-
+ arch/x86/entry/vdso/vdso2c.c | 21 --
+ arch/x86/entry/vdso/vdso2c.h | 20 --
+ arch/x86/entry/vdso/vma.c | 128 +---------
+ arch/x86/events/amd/ibs.c | 206 ++++++++++++---
+ arch/x86/events/amd/iommu.c | 2 +-
+ arch/x86/events/core.c | 15 +-
+ arch/x86/events/intel/bts.c | 22 +-
+ arch/x86/events/intel/core.c | 118 ++++++---
+ arch/x86/events/intel/ds.c | 204 +++++++++++++--
+ arch/x86/events/intel/uncore.c | 3 +-
+ arch/x86/events/perf_event.h | 16 +-
+ arch/x86/events/perf_event_flags.h | 2 +-
+ arch/x86/events/rapl.c | 3 +-
+ arch/x86/hyperv/mmu.c | 1 -
+ arch/x86/include/asm/alternative.h | 15 +-
+ arch/x86/include/asm/amd-ibs.h | 3 +-
+ arch/x86/include/asm/bug.h | 5 +-
+ arch/x86/include/asm/cfi.h | 11 +
+ arch/x86/include/asm/cmpxchg_32.h | 32 +--
+ arch/x86/include/asm/desc.h | 1 -
+ arch/x86/include/asm/e820/api.h | 1 -
+ arch/x86/include/asm/e820/types.h | 9 -
+ arch/x86/include/asm/elf.h | 5 +-
+ arch/x86/include/asm/ftrace.h | 16 +-
+ arch/x86/include/asm/ibt.h | 9 +-
+ arch/x86/include/asm/intel-family.h | 14 +-
+ arch/x86/include/asm/io.h | 3 +
+ arch/x86/include/asm/linkage.h | 18 +-
+ arch/x86/include/asm/page_64.h | 1 +
+ arch/x86/include/asm/paravirt.h | 5 -
+ arch/x86/include/asm/paravirt_types.h | 14 +-
+ arch/x86/include/asm/percpu.h | 99 +++-----
+ arch/x86/include/asm/perf_event.h | 20 ++
+ arch/x86/include/asm/pgtable_types.h | 2 +
+ arch/x86/include/asm/processor.h | 28 +--
+ arch/x86/include/asm/proto.h | 3 +-
+ arch/x86/include/asm/setup.h | 1 +
+ arch/x86/include/asm/smp.h | 3 +
+ arch/x86/include/asm/special_insns.h | 4 +-
+ arch/x86/include/asm/stackprotector.h | 36 +--
+ arch/x86/include/asm/string_64.h | 2 +
+ arch/x86/include/asm/tlbflush.h | 2 +-
+ arch/x86/include/asm/traps.h | 2 -
+ arch/x86/include/asm/vdso.h | 6 -
+ arch/x86/include/asm/vdso/getrandom.h | 10 -
+ arch/x86/include/asm/vdso/gettimeofday.h | 25 +-
+ arch/x86/include/asm/vdso/vsyscall.h | 23 +-
+ arch/x86/kernel/Makefile | 2 +
+ arch/x86/kernel/acpi/cstate.c | 11 +
+ arch/x86/kernel/acpi/madt_playdead.S | 1 +
+ arch/x86/kernel/acpi/wakeup_64.S | 1 +
+ arch/x86/kernel/alternative.c | 276 ++++++++++++---------
+ arch/x86/kernel/apic/ipi.c | 3 +-
+ arch/x86/kernel/apic/vector.c | 231 ++++++++---------
+ arch/x86/kernel/asm-offsets_64.c | 6 -
+ arch/x86/kernel/bootflag.c | 12 +-
+ arch/x86/kernel/callthunks.c | 13 -
+ arch/x86/kernel/cfi.c | 22 +-
+ arch/x86/kernel/cpu/common.c | 11 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 155 ++++++------
+ arch/x86/kernel/cpu/microcode/internal.h | 2 -
+ arch/x86/kernel/e820.c | 115 ++++-----
+ arch/x86/kernel/early_printk.c | 49 ++--
+ arch/x86/kernel/fpu/core.c | 2 +-
+ arch/x86/kernel/fpu/internal.h | 2 +-
+ arch/x86/kernel/ftrace.c | 30 ++-
+ arch/x86/kernel/ftrace_64.S | 5 +
+ arch/x86/kernel/head64.c | 2 +-
+ arch/x86/kernel/head_64.S | 20 +-
+ arch/x86/kernel/ioport.c | 2 +-
+ arch/x86/kernel/irq_64.c | 1 -
+ arch/x86/kernel/irqflags.S | 1 +
+ arch/x86/kernel/kprobes/core.c | 11 +-
+ arch/x86/kernel/kvm.c | 1 -
+ arch/x86/kernel/module.c | 83 +++----
+ arch/x86/kernel/paravirt.c | 30 +--
+ arch/x86/kernel/process.c | 5 +-
+ arch/x86/kernel/process_32.c | 5 -
+ arch/x86/kernel/process_64.c | 20 +-
+ arch/x86/kernel/setup.c | 200 +++++++++------
+ arch/x86/kernel/setup_percpu.c | 12 +-
+ arch/x86/kernel/smpboot.c | 47 +---
+ arch/x86/kernel/tboot.c | 3 +-
+ arch/x86/kernel/traps.c | 82 ++++--
+ arch/x86/kernel/tsc.c | 4 +-
+ arch/x86/kernel/tsc_msr.c | 2 +-
+ arch/x86/kernel/vmlinux.lds.S | 35 ---
+ arch/x86/kvm/hyperv.c | 3 +-
+ arch/x86/kvm/i8254.c | 3 +-
+ arch/x86/kvm/lapic.c | 5 +-
+ arch/x86/kvm/vmx/nested.c | 5 +-
+ arch/x86/kvm/xen.c | 4 +-
+ arch/x86/lib/clear_page_64.S | 9 +-
+ arch/x86/lib/copy_page_64.S | 3 +-
+ arch/x86/lib/copy_user_64.S | 3 +
+ arch/x86/lib/copy_user_uncached_64.S | 2 +
+ arch/x86/lib/getuser.S | 9 +
+ arch/x86/lib/hweight.S | 3 +
+ arch/x86/lib/memmove_64.S | 3 +-
+ arch/x86/lib/memset_64.S | 3 +-
+ arch/x86/lib/msr-reg.S | 3 +-
+ arch/x86/lib/putuser.S | 9 +
+ arch/x86/lib/retpoline.S | 1 +
+ arch/x86/lib/usercopy_64.c | 2 +-
+ arch/x86/mm/init_64.c | 8 -
+ arch/x86/mm/ioremap.c | 8 +
+ arch/x86/mm/kaslr.c | 10 +-
+ arch/x86/mm/mem_encrypt_boot.S | 1 +
+ arch/x86/mm/mmap.c | 9 +-
+ arch/x86/mm/pat/cpa-test.c | 2 +-
+ arch/x86/mm/pat/set_memory.c | 224 ++++++++++++++++-
+ arch/x86/mm/pgtable.c | 27 +-
+ arch/x86/mm/tlb.c | 2 +-
+ arch/x86/net/bpf_jit_comp.c | 4 +-
+ arch/x86/platform/olpc/olpc-xo1-sci.c | 1 -
+ arch/x86/platform/pvh/head.S | 14 +-
+ arch/x86/power/hibernate_asm_64.S | 2 +
+ arch/x86/tools/relocs.c | 147 +----------
+ arch/x86/virt/svm/sev.c | 1 -
+ arch/x86/xen/mmu_pv.c | 1 -
+ arch/x86/xen/xen-asm.S | 5 +
+ arch/x86/xen/xen-head.S | 12 +-
+ block/bfq-iosched.c | 5 +-
+ block/blk-iocost.c | 3 +-
+ drivers/acpi/processor_idle.c | 2 +
+ drivers/ata/pata_octeon_cf.c | 5 +-
+ drivers/base/power/runtime.c | 4 +-
+ drivers/block/null_blk/main.c | 7 +-
+ drivers/char/hw_random/timeriomem-rng.c | 3 +-
+ drivers/char/random.c | 6 +-
+ drivers/devfreq/event/rockchip-dfi.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +-
+ drivers/gpu/drm/i915/gvt/display.c | 3 +-
+ drivers/gpu/drm/i915/gvt/sched_policy.c | 3 +-
+ drivers/gpu/drm/i915/i915_perf.c | 5 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 3 +-
+ drivers/gpu/drm/i915/i915_request.c | 3 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 3 +-
+ drivers/gpu/drm/msm/msm_fence.c | 3 +-
+ drivers/gpu/drm/msm/msm_io_utils.c | 3 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 4 +-
+ drivers/gpu/drm/xe/xe_oa.c | 4 +-
+ drivers/hwtracing/stm/heartbeat.c | 6 +-
+ drivers/i2c/busses/i2c-imx.c | 4 +-
+ drivers/idle/intel_idle.c | 14 ++
+ drivers/iio/adc/ti-tsc2046.c | 4 +-
+ drivers/iio/trigger/iio-trig-hrtimer.c | 4 +-
+ drivers/infiniband/hw/hfi1/init.c | 5 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 5 +-
+ drivers/irqchip/Kconfig | 8 +-
+ drivers/irqchip/irq-gic-v2m.c | 1 +
+ drivers/irqchip/irq-gic-v3-its-msi-parent.c | 1 +
+ drivers/irqchip/irq-gic-v3-its.c | 23 +-
+ drivers/irqchip/irq-gic-v3-mbi.c | 1 +
+ drivers/irqchip/irq-imx-mu-msi.c | 1 +
+ drivers/irqchip/irq-loongson-pch-msi.c | 1 +
+ drivers/irqchip/irq-msi-lib.c | 11 +-
+ drivers/irqchip/irq-mvebu-gicp.c | 1 +
+ drivers/irqchip/irq-mvebu-odmi.c | 1 +
+ drivers/irqchip/irq-mvebu-sei.c | 1 +
+ drivers/irqchip/irq-renesas-rzg2l.c | 53 ++--
+ drivers/irqchip/irq-riscv-aplic-direct.c | 24 +-
+ drivers/irqchip/irq-riscv-imsic-early.c | 14 +-
+ drivers/irqchip/irq-riscv-imsic-platform.c | 215 ++++++++--------
+ drivers/irqchip/irq-riscv-imsic-state.c | 151 ++++++++---
+ drivers/irqchip/irq-riscv-imsic-state.h | 12 +-
+ drivers/leds/trigger/ledtrig-pattern.c | 4 +-
+ drivers/mailbox/mailbox.c | 4 +-
+ drivers/media/cec/core/cec-pin.c | 3 +-
+ drivers/media/pci/cx88/cx88-input.c | 3 +-
+ .../media/platform/chips-media/wave5/wave5-vpu.c | 4 +-
+ drivers/media/rc/pwm-ir-tx.c | 3 +-
+ drivers/misc/vcpu_stall_detector.c | 3 +-
+ drivers/mmc/host/dw_mmc.c | 3 +-
+ drivers/net/can/m_can/m_can.c | 9 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 8 +-
+ drivers/net/ethernet/cortina/gemini.c | 5 +-
+ drivers/net/ethernet/ec_bhf.c | 3 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 4 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 4 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +-
+ drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 3 +-
+ .../net/ethernet/microchip/sparx5/sparx5_packet.c | 4 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 9 +-
+ drivers/net/ethernet/ti/icssg/icssg_common.c | 5 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 5 +-
+ drivers/net/ieee802154/at86rf230.c | 4 +-
+ drivers/net/usb/cdc_ncm.c | 3 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 6 +-
+ drivers/net/wwan/iosm/iosm_ipc_imem.c | 24 +-
+ drivers/ntb/test/ntb_pingpong.c | 3 +-
+ drivers/pci/Kconfig | 6 +
+ drivers/perf/arm-ccn.c | 5 +-
+ drivers/perf/marvell_cn10k_ddr_pmu.c | 4 +-
+ drivers/perf/thunderx2_pmu.c | 5 +-
+ drivers/power/reset/ltc2952-poweroff.c | 8 +-
+ drivers/power/supply/ab8500_chargalg.c | 9 +-
+ drivers/powercap/idle_inject.c | 3 +-
+ drivers/powercap/intel_rapl_common.c | 5 +-
+ drivers/pps/generators/pps_gen_parport.c | 3 +-
+ drivers/rtc/class.c | 3 +-
+ drivers/s390/crypto/ap_bus.c | 3 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 7 +-
+ drivers/scsi/scsi_debug.c | 4 +-
+ .../media/atomisp/include/linux/atomisp_platform.h | 4 +-
+ drivers/thermal/intel/intel_tcc.c | 2 +-
+ drivers/tty/serial/8250/8250_bcm7271.c | 3 +-
+ drivers/tty/serial/8250/8250_port.c | 10 +-
+ drivers/tty/serial/amba-pl011.c | 9 +-
+ drivers/tty/serial/imx.c | 8 +-
+ drivers/tty/serial/sh-sci.c | 3 +-
+ drivers/tty/serial/xilinx_uartps.c | 8 +-
+ drivers/usb/chipidea/otg_fsm.c | 3 +-
+ drivers/usb/dwc2/hcd_queue.c | 3 +-
+ drivers/usb/fotg210/fotg210-hcd.c | 3 +-
+ drivers/usb/gadget/function/f_ncm.c | 3 +-
+ drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
+ drivers/usb/host/ehci-hcd.c | 3 +-
+ drivers/usb/musb/musb_cppi41.c | 4 +-
+ drivers/usb/typec/tcpm/tcpm.c | 16 +-
+ drivers/virtio/virtio_mem.c | 4 +-
+ drivers/watchdog/softdog.c | 8 +-
+ drivers/watchdog/watchdog_dev.c | 4 +-
+ drivers/watchdog/watchdog_hrtimer_pretimeout.c | 4 +-
+ fs/timerfd.c | 5 +-
+ fs/ubifs/io.c | 3 +-
+ include/acpi/processor.h | 5 +
+ include/asm-generic/sections.h | 2 +-
+ include/asm-generic/vdso/vsyscall.h | 27 +-
+ include/asm-generic/vmlinux.lds.h | 38 +--
+ include/linux/acpi.h | 1 -
+ include/linux/align.h | 10 +-
+ include/linux/compiler.h | 10 +
+ include/linux/execmem.h | 31 +++
+ include/linux/hrtimer.h | 8 +-
+ include/linux/irq.h | 7 +-
+ include/linux/module.h | 16 --
+ include/linux/moduleloader.h | 4 -
+ include/linux/msi.h | 11 +
+ include/linux/objtool.h | 4 +-
+ include/linux/percpu-defs.h | 12 -
+ include/linux/perf_event.h | 17 +-
+ include/linux/time_namespace.h | 2 -
+ include/linux/uprobes.h | 1 +
+ include/linux/vdso_datastore.h | 10 +
+ include/linux/vm_event_item.h | 2 +
+ include/vdso/align.h | 15 ++
+ include/vdso/datapage.h | 72 ++++--
+ include/vdso/helpers.h | 8 +-
+ init/Kconfig | 5 -
+ io_uring/io_uring.c | 2 +-
+ io_uring/timeout.c | 13 +-
+ kernel/bpf/helpers.c | 3 +-
+ kernel/events/callchain.c | 38 ++-
+ kernel/events/core.c | 97 ++++++--
+ kernel/events/ring_buffer.c | 1 +
+ kernel/events/uprobes.c | 10 +-
+ kernel/fork.c | 3 +-
+ kernel/iomem.c | 5 +-
+ kernel/irq/internals.h | 2 +
+ kernel/irq/migration.c | 20 ++
+ kernel/kallsyms.c | 12 +-
+ kernel/locking/mutex.c | 2 +
+ kernel/module/main.c | 81 ++----
+ kernel/module/strict_rwx.c | 9 +-
+ kernel/sched/core.c | 4 +-
+ kernel/sched/cputime.c | 8 +-
+ kernel/sched/deadline.c | 6 +-
+ kernel/sched/fair.c | 75 ++++--
+ kernel/sched/rt.c | 5 +-
+ kernel/sched/sched.h | 4 +-
+ kernel/sched/syscalls.c | 10 +-
+ kernel/sysctl.c | 120 ---------
+ kernel/time/hrtimer.c | 34 +--
+ kernel/time/namespace.c | 12 +-
+ kernel/time/ntp.c | 3 +-
+ kernel/time/posix-timers.c | 11 +-
+ kernel/time/sched_clock.c | 3 +-
+ kernel/time/tick-broadcast-hrtimer.c | 3 +-
+ kernel/time/tick-sched.c | 6 +-
+ kernel/time/vsyscall.c | 19 +-
+ kernel/trace/bpf_trace.c | 21 +-
+ kernel/trace/trace_osnoise.c | 6 +-
+ kernel/watchdog.c | 3 +-
+ lib/Makefile | 2 +-
+ lib/test_objpool.c | 3 +-
+ lib/vdso/Kconfig | 5 +
+ lib/vdso/Makefile | 19 +-
+ lib/vdso/Makefile.include | 18 ++
+ lib/vdso/datastore.c | 129 ++++++++++
+ lib/vdso/getrandom.c | 8 +-
+ lib/vdso/gettimeofday.c | 74 +++---
+ mm/execmem.c | 39 ++-
+ mm/percpu.c | 4 +-
+ mm/slab_common.c | 4 +-
+ mm/vmstat.c | 2 +
+ net/can/bcm.c | 20 +-
+ net/can/isotp.c | 10 +-
+ net/can/j1939/bus.c | 4 +-
+ net/can/j1939/transport.c | 8 +-
+ net/core/dev.c | 3 +-
+ net/ipv4/tcp_timer.c | 10 +-
+ net/mac802154/main.c | 4 +-
+ net/sched/act_gate.c | 3 +-
+ net/sched/sch_api.c | 3 +-
+ net/sched/sch_taprio.c | 6 +-
+ net/xfrm/xfrm_iptfs.c | 6 +-
+ net/xfrm/xfrm_state.c | 4 +-
+ scripts/gcc-x86_32-has-stack-protector.sh | 8 -
+ scripts/gcc-x86_64-has-stack-protector.sh | 4 -
+ scripts/kallsyms.c | 70 +-----
+ scripts/link-vmlinux.sh | 4 -
+ scripts/min-tool-version.sh | 4 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 3 +-
+ tools/arch/x86/include/asm/amd-ibs.h | 3 +-
+ tools/objtool/arch/x86/decode.c | 1 +
+ tools/objtool/check.c | 12 +-
+ tools/power/x86/turbostat/turbostat.c | 2 +-
+ tools/testing/selftests/rseq/.gitignore | 1 +
+ tools/testing/selftests/rseq/Makefile | 9 +-
+ tools/testing/selftests/rseq/rseq.c | 6 +-
+ tools/testing/selftests/rseq/rseq.h | 5 +
+ .../selftests/rseq/run_syscall_errors_test.sh | 5 +
+ tools/testing/selftests/rseq/syscall_errors_test.c | 124 +++++++++
+ tools/testing/selftests/x86/lam.c | 147 ++++++++++-
+ 451 files changed, 3657 insertions(+), 3756 deletions(-)
+ create mode 100644 arch/loongarch/include/asm/vdso/arch_data.h
+ create mode 100644 arch/powerpc/include/asm/vdso/arch_data.h
+ rename arch/riscv/include/asm/vdso/{time_data.h => arch_data.h} (71%)
+ create mode 100644 include/linux/vdso_datastore.h
+ create mode 100644 include/vdso/align.h
+ create mode 100644 lib/vdso/Makefile.include
+ create mode 100644 lib/vdso/datastore.c
+ delete mode 100755 scripts/gcc-x86_32-has-stack-protector.sh
+ delete mode 100755 scripts/gcc-x86_64-has-stack-protector.sh
+ create mode 100755 tools/testing/selftests/rseq/run_syscall_errors_test.sh
+ create mode 100644 tools/testing/selftests/rseq/syscall_errors_test.c
+Merging clockevents/timers/drivers/next (fafc3058cc2f dt-bindings: timer: exynos4210-mct: Add samsung,exynos990-mct compatible)
+$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/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/arm,twd-timer.yaml | 6 +--
+ .../devicetree/bindings/timer/renesas,cmt.yaml | 44 +++++++++++-----------
+ .../devicetree/bindings/timer/renesas,em-sti.yaml | 10 ++---
+ .../devicetree/bindings/timer/renesas,mtu2.yaml | 14 +++----
+ .../devicetree/bindings/timer/renesas,ostm.yaml | 10 ++---
+ .../devicetree/bindings/timer/renesas,tmu.yaml | 22 +++++------
+ .../devicetree/bindings/timer/renesas,tpu.yaml | 8 ++--
+ .../bindings/timer/samsung,exynos4210-mct.yaml | 2 +
+ .../devicetree/bindings/timer/sifive,clint.yaml | 2 +-
+ 9 files changed, 60 insertions(+), 58 deletions(-)
+Merging edac/edac-for-next (b3205f5a415b Merge branch 'edac-drivers' into edac-for-next)
+$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
+Merge made by the 'ort' strategy.
+ drivers/edac/i10nm_base.c | 2 ++
+ drivers/edac/ie31200_edac.c | 28 +++++++++++++---------------
+ drivers/edac/igen6_edac.c | 21 +++++++++++++++------
+ drivers/edac/skx_common.c | 33 +++++++++++++++++++++++++++++++++
+ drivers/edac/skx_common.h | 11 +++++++++++
+ 5 files changed, 74 insertions(+), 21 deletions(-)
+Merging ftrace/for-next (264143c4e544 ftrace: Have ftrace pages output reflect freed pages)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
+Auto-merging arch/arm64/Kconfig
+Auto-merging kernel/trace/ftrace.c
+Auto-merging scripts/link-vmlinux.sh
+Merge made by the 'ort' strategy.
+ arch/arm64/Kconfig | 1 +
+ kernel/trace/ftrace.c | 44 +++++-
+ scripts/link-vmlinux.sh | 4 +-
+ scripts/sorttable.c | 401 +++++++++++++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 436 insertions(+), 14 deletions(-)
+Merging rcu/next (83ad40ba2e4a Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.02.20a', 'misc.2025.02.06a', 'srcu.2025.02.05a' and 'torture.2025.02.05a')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/trace/trace_osnoise.c
+Merge made by the 'ort' strategy.
+ Documentation/RCU/rcubarrier.rst | 5 +-
+ Documentation/RCU/stallwarn.rst | 7 +
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/core-api/this_cpu_ops.rst | 20 +-
+ include/linux/rcupdate.h | 25 +--
+ include/linux/rcutree.h | 2 +-
+ include/linux/srcu.h | 102 ++++++++--
+ include/linux/srcutiny.h | 29 ++-
+ include/linux/srcutree.h | 98 ++++++++--
+ include/linux/torture.h | 1 +
+ include/trace/events/rcu.h | 2 +-
+ init/main.c | 1 -
+ kernel/context_tracking.c | 9 +-
+ kernel/rcu/Kconfig | 35 +++-
+ kernel/rcu/Kconfig.debug | 18 +-
+ kernel/rcu/rcu.h | 13 +-
+ kernel/rcu/rcutorture.c | 84 ++++++++-
+ kernel/rcu/refscale.c | 32 +++-
+ kernel/rcu/srcutiny.c | 20 +-
+ kernel/rcu/srcutree.c | 207 +++++++++++----------
+ kernel/rcu/tasks.h | 5 +-
+ kernel/rcu/tiny.c | 14 ++
+ kernel/rcu/tree.c | 50 ++++-
+ kernel/rcu/tree_exp.h | 6 +-
+ kernel/rcu/tree_nocb.h | 20 +-
+ kernel/rcu/tree_plugin.h | 22 ++-
+ kernel/sched/core.c | 4 +-
+ kernel/torture.c | 12 ++
+ kernel/trace/trace_osnoise.c | 32 ++--
+ .../selftests/rcutorture/bin/srcu_lockdep.sh | 2 +-
+ .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE07 | 3 +-
+ .../selftests/rcutorture/configs/rcu/TREE10 | 3 +-
+ 33 files changed, 660 insertions(+), 229 deletions(-)
+Merging paulmck/non-rcu/next (de3ac915f986 tools/memory-model: Distinguish between syntactic and semantic tags)
+$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next
+Merge made by the 'ort' strategy.
+ .../Documentation/herd-representation.txt | 49 ++++---
+ tools/memory-model/README | 2 +-
+ tools/memory-model/linux-kernel.bell | 33 +++--
+ tools/memory-model/linux-kernel.cat | 10 ++
+ tools/memory-model/linux-kernel.cfg | 1 +
+ tools/memory-model/linux-kernel.def | 157 ++++++++++++---------
+ 6 files changed, 155 insertions(+), 97 deletions(-)
+Merging kvm/next (d3d0b8dfe060 Merge tag 'kvm-x86-fixes-6.14-rcN' 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 (86d8f0dd0035 Merge branch 'kvm-arm64/nv-idregs' into kvmarm/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Auto-merging arch/arm64/kvm/arm.c
+Merge made by the 'ort' strategy.
+ arch/arm64/include/asm/kvm_nested.h | 1 +
+ arch/arm64/include/uapi/asm/kvm.h | 1 +
+ arch/arm64/kernel/cpufeature.c | 15 +-
+ arch/arm64/kvm/arm.c | 5 +-
+ arch/arm64/kvm/nested.c | 273 +++++++++++++++++++-----------------
+ arch/arm64/kvm/sys_regs.c | 63 +++++----
+ arch/arm64/kvm/sys_regs.h | 10 ++
+ 7 files changed, 207 insertions(+), 161 deletions(-)
+Merging kvms390/next (32239066776a KVM: s390: selftests: Streamline uc_skey test to issue iske after sske)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Already up to date.
+Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'topic/ppc-kvm' of git://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 (d252435aca44 riscv: KVM: Remove unnecessary vcpu kick)
+$ 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 (fed48e2967f4 Merge branches 'fixes', 'misc', 'mmu', 'pvclock', 'selftests', 'selftests_6.14', 'svm' and 'xen')
+$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/x86/kvm/svm/sev.c
+Auto-merging arch/x86/kvm/vmx/nested.c
+Auto-merging arch/x86/kvm/xen.c
+Auto-merging virt/kvm/kvm_main.c
+Merge made by the 'ort' strategy.
+ Documentation/virt/kvm/locking.rst | 4 +-
+ arch/x86/include/asm/kvm_host.h | 10 +-
+ arch/x86/kvm/Kconfig | 1 +
+ arch/x86/kvm/cpuid.c | 44 +-
+ arch/x86/kvm/cpuid.h | 9 +-
+ arch/x86/kvm/i8259.c | 2 +-
+ arch/x86/kvm/lapic.c | 17 +-
+ arch/x86/kvm/mmu/mmu.c | 363 ++++++++++----
+ arch/x86/kvm/mmu/spte.c | 31 +-
+ arch/x86/kvm/mmu/spte.h | 2 +-
+ arch/x86/kvm/mmu/tdp_iter.h | 34 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 36 +-
+ arch/x86/kvm/smm.c | 2 +-
+ arch/x86/kvm/svm/nested.c | 2 +-
+ arch/x86/kvm/svm/sev.c | 146 +++---
+ arch/x86/kvm/svm/svm.c | 2 +-
+ arch/x86/kvm/svm/svm.h | 8 +-
+ arch/x86/kvm/vmx/nested.c | 4 +-
+ arch/x86/kvm/vmx/vmx.c | 2 +-
+ arch/x86/kvm/x86.c | 161 ++++---
+ arch/x86/kvm/x86.h | 7 +
+ arch/x86/kvm/xen.c | 73 ++-
+ include/linux/kvm_host.h | 1 +
+ .../selftests/kvm/access_tracking_perf_test.c | 2 +-
+ tools/testing/selftests/kvm/dirty_log_test.c | 521 ++++++++++-----------
+ tools/testing/selftests/kvm/include/kvm_util.h | 33 +-
+ tools/testing/selftests/kvm/include/test_util.h | 2 +-
+ .../testing/selftests/kvm/include/x86/processor.h | 49 +-
+ tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 28 +-
+ tools/testing/selftests/kvm/lib/kvm_util.c | 114 +++--
+ .../kvm/x86/dirty_log_page_splitting_test.c | 6 +-
+ tools/testing/selftests/kvm/x86/hyperv_ipi.c | 6 +-
+ .../testing/selftests/kvm/x86/nx_huge_pages_test.c | 4 +-
+ .../testing/selftests/kvm/x86/pmu_counters_test.c | 158 ++++---
+ tools/testing/selftests/kvm/x86/svm_int_ctl_test.c | 5 +-
+ .../selftests/kvm/x86/ucna_injection_test.c | 2 +-
+ tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 5 +-
+ tools/testing/selftests/kvm/x86/xapic_state_test.c | 4 +-
+ tools/testing/selftests/kvm/x86/xen_shinfo_test.c | 5 +-
+ virt/kvm/Kconfig | 4 +
+ virt/kvm/kvm_main.c | 53 ++-
+ 41 files changed, 1149 insertions(+), 813 deletions(-)
+Merging xen-tip/linux-next (75ad02318af2 Xen/swiotlb: mark xen_swiotlb_fixup() __init)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Already up to date.
+Merging workqueues/for-next (1e5f94eb8ef7 Merge branch 'for-6.15' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Merge made by the 'ort' strategy.
+ kernel/workqueue.c | 4 +++-
+ rust/kernel/workqueue.rs | 18 ++++++++++++++++++
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+Merging sched-ext/for-next (fe4b65fc612a Merge branch 'for-6.15' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next
+Auto-merging MAINTAINERS
+Auto-merging kernel/sched/core.c
+Auto-merging mm/mempolicy.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 3 +-
+ include/linux/nodemask.h | 8 +-
+ include/linux/nodemask_types.h | 11 +-
+ include/linux/numa.h | 17 +-
+ include/linux/sched/ext.h | 1 +
+ include/linux/topology.h | 30 +
+ kernel/sched/build_policy.c | 1 +
+ kernel/sched/core.c | 9 +-
+ kernel/sched/ext.c | 1067 +++++++--------------
+ kernel/sched/ext.h | 10 +
+ kernel/sched/ext_idle.c | 1139 +++++++++++++++++++++++
+ kernel/sched/ext_idle.h | 35 +
+ mm/mempolicy.c | 31 +
+ tools/sched_ext/include/scx/common.bpf.h | 34 +
+ tools/sched_ext/include/scx/common.h | 1 +
+ tools/sched_ext/include/scx/compat.bpf.h | 87 ++
+ tools/sched_ext/include/scx/compat.h | 6 +
+ tools/sched_ext/include/scx/enum_defs.autogen.h | 120 +++
+ tools/sched_ext/scx_central.c | 15 +-
+ tools/sched_ext/scx_qmap.bpf.c | 23 +-
+ 20 files changed, 1874 insertions(+), 774 deletions(-)
+ create mode 100644 kernel/sched/ext_idle.c
+ create mode 100644 kernel/sched/ext_idle.h
+ create mode 100644 tools/sched_ext/include/scx/enum_defs.autogen.h
+Merging drivers-x86/for-next (c86e269c4da6 platform/x86: dell: Use *-y instead of *-objs in Makefile)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-platform-mellanox-bootctl | 10 +
+ Documentation/admin-guide/laptops/index.rst | 1 +
+ .../admin-guide/laptops/samsung-galaxybook.rst | 174 +++
+ MAINTAINERS | 17 +-
+ drivers/char/sonypi.c | 11 +-
+ drivers/platform/mellanox/Kconfig | 13 +
+ drivers/platform/mellanox/Makefile | 1 +
+ drivers/platform/{x86 => mellanox}/mlx-platform.c | 17 +-
+ drivers/platform/mellanox/mlxbf-bootctl.c | 20 +
+ drivers/platform/mellanox/mlxbf-bootctl.h | 5 +
+ drivers/platform/x86/Kconfig | 30 +-
+ drivers/platform/x86/Makefile | 6 +-
+ drivers/platform/x86/compal-laptop.c | 1 -
+ drivers/platform/x86/dell/Kconfig | 30 +-
+ drivers/platform/x86/dell/Makefile | 45 +-
+ drivers/platform/x86/dell/alienware-wmi-base.c | 491 +++++++
+ drivers/platform/x86/dell/alienware-wmi-legacy.c | 95 ++
+ drivers/platform/x86/dell/alienware-wmi-wmax.c | 768 +++++++++++
+ drivers/platform/x86/dell/alienware-wmi.c | 1249 -----------------
+ drivers/platform/x86/dell/alienware-wmi.h | 117 ++
+ drivers/platform/x86/ideapad-laptop.c | 23 +-
+ drivers/platform/x86/intel/int3472/discrete.c | 48 +-
+ drivers/platform/x86/intel/pmc/adl.c | 22 +-
+ drivers/platform/x86/intel/pmc/arl.c | 83 +-
+ drivers/platform/x86/intel/pmc/cnp.c | 21 +-
+ drivers/platform/x86/intel/pmc/core.c | 114 +-
+ drivers/platform/x86/intel/pmc/core.h | 46 +-
+ drivers/platform/x86/intel/pmc/icl.c | 18 +-
+ drivers/platform/x86/intel/pmc/lnl.c | 25 +-
+ drivers/platform/x86/intel/pmc/mtl.c | 45 +-
+ drivers/platform/x86/intel/pmc/spt.c | 33 +-
+ drivers/platform/x86/intel/pmc/tgl.c | 39 +-
+ drivers/platform/x86/samsung-galaxybook.c | 1423 ++++++++++++++++++++
+ drivers/platform/x86/thinkpad_acpi.c | 1 -
+ 34 files changed, 3467 insertions(+), 1575 deletions(-)
+ create mode 100644 Documentation/admin-guide/laptops/samsung-galaxybook.rst
+ rename drivers/platform/{x86 => mellanox}/mlx-platform.c (99%)
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi-base.c
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi-legacy.c
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi-wmax.c
+ delete mode 100644 drivers/platform/x86/dell/alienware-wmi.c
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi.h
+ create mode 100644 drivers/platform/x86/samsung-galaxybook.c
+Merging chrome-platform/for-next (9fc83373f0ff platform/chrome: cros_ec_typec: Add support for setting USB mode via sysfs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/platform/chrome/cros_ec_lpc.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-chromeos | 20 ++++++++
+ MAINTAINERS | 9 +++-
+ drivers/platform/chrome/cros_ec_lpc.c | 22 +++++---
+ drivers/platform/chrome/cros_ec_sysfs.c | 71 ++++++++++++++++++++++++++
+ drivers/platform/chrome/cros_ec_typec.c | 28 ++++++++++
+ drivers/platform/chrome/cros_ec_typec.h | 1 +
+ 6 files changed, 141 insertions(+), 10 deletions(-)
+Merging chrome-platform-firmware/for-firmware-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next
+Already up to date.
+Merging hsi/for-next (e3f88665a780 HSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Merge made by the 'ort' strategy.
+ drivers/hsi/clients/ssi_protocol.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging leds-lj/for-leds-next (012825dbd5aa Revert "leds-pca955x: Remove the unused function pca95xx_num_led_regs()")
+$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 4 +
+ .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 ---
+ .../devicetree/bindings/leds/ti,tlc59116.yaml | 90 ++++++
+ drivers/leds/leds-lp8860.c | 2 -
+ drivers/leds/leds-pca955x.c | 359 ++++++++++++++-------
+ drivers/leds/leds-st1202.c | 7 +-
+ drivers/leds/trigger/ledtrig-netdev.c | 16 +-
+ 7 files changed, 358 insertions(+), 160 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/ti,tlc59116.yaml
+Merging ipmi/for-next (d082ecbc71e9 Linux 6.14-rc4)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Already up to date.
+Merging driver-core/driver-core-next (354fd6e86fac rust: io: rename `io::Io` accessors)
+$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+Auto-merging include/linux/device.h
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +
+ arch/powerpc/kernel/secvar-sysfs.c | 24 +--
+ arch/powerpc/perf/hv-24x7.c | 8 +-
+ arch/powerpc/platforms/powernv/opal-core.c | 10 +-
+ arch/powerpc/platforms/powernv/opal-dump.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-elog.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-flash.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-msglog.c | 6 +-
+ arch/powerpc/platforms/powernv/ultravisor.c | 6 +-
+ arch/x86/kernel/cpu/resctrl/internal.h | 5 +
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 14 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 73 ++++---
+ drivers/accel/habanalabs/common/sysfs.c | 10 +-
+ drivers/base/bus.c | 2 +-
+ drivers/base/component.c | 12 +-
+ drivers/base/physical_location.c | 5 +-
+ drivers/cxl/port.c | 10 +-
+ drivers/firmware/dmi-sysfs.c | 28 ++-
+ drivers/firmware/dmi_scan.c | 4 +-
+ drivers/firmware/efi/mokvar-table.c | 4 +-
+ drivers/firmware/efi/rci2-table.c | 2 +-
+ drivers/firmware/qemu_fw_cfg.c | 6 +-
+ drivers/fsi/fsi-core.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 13 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 8 +-
+ drivers/gpu/drm/drm_sysfs.c | 10 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 8 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 12 +-
+ drivers/gpu/drm/lima/lima_drv.c | 8 +-
+ drivers/input/touchscreen/goodix_berlin_core.c | 10 +-
+ drivers/pcmcia/cistpl.c | 8 +-
+ drivers/rapidio/rio-sysfs.c | 14 +-
+ fs/kernfs/dir.c | 211 ++++++++++++---------
+ fs/kernfs/file.c | 6 +-
+ fs/kernfs/kernfs-internal.h | 37 +++-
+ fs/kernfs/mount.c | 46 +++--
+ fs/kernfs/symlink.c | 30 +--
+ fs/sysfs/dir.c | 2 +-
+ fs/sysfs/file.c | 24 ++-
+ include/linux/device.h | 2 +-
+ include/linux/device/class.h | 2 +-
+ include/linux/kernfs.h | 14 +-
+ kernel/Kconfig.hz | 2 +-
+ kernel/cgroup/cgroup-v1.c | 2 +-
+ kernel/cgroup/cgroup.c | 24 ++-
+ rust/kernel/io.rs | 66 +++----
+ samples/rust/rust_driver_pci.rs | 12 +-
+ security/selinux/hooks.c | 7 +-
+ tools/testing/selftests/bpf/progs/profiler.inc.h | 2 +-
+ 51 files changed, 503 insertions(+), 348 deletions(-)
+Merging usb/usb-next (c749f058b437 USB: core: Add eUSB2 descriptor and parsing in USB core)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Auto-merging drivers/usb/typec/ucsi/ucsi.c
+Auto-merging drivers/usb/typec/ucsi/ucsi.h
+Auto-merging drivers/usb/typec/ucsi/ucsi_acpi.c
+CONFLICT (content): Merge conflict in drivers/usb/typec/ucsi/ucsi_acpi.c
+Auto-merging drivers/usb/typec/ucsi/ucsi_ccg.c
+Auto-merging include/uapi/linux/usb/ch9.h
+Resolved 'drivers/usb/typec/ucsi/ucsi_acpi.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9ecb16c1d202] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mfd/aspeed-lpc.yaml | 2 +-
+ .../devicetree/bindings/usb/microchip,usb2514.yaml | 35 +-
+ .../devicetree/bindings/usb/parade,ps8830.yaml | 140 +++++++
+ .../bindings/usb/samsung,exynos-dwc3.yaml | 16 +-
+ .../devicetree/bindings/usb/snps,dwc3-common.yaml | 11 +
+ .../devicetree/bindings/usb/usb-device.yaml | 6 +-
+ .../driver-api/usb/writing_musb_glue_layer.rst | 2 +-
+ Documentation/usb/CREDITS | 2 +-
+ drivers/usb/core/config.c | 51 ++-
+ drivers/usb/dwc2/core.c | 1 +
+ drivers/usb/dwc2/core.h | 23 +-
+ drivers/usb/dwc2/gadget.c | 116 ++---
+ drivers/usb/dwc2/hcd.c | 99 ++---
+ drivers/usb/dwc2/platform.c | 38 ++
+ drivers/usb/dwc3/dwc3-am62.c | 12 +-
+ drivers/usb/dwc3/dwc3-pci.c | 10 +
+ drivers/usb/dwc3/gadget.c | 63 ++-
+ drivers/usb/gadget/function/uvc_queue.c | 2 -
+ drivers/usb/host/max3421-hcd.c | 7 +
+ drivers/usb/misc/onboard_usb_dev.h | 9 +-
+ drivers/usb/misc/usb251xb.c | 6 +-
+ drivers/usb/musb/jz4740.c | 4 +-
+ drivers/usb/musb/mediatek.c | 2 +-
+ drivers/usb/musb/mpfs.c | 2 +-
+ drivers/usb/musb/musb_core.c | 14 +-
+ drivers/usb/musb/sunxi.c | 4 +-
+ drivers/usb/phy/phy-mxs-usb.c | 8 +-
+ drivers/usb/typec/altmodes/thunderbolt.c | 10 +-
+ drivers/usb/typec/mux/Kconfig | 10 +
+ drivers/usb/typec/mux/Makefile | 1 +
+ drivers/usb/typec/mux/ps883x.c | 466 +++++++++++++++++++++
+ drivers/usb/typec/ucsi/cros_ec_ucsi.c | 22 +-
+ drivers/usb/typec/ucsi/debugfs.c | 6 +-
+ drivers/usb/typec/ucsi/trace.c | 2 +-
+ drivers/usb/typec/ucsi/ucsi.c | 19 +-
+ drivers/usb/typec/ucsi/ucsi.h | 10 +-
+ drivers/usb/typec/ucsi/ucsi_acpi.c | 29 +-
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 67 ++-
+ include/linux/platform_data/cros_ec_commands.h | 1 +
+ include/linux/usb.h | 8 +-
+ include/linux/usb/musb.h | 2 +-
+ include/uapi/linux/usb/ch9.h | 15 +
+ 42 files changed, 1099 insertions(+), 254 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/parade,ps8830.yaml
+ create mode 100644 drivers/usb/typec/mux/ps883x.c
+Merging thunderbolt/next (72cef52b353c thunderbolt: Make tb_tunnel_alloc_usb3() error paths consistent with the rest)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 4 ++--
+ drivers/thunderbolt/tunnel.c | 16 ++++++++--------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+Merging usb-serial/usb-next (6a7713ec5337 USB: serial: mos7840: drop unused defines)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Merge made by the 'ort' strategy.
+ drivers/usb/serial/mos7840.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+Merging tty/tty-next (d2fa8e52cf91 serial: xilinx_uartps: Switch to use hrtimer_setup())
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Auto-merging drivers/tty/serial/8250/8250_port.c
+Auto-merging drivers/tty/serial/amba-pl011.c
+Auto-merging drivers/tty/serial/imx.c
+Auto-merging drivers/tty/serial/sh-sci.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/serial/8250.yaml | 2 +-
+ .../bindings/serial/nvidia,tegra264-utc.yaml | 73 +++
+ .../devicetree/bindings/serial/pl011.yaml | 3 +
+ .../devicetree/bindings/serial/sprd-uart.yaml | 9 +-
+ Documentation/driver-api/serial/driver.rst | 4 +-
+ drivers/tty/serial/8250/8250_dw.c | 40 +-
+ drivers/tty/serial/8250/8250_port.c | 2 +-
+ drivers/tty/serial/Kconfig | 42 +-
+ drivers/tty/serial/Makefile | 2 +-
+ drivers/tty/serial/amba-pl011.c | 143 +++--
+ drivers/tty/serial/atmel_serial.c | 2 +-
+ drivers/tty/serial/fsl_lpuart.c | 2 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/kgdb_nmi.c | 280 ---------
+ drivers/tty/serial/kgdboc.c | 8 -
+ drivers/tty/serial/mpc52xx_uart.c | 1 -
+ drivers/tty/serial/pch_uart.c | 1 -
+ drivers/tty/serial/serial_mctrl_gpio.c | 62 +-
+ drivers/tty/serial/serial_mctrl_gpio.h | 33 +-
+ drivers/tty/serial/sh-sci.c | 73 ++-
+ drivers/tty/serial/stm32-usart.c | 2 +-
+ drivers/tty/serial/tegra-utc.c | 625 +++++++++++++++++++++
+ drivers/tty/tty_ldsem.c | 17 -
+ include/linux/kgdb.h | 11 -
+ include/linux/tty_ldisc.h | 1 -
+ kernel/debug/debug_core.c | 14 +-
+ kernel/debug/kdb/kdb_main.c | 37 --
+ 27 files changed, 977 insertions(+), 514 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra264-utc.yaml
+ delete mode 100644 drivers/tty/serial/kgdb_nmi.c
+ create mode 100644 drivers/tty/serial/tegra-utc.c
+Merging char-misc/char-misc-next (264ff8415aed ABI: pps: Add ABI documentation for Intel TIO)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging MAINTAINERS
+Auto-merging lib/Kconfig.debug
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-pps-gen-tio | 6 +
+ Documentation/driver-api/pps.rst | 27 ++-
+ MAINTAINERS | 1 +
+ drivers/android/binder_internal.h | 1 -
+ drivers/char/virtio_console.c | 9 +-
+ drivers/greybus/gb-beagleplay.c | 4 +-
+ drivers/misc/eeprom/ee1004.c | 4 +
+ drivers/misc/mei/bus.c | 52 ------
+ drivers/misc/mei/client.c | 22 ---
+ drivers/misc/mei/client.h | 2 -
+ drivers/misc/mei/hw-txe.c | 45 -----
+ drivers/misc/mei/hw-txe.h | 2 -
+ drivers/pps/generators/Kconfig | 16 ++
+ drivers/pps/generators/Makefile | 1 +
+ drivers/pps/generators/pps_gen-dummy.c | 2 +-
+ drivers/pps/generators/pps_gen.c | 14 +-
+ drivers/pps/generators/pps_gen_tio.c | 272 ++++++++++++++++++++++++++++
+ drivers/pps/generators/sysfs.c | 6 +-
+ include/linux/mei_cl_bus.h | 5 -
+ include/linux/pps_gen_kernel.h | 4 +-
+ lib/Kconfig.debug | 15 +-
+ scripts/tags.sh | 1 +
+ 22 files changed, 356 insertions(+), 155 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-pps-gen-tio
+ create mode 100644 drivers/pps/generators/pps_gen_tio.c
+Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
+$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
+Already up to date.
+Merging coresight/next (2197cbc22c1b coresight: tpdm: Constify amba_id table)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 26 ++
+ Documentation/trace/coresight/panic.rst | 362 +++++++++++++++++++++
+ drivers/hwtracing/coresight/Makefile | 2 +-
+ drivers/hwtracing/coresight/coresight-catu.c | 4 +-
+ .../hwtracing/coresight/coresight-cfg-preload.c | 2 +
+ .../hwtracing/coresight/coresight-cfg-preload.h | 2 +
+ drivers/hwtracing/coresight/coresight-cfg-pstop.c | 83 +++++
+ drivers/hwtracing/coresight/coresight-core.c | 42 +++
+ drivers/hwtracing/coresight/coresight-tmc-core.c | 321 +++++++++++++++++-
+ drivers/hwtracing/coresight/coresight-tmc-etf.c | 92 +++++-
+ drivers/hwtracing/coresight/coresight-tmc-etr.c | 184 ++++++++++-
+ drivers/hwtracing/coresight/coresight-tmc.h | 104 ++++++
+ drivers/hwtracing/coresight/coresight-tpda.c | 2 +-
+ drivers/hwtracing/coresight/coresight-tpdm.c | 2 +-
+ include/linux/coresight.h | 12 +
+ 15 files changed, 1224 insertions(+), 16 deletions(-)
+ create mode 100644 Documentation/trace/coresight/panic.rst
+ create mode 100644 drivers/hwtracing/coresight/coresight-cfg-pstop.c
+Merging fastrpc/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
+Already up to date.
+Merging fpga/for-next (cc1eb048e7ee fpga: m10bmc-sec: update email address for Peter Colberg)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-intel-m10-bmc | 4 ++--
+ .../ABI/testing/sysfs-driver-intel-m10-bmc-sec-update | 14 +++++++-------
+ MAINTAINERS | 2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+Merging icc/icc-next (4cc004716977 Merge branch 'icc-sm8750' into icc-next)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Already up to date.
+Merging iio/togreg (66e80e2f2176 iio: resolver: ad2s1210: use bitmap_write)
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/iio/adc/ad7606.c
+Auto-merging drivers/iio/dac/ad3552r.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-iio | 10 +-
+ Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 | 20 +
+ .../devicetree/bindings/iio/adc/adi,ad4030.yaml | 110 ++
+ .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 13 +
+ .../devicetree/bindings/iio/adc/adi,ad4851.yaml | 153 ++
+ .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 72 +-
+ .../devicetree/bindings/iio/adc/ti,ads7138.yaml | 63 +
+ .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 18 +-
+ .../devicetree/bindings/iio/frequency/adf4371.yaml | 5 +-
+ .../bindings/iio/humidity/sciosense,ens210.yaml | 12 +-
+ .../bindings/iio/light/brcm,apds9160.yaml | 78 +
+ .../bindings/iio/magnetometer/silabs,si7210.yaml | 48 +
+ .../bindings/iio/temperature/maxim,max31865.yaml | 18 +-
+ .../bindings/iio/temperature/ti,tmp117.yaml | 6 +-
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ Documentation/iio/ad4030.rst | 180 +++
+ Documentation/iio/ad4695.rst | 104 +-
+ Documentation/iio/ad7380.rst | 33 +-
+ Documentation/iio/ad7944.rst | 24 +-
+ Documentation/iio/index.rst | 1 +
+ MAINTAINERS | 19 +
+ drivers/iio/accel/adxl367.c | 194 +--
+ drivers/iio/accel/bma400_core.c | 2 +-
+ drivers/iio/accel/bmi088-accel-core.c | 2 +-
+ drivers/iio/accel/kionix-kx022a.c | 4 +-
+ drivers/iio/accel/mc3230.c | 95 +-
+ drivers/iio/accel/msa311.c | 2 +-
+ drivers/iio/adc/Kconfig | 44 +-
+ drivers/iio/adc/Makefile | 3 +
+ drivers/iio/adc/ad4000.c | 64 +-
+ drivers/iio/adc/ad4030.c | 1233 +++++++++++++++
+ drivers/iio/adc/ad4130.c | 25 +-
+ drivers/iio/adc/ad4695.c | 1084 +++++++++++--
+ drivers/iio/adc/ad4851.c | 1315 ++++++++++++++++
+ drivers/iio/adc/ad7124.c | 25 +-
+ drivers/iio/adc/ad7173.c | 668 +++++---
+ drivers/iio/adc/ad7380.c | 397 ++++-
+ drivers/iio/adc/ad7606.c | 175 ++-
+ drivers/iio/adc/ad7606.h | 103 +-
+ drivers/iio/adc/ad7606_bus_iface.h | 16 +
+ drivers/iio/adc/ad7606_par.c | 52 +-
+ drivers/iio/adc/ad7606_spi.c | 137 +-
+ drivers/iio/adc/ad7625.c | 13 +-
+ drivers/iio/adc/ad7779.c | 103 +-
+ drivers/iio/adc/ad7944.c | 309 +++-
+ drivers/iio/adc/ad9467.c | 23 +-
+ drivers/iio/adc/ad_sigma_delta.c | 11 +-
+ drivers/iio/adc/adi-axi-adc.c | 303 +++-
+ drivers/iio/adc/max1363.c | 163 +-
+ drivers/iio/adc/rtq6056.c | 46 +-
+ drivers/iio/adc/stm32-adc-core.c | 6 +-
+ drivers/iio/adc/ti-adc161s626.c | 14 +-
+ drivers/iio/adc/ti-ads1119.c | 17 +-
+ drivers/iio/adc/ti-ads124s08.c | 2 +-
+ drivers/iio/adc/ti-ads7138.c | 749 +++++++++
+ drivers/iio/addac/ad74413r.c | 14 +-
+ drivers/iio/amplifiers/hmc425a.c | 3 +-
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 150 +-
+ drivers/iio/chemical/ens160_core.c | 36 +-
+ drivers/iio/chemical/scd30_core.c | 70 +-
+ drivers/iio/common/cros_ec_sensors/Makefile | 3 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c | 9 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_trace.c | 32 +
+ .../common/cros_ec_sensors/cros_ec_sensors_trace.h | 56 +
+ drivers/iio/dac/Kconfig | 3 +
+ drivers/iio/dac/ad3552r-common.c | 50 +-
+ drivers/iio/dac/ad3552r-hs.c | 333 +++-
+ drivers/iio/dac/ad3552r-hs.h | 8 +
+ drivers/iio/dac/ad3552r.c | 36 -
+ drivers/iio/dac/ad3552r.h | 9 +-
+ drivers/iio/dac/ad5791.c | 187 ++-
+ drivers/iio/dac/ad8460.c | 18 +-
+ drivers/iio/dac/adi-axi-dac.c | 32 +-
+ drivers/iio/dummy/iio_simple_dummy.c | 119 +-
+ drivers/iio/frequency/adf4371.c | 45 +-
+ drivers/iio/humidity/dht11.c | 3 +-
+ drivers/iio/imu/bmi270/bmi270_core.c | 48 +-
+ drivers/iio/imu/bmi323/bmi323_core.c | 44 +-
+ drivers/iio/industrialio-backend.c | 60 +
+ drivers/iio/industrialio-event.c | 2 +
+ drivers/iio/industrialio-gts-helper.c | 293 ++--
+ drivers/iio/light/Kconfig | 12 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/adux1020.c | 1 -
+ drivers/iio/light/apds9160.c | 1594 ++++++++++++++++++++
+ drivers/iio/light/bh1745.c | 18 +-
+ drivers/iio/light/veml6030.c | 618 ++++----
+ drivers/iio/magnetometer/Kconfig | 11 +
+ drivers/iio/magnetometer/Makefile | 2 +
+ drivers/iio/magnetometer/af8133j.c | 1 -
+ drivers/iio/magnetometer/si7210.c | 446 ++++++
+ drivers/iio/pressure/zpa2326_i2c.c | 1 -
+ drivers/iio/pressure/zpa2326_spi.c | 1 -
+ drivers/iio/proximity/irsd200.c | 3 +-
+ drivers/iio/proximity/sx9310.c | 19 +-
+ drivers/iio/proximity/sx9324.c | 19 +-
+ drivers/iio/proximity/sx9360.c | 19 +-
+ drivers/iio/resolver/ad2s1210.c | 17 +-
+ drivers/iio/temperature/tmp006.c | 33 +-
+ include/dt-bindings/iio/adc/adi,ad4695.h | 7 +
+ include/linux/iio/adc/ad_sigma_delta.h | 4 +-
+ include/linux/iio/backend.h | 19 +
+ include/linux/iio/buffer-dmaengine.h | 7 +-
+ include/linux/iio/iio-gts-helper.h | 1 +
+ include/linux/iio/iio.h | 41 +-
+ include/uapi/linux/iio/types.h | 2 +
+ tools/iio/iio_event_monitor.c | 4 +
+ 107 files changed, 11100 insertions(+), 1852 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4030.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4851.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads7138.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/light/brcm,apds9160.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/silabs,si7210.yaml
+ create mode 100644 Documentation/iio/ad4030.rst
+ create mode 100644 drivers/iio/adc/ad4030.c
+ create mode 100644 drivers/iio/adc/ad4851.c
+ create mode 100644 drivers/iio/adc/ad7606_bus_iface.h
+ create mode 100644 drivers/iio/adc/ti-ads7138.c
+ create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_trace.c
+ create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_trace.h
+ create mode 100644 drivers/iio/light/apds9160.c
+ create mode 100644 drivers/iio/magnetometer/si7210.c
+Merging phy-next/next (7dff18535b93 phy: PHY_LAN966X_SERDES should depend on SOC_LAN966 || MCHP_LAN966X_PCI)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Auto-merging drivers/phy/freescale/phy-fsl-samsung-hdmi.c
+Auto-merging drivers/phy/samsung/phy-exynos5-usbdrd.c
+Merge made by the 'ort' strategy.
+ .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 9 +-
+ .../bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 62 +-
+ .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 +
+ .../bindings/phy/samsung,usb3-drd-phy.yaml | 21 +-
+ drivers/phy/freescale/Kconfig | 1 +
+ drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 240 +++++
+ drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 10 +-
+ drivers/phy/mediatek/phy-mtk-tphy.c | 4 +-
+ drivers/phy/microchip/Kconfig | 1 +
+ drivers/phy/phy-can-transceiver.c | 13 +-
+ drivers/phy/phy-core.c | 7 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 18 +
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +-
+ drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 1035 ++++++++++++++++++--
+ drivers/phy/samsung/Kconfig | 1 +
+ drivers/phy/samsung/Makefile | 1 +
+ drivers/phy/samsung/phy-exynos5-usbdrd.c | 202 +++-
+ drivers/phy/samsung/phy-exynosautov920-ufs.c | 168 ++++
+ drivers/phy/samsung/phy-samsung-ufs.c | 9 +-
+ drivers/phy/samsung/phy-samsung-ufs.h | 4 +
+ drivers/phy/st/phy-stih407-usb.c | 24 +-
+ 21 files changed, 1657 insertions(+), 178 deletions(-)
+ create mode 100644 drivers/phy/samsung/phy-exynosautov920-ufs.c
+Merging soundwire/next (aac2f8363f77 soundwire: slave: fix an OF node reference leak in soundwire slave device)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Merge made by the 'ort' strategy.
+ drivers/soundwire/amd_manager.c | 151 ++++++++++++++++++++++++++++++++++--
+ drivers/soundwire/amd_manager.h | 26 +++++++
+ drivers/soundwire/bus.c | 5 +-
+ drivers/soundwire/cadence_master.c | 22 +++++-
+ drivers/soundwire/debugfs.c | 3 +-
+ drivers/soundwire/intel_auxdevice.c | 21 -----
+ drivers/soundwire/slave.c | 1 +
+ drivers/soundwire/stream.c | 3 +-
+ include/linux/soundwire/sdw_amd.h | 2 +
+ 9 files changed, 200 insertions(+), 34 deletions(-)
+Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Already up to date.
+Merging gnss/gnss-next (0ad2507d5d93 Linux 6.14-rc3)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Already up to date.
+Merging vfio/next (2bb447540e71 vfio/nvgrace-gpu: Add GB200 SKU to the devid table)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Already up to date.
+Merging w1/for-next (33c145297840 w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
+Merge made by the 'ort' strategy.
+ drivers/w1/masters/w1-uart.c | 4 ++--
+ drivers/w1/slaves/w1_therm.c | 12 +-----------
+ 2 files changed, 3 insertions(+), 13 deletions(-)
+Merging spmi/spmi-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next
+Already up to date.
+Merging staging/staging-next (20a351c36afc staging: gpib: tnt4882 console messaging cleanup)
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Merge made by the 'ort' strategy.
+ drivers/pnp/isapnp/core.c | 1 +
+ drivers/staging/gpib/Kconfig | 5 -
+ .../staging/gpib/agilent_82350b/agilent_82350b.c | 238 ++-
+ .../staging/gpib/agilent_82350b/agilent_82350b.h | 50 -
+ .../staging/gpib/agilent_82357a/agilent_82357a.c | 359 ++---
+ drivers/staging/gpib/cb7210/Makefile | 1 -
+ drivers/staging/gpib/cb7210/cb7210.c | 236 ++-
+ drivers/staging/gpib/cb7210/cb7210.h | 45 -
+ drivers/staging/gpib/cec/cec.h | 29 -
+ drivers/staging/gpib/cec/cec_gpib.c | 83 +-
+ drivers/staging/gpib/common/gpib_os.c | 127 +-
+ drivers/staging/gpib/common/iblib.c | 109 +-
+ drivers/staging/gpib/eastwood/fluke_gpib.c | 93 +-
+ drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 140 +-
+ drivers/staging/gpib/gpio/gpib_bitbang.c | 56 +-
+ drivers/staging/gpib/hp_82335/hp82335.c | 71 +-
+ drivers/staging/gpib/hp_82335/hp82335.h | 30 -
+ drivers/staging/gpib/hp_82341/hp_82341.c | 145 +-
+ drivers/staging/gpib/hp_82341/hp_82341.h | 40 -
+ drivers/staging/gpib/ines/Makefile | 1 -
+ drivers/staging/gpib/ines/ines_gpib.c | 111 +-
+ drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 255 +--
+ drivers/staging/gpib/nec7210/nec7210.c | 69 +-
+ drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 428 +++--
+ drivers/staging/gpib/pc2/pc2_gpib.c | 588 ++++---
+ drivers/staging/gpib/tms9914/tms9914.c | 33 +-
+ drivers/staging/gpib/tnt4882/Makefile | 1 -
+ drivers/staging/gpib/tnt4882/mite.c | 17 -
+ drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 1662 +++++++++-----------
+ drivers/staging/sm750fb/ddk750_chip.c | 2 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 -
+ 31 files changed, 2094 insertions(+), 2933 deletions(-)
+Merging counter-next/counter-next (c2a756660324 counter: ti-eqep: add direction support)
+$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
+Merge made by the 'ort' strategy.
+ drivers/counter/ti-eqep.c | 32 ++++++++++++++++++++++++++++++++
+ include/uapi/linux/counter.h | 2 ++
+ tools/counter/.gitignore | 1 +
+ tools/counter/counter_watch_events.c | 5 +++++
+ 4 files changed, 40 insertions(+)
+Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
+$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-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 (2c17e9ea0caa dmaengine: idxd: Delete unnecessary NULL check)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+CONFLICT (modify/delete): Documentation/devicetree/bindings/misc/atmel-ssc.txt deleted in HEAD and modified in dmaengine/next. Version dmaengine/next of Documentation/devicetree/bindings/misc/atmel-ssc.txt left in tree.
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/misc/atmel-ssc.txt
+rm 'Documentation/devicetree/bindings/misc/atmel-ssc.txt'
+$ git commit --no-edit -v -a
+[master 70026d4465a1] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/dma/atmel,at91sam9g45-dma.yaml | 68 ++++++++++++++++++++++
+ .../devicetree/bindings/dma/atmel-dma.txt | 42 -------------
+ MAINTAINERS | 4 +-
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/dmaengine.c | 16 ++---
+ drivers/dma/dw-edma/dw-edma-core.c | 6 +-
+ drivers/dma/dw/pci.c | 8 +--
+ drivers/dma/dw/platform.c | 8 +--
+ drivers/dma/fsl-edma-main.c | 4 +-
+ drivers/dma/idxd/init.c | 3 +-
+ drivers/dma/imx-dma.c | 3 +-
+ drivers/dma/imx-sdma.c | 5 +-
+ drivers/dma/pxa_dma.c | 4 +-
+ drivers/dma/sun6i-dma.c | 3 +-
+ drivers/dma/ti/edma.c | 3 +-
+ drivers/dma/xilinx/xilinx_dma.c | 3 +-
+ include/linux/dmaengine.h | 6 +-
+ 17 files changed, 105 insertions(+), 83 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/atmel,at91sam9g45-dma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt
+Merging cgroup/for-next (d920908fe36c Merge branch 'for-6.14-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Auto-merging init/Kconfig
+Auto-merging kernel/cgroup/cgroup.c
+Merge made by the 'ort' strategy.
+ include/linux/misc_cgroup.h | 6 ------
+ init/Kconfig | 5 +++--
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/cgroup/cpuset-v1.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ kernel/cgroup/cpuset.c | 45 ---------------------------------------------
+ kernel/cgroup/misc.c | 16 ----------------
+ 6 files changed, 45 insertions(+), 70 deletions(-)
+Merging scsi/for-next (f6d13738292e Merge branch 'fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/ufs/host/ufs-exynos.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+Auto-merging tools/testing/selftests/filesystems/statmount/statmount_test.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 12 +
+ Documentation/arch/powerpc/cxlflash.rst | 433 ---
+ Documentation/arch/powerpc/index.rst | 1 -
+ Documentation/scsi/st.rst | 5 +
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +-
+ MAINTAINERS | 9 -
+ drivers/message/fusion/mptscsih.c | 64 +-
+ drivers/message/fusion/mptscsih.h | 1 -
+ drivers/scsi/Kconfig | 3 +-
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aacraid/aachba.c | 4 +-
+ drivers/scsi/aacraid/linit.c | 2 +-
+ drivers/scsi/arm/acornscsi.c | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 2 +-
+ drivers/scsi/bfa/bfad.c | 2 +-
+ drivers/scsi/csiostor/csio_init.c | 2 +-
+ drivers/scsi/cxlflash/Kconfig | 15 -
+ drivers/scsi/cxlflash/Makefile | 5 -
+ drivers/scsi/cxlflash/backend.h | 48 -
+ drivers/scsi/cxlflash/common.h | 340 --
+ drivers/scsi/cxlflash/cxl_hw.c | 177 -
+ drivers/scsi/cxlflash/lunmgt.c | 278 --
+ drivers/scsi/cxlflash/main.c | 3970 --------------------
+ drivers/scsi/cxlflash/main.h | 129 -
+ drivers/scsi/cxlflash/ocxl_hw.c | 1399 -------
+ drivers/scsi/cxlflash/ocxl_hw.h | 72 -
+ drivers/scsi/cxlflash/sislite.h | 560 ---
+ drivers/scsi/cxlflash/superpipe.c | 2218 -----------
+ drivers/scsi/cxlflash/superpipe.h | 150 -
+ drivers/scsi/cxlflash/vlun.c | 1336 -------
+ drivers/scsi/cxlflash/vlun.h | 82 -
+ drivers/scsi/elx/efct/efct_driver.c | 2 +-
+ drivers/scsi/ips.c | 8 +-
+ drivers/scsi/isci/remote_device.h | 2 +-
+ drivers/scsi/iscsi_tcp.c | 60 +-
+ drivers/scsi/iscsi_tcp.h | 4 +-
+ drivers/scsi/libiscsi_tcp.c | 89 +-
+ drivers/scsi/lpfc/lpfc_els.c | 18 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 31 +-
+ drivers/scsi/lpfc/lpfc_init.c | 4 +-
+ drivers/scsi/lpfc/lpfc_version.h | 6 +-
+ drivers/scsi/megaraid.c | 10 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 10 +-
+ drivers/scsi/mpi3mr/mpi/mpi30_tool.h | 1 +
+ drivers/scsi/mpi3mr/mpi3mr.h | 31 +-
+ drivers/scsi/mpi3mr/mpi3mr_app.c | 128 +-
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 144 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 6 -
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 79 -
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +-
+ drivers/scsi/mvsas/mv_sas.c | 10 -
+ drivers/scsi/mvsas/mv_sas.h | 1 -
+ drivers/scsi/qedi/qedi_main.c | 2 +-
+ drivers/scsi/scsi_error.c | 12 +
+ drivers/scsi/st.c | 73 +-
+ drivers/scsi/st.h | 6 +
+ drivers/target/iscsi/iscsi_target_nego.c | 6 +-
+ drivers/target/target_core_device.c | 8 +-
+ drivers/target/target_core_pr.c | 6 +-
+ drivers/target/target_core_spc.c | 36 +-
+ drivers/ufs/core/ufs-sysfs.c | 10 +
+ drivers/ufs/core/ufshcd-priv.h | 6 +-
+ drivers/ufs/core/ufshcd.c | 10 +
+ drivers/ufs/host/ufs-exynos.c | 10 +-
+ drivers/ufs/host/ufs-exynos.h | 2 +-
+ drivers/ufs/host/ufs-hisi.c | 6 +-
+ drivers/ufs/host/ufs-mediatek.c | 10 +-
+ drivers/ufs/host/ufs-qcom.c | 39 +-
+ drivers/ufs/host/ufs-qcom.h | 39 +-
+ drivers/ufs/host/ufs-sprd.c | 6 +-
+ drivers/ufs/host/ufshcd-pci.c | 2 +-
+ drivers/usb/gadget/function/f_mass_storage.c | 4 +-
+ drivers/usb/storage/debug.c | 4 +-
+ include/scsi/libiscsi_tcp.h | 16 +-
+ include/scsi/scsi_device.h | 9 +
+ include/scsi/scsi_proto.h | 4 +-
+ include/trace/events/scsi.h | 4 +-
+ include/trace/events/target.h | 4 +-
+ include/uapi/scsi/cxlflash_ioctl.h | 276 --
+ include/ufs/ufs.h | 1 +
+ include/ufs/ufshcd.h | 11 +-
+ .../filesystems/statmount/statmount_test.c | 13 +-
+ 83 files changed, 684 insertions(+), 11925 deletions(-)
+ delete mode 100644 Documentation/arch/powerpc/cxlflash.rst
+ delete mode 100644 drivers/scsi/cxlflash/Kconfig
+ delete mode 100644 drivers/scsi/cxlflash/Makefile
+ delete mode 100644 drivers/scsi/cxlflash/backend.h
+ delete mode 100644 drivers/scsi/cxlflash/common.h
+ delete mode 100644 drivers/scsi/cxlflash/cxl_hw.c
+ delete mode 100644 drivers/scsi/cxlflash/lunmgt.c
+ delete mode 100644 drivers/scsi/cxlflash/main.c
+ delete mode 100644 drivers/scsi/cxlflash/main.h
+ delete mode 100644 drivers/scsi/cxlflash/ocxl_hw.c
+ delete mode 100644 drivers/scsi/cxlflash/ocxl_hw.h
+ delete mode 100644 drivers/scsi/cxlflash/sislite.h
+ delete mode 100644 drivers/scsi/cxlflash/superpipe.c
+ delete mode 100644 drivers/scsi/cxlflash/superpipe.h
+ delete mode 100644 drivers/scsi/cxlflash/vlun.c
+ delete mode 100644 drivers/scsi/cxlflash/vlun.h
+ delete mode 100644 include/uapi/scsi/cxlflash_ioctl.h
+Merging scsi-mkp/for-next (ac0fb4a55bde scsi: scsi_debug: Do not sleep in atomic sections)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Auto-merging arch/arm64/boot/dts/rockchip/rk3576.dtsi
+Auto-merging drivers/scsi/scsi_debug.c
+CONFLICT (content): Merge conflict in drivers/scsi/scsi_debug.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+Recorded preimage for 'drivers/scsi/scsi_debug.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/scsi/scsi_debug.c'.
+[master b2cda0307749] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-driver-ufs | 33 +
+ .../bindings/ufs/rockchip,rk3576-ufshc.yaml | 105 +++
+ arch/arm64/boot/dts/rockchip/rk3576.dtsi | 24 +
+ drivers/scsi/hpsa.c | 19 +-
+ drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 4 +
+ drivers/scsi/mpi3mr/mpi/mpi30_image.h | 8 +
+ drivers/scsi/mpi3mr/mpi/mpi30_init.h | 11 +-
+ drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 21 +
+ drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 20 +-
+ drivers/scsi/mpi3mr/mpi3mr.h | 7 +-
+ drivers/scsi/mpi3mr/mpi3mr_app.c | 1 +
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 15 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 9 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 5 +
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 54 ++
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 23 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 279 ++++++-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.h | 49 +-
+ drivers/scsi/qla2xxx/qla_sup.c | 4 +-
+ drivers/scsi/scsi_debug.c | 929 ++++++++++++++++++---
+ drivers/ufs/core/ufs_trace.h | 135 +--
+ drivers/ufs/core/ufshcd-priv.h | 15 +-
+ drivers/ufs/core/ufshcd.c | 138 +--
+ drivers/ufs/host/Kconfig | 12 +
+ drivers/ufs/host/Makefile | 1 +
+ drivers/ufs/host/ufs-mediatek.c | 1 +
+ drivers/ufs/host/ufs-qcom.c | 87 +-
+ drivers/ufs/host/ufs-rockchip.c | 354 ++++++++
+ drivers/ufs/host/ufs-rockchip.h | 90 ++
+ include/ufs/ufshcd.h | 11 +-
+ 31 files changed, 2140 insertions(+), 328 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ufs/rockchip,rk3576-ufshc.yaml
+ create mode 100644 drivers/ufs/host/ufs-rockchip.c
+ create mode 100644 drivers/ufs/host/ufs-rockchip.h
+Merging vhost/linux-next (6a2bc0deaf44 vhost-scsi: Reduce response iov mem use)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Merge made by the 'ort' strategy.
+ drivers/vdpa/mlx5/core/mr.c | 7 +-
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +
+ drivers/vdpa/vdpa_user/vduse_dev.c | 1 +
+ drivers/vhost/Kconfig | 1 +
+ drivers/vhost/scsi.c | 549 +++++++++++++++++++++++--------------
+ drivers/virtio/virtio.c | 29 ++
+ sound/virtio/virtio_pcm.c | 21 +-
+ tools/virtio/linux/compiler.h | 25 ++
+ tools/virtio/linux/dma-mapping.h | 13 +
+ tools/virtio/linux/module.h | 7 +
+ 10 files changed, 439 insertions(+), 217 deletions(-)
+Merging rpmsg/for-next (539c3845d320 remoteproc: omap: Add comment for is_iomem)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Merge made by the 'ort' strategy.
+ drivers/remoteproc/omap_remoteproc.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging gpio-brgl/gpio/for-next (da5dd31efd24 gpio: vf610: Switch to gpio-mmio)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/gpio/aspeed,ast2400-gpio.yaml | 6 +
+ drivers/gpio/Kconfig | 7 +-
+ drivers/gpio/Makefile | 3 +
+ drivers/gpio/dev-sync-probe.c | 97 ++++++++++++
+ drivers/gpio/dev-sync-probe.h | 25 +++
+ drivers/gpio/gpio-74x164.c | 76 ++++-----
+ drivers/gpio/gpio-brcmstb.c | 3 +-
+ drivers/gpio/gpio-crystalcove.c | 3 +-
+ drivers/gpio/gpio-grgpio.c | 3 +-
+ drivers/gpio/gpio-latch.c | 25 +--
+ drivers/gpio/gpio-loongson-64bit.c | 4 -
+ drivers/gpio/gpio-max3191x.c | 18 +--
+ drivers/gpio/gpio-mmio.c | 37 ++++-
+ drivers/gpio/gpio-mvebu.c | 7 +-
+ drivers/gpio/gpio-nomadik.c | 3 +-
+ drivers/gpio/gpio-regmap.c | 41 ++---
+ drivers/gpio/gpio-sim.c | 84 ++--------
+ drivers/gpio/gpio-stmpe.c | 6 +-
+ drivers/gpio/gpio-vf610.c | 105 ++-----------
+ drivers/gpio/gpio-virtio.c | 29 ++--
+ drivers/gpio/gpio-virtuser.c | 73 ++-------
+ drivers/gpio/gpio-wcove.c | 3 +-
+ drivers/gpio/gpio-wm831x.c | 3 +-
+ drivers/gpio/gpio-xilinx.c | 102 +++++-------
+ drivers/gpio/gpio-xra1403.c | 3 +-
+ drivers/gpio/gpiolib.c | 173 ++++++++++++++++-----
+ drivers/mmc/core/pwrseq_simple.c | 3 +-
+ drivers/mux/gpio.c | 4 +-
+ drivers/phy/motorola/phy-mapphone-mdm6600.c | 4 +-
+ include/drm/drm_util.h | 16 +-
+ include/linux/gpio/consumer.h | 48 +++---
+ include/linux/gpio/driver.h | 45 ++++--
+ include/linux/gpio/regmap.h | 4 +-
+ include/linux/util_macros.h | 15 ++
+ 34 files changed, 564 insertions(+), 514 deletions(-)
+ create mode 100644 drivers/gpio/dev-sync-probe.c
+ create mode 100644 drivers/gpio/dev-sync-probe.h
+Merging gpio-intel/for-next (1f4c7f3b3afa Merge patch series "Split devres APIs to device/devres.h and introduce devm_kmemdup_array()")
+$ git merge -m Merge branch 'for-next' of git://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 (d01895c5b118 Merge branch 'devel' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 2 +-
+ drivers/pinctrl/devicetree.c | 10 +-
+ drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 7 +-
+ drivers/pinctrl/pinctrl-cy8c95x0.c | 191 ++++++++++++++----------------
+ drivers/pinctrl/pinctrl-mcp23s08.c | 23 +++-
+ drivers/pinctrl/pinctrl-pistachio.c | 6 -
+ 6 files changed, 122 insertions(+), 117 deletions(-)
+Merging pinctrl-intel/for-next (0eee258cdf17 pinctrl: intel: Fix wrong bypass assignment in intel_pinctrl_probe_pwm())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c
+Auto-merging drivers/pinctrl/intel/pinctrl-intel.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 7 +++++++
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 5 ++++-
+ drivers/pinctrl/intel/pinctrl-intel.c | 2 +-
+ drivers/pinctrl/intel/pinctrl-lynxpoint.c | 5 ++++-
+ drivers/pwm/pwm-lpss.c | 4 ++--
+ include/linux/platform_data/x86/pwm-lpss.h | 33 +++++++++++++++++++++++++++---
+ 6 files changed, 48 insertions(+), 8 deletions(-)
+Merging pinctrl-renesas/renesas-pinctrl (ea4065345643 pinctrl: renesas: rzg2l: Suppress binding attributes)
+$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/renesas/pinctrl-rza2.c | 3 +++
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 20 +++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+Merging pinctrl-samsung/for-next (574d0f2120b8 pinctrl: samsung: add exynos2200 SoC pinctrl configuration)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Merge made by the 'ort' strategy.
+ .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 1 +
+ .../bindings/pinctrl/samsung,pinctrl.yaml | 1 +
+ drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 168 +++++++++++++++++++++
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/samsung/pinctrl-samsung.h | 1 +
+ 5 files changed, 173 insertions(+)
+Merging pwm/pwm/for-next (e8af7c083520 pwm: Strengthen dependency for PWM_SIFIVE)
+$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next
+Auto-merging drivers/pwm/pwm-lpss.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/pwm/pwm-nexus-node.yaml | 65 +++++++
+ .../devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml | 58 ++++++
+ drivers/pwm/Kconfig | 12 +-
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/core.c | 19 +-
+ drivers/pwm/pwm-clps711x.c | 4 +-
+ drivers/pwm/pwm-gpio.c | 5 +-
+ drivers/pwm/pwm-lpss.c | 1 +
+ drivers/pwm/pwm-lpss.h | 1 -
+ drivers/pwm/pwm-pca9685.c | 9 +-
+ drivers/pwm/pwm-sophgo-sg2042.c | 194 +++++++++++++++++++++
+ 11 files changed, 353 insertions(+), 16 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-nexus-node.yaml
+ create mode 100644 Documentation/devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml
+ create mode 100644 drivers/pwm/pwm-sophgo-sg2042.c
+Merging ktest/for-next (f3a30016e4b5 ktest.pl: Fix typo "accesing")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
+Already up to date.
+Merging kselftest/next (e402c70856a3 selftests/user_events: Fix failures caused by test code)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Merge made by the 'ort' strategy.
+ tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
+ .../test.d/trigger/inter-event/trigger-action-hist-xfail.tc | 1 +
+ .../test.d/trigger/inter-event/trigger-onchange-action-hist.tc | 3 +++
+ .../test.d/trigger/inter-event/trigger-snapshot-action-hist.tc | 3 +++
+ .../selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc | 1 +
+ tools/testing/selftests/user_events/dyn_test.c | 2 ++
+ 6 files changed, 17 insertions(+), 1 deletion(-)
+Merging kunit/test (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
+Already up to date.
+Merging kunit-next/kunit (0619a4868fc1 kunit: Clarify kunit_skip() argument name)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Merge made by the 'ort' strategy.
+ include/kunit/test.h | 20 ++++++++++----------
+ tools/testing/kunit/kunit_kernel.py | 4 ++--
+ tools/testing/kunit/qemu_configs/sparc.py | 5 +++--
+ tools/testing/kunit/qemu_configs/x86_64.py | 4 +++-
+ 4 files changed, 18 insertions(+), 15 deletions(-)
+Merging livepatching/for-next (f76ad354146d Merge branch 'for-6.14/selftests-dmesg' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Merge made by the 'ort' strategy.
+Merging rtc/rtc-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Already up to date.
+Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations)
+$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (03480898cefe dt-bindings: eeprom: at24: Add compatible for Giantec GT24P128E)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 -
+ drivers/ntb/hw/intel/ntb_hw_gen3.c | 3 +++
+ drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+Merging seccomp/for-next/seccomp (8f19331384e6 seccomp: avoid the lock trip seccomp_filter_release in common case)
+$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
+Merge made by the 'ort' strategy.
+ arch/mips/kernel/ptrace.c | 20 ++---------
+ arch/powerpc/kernel/ptrace/ptrace.c | 2 +-
+ include/linux/seccomp.h | 12 +++----
+ kernel/entry/common.c | 2 +-
+ kernel/seccomp.c | 49 ++++++++++++++++-----------
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++
+ 6 files changed, 43 insertions(+), 48 deletions(-)
+Merging slimbus/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Already up to date.
+Merging nvmem/for-next (d0ee061dec06 nvmem: make the misaligned raw_len non-fatal)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+Merge made by the 'ort' strategy.
+ .../bindings/nvmem/layouts/fixed-cell.yaml | 2 +-
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 ++
+ .../devicetree/bindings/nvmem/rockchip,otp.yaml | 25 ++++++++++++++
+ drivers/clk/rockchip/clk-rk3576.c | 2 ++
+ drivers/nvmem/core.c | 40 +++++++++++++++++-----
+ drivers/nvmem/qfprom.c | 26 ++++++++++----
+ drivers/nvmem/rockchip-otp.c | 17 +++++++--
+ 7 files changed, 97 insertions(+), 17 deletions(-)
+Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Auto-merging include/linux/xarray.h
+Auto-merging lib/xarray.c
+Merge made by the 'ort' strategy.
+ include/linux/xarray.h | 60 +++++++++++++++++++++++++++-----------------------
+ lib/xarray.c | 3 +--
+ 2 files changed, 34 insertions(+), 29 deletions(-)
+Merging hyperv/hyperv-next (21cfcbeb7bff hyperv: Add CONFIG_MSHV_ROOT to gate root partition support)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Merge made by the 'ort' strategy.
+ arch/arm64/hyperv/mshyperv.c | 5 ++
+ arch/x86/hyperv/Makefile | 2 +-
+ arch/x86/hyperv/hv_init.c | 35 ++----------
+ arch/x86/include/asm/mshyperv.h | 6 --
+ arch/x86/kernel/cpu/mshyperv.c | 24 +-------
+ drivers/clocksource/hyperv_timer.c | 4 +-
+ drivers/hv/Kconfig | 16 ++++++
+ drivers/hv/Makefile | 1 +
+ drivers/hv/hv.c | 82 +++++++++++++++++++---------
+ drivers/hv/hv_common.c | 91 +++++++++++++++++++++++++++++--
+ {arch/x86/hyperv => drivers/hv}/hv_proc.c | 14 ++---
+ drivers/hv/vmbus_drv.c | 54 ++++++++++--------
+ drivers/iommu/hyperv-iommu.c | 4 +-
+ include/asm-generic/mshyperv.h | 38 ++++++++++++-
+ include/hyperv/hvgdk_mini.h | 2 +-
+ include/linux/hyperv.h | 1 +
+ kernel/cpu.c | 1 +
+ 17 files changed, 252 insertions(+), 128 deletions(-)
+ rename {arch/x86/hyperv => drivers/hv}/hv_proc.c (95%)
+Merging auxdisplay/for-next (72e1c440c848 auxdisplay: panel: Fix an API misuse in panel.c)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
+Merge made by the 'ort' strategy.
+ drivers/auxdisplay/Kconfig | 1 +
+ drivers/auxdisplay/hd44780.c | 4 ++--
+ drivers/auxdisplay/panel.c | 4 ++--
+ drivers/auxdisplay/seg-led-gpio.c | 3 +--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+Merging kgdb/kgdb/for-next (6beaa75cd24d kdb: Remove unused flags stack)
+$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Already up to date.
+Merging cfi/cfi/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
+Already up to date.
+Merging mhi/mhi-next (cba6bdfd7929 bus: mhi: host: pci_generic: Add support for SA8775P endpoint)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Auto-merging drivers/bus/mhi/host/pci_generic.c
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/host/main.c | 19 -------------------
+ drivers/bus/mhi/host/pci_generic.c | 34 ++++++++++++++++++++++++++++++++++
+ drivers/bus/mhi/host/pm.c | 14 --------------
+ include/linux/mhi.h | 18 ------------------
+ 4 files changed, 34 insertions(+), 51 deletions(-)
+Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
+Already up to date.
+Merging cxl/next (2bb67004903c tools/testing/cxl: Set Shutdown State support)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-cxl | 38 ++-
+ Documentation/driver-api/cxl/maturity-map.rst | 2 +-
+ drivers/acpi/apei/ghes.c | 54 ++++
+ drivers/cxl/core/cdat.c | 100 +++----
+ drivers/cxl/core/core.h | 12 +-
+ drivers/cxl/core/hdm.c | 382 ++++++++++++++++++--------
+ drivers/cxl/core/mbox.c | 207 +++++++-------
+ drivers/cxl/core/memdev.c | 105 ++++---
+ drivers/cxl/core/pci.c | 97 +++++++
+ drivers/cxl/core/port.c | 31 ++-
+ drivers/cxl/core/region.c | 234 ++++++++--------
+ drivers/cxl/cxl.h | 44 +--
+ drivers/cxl/cxlmem.h | 115 ++++----
+ drivers/cxl/cxlpci.h | 6 +
+ drivers/cxl/mem.c | 2 +-
+ drivers/cxl/pci.c | 7 +-
+ drivers/cxl/pmem.c | 81 +++++-
+ drivers/firmware/efi/cper.c | 6 +-
+ drivers/firmware/efi/cper_cxl.c | 39 +--
+ drivers/firmware/efi/cper_cxl.h | 66 -----
+ include/cxl/event.h | 86 ++++++
+ include/cxl/mailbox.h | 41 ++-
+ include/linux/cper.h | 8 +
+ tools/testing/cxl/test/cxl.c | 22 +-
+ tools/testing/cxl/test/mem.c | 32 ++-
+ 25 files changed, 1165 insertions(+), 652 deletions(-)
+ delete mode 100644 drivers/firmware/efi/cper_cxl.h
+Merging efi/next (fb84cefd4ce7 x86/efi/mixed: Move mixed mode startup code into libstub)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Auto-merging arch/x86/boot/compressed/Makefile
+Merge made by the 'ort' strategy.
+ arch/x86/boot/compressed/Makefile | 1 -
+ arch/x86/boot/compressed/efi_mixed.S | 341 -------------------------------
+ arch/x86/boot/compressed/head_64.S | 7 -
+ drivers/firmware/efi/libstub/Makefile | 3 +
+ drivers/firmware/efi/libstub/x86-mixed.S | 253 +++++++++++++++++++++++
+ drivers/firmware/efi/libstub/x86-stub.c | 52 ++---
+ 6 files changed, 285 insertions(+), 372 deletions(-)
+ delete mode 100644 arch/x86/boot/compressed/efi_mixed.S
+ create mode 100644 drivers/firmware/efi/libstub/x86-mixed.S
+Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Already up to date.
+Merging slab/slab/for-next (c6bb909b8f11 Merge branch 'slab/for-6.15/kfree_rcu_tiny' into slab/for-next)
+$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next
+Auto-merging include/linux/rcupdate.h
+Auto-merging include/linux/rcutree.h
+Auto-merging include/linux/slab.h
+Auto-merging include/trace/events/rcu.h
+Auto-merging kernel/rcu/tiny.c
+CONFLICT (content): Merge conflict in kernel/rcu/tiny.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging mm/Kconfig
+Auto-merging mm/slab_common.c
+Auto-merging mm/slub.c
+Resolved 'kernel/rcu/tiny.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4030e0eb4d7d] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
+$ git diff -M --stat --summary HEAD^..
+ include/linux/rcupdate.h | 33 +++----
+ include/linux/rcutiny.h | 36 --------
+ include/linux/rcutree.h | 3 -
+ include/linux/slab.h | 14 +++
+ include/trace/events/rcu.h | 34 --------
+ kernel/rcu/tiny.c | 25 ------
+ kernel/rcu/tree.c | 9 +-
+ mm/Kconfig | 4 +
+ mm/slab.h | 34 ++------
+ mm/slab_common.c | 44 ++++++----
+ mm/slub.c | 208 +++++++++++++++++++++++++++++++++++++++++++++
+ mm/util.c | 162 -----------------------------------
+ 12 files changed, 282 insertions(+), 324 deletions(-)
+Merging random/master (93354d866ac4 prandom: remove next_pseudo_random32)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 7 ++++---
+ drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +++-
+ include/linux/prandom.h | 6 ------
+ 3 files changed, 7 insertions(+), 10 deletions(-)
+Merging landlock/next (78332fdb956f selftests/landlock: Add binaries to .gitignore)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Merge made by the 'ort' strategy.
+ Documentation/userspace-api/landlock.rst | 6 +-
+ include/uapi/linux/landlock.h | 8 +-
+ security/landlock/net.c | 3 +-
+ security/landlock/ruleset.c | 2 +-
+ tools/testing/selftests/landlock/.gitignore | 2 +
+ tools/testing/selftests/landlock/common.h | 1 +
+ tools/testing/selftests/landlock/config | 3 +
+ tools/testing/selftests/landlock/net_test.c | 124 ++++++++++++++++++++++++----
+ 8 files changed, 127 insertions(+), 22 deletions(-)
+Merging rust/rust-next (beeb78d46249 MAINTAINERS: add Danilo Krummrich as Rust reviewer)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ 1 file changed, 1 insertion(+)
+Merging sysctl/sysctl-next (ae9ebda1bc32 selftests: fix spelling/grammar errors in sysctl/sysctl.sh)
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next
+Auto-merging MAINTAINERS
+Auto-merging fs/coredump.c
+Auto-merging fs/dcache.c
+Auto-merging include/linux/dcache.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/vmstat.h
+Auto-merging kernel/sysctl.c
+CONFLICT (content): Merge conflict in kernel/sysctl.c
+Auto-merging mm/filemap.c
+Auto-merging mm/internal.h
+Auto-merging mm/mmap.c
+Auto-merging mm/nommu.c
+Auto-merging mm/swap.c
+Auto-merging mm/util.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/vmstat.c
+Resolved 'kernel/sysctl.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 59ad583aa687] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 7 +-
+ arch/csky/abiv1/alignment.c | 2 +-
+ arch/sh/kernel/vsyscall/vsyscall.c | 21 +++
+ arch/x86/entry/vdso/vdso32-setup.c | 16 ++-
+ fs/coredump.c | 4 +-
+ fs/dcache.c | 21 ++-
+ fs/drop_caches.c | 23 +++-
+ fs/fs-writeback.c | 30 +++--
+ include/linux/dcache.h | 7 +-
+ include/linux/mm.h | 23 ----
+ include/linux/mman.h | 2 -
+ include/linux/swap.h | 9 --
+ include/linux/vmstat.h | 11 --
+ include/linux/writeback.h | 4 -
+ kernel/sysctl.c | 221 -------------------------------
+ mm/filemap.c | 18 ++-
+ mm/internal.h | 10 ++
+ mm/mmap.c | 54 ++++++++
+ mm/nommu.c | 15 ++-
+ mm/swap.c | 16 ++-
+ mm/swap.h | 1 +
+ mm/util.c | 67 ++++++++--
+ mm/vmscan.c | 23 ++++
+ mm/vmstat.c | 44 +++++-
+ net/sunrpc/auth.c | 2 +-
+ security/min_addr.c | 11 ++
+ tools/testing/selftests/sysctl/sysctl.sh | 6 +-
+ 27 files changed, 348 insertions(+), 320 deletions(-)
+Merging execve/for-next/execve (07c29c78ca3a Merge branch 'for-linus/execve' into for-next/execve)
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging arch/powerpc/kernel/fadump.c
+Auto-merging arch/powerpc/platforms/powernv/opal-core.c
+Auto-merging fs/coredump.c
+Auto-merging include/linux/kexec.h
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/kernel.rst | 11 ++++
+ arch/powerpc/kernel/fadump.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-core.c | 8 +--
+ arch/s390/kernel/crash_dump.c | 62 ++++++++------------
+ fs/binfmt_elf.c | 21 ++++---
+ fs/binfmt_elf_fdpic.c | 8 +--
+ fs/coredump.c | 15 ++++-
+ fs/exec.c | 2 -
+ fs/proc/kcore.c | 12 ++--
+ include/linux/binfmts.h | 2 +-
+ include/linux/kexec.h | 2 -
+ include/linux/vmcore_info.h | 3 +-
+ include/uapi/linux/elf.h | 89 +++++++++++++++++++++++++++--
+ kernel/crash_core.c | 2 +-
+ 14 files changed, 159 insertions(+), 80 deletions(-)
+Merging bitmap/bitmap-for-next (14c384131ea0 cpumask: drop cpumask_next_wrap_old())
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Auto-merging drivers/net/ethernet/ibm/ibmvnic.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Merge made by the 'ort' strategy.
+ arch/powerpc/xmon/xmon.c | 6 +---
+ arch/s390/kernel/processor.c | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 18 ++++++----
+ drivers/net/virtio_net.c | 12 ++++---
+ drivers/pci/controller/pci-hyperv.c | 3 +-
+ drivers/scsi/lpfc/lpfc.h | 23 +++----------
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ include/linux/bitmap.h | 8 +++--
+ include/linux/cpumask.h | 69 ++++++++++++++++++++++++++-----------
+ include/linux/objpool.h | 7 ++--
+ kernel/padata.c | 2 +-
+ lib/cpumask.c | 37 ++------------------
+ lib/test_bitmap.c | 28 ---------------
+ 13 files changed, 86 insertions(+), 131 deletions(-)
+Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
+Already up to date.
+Merging kspp/for-next/kspp (dc95913ce686 Merge branch 'for-next/hardening' into for-next/kspp)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+Auto-merging include/linux/compiler.h
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Resolved 'lib/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 94246bc2b7e6] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 4 +-
+ MAINTAINERS | 20 +-
+ arch/x86/coco/tdx/tdx.c | 4 +-
+ drivers/message/fusion/mptsas.c | 8 +-
+ drivers/scsi/mpi3mr/mpi3mr_transport.c | 8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +-
+ drivers/scsi/qla2xxx/qla_mr.h | 4 +-
+ fs/unicode/Kconfig | 5 +-
+ fs/unicode/Makefile | 2 +-
+ fs/unicode/tests/.kunitconfig | 3 +
+ fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 151 +++++++-------
+ fs/unicode/utf8-norm.c | 2 +-
+ include/linux/compiler.h | 18 +-
+ include/linux/string.h | 16 +-
+ include/linux/thread_info.h | 9 +-
+ include/uapi/linux/nilfs2_ondisk.h | 3 +-
+ include/uapi/linux/stddef.h | 6 +
+ lib/Kconfig.debug | 54 ++++-
+ lib/Makefile | 40 +---
+ lib/math/Makefile | 5 +-
+ lib/math/prime_numbers.c | 91 ++-------
+ lib/math/prime_numbers_private.h | 16 ++
+ lib/math/tests/Makefile | 8 +-
+ lib/math/tests/gcd_kunit.c | 56 ++++++
+ lib/math/tests/int_log_kunit.c | 74 +++++++
+ lib/math/tests/prime_numbers_kunit.c | 59 ++++++
+ .../{rational-test.c => tests/rational_kunit.c} | 0
+ lib/tests/Makefile | 41 ++++
+ lib/{ => tests}/bitfield_kunit.c | 0
+ lib/{ => tests}/checksum_kunit.c | 0
+ lib/{ => tests}/cmdline_kunit.c | 0
+ lib/{ => tests}/cpumask_kunit.c | 0
+ lib/{ => tests}/crc_kunit.c | 0
+ lib/{ => tests}/fortify_kunit.c | 0
+ lib/{ => tests}/hashtable_test.c | 0
+ lib/{ => tests}/is_signed_type_kunit.c | 0
+ lib/tests/kfifo_kunit.c | 224 +++++++++++++++++++++
+ lib/{ => tests}/kunit_iov_iter.c | 0
+ lib/{ => tests}/list-test.c | 0
+ lib/{ => tests}/memcpy_kunit.c | 0
+ lib/{ => tests}/overflow_kunit.c | 0
+ lib/{ => tests}/siphash_kunit.c | 0
+ lib/{ => tests}/slub_kunit.c | 0
+ lib/{ => tests}/stackinit_kunit.c | 0
+ lib/{ => tests}/string_helpers_kunit.c | 0
+ lib/{ => tests}/string_kunit.c | 4 +-
+ lib/{ => tests}/test_bits.c | 0
+ lib/{ => tests}/test_fprobe.c | 0
+ lib/{ => tests}/test_hash.c | 0
+ lib/{ => tests}/test_kprobes.c | 0
+ lib/{ => tests}/test_linear_ranges.c | 0
+ lib/{ => tests}/test_list_sort.c | 0
+ lib/{ => tests}/test_sort.c | 0
+ lib/{ => tests}/usercopy_kunit.c | 0
+ lib/{ => tests}/util_macros_kunit.c | 0
+ mm/usercopy.c | 16 +-
+ security/Kconfig | 21 --
+ security/Kconfig.hardening | 33 +++
+ tools/testing/selftests/lib/Makefile | 2 +-
+ tools/testing/selftests/lib/config | 1 -
+ tools/testing/selftests/lib/prime_numbers.sh | 4 -
+ 62 files changed, 749 insertions(+), 273 deletions(-)
+ create mode 100644 fs/unicode/tests/.kunitconfig
+ rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (63%)
+ create mode 100644 lib/math/prime_numbers_private.h
+ create mode 100644 lib/math/tests/gcd_kunit.c
+ create mode 100644 lib/math/tests/int_log_kunit.c
+ create mode 100644 lib/math/tests/prime_numbers_kunit.c
+ rename lib/math/{rational-test.c => tests/rational_kunit.c} (100%)
+ rename lib/{ => tests}/bitfield_kunit.c (100%)
+ rename lib/{ => tests}/checksum_kunit.c (100%)
+ rename lib/{ => tests}/cmdline_kunit.c (100%)
+ rename lib/{ => tests}/cpumask_kunit.c (100%)
+ rename lib/{ => tests}/crc_kunit.c (100%)
+ rename lib/{ => tests}/fortify_kunit.c (100%)
+ rename lib/{ => tests}/hashtable_test.c (100%)
+ rename lib/{ => tests}/is_signed_type_kunit.c (100%)
+ create mode 100644 lib/tests/kfifo_kunit.c
+ rename lib/{ => tests}/kunit_iov_iter.c (100%)
+ rename lib/{ => tests}/list-test.c (100%)
+ rename lib/{ => tests}/memcpy_kunit.c (100%)
+ rename lib/{ => tests}/overflow_kunit.c (100%)
+ rename lib/{ => tests}/siphash_kunit.c (100%)
+ rename lib/{ => tests}/slub_kunit.c (100%)
+ rename lib/{ => tests}/stackinit_kunit.c (100%)
+ rename lib/{ => tests}/string_helpers_kunit.c (100%)
+ rename lib/{ => tests}/string_kunit.c (99%)
+ rename lib/{ => tests}/test_bits.c (100%)
+ rename lib/{ => tests}/test_fprobe.c (100%)
+ rename lib/{ => tests}/test_hash.c (100%)
+ rename lib/{ => tests}/test_kprobes.c (100%)
+ rename lib/{ => tests}/test_linear_ranges.c (100%)
+ rename lib/{ => tests}/test_list_sort.c (100%)
+ rename lib/{ => tests}/test_sort.c (100%)
+ rename lib/{ => tests}/usercopy_kunit.c (100%)
+ rename lib/{ => tests}/util_macros_kunit.c (100%)
+ delete mode 100755 tools/testing/selftests/lib/prime_numbers.sh
+$ git am -3 ../patches/0001-fix-up-for-lib-Move-KUnit-tests-into-tests-subdirect.patch
+Applying: fix up for "lib: Move KUnit tests into tests/ subdirectory"
+$ git reset HEAD^
+Unstaged changes after reset:
+D lib/blackhole_dev_kunit.c
+M lib/tests/Makefile
+$ git add -A .
+$ git commit -v -a --amend
+[master 49a3e7299144] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+ Date: Tue Feb 25 16:07:32 2025 +1100
+Merging nolibc/nolibc (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc
+Already up to date.
+Merging iommufd/for-next (598749522d42 iommufd: Implement sw_msi support natively)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Auto-merging drivers/iommu/iommu.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/irqchip/irq-gic-v2m.c
+Auto-merging drivers/irqchip/irq-gic-v3-its.c
+Auto-merging drivers/irqchip/irq-gic-v3-mbi.c
+Auto-merging include/linux/msi.h
+Auto-merging kernel/irq/Kconfig
+Merge made by the 'ort' strategy.
+ drivers/iommu/Kconfig | 1 -
+ drivers/iommu/dma-iommu.c | 65 +++-----
+ drivers/iommu/iommu.c | 29 ++++
+ drivers/iommu/iommufd/device.c | 267 +++++++++++++++++++++++++++++---
+ drivers/iommu/iommufd/fault.c | 130 +---------------
+ drivers/iommu/iommufd/hw_pagetable.c | 5 +-
+ drivers/iommu/iommufd/iommufd_private.h | 64 ++++----
+ drivers/iommu/iommufd/main.c | 9 ++
+ drivers/irqchip/Kconfig | 4 +
+ drivers/irqchip/irq-gic-v2m.c | 5 +-
+ drivers/irqchip/irq-gic-v3-its.c | 13 +-
+ drivers/irqchip/irq-gic-v3-mbi.c | 12 +-
+ drivers/irqchip/irq-ls-scfg-msi.c | 5 +-
+ include/linux/iommu.h | 56 ++++---
+ include/linux/msi.h | 61 +++++---
+ kernel/irq/Kconfig | 1 +
+ 16 files changed, 427 insertions(+), 300 deletions(-)
+Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next
+Auto-merging tools/power/x86/turbostat/turbostat.c
+Merge made by the 'ort' strategy.
+ tools/power/x86/turbostat/turbostat.8 | 5 ++
+ tools/power/x86/turbostat/turbostat.c | 92 +++++++++++++++++++++++++++--------
+ 2 files changed, 77 insertions(+), 20 deletions(-)
+Merging pwrseq/pwrseq/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next
+Already up to date.
+Merging capabilities-next/caps-next (d48da4d5ed7b security: add trace event for cap_capable)
+$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next
+Already up to date.
+Merging ipe/next (aefadf03b3e3 ipe: policy_fs: fix kernel-doc warnings)
+$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next
+Merge made by the 'ort' strategy.
+ security/ipe/policy_fs.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Merging kcsan/next (9d89551994a4 Linux 6.13-rc6)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next
+Already up to date.
+Merging crc/crc-next (a0bd462f3a13 x86/crc: add ANNOTATE_NOENDBR to suppress objtool warnings)
+$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next
+Auto-merging MAINTAINERS
+Auto-merging arch/powerpc/configs/mpc885_ads_defconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/crypto/aesni-intel_glue.c
+Auto-merging crypto/tcrypt.c
+Auto-merging crypto/testmgr.c
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ arch/arm/configs/moxart_defconfig | 1 -
+ arch/arm/lib/crc-t10dif-glue.c | 6 -
+ arch/arm/lib/crc32-glue.c | 12 +-
+ arch/arm64/lib/crc-t10dif-glue.c | 6 -
+ arch/arm64/lib/crc32-glue.c | 10 +-
+ arch/loongarch/lib/crc32-loongarch.c | 6 +-
+ arch/mips/configs/bcm47xx_defconfig | 1 -
+ arch/mips/configs/db1xxx_defconfig | 1 -
+ arch/mips/configs/decstation_64_defconfig | 1 -
+ arch/mips/configs/decstation_defconfig | 1 -
+ arch/mips/configs/decstation_r4k_defconfig | 1 -
+ arch/mips/configs/rt305x_defconfig | 1 -
+ arch/mips/configs/xway_defconfig | 1 -
+ arch/mips/lib/crc32-mips.c | 15 +-
+ arch/powerpc/configs/adder875_defconfig | 1 -
+ arch/powerpc/configs/ep88xc_defconfig | 1 -
+ arch/powerpc/configs/mpc866_ads_defconfig | 1 -
+ arch/powerpc/configs/mpc885_ads_defconfig | 1 -
+ arch/powerpc/configs/tqm8xx_defconfig | 1 -
+ arch/powerpc/lib/crc-t10dif-glue.c | 6 -
+ arch/powerpc/lib/crc32-glue.c | 10 +-
+ arch/riscv/lib/crc32-riscv.c | 17 +-
+ arch/s390/lib/crc32-glue.c | 2 +-
+ arch/sparc/lib/crc32_glue.c | 10 +-
+ arch/x86/Kconfig | 3 +-
+ arch/x86/crypto/aesni-intel_glue.c | 22 +-
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/kernel/cpu/intel.c | 22 +
+ arch/x86/lib/Makefile | 5 +-
+ arch/x86/lib/crc-pclmul-consts.h | 195 ++++++++
+ arch/x86/lib/crc-pclmul-template.S | 589 +++++++++++++++++++++++++
+ arch/x86/lib/crc-pclmul-template.h | 81 ++++
+ arch/x86/lib/crc-t10dif-glue.c | 29 +-
+ arch/x86/lib/crc16-msb-pclmul.S | 6 +
+ arch/x86/lib/crc32-glue.c | 47 +-
+ arch/x86/lib/crc32-pclmul.S | 219 +--------
+ arch/x86/lib/crc64-glue.c | 50 +++
+ arch/x86/lib/crc64-pclmul.S | 7 +
+ arch/x86/lib/crct10dif-pcl-asm_64.S | 332 --------------
+ block/Kconfig | 2 +-
+ block/t10-pi.c | 2 +-
+ crypto/Kconfig | 20 -
+ crypto/Makefile | 3 -
+ crypto/crc32c_generic.c | 8 +-
+ crypto/crc64_rocksoft_generic.c | 89 ----
+ crypto/crct10dif_generic.c | 168 -------
+ crypto/tcrypt.c | 8 -
+ crypto/testmgr.c | 14 -
+ crypto/testmgr.h | 303 -------------
+ drivers/crypto/stm32/stm32-crc32.c | 2 +-
+ drivers/infiniband/sw/siw/siw.h | 4 +-
+ drivers/md/raid5-cache.c | 31 +-
+ drivers/md/raid5-ppl.c | 16 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +-
+ drivers/thunderbolt/ctl.c | 2 +-
+ drivers/thunderbolt/eeprom.c | 2 +-
+ include/linux/crc-t10dif.h | 12 -
+ include/linux/crc32.h | 55 ++-
+ include/linux/crc32c.h | 8 -
+ include/linux/crc64.h | 38 +-
+ include/net/sctp/checksum.h | 7 +-
+ lib/Kconfig | 16 +-
+ lib/Makefile | 1 -
+ lib/crc32.c | 21 +-
+ lib/crc64-rocksoft.c | 126 ------
+ lib/crc64.c | 49 +-
+ lib/gen_crc64table.c | 10 +-
+ lib/tests/crc_kunit.c | 32 +-
+ scripts/gen-crc-consts.py | 238 ++++++++++
+ sound/soc/codecs/aw88395/aw88395_device.c | 2 +-
+ tools/testing/selftests/arm64/fp/kernel-test.c | 1 -
+ 72 files changed, 1419 insertions(+), 1595 deletions(-)
+ create mode 100644 arch/x86/lib/crc-pclmul-consts.h
+ create mode 100644 arch/x86/lib/crc-pclmul-template.S
+ create mode 100644 arch/x86/lib/crc-pclmul-template.h
+ create mode 100644 arch/x86/lib/crc16-msb-pclmul.S
+ create mode 100644 arch/x86/lib/crc64-glue.c
+ create mode 100644 arch/x86/lib/crc64-pclmul.S
+ delete mode 100644 arch/x86/lib/crct10dif-pcl-asm_64.S
+ delete mode 100644 crypto/crc64_rocksoft_generic.c
+ delete mode 100644 crypto/crct10dif_generic.c
+ delete mode 100644 lib/crc64-rocksoft.c
+ create mode 100755 scripts/gen-crc-consts.py
+Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next
+Already up to date.
gentwo / linux / .git / commitdiff