--- /dev/null
+$ date -R
+Wed, 12 Feb 2025 08:57:32 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at a64dcfb451e2 Linux 6.14-rc2
+Merging origin/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.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating a64dcfb451e2..09fbf3d50205
+Fast-forward (no commit created; -m option ignored)
+ arch/x86/Kconfig | 3 +-
+ arch/x86/kernel/cpu/bugs.c | 21 ++--
+ drivers/hid/Kconfig | 15 ++-
+ drivers/hid/amd-sfh-hid/Kconfig | 1 -
+ drivers/hid/hid-apple.c | 8 ++
+ drivers/hid/hid-corsair-void.c | 3 +-
+ drivers/hid/hid-ids.h | 3 +
+ drivers/hid/hid-lenovo.c | 7 +-
+ drivers/hid/hid-multitouch.c | 5 +-
+ drivers/hid/hid-quirks.c | 1 +
+ drivers/hid/hid-steam.c | 46 ++++++---
+ drivers/hid/hid-thrustmaster.c | 2 +-
+ drivers/hid/hid-topre.c | 7 ++
+ drivers/hid/hid-winwing.c | 2 +
+ drivers/hid/i2c-hid/Kconfig | 2 +-
+ drivers/hid/intel-ish-hid/Kconfig | 1 -
+ drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 +
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 15 +--
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 7 ++
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 2 +
+ drivers/hid/intel-thc-hid/Kconfig | 1 -
+ drivers/hid/surface-hid/Kconfig | 2 -
+ drivers/hid/usbhid/Kconfig | 3 +-
+ drivers/pinctrl/pinconf-generic.c | 8 +-
+ drivers/pinctrl/pinctrl-cy8c95x0.c | 42 ++++----
+ fs/nfsd/filecache.c | 11 ++-
+ fs/nfsd/nfs2acl.c | 2 +
+ fs/nfsd/nfs3acl.c | 2 +
+ fs/nfsd/nfs4callback.c | 9 +-
+ fs/nfsd/nfs4state.c | 3 +-
+ fs/nfsd/nfsfh.c | 5 +-
+ net/bluetooth/hidp/Kconfig | 3 +-
+ samples/hid/Makefile | 13 +--
+ security/tomoyo/common.c | 145 +++++++++++++++++++++-------
+ security/tomoyo/domain.c | 2 +-
+ security/tomoyo/securityfs_if.c | 6 +-
+ security/tomoyo/tomoyo.c | 5 +-
+ 37 files changed, 291 insertions(+), 124 deletions(-)
+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 (37d11cfc6360 vfs: sanity check the length passed to inode_set_cached_link())
+$ 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
+Already up to date.
+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 (b79441300c98 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/direct-io.c | 17 +++++++++++++++++
+ fs/btrfs/extent_io.c | 29 ++++++++++++++++++++---------
+ fs/btrfs/file.c | 4 +---
+ 3 files changed, 38 insertions(+), 12 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 (ffd294d346d1 Linux 6.13)
+$ 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 (990c139da9ba bcachefs: check_bp_exists() check for backpointers for stale pointers)
+$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next
+Merge made by the 'ort' strategy.
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/alloc_background.c | 51 ++--
+ 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 | 126 +++------
+ fs/bcachefs/backpointers.h | 11 +-
+ fs/bcachefs/bcachefs.h | 5 +-
+ fs/bcachefs/bcachefs_ioctl.h | 29 +-
+ fs/bcachefs/btree_gc.c | 18 +-
+ fs/bcachefs/btree_io.c | 205 +++++++++++++-
+ fs/bcachefs/btree_io.h | 4 +
+ fs/bcachefs/btree_update_interior.c | 20 ++
+ fs/bcachefs/btree_update_interior.h | 8 +-
+ fs/bcachefs/chardev.c | 38 ++-
+ fs/bcachefs/compress.c | 8 +-
+ fs/bcachefs/data_update.c | 220 +++++++++++----
+ fs/bcachefs/data_update.h | 17 +-
+ fs/bcachefs/debug.c | 34 ++-
+ fs/bcachefs/disk_accounting.h | 2 +
+ fs/bcachefs/ec.c | 6 +-
+ fs/bcachefs/errcode.h | 6 +
+ fs/bcachefs/error.c | 60 +++--
+ fs/bcachefs/error.h | 5 +-
+ fs/bcachefs/extents.c | 9 +-
+ fs/bcachefs/extents.h | 2 +-
+ fs/bcachefs/eytzinger.c | 136 +++++-----
+ fs/bcachefs/eytzinger.h | 93 +++----
+ fs/bcachefs/fs-io-buffered.c | 26 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/io_misc.c | 3 +-
+ fs/bcachefs/io_read.c | 523 ++++++++++++++++++------------------
+ fs/bcachefs/io_read.h | 75 ++++--
+ fs/bcachefs/io_write.c | 152 ++++++-----
+ fs/bcachefs/io_write.h | 33 +--
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 125 +++++++--
+ fs/bcachefs/journal.h | 38 ++-
+ fs/bcachefs/journal_io.c | 30 ++-
+ fs/bcachefs/journal_reclaim.c | 37 ++-
+ fs/bcachefs/journal_seq_blacklist.c | 7 +-
+ fs/bcachefs/journal_types.h | 24 +-
+ fs/bcachefs/lru.c | 93 ++++---
+ fs/bcachefs/lru.h | 15 +-
+ fs/bcachefs/lru_format.h | 2 +-
+ fs/bcachefs/migrate.c | 26 +-
+ fs/bcachefs/move.c | 436 +++++++++++++++++-------------
+ 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 | 23 +-
+ fs/bcachefs/sb-counters.c | 90 +++++--
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 30 ++-
+ 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/sysfs.c | 5 -
+ fs/bcachefs/trace.h | 76 +-----
+ fs/bcachefs/util.c | 210 ++++++++++++---
+ 65 files changed, 2185 insertions(+), 1224 deletions(-)
+ create mode 100644 fs/bcachefs/progress.c
+ create mode 100644 fs/bcachefs/progress.h
+Merging fscrypt/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
+Already up to date.
+Merging btrfs/for-next (e87006a1ee8f Merge branch 'for-next-next-v6.14-20250210' into for-next-20250210)
+$ 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/bio.c | 4 +-
+ fs/btrfs/bio.h | 3 +
+ fs/btrfs/btrfs_inode.h | 8 ++
+ fs/btrfs/compression.c | 21 ++--
+ fs/btrfs/compression.h | 25 ++--
+ fs/btrfs/disk-io.c | 5 +-
+ fs/btrfs/extent-tree.c | 12 +-
+ fs/btrfs/extent_io.c | 221 ++++++++++++--------------------
+ fs/btrfs/file.c | 22 ++--
+ fs/btrfs/free-space-cache.c | 26 ++--
+ fs/btrfs/fs.h | 9 +-
+ fs/btrfs/inode.c | 242 ++++++++++++++++++++----------------
+ fs/btrfs/ioctl.c | 1 +
+ fs/btrfs/scrub.c | 142 ++++++---------------
+ fs/btrfs/subpage.c | 196 ++++++++++++++++++-----------
+ fs/btrfs/subpage.h | 52 +++++++-
+ fs/btrfs/super.c | 2 +-
+ fs/btrfs/tests/delayed-refs-tests.c | 1 +
+ fs/btrfs/volumes.c | 2 +-
+ fs/btrfs/zlib.c | 83 ++++++++-----
+ fs/btrfs/zoned.c | 9 ++
+ fs/btrfs/zstd.c | 52 ++++----
+ 23 files changed, 601 insertions(+), 538 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 (a077cd56f047 smb: client, common: Avoid multiple -Wflex-array-member-not-at-end warnings)
+$ 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/cifsglob.h | 11 ++++--
+ fs/smb/client/file.c | 7 ++--
+ fs/smb/client/inode.c | 13 +++++++
+ fs/smb/client/reparse.c | 5 +--
+ fs/smb/client/smb2ops.c | 99 +++++++++++++++++++++++++++++++++++++-----------
+ fs/smb/common/smb2pdu.h | 30 ++++++++++-----
+ fs/smb/common/smbfsctl.h | 3 ++
+ 7 files changed, 126 insertions(+), 42 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 (8f9530aeeb4f erofs: refine z_erofs_get_extent_compressedlen())
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Already up to date.
+Merging exfat/dev (d8efe986116d exfat: fix soft lockup in exfat_clear_bitmap)
+$ 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/namei.c | 2 +-
+ 4 files changed, 17 insertions(+), 8 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 (94dfee45999c Merge fix for access beyond end of bitmap in fanotify_init(2).)
+$ 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.
+Merging ext4/dev (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Already up to date.
+Merging f2fs/dev (1534747d3170 f2fs: don't retry IO for corrupted data scenario)
+$ 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.
+ fs/f2fs/checkpoint.c | 15 ++++++-----
+ fs/f2fs/data.c | 2 --
+ fs/f2fs/f2fs.h | 3 ++-
+ fs/f2fs/inode.c | 4 +++
+ fs/f2fs/shrinker.c | 2 +-
+ fs/f2fs/super.c | 65 ++++++++++++++++++++++++++++++++++-----------
+ fs/f2fs/sysfs.c | 74 ++++++++++++++++++++++++++++++++++++----------------
+ 7 files changed, 118 insertions(+), 47 deletions(-)
+Merging fsverity/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
+Already up to date.
+Merging fuse/for-next (9afd7336f3ac fuse: add default_request_timeout and max_request_timeout sysctls)
+$ 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 Documentation/admin-guide/sysctl/fs.rst
+Auto-merging fs/fuse/sysctl.c
+CONFLICT (content): Merge conflict in fs/fuse/sysctl.c
+Resolved 'fs/fuse/sysctl.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[fs-next d8ae4cf9ff9c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/sysctl/fs.rst | 25 +++++++++
+ fs/fuse/dev.c | 98 +++++++++++++++++++++++++++++++++
+ fs/fuse/dev_uring.c | 27 +++++++++
+ fs/fuse/dev_uring_i.h | 6 ++
+ fs/fuse/fuse_dev_i.h | 3 +
+ fs/fuse/fuse_i.h | 30 ++++++++++
+ fs/fuse/inode.c | 43 ++++++++++++++-
+ fs/fuse/sysctl.c | 24 ++++++++
+ include/uapi/linux/fuse.h | 10 +++-
+ 9 files changed, 263 insertions(+), 3 deletions(-)
+Merging gfs2/for-next (e2fcacf5998d gfs2: Fix request cancelation in finish_xmote)
+$ 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 | 49 ++++++++++++++++++++++++-------------------------
+ fs/gfs2/incore.h | 3 ++-
+ fs/gfs2/super.c | 3 ++-
+ fs/gfs2/trace_gfs2.h | 8 +++++++-
+ 4 files changed, 35 insertions(+), 28 deletions(-)
+Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Already up to date.
+Merging ksmbd/ksmbd-for-next (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
+Already up to date.
+Merging nfs/linux-next (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (6f56971841a1 SUNRPC: do not retry on EKEYEXPIRED when user TGT ticket expired)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (163781411dda svcrdma: do not unregister device for listeners)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Auto-merging fs/nfsd/nfs4state.c
+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/nfs4state.c | 22 +++--
+ 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 +-
+ 17 files changed, 400 insertions(+), 226 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 (ffd294d346d1 Linux 6.13)
+$ 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 (35010cc72acc 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
+Merge made by the 'ort' strategy.
+ fs/xfs/scrub/common.h | 5 -----
+ fs/xfs/scrub/inode_repair.c | 12 ++++++++--
+ fs/xfs/scrub/repair.h | 11 ++++++++-
+ fs/xfs/scrub/scrub.c | 12 ++++++++++
+ fs/xfs/xfs_aops.c | 41 +++++++++++++++++++++++++++++----
+ fs/xfs/xfs_qm_bhv.c | 55 ++++++++++++++++++++++++++++++++-------------
+ fs/xfs/xfs_super.c | 8 +++++--
+ 7 files changed, 114 insertions(+), 30 deletions(-)
+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 file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Already up to date.
+Merging vfs-brauner/vfs.all (30a78464c9c7 Merge branch 'vfs-6.15.iomap' 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 fs/xfs/xfs_aops.c
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging virt/kvm/kvm_main.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/iomap/design.rst | 4 +
+ Documentation/filesystems/iomap/operations.rst | 11 +-
+ 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/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 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/kernel/syscalls/syscall.tbl | 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 | 81 +++-
+ drivers/vfio/group.c | 16 +-
+ fs/cachefiles/ondemand.c | 7 +-
+ fs/coredump.c | 38 +-
+ fs/devpts/inode.c | 247 +++++------
+ fs/eventfd.c | 5 +-
+ fs/gfs2/bmap.c | 3 +-
+ fs/internal.h | 5 +-
+ fs/ioctl.c | 10 +-
+ fs/iomap/Makefile | 1 +
+ fs/iomap/buffered-io.c | 202 ++-------
+ fs/iomap/direct-io.c | 132 ++++--
+ fs/iomap/internal.h | 10 +
+ fs/iomap/ioend.c | 216 +++++++++
+ fs/mnt_idmapping.c | 51 +++
+ fs/mount.h | 26 ++
+ fs/namei.c | 7 +-
+ fs/namespace.c | 487 ++++++++++++++++-----
+ 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/open.c | 20 +-
+ fs/pipe.c | 62 ++-
+ fs/pnode.c | 4 +-
+ fs/pstore/inode.c | 109 +++--
+ fs/signalfd.c | 7 +-
+ fs/super.c | 55 ---
+ fs/sysv/super.c | 57 ++-
+ 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/fanotify.h | 12 +-
+ include/linux/fs.h | 32 +-
+ include/linux/fs_context.h | 2 -
+ include/linux/fsnotify.h | 20 +
+ include/linux/fsnotify_backend.h | 42 ++
+ include/linux/iomap.h | 66 ++-
+ 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/uidgid.h | 6 +
+ include/linux/vfsdebug.h | 49 +++
+ 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/exit.c | 56 ++-
+ 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 +
+ .../filesystems/overlayfs/set_layers_via_fds.c | 120 +++++
+ .../selftests/filesystems/overlayfs/wrappers.h | 17 +
+ 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 +-
+ 92 files changed, 2225 insertions(+), 968 deletions(-)
+ create mode 100644 fs/iomap/internal.h
+ create mode 100644 fs/iomap/ioend.c
+ create mode 100644 include/linux/vfsdebug.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 (083d2868a0c3 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.
+ .mailmap | 3 +++
+ fs/proc/vmcore.c | 5 ++++-
+ include/linux/alloc_tag.h | 15 ++++++++++++++-
+ include/linux/page-flags.h | 37 +++++++++++++++++++++++++++++++++++++
+ include/linux/page_ref.h | 2 +-
+ include/uapi/linux/taskstats.h | 2 +-
+ lib/iov_iter.c | 3 ++-
+ mm/madvise.c | 11 ++++++++++-
+ mm/memory.c | 17 ++++++++++++++---
+ mm/migrate_device.c | 13 ++++---------
+ mm/page_isolation.c | 9 ++++++++-
+ mm/zswap.c | 35 ++++++++++++++++-------------------
+ tools/accounting/getdelays.c | 32 ++++++++++++++++----------------
+ tools/mm/page-types.c | 4 ++--
+ 14 files changed, 132 insertions(+), 56 deletions(-)
+Merging fs-current (d6b1fce8dbc9 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/direct-io.c | 17 +++++++++++++++++
+ fs/btrfs/extent_io.c | 29 ++++++++++++++++++++---------
+ fs/btrfs/file.c | 4 +---
+ 3 files changed, 38 insertions(+), 12 deletions(-)
+Merging kbuild-current/fixes (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (875d742cf532 arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array)
+$ 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
+Merge made by the 'ort' strategy.
+ Documentation/arch/arm64/gcs.rst | 2 +-
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/kernel/cacheinfo.c | 12 +++++++-----
+ arch/arm64/kernel/cpufeature.c | 2 --
+ arch/arm64/kernel/vdso/vdso.lds.S | 1 +
+ arch/arm64/kernel/vmlinux.lds.S | 1 +
+ arch/arm64/mm/trans_pgd.c | 7 +++++++
+ 7 files changed, 17 insertions(+), 9 deletions(-)
+Merging arm-soc-fixes/arm/fixes (352bba6c19cd Merge tag 'ti-driver-soc-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes)
+$ 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (2844ddbd540f s390/pci: Fix handling of isolated VFs)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/s390/configs/debug_defconfig | 1 -
+ arch/s390/configs/defconfig | 1 -
+ arch/s390/configs/zfcpdump_defconfig | 1 -
+ arch/s390/include/asm/bitops.h | 6 +++-
+ arch/s390/pci/pci_bus.c | 20 +++++++++++++
+ arch/s390/pci/pci_iov.c | 56 +++++++++++++++++++++++++++---------
+ arch/s390/pci/pci_iov.h | 7 +++++
+ drivers/s390/cio/chp.c | 3 +-
+ 8 files changed, 76 insertions(+), 19 deletions(-)
+Merging net/main (44ce3511c21c Merge tag 'batadv-net-pullrequest-20250207' of git://git.open-mesh.org/linux-merge)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .mailmap | 1 +
+ .../bindings/net/wireless/qcom,ath10k.yaml | 1 -
+ .../bindings/net/wireless/qcom,ath11k-pci.yaml | 1 -
+ .../bindings/net/wireless/qcom,ath11k.yaml | 1 -
+ .../bindings/net/wireless/qcom,ath12k-wsi.yaml | 1 -
+ .../bindings/net/wireless/qcom,ath12k.yaml | 1 -
+ Documentation/netlink/specs/ethtool.yaml | 3 +-
+ Documentation/networking/iso15765-2.rst | 4 +-
+ MAINTAINERS | 6 +-
+ drivers/net/can/c_can/c_can_platform.c | 5 +-
+ drivers/net/can/ctucanfd/ctucanfd_base.c | 10 +-
+ drivers/net/can/rockchip/rockchip_canfd-core.c | 2 +-
+ drivers/net/can/usb/etas_es58x/es58x_devlink.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +
+ drivers/net/wireless/ath/ath12k/wmi.c | 61 ++++++++---
+ drivers/net/wireless/ath/ath12k/wmi.h | 1 -
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +-
+ drivers/ptp/ptp_vmclock.c | 47 ++++----
+ include/linux/netdevice.h | 7 +-
+ include/net/ip.h | 13 ++-
+ include/net/l3mdev.h | 2 +
+ include/net/net_namespace.h | 2 +-
+ include/net/route.h | 9 +-
+ include/uapi/linux/ethtool.h | 2 +
+ net/ax25/af_ax25.c | 11 ++
+ net/batman-adv/bat_v.c | 2 -
+ net/batman-adv/bat_v_elp.c | 122 +++++++++++++++------
+ net/batman-adv/bat_v_elp.h | 2 -
+ net/batman-adv/translation-table.c | 12 +-
+ net/batman-adv/types.h | 3 -
+ net/can/j1939/socket.c | 4 +-
+ net/can/j1939/transport.c | 5 +-
+ net/core/dev.c | 17 +++
+ net/core/fib_rules.c | 24 ++--
+ net/core/flow_dissector.c | 21 ++--
+ net/core/neighbour.c | 8 +-
+ net/core/rtnetlink.c | 1 +
+ net/core/skbuff.c | 103 +----------------
+ net/ethtool/common.c | 5 +
+ net/ethtool/common.h | 2 +
+ net/ethtool/strset.c | 5 +
+ net/ethtool/tsconfig.c | 33 ++++--
+ net/ipv4/arp.c | 4 +-
+ net/ipv4/devinet.c | 3 +-
+ net/ipv4/icmp.c | 31 +++---
+ net/ipv4/route.c | 30 +++--
+ net/ipv6/icmp.c | 42 +++----
+ net/ipv6/ip6_input.c | 14 ++-
+ net/ipv6/mcast.c | 31 +++---
+ net/ipv6/ndisc.c | 28 ++---
+ net/ipv6/route.c | 7 +-
+ net/openvswitch/datapath.c | 12 +-
+ 52 files changed, 437 insertions(+), 340 deletions(-)
+Merging bpf/master (8784714d7f27 bpf: Handle allocation failure in acquire_lock_state)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Auto-merging kernel/bpf/syscall.c
+Merge made by the 'ort' strategy.
+ Documentation/networking/strparser.rst | 9 +-
+ include/linux/skmsg.h | 2 +
+ include/net/strparser.h | 2 +
+ include/net/tcp.h | 8 +
+ kernel/bpf/arena.c | 2 +-
+ kernel/bpf/bpf_cgrp_storage.c | 2 +-
+ kernel/bpf/btf.c | 2 +
+ kernel/bpf/ringbuf.c | 4 -
+ kernel/bpf/syscall.c | 25 +-
+ kernel/bpf/verifier.c | 31 +-
+ net/bpf/test_run.c | 5 +-
+ net/core/bpf_sk_storage.c | 13 +-
+ net/core/skmsg.c | 7 +
+ net/core/sock_map.c | 5 +-
+ net/ipv4/tcp.c | 29 +-
+ net/ipv4/tcp_bpf.c | 36 ++
+ net/strparser/strparser.c | 11 +-
+ .../selftests/bpf/prog_tests/sockmap_basic.c | 59 +--
+ .../selftests/bpf/prog_tests/sockmap_strp.c | 454 +++++++++++++++++++++
+ .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 4 +-
+ .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 8 +-
+ .../selftests/bpf/progs/test_sockmap_strp.c | 53 +++
+ .../selftests/bpf/progs/verifier_array_access.c | 15 +
+ 23 files changed, 677 insertions(+), 109 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/sockmap_strp.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_strp.c
+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 (dfffaccffc53 Merge tag 'nf-25-01-30' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
+$ 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 (12d044770e12 IB/mlx5: Set and get correct qp_num for a DCT QP)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Merge made by the 'ort' strategy.
+ drivers/infiniband/hw/mlx5/qp.c | 4 +-
+ drivers/infiniband/hw/mlx5/umr.c | 83 +++++++++++++++++++++++++++-------------
+ 2 files changed, 59 insertions(+), 28 deletions(-)
+Merging sound-current/for-linus (2afd96a4a0b1 ALSA: hda/tas2781: Update tas2781 hda SPI driver)
+$ 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.
+ include/linux/pci_ids.h | 1 +
+ sound/core/hrtimer.c | 3 +--
+ sound/drivers/dummy.c | 3 +--
+ sound/drivers/pcsp/pcsp.c | 3 +--
+ sound/hda/intel-dsp-config.c | 5 +++++
+ sound/pci/hda/hda_intel.c | 2 ++
+ sound/pci/hda/patch_realtek.c | 1 +
+ sound/pci/hda/tas2781_hda_spi.c | 27 ++++++++++++++-------------
+ sound/sh/sh_dac_audio.c | 3 +--
+ sound/soc/sof/intel/pci-ptl.c | 1 +
+ 10 files changed, 28 insertions(+), 21 deletions(-)
+Merging sound-asoc-fixes/for-linus (f6841309b6de ASoC: Intel: soc-acpi-intel-ptl-match typo fixups)
+$ 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/arizona.c | 14 +--
+ sound/soc/codecs/cs35l41.c | 30 ++++--
+ sound/soc/codecs/madera.c | 10 +-
+ sound/soc/codecs/tas2781-i2c.c | 4 +-
+ sound/soc/codecs/wm5110.c | 8 +-
+ sound/soc/fsl/fsl_micfil.c | 2 +
+ sound/soc/generic/simple-card-utils.c | 1 +
+ sound/soc/intel/boards/sof_sdw.c | 41 ++++++--
+ sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 12 +--
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 16 +--
+ sound/soc/renesas/rcar/core.c | 14 ---
+ sound/soc/renesas/rcar/rsnd.h | 1 -
+ sound/soc/renesas/rcar/src.c | 116 +++++++++++++++++-----
+ sound/soc/renesas/rcar/ssi.c | 3 +-
+ sound/soc/rockchip/rockchip_i2s_tdm.c | 4 +-
+ sound/soc/sof/amd/acp-ipc.c | 25 +++--
+ sound/soc/sof/amd/acp.c | 1 +
+ sound/soc/sof/amd/acp.h | 1 +
+ sound/soc/sof/amd/pci-vangogh.c | 2 -
+ sound/soc/sof/amd/vangogh.c | 22 +++-
+ sound/soc/sof/intel/hda-codec.c | 1 +
+ sound/soc/sof/ipc4-topology.c | 12 ++-
+ sound/soc/sof/pcm.c | 2 +
+ sound/soc/sof/stream-ipc.c | 6 +-
+ 25 files changed, 245 insertions(+), 105 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
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/regmap-irq.c | 2 ++
+ 1 file changed, 2 insertions(+)
+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
+Merge made by the 'ort' strategy.
+ .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 2 +-
+ drivers/regulator/core.c | 61 ++++++++++------------
+ 2 files changed, 28 insertions(+), 35 deletions(-)
+Merging spi-fixes/for-linus (3588b1c0fde2 spi: sn-f-ospi: Fix division by zero)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Merge made by the 'ort' strategy.
+ drivers/spi/atmel-quadspi.c | 4 ++--
+ drivers/spi/spi-pxa2xx.c | 2 +-
+ drivers/spi/spi-sn-f-ospi.c | 3 +++
+ 3 files changed, 6 insertions(+), 3 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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
+Already up to date.
+Merging tty.current/tty-linus (0f3fd9cf6491 serial: 8250_pnp: Remove unneeded ->iotype assignment)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Merge made by the 'ort' strategy.
+ drivers/tty/serial/8250/8250_of.c | 1 -
+ drivers/tty/serial/8250/8250_platform.c | 9 ---------
+ drivers/tty/serial/8250/8250_pnp.c | 10 ----------
+ drivers/tty/serial/sc16is7xx.c | 2 +-
+ drivers/tty/serial/serial_port.c | 12 +++++++-----
+ 5 files changed, 8 insertions(+), 26 deletions(-)
+Merging usb.current/usb-linus (da1668997052 usb: gadget: f_midi: fix MIDI Streaming descriptor lengths)
+$ 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/core/hub.c | 11 +++++++++++
+ drivers/usb/dwc2/gadget.c | 1 +
+ drivers/usb/dwc3/core.h | 1 +
+ drivers/usb/gadget/function/f_midi.c | 17 +++++++++++++----
+ drivers/usb/gadget/udc/renesas_usb3.c | 2 +-
+ drivers/usb/phy/phy-generic.c | 2 +-
+ 6 files changed, 28 insertions(+), 6 deletions(-)
+Merging usb-serial-fixes/usb-linus (6aa8a63c471e USB: serial: option: drop MeiG Smart defines)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/usb/serial/option.c | 49 +++++++++++++++++++++++++++------------------
+ 1 file changed, 29 insertions(+), 20 deletions(-)
+Merging phy/fixes (e2158c953c97 phy: exynos5-usbdrd: fix MPLL_MULTIPLIER and SSC_REFCLKSEL masks in refclk)
+$ 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/rockchip/Kconfig | 1 +
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 5 ++-
+ drivers/phy/samsung/phy-exynos5-usbdrd.c | 12 +++----
+ drivers/phy/st/phy-stm32-combophy.c | 38 ++++++++++------------
+ 4 files changed, 29 insertions(+), 27 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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
+Already up to date.
+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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (777f290ab328 selftests/ftrace: adjust offset for kprobe syntax error test)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/dma/tegra210-adma.c | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+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 (86ede0a61f85 mtd: rawnand: qcom: fix broken config in qcom_param_page_type_exec)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Merge made by the 'ort' strategy.
+ drivers/mtd/nand/raw/cadence-nand-controller.c | 42 +++++++++++++++++++-------
+ drivers/mtd/nand/raw/qcom_nandc.c | 22 +++++++-------
+ 2 files changed, 42 insertions(+), 22 deletions(-)
+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 (2014c95afece Linux 6.14-rc1)
+$ 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 (43fb96ae7855 KVM: x86/mmu: Ensure NX huge page recovery thread is alive before waking)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (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 (9cff907cbf8c platform/x86: thinkpad_acpi: Support for V9 DYTC platform profiles)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/platform/x86/thinkpad_acpi.c | 50 ++++++++++++++++++++++++++----------
+ 1 file changed, 36 insertions(+), 14 deletions(-)
+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
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/clock/qcom,gpucc.yaml | 3 +
+ .../bindings/clock/qcom,sa8775p-camcc.yaml | 6 +-
+ .../bindings/clock/qcom,sa8775p-videocc.yaml | 1 +
+ .../bindings/display/panel/powertip,hx8238a.yaml | 29 +++++
+ .../bindings/display/panel/powertip,st7272.yaml | 29 +++++
+ .../bindings/display/ti/ti,am65x-dss.yaml | 2 +-
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 +
+ drivers/of/address.c | 5 +-
+ drivers/of/of_private.h | 4 +
+ drivers/of/of_test.c | 119 ++++++++++++++++++++-
+ include/dt-bindings/clock/qcom,qcs8300-camcc.h | 16 +++
+ include/dt-bindings/clock/qcom,qcs8300-gpucc.h | 17 +++
+ 12 files changed, 228 insertions(+), 4 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/panel/powertip,hx8238a.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/powertip,st7272.yaml
+ create mode 100644 include/dt-bindings/clock/qcom,qcs8300-camcc.h
+ create mode 100644 include/dt-bindings/clock/qcom,qcs8300-gpucc.h
+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 (5233e3235dec scsi: qla1280: Fix kernel oops when debug level > 2)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (53139b3f9998 drm/i915/selftests: avoid using uninitialized context)
+$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+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
+Merge made by the 'ort' strategy.
+ drivers/mmc/host/mtk-sd.c | 31 ++++++++++++++++++++-----------
+ drivers/mmc/host/sdhci_am654.c | 30 ------------------------------
+ 2 files changed, 20 insertions(+), 41 deletions(-)
+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 (2014c95afece Linux 6.14-rc1)
+$ 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 (175c71c2acee tools/hv: reduce resource usage in hv_kvp_daemon)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging risc-v-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Already up to date.
+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 (615279db222c gpio: bcm-kona: Add missing newline to dev_err format string)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/gpio/gpio-bcm-kona.c | 71 ++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 58 insertions(+), 13 deletions(-)
+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 (40384c840ea1 Linux 6.13-rc1)
+$ 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 850fb725a7f2] 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 (9fae5884bb0e perf cpumap: Fix die and cluster IDs)
+$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
+Already up to date.
+Merging efi-fixes/urgent (bbc4578537e3 efi: Use BIT_ULL() constants for memory attributes)
+$ 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/efi.c | 6 ++++--
+ drivers/firmware/efi/libstub/randomalloc.c | 3 +++
+ drivers/firmware/efi/libstub/relocate.c | 3 +++
+ include/linux/efi.h | 31 +++++++++++++++---------------
+ 4 files changed, 26 insertions(+), 17 deletions(-)
+Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Already up to date.
+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
+Merge made by the 'ort' strategy.
+ drivers/power/supply/axp20x_battery.c | 31 +++++++++++++++----------------
+ drivers/power/supply/da9150-fg.c | 4 ++--
+ drivers/power/supply/power_supply_core.c | 8 ++++----
+ 3 files changed, 21 insertions(+), 22 deletions(-)
+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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 (9d89551994a4 Linux 6.13-rc6)
+$ 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 (c8c9b1d2d5b4 fgraph: Fix set_graph_notrace with setting TRACE_GRAPH_NOTRACE_BIT)
+$ 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 (8cd63406d081 trace/ring-buffer: Do not use TP_printk() formatting for boot mapped buffers)
+$ 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 (09ef33675a29 Merge branch into tip/master: 'sched/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.
+ kernel/sched/core.c | 5 +++--
+ tools/objtool/check.c | 11 ++++++++++-
+ 2 files changed, 13 insertions(+), 3 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 (866e43b945bf drm/msm: UAPI error reporting)
+$ 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 (095f7a647ccd 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
+Auto-merging arch/um/kernel/process.c
+Merge made by the 'ort' strategy.
+ arch/um/drivers/virt-pci.c | 196 ++++++++++++++++++++-------------------
+ arch/um/drivers/virtio_uml.c | 8 +-
+ arch/um/kernel/irq.c | 79 +++++++++-------
+ arch/um/kernel/process.c | 10 +-
+ arch/um/os-Linux/skas/process.c | 16 +++-
+ arch/x86/um/os-Linux/registers.c | 21 ++++-
+ arch/x86/um/signal.c | 13 ++-
+ 7 files changed, 202 insertions(+), 141 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (9ab127a18018 drm/hisilicon/hibmc: select CONFIG_DRM_DISPLAY_DP_HELPER)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +
+ drivers/gpu/drm/panthor/panthor_drv.c | 1 +
+ drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 200 +++++++++++----------
+ drivers/gpu/host1x/dev.c | 2 +
+ drivers/gpu/host1x/intr.c | 2 -
+ 5 files changed, 108 insertions(+), 99 deletions(-)
+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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (b9ce364939d4 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/arm64/Kconfig
+Auto-merging arch/s390/configs/debug_defconfig
+Auto-merging arch/s390/configs/defconfig
+Auto-merging arch/x86/Kconfig
+Merge made by the 'ort' strategy.
+ .mailmap | 2 -
+ CREDITS | 3 +
+ Documentation/ABI/testing/sysfs-firmware-kho | 9 +
+ Documentation/ABI/testing/sysfs-kernel-kho | 53 +
+ Documentation/ABI/testing/sysfs-kernel-mm-cma | 13 +
+ .../sysfs-kernel-mm-mempolicy-weighted-interleave | 38 +-
+ Documentation/admin-guide/cgroup-v2.rst | 24 +
+ Documentation/admin-guide/kernel-parameters.txt | 31 +
+ Documentation/admin-guide/mm/cma_debugfs.rst | 10 +-
+ Documentation/admin-guide/mm/zswap.rst | 10 +-
+ Documentation/admin-guide/sysctl/vm.rst | 17 +
+ Documentation/filesystems/dax.rst | 1 -
+ Documentation/filesystems/proc.rst | 10 +
+ .../kho/bindings/memblock/reserve_mem.yaml | 41 +
+ .../kho/bindings/memblock/reserve_mem_map.yaml | 42 +
+ Documentation/kho/concepts.rst | 80 ++
+ Documentation/kho/index.rst | 19 +
+ Documentation/kho/usage.rst | 60 +
+ Documentation/mm/index.rst | 1 -
+ Documentation/mm/z3fold.rst | 28 -
+ Documentation/subsystem-apis.rst | 1 +
+ Documentation/translations/zh_CN/mm/index.rst | 1 -
+ Documentation/translations/zh_CN/mm/z3fold.rst | 31 -
+ MAINTAINERS | 21 +-
+ arch/arm64/Kconfig | 3 +
+ arch/arm64/mm/init.c | 6 +-
+ arch/loongarch/configs/loongson3_defconfig | 3 +-
+ arch/loongarch/kernel/setup.c | 5 +-
+ arch/powerpc/Kconfig | 3 +
+ arch/powerpc/include/asm/book3s/64/hugetlb.h | 6 +
+ arch/powerpc/include/asm/crash_reserve.h | 8 +
+ 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/hugetlbpage.c | 1 +
+ arch/powerpc/mm/init_64.c | 4 +
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/riscv/mm/init.c | 6 +-
+ arch/s390/configs/debug_defconfig | 2 +-
+ arch/s390/configs/defconfig | 2 +-
+ arch/s390/mm/init.c | 13 +-
+ arch/x86/Kconfig | 4 +
+ arch/x86/boot/compressed/kaslr.c | 52 +-
+ arch/x86/include/asm/percpu.h | 33 +-
+ arch/x86/include/asm/setup.h | 4 +
+ arch/x86/include/uapi/asm/setup_data.h | 13 +-
+ arch/x86/kernel/e820.c | 18 +
+ arch/x86/kernel/kexec-bzimage64.c | 36 +
+ arch/x86/kernel/kgdb.c | 2 +-
+ arch/x86/kernel/setup.c | 49 +-
+ arch/x86/mm/init_64.c | 16 +-
+ arch/x86/realmode/init.c | 2 +
+ drivers/acpi/numa/hmat.c | 1 +
+ drivers/base/memory.c | 12 +-
+ drivers/base/node.c | 7 +
+ drivers/dax/device.c | 15 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 +-
+ drivers/nvdimm/pmem.c | 4 +-
+ drivers/of/fdt.c | 36 +
+ drivers/of/kexec.c | 42 +
+ drivers/pci/p2pdma.c | 19 +-
+ drivers/s390/block/Kconfig | 12 +-
+ drivers/s390/block/dcssblk.c | 27 +-
+ drivers/video/fbdev/core/fb_defio.c | 43 +-
+ fs/bcachefs/util.h | 2 +-
+ fs/dax.c | 367 +++--
+ fs/ext4/inode.c | 18 +-
+ fs/fuse/dax.c | 30 +-
+ fs/fuse/dir.c | 2 +-
+ fs/fuse/file.c | 4 +-
+ fs/fuse/virtio_fs.c | 3 +-
+ fs/xfs/xfs_inode.c | 31 +-
+ fs/xfs/xfs_inode.h | 2 +-
+ fs/xfs/xfs_super.c | 12 +
+ include/asm-generic/percpu.h | 39 +-
+ include/asm-generic/tlb.h | 49 +-
+ include/linux/bootmem_info.h | 7 +
+ include/linux/cma.h | 11 +
+ 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/crash_reserve.h | 11 +-
+ include/linux/damon.h | 11 +
+ include/linux/dax.h | 28 +
+ include/linux/fb.h | 1 +
+ include/linux/huge_mm.h | 6 +-
+ include/linux/hugetlb.h | 35 +
+ include/linux/kexec.h | 46 +
+ include/linux/kexec_handover.h | 10 +
+ include/linux/list_nulls.h | 1 +
+ include/linux/memblock.h | 38 +-
+ include/linux/memcontrol.h | 17 +-
+ include/linux/mempolicy.h | 4 +
+ include/linux/memremap.h | 17 +-
+ include/linux/migrate.h | 4 +-
+ include/linux/mm.h | 49 +-
+ include/linux/mm_types.h | 16 +-
+ include/linux/mmzone.h | 47 +-
+ include/linux/page-flags.h | 6 -
+ include/linux/part_stat.h | 2 +-
+ include/linux/percpu-defs.h | 6 +-
+ include/linux/pgalloc_tag.h | 75 +-
+ include/linux/rmap.h | 18 +
+ include/linux/swap.h | 12 +-
+ include/linux/user_namespace.h | 15 +-
+ include/linux/zpool.h | 5 +-
+ include/net/snmp.h | 5 +-
+ kernel/Kconfig.kexec | 13 +
+ kernel/Makefile | 1 +
+ kernel/crash_reserve.c | 9 +-
+ kernel/fork.c | 13 +-
+ kernel/kexec_elf.c | 2 +-
+ kernel/kexec_file.c | 31 +
+ kernel/kexec_handover.c | 808 +++++++++++
+ kernel/kexec_internal.h | 16 +
+ kernel/locking/percpu-rwsem.c | 2 +-
+ kernel/ucount.c | 97 +-
+ lib/alloc_tag.c | 6 +-
+ lib/maple_tree.c | 2 +-
+ lib/plist.c | 12 +
+ lib/test_hmm.c | 3 +-
+ lib/zlib_deflate/deflate.c | 6 +-
+ mm/Kconfig | 59 +-
+ mm/Makefile | 5 +-
+ mm/bootmem_info.c | 4 +-
+ mm/cma.c | 750 ++++++++--
+ mm/cma.h | 47 +-
+ mm/cma_debug.c | 61 +-
+ mm/cma_sysfs.c | 20 +
+ mm/compaction.c | 14 +-
+ mm/damon/core.c | 16 +-
+ mm/damon/ops-common.c | 2 +-
+ mm/damon/paddr.c | 57 +-
+ mm/debug.c | 28 +-
+ mm/gup.c | 18 +-
+ mm/hmm.c | 2 +-
+ mm/huge_memory.c | 192 ++-
+ mm/hugetlb.c | 565 ++++----
+ mm/hugetlb_cma.c | 258 ++++
+ mm/hugetlb_cma.h | 55 +
+ mm/hugetlb_vmemmap.c | 199 ++-
+ mm/hugetlb_vmemmap.h | 23 +-
+ mm/internal.h | 26 +-
+ mm/kmemleak.c | 54 +-
+ mm/madvise.c | 156 ++-
+ mm/memblock.c | 247 +++-
+ 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 | 73 +-
+ mm/mempolicy.c | 200 ++-
+ mm/memremap.c | 59 +-
+ mm/migrate.c | 2 +-
+ mm/migrate_device.c | 7 +-
+ mm/mlock.c | 2 +
+ mm/mm_init.c | 124 +-
+ mm/mmap.c | 2 +-
+ mm/mprotect.c | 6 +-
+ mm/oom_kill.c | 2 +-
+ mm/page_alloc.c | 81 +-
+ mm/percpu.c | 8 +-
+ mm/rmap.c | 220 ++-
+ mm/shmem.c | 78 +-
+ 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 | 83 +-
+ mm/truncate.c | 16 +-
+ mm/vma.c | 331 ++---
+ mm/vma.h | 86 +-
+ mm/vmscan.c | 153 +--
+ mm/z3fold.c | 1447 --------------------
+ mm/zbud.c | 455 ------
+ mm/zpool.c | 4 +-
+ net/mpls/internal.h | 4 +-
+ samples/kmemleak/kmemleak-test.c | 36 +-
+ scripts/checkpatch.pl | 96 ++
+ scripts/extract-fwblobs | 31 +
+ scripts/get_maintainer.pl | 49 +-
+ tools/testing/selftests/mm/split_huge_page_test.c | 63 +-
+ tools/testing/selftests/mm/thuge-gen.c | 4 +-
+ tools/testing/selftests/mm/uffd-common.c | 2 +-
+ tools/testing/vma/vma.c | 63 +-
+ tools/testing/vma/vma_internal.h | 4 +-
+ 190 files changed, 6655 insertions(+), 4270 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-kho
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-kho
+ create mode 100644 Documentation/kho/bindings/memblock/reserve_mem.yaml
+ create mode 100644 Documentation/kho/bindings/memblock/reserve_mem_map.yaml
+ create mode 100644 Documentation/kho/concepts.rst
+ create mode 100644 Documentation/kho/index.rst
+ create mode 100644 Documentation/kho/usage.rst
+ 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 include/linux/kexec_handover.h
+ create mode 100644 kernel/kexec_handover.c
+ 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
+Merging kbuild/for-next (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Already up to date.
+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 (9e676a024fa1 Merge tag 'v6.14-rc1' into perf-tools-next)
+$ 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/perf/Makefile.config | 10 +-
+ tools/perf/builtin-trace.c | 2 +-
+ .../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 +
+ 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/hwmon_pmu.c | 16 +-
+ tools/perf/tests/pmu.c | 85 ++--
+ tools/perf/tests/shell/record.sh | 59 ++-
+ tools/perf/tests/shell/test_stat_intel_tpebs.sh | 89 +++-
+ tools/perf/util/comm.c | 2 +
+ tools/perf/util/evsel.c | 14 +-
+ tools/perf/util/evsel.h | 2 +
+ tools/perf/util/hwmon_pmu.c | 14 -
+ tools/perf/util/hwmon_pmu.h | 16 +
+ tools/perf/util/parse-events.c | 2 +-
+ tools/perf/util/pmu.c | 258 ++++++++----
+ tools/perf/util/pmu.h | 7 +-
+ tools/perf/util/pmus.c | 168 +++++---
+ tools/perf/util/stat-display.c | 111 +++--
+ tools/perf/util/stat-shadow.c | 3 +-
+ tools/perf/util/stat.c | 13 +-
+ 58 files changed, 3668 insertions(+), 285 deletions(-)
+ 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
+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 arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-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 (1dd3393696ef Merge branch 'for-next/perf' 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
+Already up to date.
+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 (5bc55a333a2f Linux 6.13-rc7)
+$ 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 (c559645f343a soc: apple: rtkit: Pass the crashlog to the crashed() callback)
+$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
+Merge made by the 'ort' strategy.
+ 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/t7000-6.dtsi | 8 +
+ arch/arm64/boot/dts/apple/t7000-j42d.dts | 5 +
+ arch/arm64/boot/dts/apple/t7000-mini4.dtsi | 8 +
+ 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 | 60 ++
+ 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 ++++
+ drivers/nvme/host/apple.c | 2 +-
+ drivers/soc/apple/rtkit.c | 2 +-
+ include/linux/soc/apple/rtkit.h | 2 +-
+ 68 files changed, 8534 insertions(+), 130 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/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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Already up to date.
+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 (f89ee1bb86d7 Merge branch 'imx/defconfig' 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
+Merge made by the 'ort' strategy.
+Merging mediatek/for-next (3ac908716b82 arm64: dts: mediatek: add device-tree for Genio 510 EVK board)
+$ 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 +
+ 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/mt8173-elm.dtsi | 2 -
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 12 +-
+ arch/arm64/boot/dts/mediatek/mt8188.dtsi | 8 +-
+ 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 | 1040 ++++++++++++++++++++
+ 13 files changed, 1790 insertions(+), 1046 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 (a34c9fac85b2 arm64: dts: marvell: drop additional phy-names for sata)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Already up to date.
+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 (18f0a0ac2430 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.
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 58 ++++++-
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi | 236 +++++++++++++--------------
+ drivers/clk/qcom/gcc-x1e80100.c | 30 ----
+ drivers/firmware/qcom/qcom_scm.c | 4 +-
+ drivers/soc/qcom/pmic_glink.c | 2 +-
+ drivers/soc/qcom/qcom_aoss.c | 3 +-
+ 6 files changed, 180 insertions(+), 153 deletions(-)
+Merging renesas/next (231c17e981fb Merge branches '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/configs/shmobile_defconfig | 1 +
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 -----
+ arch/arm64/boot/dts/renesas/Makefile | 5 +
+ .../renesas/r8a77970-eagle-function-expansion.dtso | 2 +-
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 80 +++++
+ .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 108 ++++---
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 9 +-
+ arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 68 ++---
+ arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 80 ++---
+ .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 153 ++++++++--
+ arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 26 +-
+ .../arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts | 339 +++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 1 -
+ .../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 +
+ .../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 | 136 +++++++++
+ drivers/soc/renesas/rz-sysc.h | 46 +++
+ 33 files changed, 1376 insertions(+), 296 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 (96966b5836cb 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 | 5 +
+ .../devicetree/bindings/arm/rockchip/pmu.yaml | 8 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 1 +
+ .../boot/dts/rockchip/px30-ringneck-haikou.dts | 1 -
+ arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 6 +
+ .../dts/rockchip/rk3328-orangepi-r1-plus-lts.dts | 3 +-
+ .../boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 1 +
+ .../boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 8 +
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 8 +-
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 6 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 22 +-
+ .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 8 +
+ 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 +
+ .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 47 ++
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 105 +++-
+ .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 2 +-
+ .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 6 +-
+ .../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 | 93 +++-
+ .../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 +-
+ arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 2 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-max.dts | 2 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 2 +-
+ .../boot/dts/rockchip/rk3588-rock-5b-pcie-ep.dtso | 4 +
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 46 +-
+ .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 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 +
+ 45 files changed, 1065 insertions(+), 76 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts
+Merging samsung-krzk/for-next (4a96b08b7327 Merge branches 'next/clk', 'next/drivers', 'next/dt64' and 'next/soc' 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
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/google.yaml | 3 +-
+ .../bindings/clock/samsung,exynos990-clock.yaml | 19 +
+ .../bindings/soc/samsung/exynos-usi.yaml | 99 ++-
+ 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 | 908 +++++++++++++++++++++
+ arch/arm64/boot/dts/exynos/exynos990.dtsi | 92 ++-
+ 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 | 1 +
+ drivers/clk/samsung/clk-cpu.c | 2 +-
+ drivers/clk/samsung/clk-exynos990.c | 180 +++-
+ drivers/soc/samsung/exynos-usi.c | 107 ++-
+ include/dt-bindings/clock/samsung,exynos990.h | 21 +
+ include/dt-bindings/soc/samsung,exynos-usi.h | 17 +-
+ 18 files changed, 1763 insertions(+), 351 deletions(-)
+ 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
+Merging scmi/for-linux-next (b81ada150448 Merge tag 'scmi-updates-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ 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.
+Merging sophgo/for-next (255f83ba5c16 riscv: sophgo: dts: add pwm controller for SG2042 SoC)
+$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/sophgo/sg2042.dtsi | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+Merging spacemit/for-next (4a0c4e723c94 MAINTAINERS: spacemit: update various info)
+$ 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.
+ MAINTAINERS | 3 +++
+ 1 file changed, 3 insertions(+)
+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 (6e085e64a290 ARM: dts: sunxi: add support for NetCube Systems Kumquat)
+$ 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 +
+ 5 files changed, 291 insertions(+)
+ create mode 100644 arch/arm/boot/dts/allwinner/sun8i-v3s-netcube-kumquat.dts
+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
+Merge made by the 'ort' strategy.
+ arch/arm64/configs/defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging xilinx/for-next (600d48b6f347 Merge branch 'zynq/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.
+ 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/zynqmp-clk-ccf.dtsi | 15 +++--
+ 16 files changed, 414 insertions(+), 56 deletions(-)
+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 (5a1cb35ba37a clk: renesas: r9a09g047: Add ICU clock/reset)
+$ 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 | 49 +++++++++++++
+ drivers/clk/renesas/rzg2l-cpg.c | 119 ++++++++++++++++++--------------
+ drivers/clk/renesas/rzg2l-cpg.h | 12 +++-
+ 9 files changed, 206 insertions(+), 58 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 (8c9836f7c13b 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
+Merge made by the 'ort' strategy.
+ arch/loongarch/include/asm/cpu-info.h | 21 ---------------------
+ arch/loongarch/include/asm/smp.h | 2 ++
+ arch/loongarch/kernel/genex.S | 28 +++++++++++++++-------------
+ arch/loongarch/kernel/idle.c | 3 +--
+ arch/loongarch/kernel/proc.c | 29 +++--------------------------
+ arch/loongarch/kernel/reset.c | 6 +++---
+ arch/loongarch/kvm/main.c | 4 ++--
+ arch/loongarch/kvm/switch.S | 2 +-
+ arch/loongarch/kvm/vcpu.c | 3 ---
+ arch/loongarch/lib/csum.c | 2 +-
+ arch/loongarch/mm/pageattr.c | 3 ++-
+ 11 files changed, 30 insertions(+), 73 deletions(-)
+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 (e156413e8820 m68k: Do not include <linux/fb.h>)
+$ 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_no.c | 1 -
+ arch/m68k/kernel/uboot.c | 1 -
+ 2 files changed, 2 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Already up to date.
+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
+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 (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Already up to date.
+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 (6b47db27468c riscv: dts: starfive: Unify regulator naming scheme)
+$ 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.
+ arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 5 +++--
+ arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi | 5 +++--
+ arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi | 5 +++--
+ arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 2 +-
+ 4 files changed, 10 insertions(+), 7 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 (ce6bdbd583f3 Merge branch 'fixes' 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
+Merge made by the 'ort' strategy.
+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 (d14b9a713b34 xtensa/simdisk: Use str_write_read() helper in simdisk_transfer())
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Already up to date.
+Merging fs-next (4986821678e9 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 fs/xfs/xfs_super.c
+Auto-merging include/linux/mm.h
+Auto-merging mm/gup.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/fs.rst | 25 +
+ Documentation/filesystems/iomap/design.rst | 4 +
+ Documentation/filesystems/iomap/operations.rst | 11 +-
+ Documentation/netlink/specs/lockd.yaml | 45 ++
+ 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/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 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/kernel/syscalls/syscall.tbl | 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 | 81 +++-
+ drivers/vfio/group.c | 16 +-
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/alloc_background.c | 51 +-
+ 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 | 126 ++---
+ fs/bcachefs/backpointers.h | 11 +-
+ fs/bcachefs/bcachefs.h | 5 +-
+ fs/bcachefs/bcachefs_ioctl.h | 29 +-
+ fs/bcachefs/btree_gc.c | 18 +-
+ fs/bcachefs/btree_io.c | 205 +++++++-
+ fs/bcachefs/btree_io.h | 4 +
+ fs/bcachefs/btree_update_interior.c | 20 +
+ fs/bcachefs/btree_update_interior.h | 8 +-
+ fs/bcachefs/chardev.c | 38 +-
+ fs/bcachefs/compress.c | 8 +-
+ fs/bcachefs/data_update.c | 220 ++++++---
+ fs/bcachefs/data_update.h | 17 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/disk_accounting.h | 2 +
+ fs/bcachefs/ec.c | 6 +-
+ fs/bcachefs/errcode.h | 6 +
+ fs/bcachefs/error.c | 60 ++-
+ fs/bcachefs/error.h | 5 +-
+ fs/bcachefs/extents.c | 9 +-
+ fs/bcachefs/extents.h | 2 +-
+ fs/bcachefs/eytzinger.c | 136 +++---
+ fs/bcachefs/eytzinger.h | 93 ++--
+ fs/bcachefs/fs-io-buffered.c | 26 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/io_misc.c | 3 +-
+ fs/bcachefs/io_read.c | 523 ++++++++++-----------
+ fs/bcachefs/io_read.h | 75 +--
+ fs/bcachefs/io_write.c | 152 +++---
+ fs/bcachefs/io_write.h | 33 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 125 ++++-
+ fs/bcachefs/journal.h | 38 +-
+ fs/bcachefs/journal_io.c | 30 +-
+ fs/bcachefs/journal_reclaim.c | 37 +-
+ fs/bcachefs/journal_seq_blacklist.c | 7 +-
+ fs/bcachefs/journal_types.h | 24 +-
+ fs/bcachefs/lru.c | 93 ++--
+ fs/bcachefs/lru.h | 15 +-
+ fs/bcachefs/lru_format.h | 2 +-
+ fs/bcachefs/migrate.c | 26 +-
+ fs/bcachefs/move.c | 436 ++++++++++-------
+ 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 | 23 +-
+ fs/bcachefs/sb-counters.c | 90 +++-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 30 +-
+ 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/sysfs.c | 5 -
+ fs/bcachefs/trace.h | 76 +--
+ fs/bcachefs/util.c | 210 +++++++--
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/bio.c | 4 +-
+ fs/btrfs/bio.h | 3 +
+ fs/btrfs/btrfs_inode.h | 8 +
+ fs/btrfs/compression.c | 21 +-
+ fs/btrfs/compression.h | 25 +-
+ fs/btrfs/disk-io.c | 5 +-
+ fs/btrfs/extent-tree.c | 12 +-
+ fs/btrfs/extent_io.c | 221 ++++-----
+ fs/btrfs/file.c | 22 +-
+ fs/btrfs/free-space-cache.c | 26 +-
+ fs/btrfs/fs.h | 9 +-
+ fs/btrfs/inode.c | 242 +++++-----
+ fs/btrfs/ioctl.c | 1 +
+ fs/btrfs/scrub.c | 142 ++----
+ fs/btrfs/subpage.c | 196 +++++---
+ fs/btrfs/subpage.h | 52 +-
+ fs/btrfs/super.c | 2 +-
+ fs/btrfs/tests/delayed-refs-tests.c | 1 +
+ fs/btrfs/volumes.c | 2 +-
+ fs/btrfs/zlib.c | 83 ++--
+ fs/btrfs/zoned.c | 9 +
+ fs/btrfs/zstd.c | 52 +-
+ fs/cachefiles/ondemand.c | 7 +-
+ fs/coredump.c | 38 +-
+ 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/eventfd.c | 5 +-
+ fs/exfat/balloc.c | 10 +-
+ fs/exfat/exfat_fs.h | 2 +-
+ fs/exfat/fatent.c | 11 +-
+ fs/exfat/namei.c | 2 +-
+ fs/f2fs/checkpoint.c | 15 +-
+ fs/f2fs/data.c | 2 -
+ fs/f2fs/f2fs.h | 3 +-
+ fs/f2fs/inode.c | 4 +
+ fs/f2fs/shrinker.c | 2 +-
+ fs/f2fs/super.c | 65 ++-
+ fs/f2fs/sysfs.c | 74 ++-
+ fs/fuse/dev.c | 98 ++++
+ fs/fuse/dev_uring.c | 27 ++
+ fs/fuse/dev_uring_i.h | 6 +
+ fs/fuse/fuse_dev_i.h | 3 +
+ fs/fuse/fuse_i.h | 30 ++
+ fs/fuse/inode.c | 43 +-
+ fs/fuse/sysctl.c | 24 +
+ fs/gfs2/bmap.c | 3 +-
+ fs/gfs2/glock.c | 49 +-
+ fs/gfs2/incore.h | 3 +-
+ fs/gfs2/super.c | 3 +-
+ fs/gfs2/trace_gfs2.h | 8 +-
+ fs/internal.h | 5 +-
+ fs/ioctl.c | 10 +-
+ fs/iomap/Makefile | 1 +
+ fs/iomap/buffered-io.c | 202 ++------
+ fs/iomap/direct-io.c | 132 ++++--
+ fs/iomap/internal.h | 10 +
+ fs/iomap/ioend.c | 216 +++++++++
+ 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 | 7 +-
+ fs/namespace.c | 487 ++++++++++++++-----
+ fs/nfsd/nfs4state.c | 22 +-
+ 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/ntfs3/attrib.c | 3 +-
+ fs/ntfs3/file.c | 42 +-
+ fs/ntfs3/frecord.c | 6 +-
+ fs/ntfs3/super.c | 89 ++--
+ fs/open.c | 20 +-
+ fs/pipe.c | 62 ++-
+ fs/pnode.c | 4 +-
+ fs/pstore/inode.c | 109 +++--
+ fs/signalfd.c | 7 +-
+ fs/smb/client/cifsglob.h | 11 +-
+ fs/smb/client/file.c | 7 +-
+ fs/smb/client/inode.c | 13 +
+ fs/smb/client/reparse.c | 5 +-
+ fs/smb/client/smb2ops.c | 99 +++-
+ fs/smb/common/smb2pdu.h | 30 +-
+ fs/smb/common/smbfsctl.h | 3 +
+ fs/super.c | 55 ---
+ fs/sysv/super.c | 57 ++-
+ fs/timerfd.c | 6 +-
+ fs/xfs/scrub/common.h | 5 -
+ fs/xfs/scrub/inode_repair.c | 12 +-
+ fs/xfs/scrub/repair.h | 11 +-
+ fs/xfs/scrub/scrub.c | 12 +
+ fs/xfs/xfs_aops.c | 66 ++-
+ fs/xfs/xfs_file.c | 3 +-
+ fs/xfs/xfs_iomap.c | 4 +-
+ fs/xfs/xfs_qm_bhv.c | 55 ++-
+ fs/xfs/xfs_super.c | 8 +-
+ fs/zonefs/file.c | 2 +-
+ include/linux/dcache.h | 38 +-
+ include/linux/fanotify.h | 12 +-
+ include/linux/fs.h | 32 +-
+ include/linux/fs_context.h | 2 -
+ include/linux/fsnotify.h | 20 +
+ include/linux/fsnotify_backend.h | 42 ++
+ include/linux/iomap.h | 66 ++-
+ 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/uidgid.h | 6 +
+ include/linux/vfsdebug.h | 49 ++
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/fanotify.h | 10 +
+ include/uapi/linux/fuse.h | 10 +-
+ include/uapi/linux/lockd_netlink.h | 29 ++
+ include/uapi/linux/mount.h | 10 +-
+ include/uapi/linux/pidfd.h | 24 +
+ kernel/exit.c | 56 ++-
+ 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/xprtrdma/svc_rdma_transport.c | 3 +-
+ samples/vfs/samples-vfs.h | 14 +-
+ samples/vfs/test-list-all-mounts.c | 35 +-
+ scripts/syscall.tbl | 1 +
+ .../filesystems/overlayfs/set_layers_via_fds.c | 120 +++++
+ .../selftests/filesystems/overlayfs/wrappers.h | 17 +
+ 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 +-
+ 244 files changed, 6206 insertions(+), 3199 deletions(-)
+ 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
+ create mode 100644 include/linux/vfsdebug.h
+ create mode 100644 include/uapi/linux/lockd_netlink.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 (c71f7bbc5d79 Merge branch 'pci/endpoint')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
+Merge made by the 'ort' strategy.
+ drivers/pci/endpoint/functions/pci-epf-test.c | 126 +++++++++++++++-----------
+ drivers/pci/iov.c | 2 +-
+ drivers/pci/pci.c | 2 +-
+ drivers/pci/quirks.c | 4 +-
+ drivers/pci/setup-res.c | 12 +--
+ 5 files changed, 83 insertions(+), 63 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 (3bf0bccd7960 Merge branch 'for-6.15/pidff' 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
+Auto-merging sound/usb/mixer_quirks.c
+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/hid-appletb-bl.c | 203 ++++++++
+ drivers/hid/hid-appletb-kbd.c | 506 +++++++++++++++++++
+ drivers/hid/hid-core.c | 6 +-
+ drivers/hid/hid-ids.h | 37 ++
+ drivers/hid/hid-lg-g15.c | 146 +++---
+ 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 ++++++++
+ .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 14 +-
+ .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 14 +-
+ 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 ++
+ 21 files changed, 1626 insertions(+), 393 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd
+ 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 (3bfa08fe9ec8 Revert "i2c: Replace list-based mechanism for handling auto-detected clients")
+$ 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
+Already up to date.
+Merging i2c-host/i2c/i2c-host (fd4e93083129 i2c: i801: Add lis3lv02d for Dell Precision M6800)
+$ 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
+Already up to date.
+Merging i3c/i3c/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Already up to date.
+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 (95767a592dc9 docs: submitting-patches: document the format for affiliation)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/removed/sysfs-class-rfkill | 2 +-
+ Documentation/ABI/stable/sysfs-class-rfkill | 12 +-
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 4 +-
+ .../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/admin-guide/README.rst | 2 +-
+ Documentation/admin-guide/abi-obsolete-files.rst | 7 +
+ Documentation/admin-guide/abi-obsolete.rst | 6 +-
+ Documentation/admin-guide/abi-readme-file.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 | 17 +
+ .../bindings/net/can/microchip,mcp251xfd.yaml | 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/mm/split_page_table_lock.rst | 2 +-
+ Documentation/process/submit-checklist.rst | 9 +-
+ Documentation/process/submitting-patches.rst | 6 +
+ Documentation/sphinx/automarkup.py | 47 +
+ Documentation/sphinx/kernel_abi.py | 160 +--
+ Documentation/sphinx/kerneldoc.py | 14 +-
+ Documentation/sphinx/kernellog.py | 22 -
+ Documentation/sphinx/kfigure.py | 81 +-
+ .../translations/zh_CN/admin-guide/README.rst | 2 +-
+ .../translations/zh_CN/dev-tools/ubsan.rst | 33 +-
+ .../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 +-
+ scripts/documentation-file-ref-check | 2 +-
+ scripts/get_abi.pl | 1103 --------------------
+ scripts/get_abi.py | 214 ++++
+ 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 +++++++
+ 58 files changed, 3123 insertions(+), 1361 deletions(-)
+ create mode 100644 Documentation/admin-guide/abi-obsolete-files.rst
+ create mode 100644 Documentation/admin-guide/abi-readme-file.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
+ 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 (39e3f5bc0ab4 media: qcom: camss: Add support for VFE 780)
+$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
+Merge made by the 'ort' strategy.
+ .../bindings/media/qcom,sc7280-camss.yaml | 10 +-
+ .../bindings/media/qcom,sm8550-camss.yaml | 597 ++++++++++++++++
+ 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 | 141 +++-
+ drivers/media/platform/qcom/camss/camss-csid.h | 31 +
+ .../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.c | 274 +++++++
+ drivers/media/platform/qcom/camss/camss-vfe.h | 59 +-
+ drivers/media/platform/qcom/camss/camss.c | 374 +++++++++-
+ drivers/media/platform/qcom/camss/camss.h | 4 +
+ 24 files changed, 2483 insertions(+), 884 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8550-camss.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
+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 (7c2191495f2c Merge branch 'thermal-core' into fixes)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Merge made by the 'ort' strategy.
+ drivers/thermal/cpufreq_cooling.c | 2 --
+ include/uapi/linux/thermal.h | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (0322f3e89b4e cpufreq: Remove cpufreq_enable_boost_support())
+$ 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
+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/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 +++++-----------
+ 43 files changed, 53 insertions(+), 178 deletions(-)
+Merging cpupower/cpupower (3d6f25870d17 pm: cpupower: Add missing residency header changes in cpuidle.h to SWIG)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Already up to date.
+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 (432a6d050b0e pmdomain: bcm2835-power: set flag GENPD_FLAG_ACTIVE_WAKEUP)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
+Merge made by the 'ort' strategy.
+ drivers/pmdomain/bcm/bcm2835-power.c | 1 +
+ drivers/pmdomain/ti/omap_prm.c | 2 +-
+ include/dt-bindings/power/qcom-rpmpd.h | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+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 (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe)
+$ 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
+Already up to date.
+Merging rdma/for-next (656dff55da19 RDMA/bnxt_re: Congestion control settings using debugfs hook)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Merge made by the 'ort' strategy.
+ drivers/infiniband/core/cma.c | 24 ++-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +
+ drivers/infiniband/hw/bnxt_re/debugfs.c | 212 +++++++++++++++++++-
+ drivers/infiniband/hw/bnxt_re/debugfs.h | 15 ++
+ drivers/infiniband/hw/mana/Makefile | 2 +-
+ drivers/infiniband/hw/mana/ah.c | 58 ++++++
+ drivers/infiniband/hw/mana/cq.c | 233 +++++++++++++++++++---
+ drivers/infiniband/hw/mana/device.c | 18 +-
+ drivers/infiniband/hw/mana/main.c | 95 ++++++++-
+ drivers/infiniband/hw/mana/mana_ib.h | 157 ++++++++++++++-
+ drivers/infiniband/hw/mana/mr.c | 36 ++++
+ 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/rxe.c | 15 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 15 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 4 +-
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 7 +-
+ include/net/mana/gdma.h | 6 +
+ 19 files changed, 1376 insertions(+), 51 deletions(-)
+ create mode 100644 drivers/infiniband/hw/mana/ah.c
+ create mode 100644 drivers/infiniband/hw/mana/shadow_queue.h
+ create mode 100644 drivers/infiniband/hw/mana/wr.c
+Merging net-next/main (b6df0523ecee Merge branch 'net-phy-rename-eee_broken_mode')
+$ 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/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging include/linux/netdevice.h
+Auto-merging include/net/tcp.h
+Auto-merging include/uapi/linux/ethtool.h
+Auto-merging net/core/dev.c
+Auto-merging net/core/fib_rules.c
+Auto-merging net/core/neighbour.c
+Auto-merging net/core/rtnetlink.c
+Auto-merging net/ethtool/common.c
+Auto-merging net/ipv4/devinet.c
+Auto-merging net/ipv4/tcp.c
+Merge made by the 'ort' strategy.
+ Documentation/arch/s390/driver-model.rst | 2 +-
+ .../devicetree/bindings/net/faraday,ftgmac100.yaml | 3 +
+ Documentation/netlink/genetlink-c.yaml | 5 +-
+ Documentation/netlink/genetlink-legacy.yaml | 5 +-
+ Documentation/netlink/genetlink.yaml | 5 +-
+ Documentation/netlink/specs/netdev.yaml | 15 +
+ Documentation/netlink/specs/rt_addr.yaml | 23 +
+ Documentation/networking/devlink/ice.rst | 11 +
+ Documentation/networking/ip-sysctl.rst | 13 +
+ .../net_cachelines/inet_connection_sock.rst | 1 +
+ .../net_cachelines/netns_ipv4_sysctl.rst | 1 +
+ Documentation/networking/netconsole.rst | 45 +
+ MAINTAINERS | 2 +-
+ 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/net/bonding/bond_main.c | 3 -
+ drivers/net/dsa/rzn1_a5psw.c | 8 +-
+ drivers/net/dsa/sja1105/sja1105_mdio.c | 6 +-
+ drivers/net/ethernet/actions/owl-emac.c | 7 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 1 -
+ .../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/gianfar.c | 14 +-
+ drivers/net/ethernet/ibm/emac/core.c | 7 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.h | 10 +-
+ drivers/net/ethernet/intel/ice/devlink/devlink.c | 102 +
+ drivers/net/ethernet/intel/ice/ice.h | 21 +-
+ drivers/net/ethernet/intel/ice/ice_base.c | 10 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 9 +-
+ 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 | 35 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 6 +-
+ drivers/net/ethernet/intel/ice/ice_sriov.c | 154 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 8 -
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +-
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/alloc.c | 22 -
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 6 -
+ drivers/net/ethernet/mellanox/mlx4/port.c | 20 -
+ 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/tc/act/act.h | 5 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 22 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 11 +-
+ .../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 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 +-
+ 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/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/fbnic.h | 6 +
+ 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 | 705 ++++++
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 3 +
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 356 ++-
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.h | 35 +
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 8 +-
+ drivers/net/ethernet/realtek/Kconfig | 3 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 7 +-
+ drivers/net/ethernet/renesas/rswitch.c | 7 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 14 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 13 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 32 +-
+ 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_main.c | 133 +-
+ drivers/net/ethernet/xilinx/Kconfig | 1 +
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 29 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 314 ++-
+ drivers/net/netconsole.c | 261 ++-
+ drivers/net/netdevsim/netdev.c | 10 +-
+ drivers/net/pcs/pcs-rzn1-miic.c | 21 +-
+ drivers/net/phy/dp83td510.c | 187 ++
+ drivers/net/phy/phy-c45.c | 2 +-
+ drivers/net/phy/phy-core.c | 22 +-
+ drivers/net/phy/phy_device.c | 2 +-
+ drivers/net/phy/realtek/Kconfig | 8 +-
+ drivers/net/phy/realtek/realtek_main.c | 9 +-
+ drivers/net/tap.c | 166 +-
+ drivers/net/tun.c | 193 +-
+ drivers/net/tun_vnet.h | 185 ++
+ drivers/net/usb/cdc_mbim.c | 2 +-
+ drivers/net/usb/qmi_wwan.c | 3 +-
+ drivers/net/usb/r8152.c | 1 +
+ drivers/net/vrf.c | 6 +-
+ drivers/net/vxlan/vxlan_core.c | 34 +-
+ 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 ---
+ include/linux/mlx4/device.h | 1 -
+ 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/phy.h | 12 +-
+ include/linux/rtnetlink.h | 1 +
+ include/linux/unroll.h | 44 +
+ include/linux/usb/r8152.h | 1 +
+ include/net/busy_poll.h | 5 +
+ include/net/fib_rules.h | 8 +-
+ include/net/inet_connection_sock.h | 4 +-
+ include/net/netdev_queues.h | 4 +
+ include/net/netdev_rx_queue.h | 1 +
+ 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/tcp.h | 24 +-
+ include/net/xdp_sock_drv.h | 43 +-
+ include/net/xsk_buff_pool.h | 8 +
+ include/uapi/linux/ethtool.h | 18 +
+ include/uapi/linux/netdev.h | 7 +
+ include/uapi/linux/tcp.h | 1 +
+ net/bridge/br_mdb.c | 2 +-
+ net/core/dev.c | 31 +-
+ net/core/dev.h | 12 +
+ net/core/devmem.c | 93 +-
+ net/core/devmem.h | 51 +-
+ net/core/fib_rules.c | 153 +-
+ net/core/neighbour.c | 9 +-
+ net/core/net-sysfs.c | 394 +++-
+ net/core/netdev-genl.c | 23 +-
+ net/core/netdev_rx_queue.c | 106 +-
+ net/core/page_pool.c | 58 +-
+ net/core/page_pool_user.c | 7 +-
+ net/core/rtnetlink.c | 5 +
+ net/ethtool/common.c | 42 +
+ net/ethtool/ioctl.c | 12 +-
+ net/ipv4/devinet.c | 77 +-
+ net/ipv4/fib_rules.c | 4 +-
+ net/ipv4/igmp.c | 14 +-
+ net/ipv4/igmp_internal.h | 17 +
+ net/ipv4/inet_connection_sock.c | 12 -
+ net/ipv4/ip_gre.c | 16 +-
+ net/ipv4/sysctl_net_ipv4.c | 10 +
+ net/ipv4/tcp.c | 25 +-
+ net/ipv4/tcp_fastopen.c | 4 +-
+ net/ipv4/tcp_input.c | 26 +-
+ net/ipv4/tcp_ipv4.c | 6 +-
+ net/ipv4/tcp_minisocks.c | 3 +-
+ net/ipv4/tcp_output.c | 18 +-
+ net/ipv4/tcp_timer.c | 52 +-
+ net/ipv6/fib6_rules.c | 4 +-
+ net/mptcp/pm.c | 86 +-
+ net/mptcp/pm_netlink.c | 129 +-
+ net/mptcp/pm_userspace.c | 209 +-
+ net/mptcp/protocol.h | 14 +-
+ net/xdp/xsk_buff_pool.c | 46 +-
+ tools/include/uapi/linux/netdev.h | 7 +
+ tools/net/ynl/Makefile.deps | 4 +-
+ tools/net/ynl/pyynl/ynl_gen_c.py | 8 +-
+ tools/testing/selftests/drivers/net/Makefile | 2 +
+ tools/testing/selftests/drivers/net/hw/csum.py | 2 +-
+ tools/testing/selftests/drivers/net/hw/ncdevmem.c | 1 -
+ tools/testing/selftests/drivers/net/hw/rss_ctx.py | 46 +-
+ tools/testing/selftests/drivers/net/lib/py/env.py | 71 +-
+ .../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/net/Makefile | 1 +
+ .../testing/selftests/net/forwarding/bridge_mdb.sh | 2 +-
+ .../selftests/net/forwarding/vxlan_bridge_1d.sh | 2 +
+ tools/testing/selftests/net/lib/py/__init__.py | 2 +-
+ tools/testing/selftests/net/lib/py/ynl.py | 4 +
+ tools/testing/selftests/net/nl_netdev.py | 18 +-
+ tools/testing/selftests/net/rtnetlink.py | 30 +
+ tools/testing/selftests/net/ynl.mk | 3 +-
+ 204 files changed, 5711 insertions(+), 5337 deletions(-)
+ 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/tun_vnet.h
+ delete mode 100644 drivers/s390/net/lcs.c
+ delete mode 100644 drivers/s390/net/lcs.h
+ create mode 100644 include/net/page_pool/memory_provider.h
+ create mode 100644 net/ipv4/igmp_internal.h
+ 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 100755 tools/testing/selftests/net/rtnetlink.py
+Merging bpf-next/for-next (ea145d530a2d bpf: define KF_ARENA_* flags for bpf_arena kfuncs)
+$ 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 kernel/bpf/arena.c
+Auto-merging kernel/bpf/btf.c
+Merge made by the 'ort' strategy.
+ Documentation/bpf/btf.rst | 25 +-
+ include/linux/btf.h | 3 +
+ include/uapi/linux/bpf.h | 5 +-
+ include/uapi/linux/btf.h | 3 +-
+ kernel/bpf/arena.c | 4 +-
+ kernel/bpf/bpf_struct_ops.c | 98 +++---
+ kernel/bpf/btf.c | 26 +-
+ samples/bpf/Makefile | 2 +-
+ tools/bpf/bpftool/common.c | 3 +-
+ tools/bpf/runqslower/Makefile | 3 +-
+ 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.map | 2 +
+ tools/testing/selftests/bpf/Makefile | 12 +-
+ tools/testing/selftests/bpf/network_helpers.c | 17 ++
+ tools/testing/selftests/bpf/network_helpers.h | 12 +
+ tools/testing/selftests/bpf/prog_tests/btf.c | 23 +-
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c | 147 ++++++---
+ .../selftests/bpf/prog_tests/setget_sockopt.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 1 +
+ .../selftests/bpf/prog_tests/test_xdp_veth.c | 331 +++++++++++++--------
+ tools/testing/selftests/bpf/test_btf.h | 6 +
+ 24 files changed, 546 insertions(+), 280 deletions(-)
+Merging ipsec-next/master (135c3c86a7ce r8169: make Kconfig option for LED support user-visible)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (6ca00ec47b70 net/mlx5: Add nic_cap_reg and vhca_icm_ctrl registers)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/main (0ad9617c78ac Merge tag 'net-next-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ 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 (0ad9617c78ac Merge tag 'net-next-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ 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 (dd6367916d2d Bluetooth: L2CAP: Fix corrupted list in hci_chan_del)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/bluetooth/btusb.c
+Auto-merging net/bluetooth/l2cap_sock.c
+Auto-merging net/bluetooth/mgmt.c
+Merge made by the 'ort' strategy.
+ drivers/bluetooth/bfusb.c | 3 +-
+ drivers/bluetooth/btintel.c | 8 ++
+ drivers/bluetooth/btintel.h | 1 +
+ drivers/bluetooth/btintel_pcie.c | 7 +-
+ drivers/bluetooth/btusb.c | 30 ++++++-
+ drivers/bluetooth/hci_ldisc.c | 3 +-
+ include/net/bluetooth/hci_core.h | 2 -
+ include/net/bluetooth/l2cap.h | 3 +-
+ net/bluetooth/l2cap_core.c | 163 ++++++++++++++++++---------------------
+ net/bluetooth/l2cap_sock.c | 15 ++--
+ net/bluetooth/mgmt.c | 40 ----------
+ net/bluetooth/mgmt_util.c | 17 ----
+ net/bluetooth/mgmt_util.h | 4 -
+ 13 files changed, 131 insertions(+), 165 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 (7b19d5adadfe wifi: ath12k: Support Received FSE 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/ahb.c | 4 +-
+ drivers/net/wireless/ath/ath11k/core.c | 4 +-
+ drivers/net/wireless/ath/ath11k/core.h | 8 +-
+ 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/mac.c | 72 +-
+ drivers/net/wireless/ath/ath11k/pci.c | 3 +-
+ 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 | 98 +-
+ 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 | 5 +-
+ drivers/net/wireless/ath/ath12k/dp_tx.c | 248 +++-
+ 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 | 780 +++++++----
+ 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 | 1169 +++++++++++++++-
+ 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 +-
+ 55 files changed, 8453 insertions(+), 971 deletions(-)
+ 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 (8079d5bc5c3d mtd: spi-nor: winbond: Add support for w25q02jv)
+$ 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/winbond.c | 88 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 88 insertions(+)
+Merging crypto/master (b16510a530d1 crypto: ecdsa - Harden against integer overflows in DIV_ROUND_UP())
+$ 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 ++
+ MAINTAINERS | 8 +
+ arch/x86/crypto/aesni-intel_glue.c | 30 +-
+ crypto/asymmetric_keys/public_key.c | 9 +-
+ crypto/ecc.c | 2 +-
+ crypto/ecdsa-p1363.c | 2 +-
+ crypto/ecdsa-x962.c | 4 +-
+ crypto/rsassa-pkcs1.c | 2 +-
+ crypto/skcipher.c | 3 +-
+ crypto/testmgr.c | 7 +-
+ drivers/char/hw_random/Kconfig | 10 +-
+ drivers/char/hw_random/imx-rngc.c | 69 +-
+ drivers/crypto/Kconfig | 1 +
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/bcm/cipher.c | 3 +-
+ drivers/crypto/bcm/spu2.c | 3 +-
+ drivers/crypto/caam/caamalg_qi2.c | 3 +-
+ drivers/crypto/ccp/sp-pci.c | 15 +-
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 7 +
+ 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 | 809 +++++++++++++++++++
+ 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_common/adf_sysfs.c | 10 +-
+ .../crypto/intel/qat/qat_common/icp_qat_fw_comp.h | 4 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 5 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 3 +-
+ include/crypto/sig.h | 5 +-
+ include/linux/math.h | 12 +
+ include/linux/spinlock.h | 13 +
+ lib/842/842_compress.c | 2 +
+ 42 files changed, 4266 insertions(+), 81 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/inside-secure,safexcel-eip93.yaml
+ 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
+Already up to date.
+Merging drm-exynos/for-linux-next (31b2be07afd0 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
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
+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 (50625eab3972 drm/edp-panel: Add panel used by T14s Gen6 Snapdragon)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
+Auto-merging CREDITS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/accel/ivpu/ivpu_drv.c
+Auto-merging drivers/accel/ivpu/ivpu_pm.c
+Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
+Auto-merging drivers/gpu/drm/ast/ast_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
+Auto-merging drivers/gpu/drm/panthor/panthor_drv.c
+Merge made by the 'ort' strategy.
+ CREDITS | 4 +
+ .../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-usage-stats.rst | 5 +-
+ Documentation/gpu/nouveau.rst | 29 +
+ Documentation/gpu/panthor.rst | 10 +
+ MAINTAINERS | 28 +-
+ 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 | 24 +-
+ 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_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/Makefile | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 8 +-
+ 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/arm/display/komeda/komeda_wb_connector.c | 2 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 2 +-
+ drivers/gpu/drm/ast/Makefile | 1 +
+ drivers/gpu/drm/ast/ast_dp.c | 269 +++++---
+ drivers/gpu/drm/ast/ast_drv.c | 8 +-
+ drivers/gpu/drm/ast/ast_drv.h | 32 +-
+ drivers/gpu/drm/ast/ast_main.c | 215 ++++--
+ drivers/gpu/drm/ast/ast_mode.c | 315 +++------
+ 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/adv7511/adv7511_audio.c | 5 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 16 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +-
+ drivers/gpu/drm/bridge/ite-it6505.c | 7 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 7 -
+ drivers/gpu/drm/bridge/microchip-lvds.c | 3 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
+ drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
+ drivers/gpu/drm/bridge/parade-ps8640.c | 1 -
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +-
+ drivers/gpu/drm/bridge/tc358762.c | 2 +-
+ drivers/gpu/drm/bridge/tc358775.c | 1 -
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 -
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 +-
+ 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 | 44 +-
+ 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_file.c | 26 +-
+ drivers/gpu/drm/drm_managed.c | 8 +
+ 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/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 | 18 -
+ drivers/gpu/drm/i2c/Makefile | 6 -
+ 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/imagination/pvr_job.c | 12 +-
+ drivers/gpu/drm/imx/ipuv3/imx-tve.c | 2 +-
+ 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/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/nvkm/subdev/gsp/r535.c | 734 ++++++++++++++-------
+ drivers/gpu/drm/omapdrm/dss/dss.c | 14 +-
+ 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-xinpeng-xpp055c272.c | 174 +++--
+ 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 | 104 ++-
+ drivers/gpu/drm/panthor/panthor_mmu.h | 3 +
+ drivers/gpu/drm/panthor/panthor_sched.c | 61 +-
+ 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/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_vop2.c | 36 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 42 +-
+ 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/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.h | 1 -
+ drivers/gpu/drm/v3d/v3d_sched.c | 2 -
+ 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_gem.c | 183 ++---
+ 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 | 9 -
+ 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/xlnx/zynqmp_dp_audio.c | 4 +
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +
+ 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 | 23 +-
+ include/drm/drm_crtc.h | 2 +-
+ include/drm/drm_file.h | 5 +
+ include/drm/drm_managed.h | 12 +
+ include/drm/drm_mode_object.h | 2 +-
+ include/drm/drm_modeset_helper_vtables.h | 4 +-
+ include/drm/drm_panel.h | 1 -
+ include/drm/drm_writeback.h | 6 +
+ include/drm/gpu_scheduler.h | 20 +-
+ 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 +
+ 309 files changed, 7951 insertions(+), 3189 deletions(-)
+ create mode 100644 Documentation/gpu/nouveau.rst
+ create mode 100644 drivers/gpu/drm/ast/ast_vbios.c
+ create mode 100644 drivers/gpu/drm/ast/ast_vbios.h
+ 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
+Merging amdgpu/drm-next (f245b400a223 Revert "drm/amd/display: Use HW lock mgr for PSR1")
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Already up to date.
+Merging drm-intel/for-linux-next (f2d236766f01 drm/i915: Continue intel_display_power struct intel_display conversion)
+$ 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_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_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/skl_universal_plane.c
+Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+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.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1cc3c0287d45] 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 | 11 +-
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 10 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 331 +++++------
+ 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 | 15 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 35 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 +
+ 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 | 494 +++++++++--------
+ 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 | 2 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 71 +--
+ drivers/gpu/drm/i915/display/intel_crtc.h | 7 +-
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 25 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 186 ++++---
+ drivers/gpu/drm/i915/display/intel_cursor.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 145 ++---
+ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 1 -
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 30 +
+ drivers/gpu/drm/i915/display/intel_ddi.c | 101 ++--
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 58 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 284 ++++++----
+ drivers/gpu/drm/i915/display/intel_display.h | 4 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 84 +--
+ .../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 | 12 +-
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 360 +++++++-----
+ .../gpu/drm/i915/display/intel_display_params.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 124 ++---
+ drivers/gpu/drm/i915/display/intel_display_power.h | 71 ++-
+ .../drm/i915/display/intel_display_power_well.c | 3 +-
+ .../drm/i915/display/intel_display_power_well.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 150 ++++-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 23 +-
+ 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 | 274 +++++-----
+ 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 | 392 +++++++------
+ 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 | 2 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 57 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 56 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_fb.c | 315 ++++++-----
+ drivers/gpu/drm/i915/display/intel_fb.h | 14 +-
+ 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 | 2 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +-
+ 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 | 114 +++-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 9 +
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 11 +-
+ 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 | 5 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 22 +-
+ 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 | 23 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 86 +--
+ drivers/gpu/drm/i915/display/intel_psr.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 7 +-
+ 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 | 142 +++--
+ drivers/gpu/drm/i915/display/intel_sprite.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 90 +--
+ 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 | 138 +++--
+ drivers/gpu/drm/i915/display/intel_vrr.h | 7 +-
+ drivers/gpu/drm/i915/display/skl_scaler.c | 330 ++++++-----
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 605 +++++++++++++--------
+ drivers/gpu/drm/i915/display/skl_universal_plane.h | 11 +-
+ drivers/gpu/drm/i915/display/skl_watermark.c | 109 +++-
+ drivers/gpu/drm/i915/display/skl_watermark.h | 3 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 6 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +-
+ 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_gem.c | 6 +-
+ drivers/gpu/drm/i915/i915_irq.c | 8 +-
+ 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 | 12 +-
+ drivers/gpu/drm/i915/i915_request.c | 2 +-
+ drivers/gpu/drm/i915/i915_request.h | 4 +-
+ drivers/gpu/drm/i915/i915_vma.c | 8 +-
+ 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 | 2 +-
+ 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/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 +-
+ include/drm/display/drm_dp.h | 3 +-
+ include/drm/display/drm_dp_dual_mode_helper.h | 2 +-
+ include/drm/intel/pciids.h | 7 +-
+ 205 files changed, 4952 insertions(+), 3407 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 (a5463629299b drm/msm/dpu: Add RM support for allocating CWB)
+$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
+Already up to date.
+Merging drm-xe/drm-xe-next (768fec5ff7c1 drm/xe/pxp: Don't use 0 to indicate NULL)
+$ 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/xe/Makefile
+Auto-merging 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_device.c
+Auto-merging drivers/gpu/drm/xe/xe_gt.c
+Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf.c
+Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c
+Auto-merging drivers/gpu/drm/xe/xe_guc_log.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_log.c
+Auto-merging include/drm/intel/pciids.h
+Resolved 'drivers/gpu/drm/xe/xe_guc_ct.c' using previous resolution.
+Resolved 'drivers/gpu/drm/xe/xe_guc_log.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 05f385793bef] 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 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.h | 2 +
+ drivers/gpu/drm/xe/Kconfig.profile | 1 +
+ drivers/gpu/drm/xe/Makefile | 19 +-
+ drivers/gpu/drm/xe/abi/gsc_pxp_commands_abi.h | 41 +
+ .../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/xe_display.c | 73 +-
+ drivers/gpu/drm/xe/display/xe_display.h | 8 +-
+ 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 | 6 +
+ 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 | 16 +-
+ drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 334 ++++++++
+ drivers/gpu/drm/xe/xe_bo.c | 159 +++-
+ drivers/gpu/drm/xe/xe_bo.h | 7 +
+ drivers/gpu/drm/xe/xe_bo_types.h | 6 +
+ drivers/gpu/drm/xe/xe_debugfs.c | 3 +
+ drivers/gpu/drm/xe/xe_device.c | 147 +++-
+ drivers/gpu/drm/xe/xe_device.h | 5 +
+ drivers/gpu/drm/xe/xe_device_types.h | 41 +-
+ drivers/gpu/drm/xe/xe_drm_client.c | 2 +-
+ drivers/gpu/drm/xe/xe_exec.c | 6 +
+ drivers/gpu/drm/xe/xe_exec_queue.c | 60 +-
+ 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_gt.c | 7 +
+ 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 | 43 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 132 +--
+ 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 | 5 +
+ 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_ct.c | 6 +-
+ drivers/gpu/drm/xe/xe_guc_debugfs.c | 15 +
+ drivers/gpu/drm/xe/xe_guc_log.c | 11 +-
+ 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 | 3 +
+ drivers/gpu/drm/xe/xe_heci_gsc.c | 3 +-
+ drivers/gpu/drm/xe/xe_hwmon.c | 60 ++
+ 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 | 39 -
+ drivers/gpu/drm/xe/xe_module.c | 5 -
+ drivers/gpu/drm/xe/xe_pci.c | 75 +-
+ 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 | 374 +++++++++
+ 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 | 29 +
+ 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_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_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_ttm_stolen_mgr.c | 70 +-
+ 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_vm.c | 169 +++-
+ 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 | 5 +
+ drivers/gpu/drm/xe/xe_wa_oob.rules | 1 +
+ include/drm/intel/pciids.h | 11 +-
+ include/uapi/drm/xe_drm.h | 123 ++-
+ 109 files changed, 4769 insertions(+), 441 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_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 (720fcad9d12e fbdev: core: Split CFB and SYS pixel reversing configuration)
+$ 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/Kconfig | 10 +-
+ drivers/video/fbdev/core/bitblit.c | 5 +-
+ drivers/video/fbdev/core/cfbcopyarea.c | 427 +-------------------------------
+ drivers/video/fbdev/core/cfbfillrect.c | 363 +--------------------------
+ drivers/video/fbdev/core/cfbimgblt.c | 358 +-------------------------
+ drivers/video/fbdev/core/fb_copyarea.h | 421 +++++++++++++++++++++++++++++++
+ drivers/video/fbdev/core/fb_draw.h | 6 +-
+ drivers/video/fbdev/core/fb_fillrect.h | 359 +++++++++++++++++++++++++++
+ drivers/video/fbdev/core/fb_imageblit.h | 356 ++++++++++++++++++++++++++
+ 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/syscopyarea.c | 358 +-------------------------
+ drivers/video/fbdev/core/sysfillrect.c | 315 +----------------------
+ drivers/video/fbdev/core/sysimgblt.c | 326 +-----------------------
+ drivers/video/fbdev/core/tileblit.c | 45 +++-
+ 18 files changed, 1262 insertions(+), 2150 deletions(-)
+ create mode 100644 drivers/video/fbdev/core/fb_copyarea.h
+ create mode 100644 drivers/video/fbdev/core/fb_fillrect.h
+ create mode 100644 drivers/video/fbdev/core/fb_imageblit.h
+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 (2a91231a78a7 ALSA: firewire: isight: changed strcpy to strscpy)
+$ 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/core/pcm_drm_eld.c | 387 +++++++++++++++++++++++++++++
+ sound/firewire/isight.c | 6 +-
+ 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, 611 insertions(+), 477 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 0a9fa8ffb6bd Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
+Merging next-20250210 version of sound
+$ git merge -m next-20250210/sound de7d2a70707ef991b8a2996ef1588f1e8b9aba95
+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/core/pcm_drm_eld.c | 387 +++++++++++++++++++++++++++++
+ sound/pci/hda/Kconfig | 1 +
+ sound/pci/hda/hda_eld.c | 383 +---------------------------
+ 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 +++++
+ 11 files changed, 565 insertions(+), 473 deletions(-)
+Merging ieee1394/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
+Already up to date.
+Merging sound-asoc/for-next (119932b6c273 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/qcom,wcd937x-sdw.yaml | 36 +
+ .../devicetree/bindings/sound/rockchip-spdif.yaml | 4 +
+ MAINTAINERS | 3 +-
+ drivers/soundwire/qcom.c | 26 +
+ include/dt-bindings/sound/qcom,wcd934x.h | 16 +
+ 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.h | 1 +
+ 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 | 1 +
+ sound/soc/amd/acp/Makefile | 2 +-
+ 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/amd-acp70-acpi-match.c | 160 +++
+ 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 | 440 +++---
+ 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/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/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/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/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-core.c | 32 +-
+ sound/soc/soc-dai.c | 18 +-
+ sound/soc/soc-dapm.c | 3 -
+ sound/soc/soc-link.c | 18 +-
+ sound/soc/soc-ops.c | 1 -
+ sound/soc/soc-pcm.c | 114 +-
+ sound/soc/soc-utils.c | 27 +
+ sound/soc/sof/imx/Kconfig | 17 +-
+ sound/soc/sof/imx/Makefile | 6 +-
+ sound/soc/sof/imx/imx-common.c | 431 +++++-
+ 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/ipc3-pcm.c | 13 +-
+ sound/soc/sof/ipc3-topology.c | 20 +-
+ 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 | 132 ++
+ sound/soc/tegra/tegra_isomgr_bw.h | 31 +
+ 110 files changed, 7102 insertions(+), 3249 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 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 (053842ec3c33 bug: Use RCU instead RCU-sched to protect module_bug_list.)
+$ 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 include/linux/module.h
+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/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 +-
+ 25 files changed, 141 insertions(+), 230 deletions(-)
+Merging input/next (a7550ff59edf Input: Switch to use hrtimer_setup())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Merge made by the 'ort' strategy.
+ drivers/input/joystick/walkera0701.c | 3 +--
+ drivers/input/keyboard/gpio_keys.c | 10 ++++------
+ drivers/input/rmi4/rmi_f54.c | 2 --
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 --
+ drivers/input/touchscreen/sur40.c | 2 --
+ 5 files changed, 5 insertions(+), 14 deletions(-)
+Merging block/for-next (b48078773e37 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
+Merge made by the 'ort' strategy.
+ Documentation/ABI/stable/sysfs-block | 20 ++
+ Documentation/block/inline-encryption.rst | 255 ++++++++++++++++++++-
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 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 +
+ drivers/block/loop.c | 2 +-
+ 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 | 3 -
+ include/linux/wait.h | 6 +-
+ include/uapi/linux/blk-crypto.h | 44 ++++
+ include/uapi/linux/fs.h | 6 +-
+ io_uring/cancel.c | 42 ++++
+ io_uring/cancel.h | 8 +
+ io_uring/futex.c | 42 +---
+ io_uring/io-wq.c | 230 +++++++++++--------
+ io_uring/io-wq.h | 7 +-
+ io_uring/io_uring.c | 113 ++++-----
+ io_uring/io_uring.h | 1 -
+ io_uring/kbuf.c | 172 ++++++--------
+ io_uring/kbuf.h | 100 +-------
+ io_uring/net.c | 18 ++
+ io_uring/waitid.c | 42 +---
+ 36 files changed, 1239 insertions(+), 496 deletions(-)
+ create mode 100644 include/uapi/linux/blk-crypto.h
+Merging device-mapper/for-next (0ce46f4f751b dm vdo slab-depot: read refcount blocks in large chunks at load time)
+$ 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-crypt.c | 41 +++--------
+ drivers/md/dm-vdo/block-map.c | 11 ++-
+ drivers/md/dm-vdo/constants.h | 3 -
+ 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/slab-depot.c | 80 +++++++++++++++-------
+ 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 ++--
+ 17 files changed, 171 insertions(+), 127 deletions(-)
+Merging libata/for-next (deca423213cb ata: libata-core: Add 'external' to the libata.force kernel parameter)
+$ 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 ++
+ drivers/ata/libata-core.c | 38 +++++++++++++++++++++++++
+ 2 files changed, 40 insertions(+)
+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 (0b1cfd51841c mfd: intel_soc_pmic_crc: Drop unneeded assignment for cache_type)
+$ 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
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 18 +-
+ 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/mt6397-core.c | 43 ++
+ drivers/mfd/mt6397-irq.c | 8 +
+ drivers/mfd/sm501.c | 6 +-
+ drivers/mfd/stm32-timers.c | 31 +-
+ drivers/mfd/tps65010.c | 13 +-
+ 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 +
+ 13 files changed, 646 insertions(+), 17 deletions(-)
+ create mode 100644 include/linux/mfd/mt6392/core.h
+ create mode 100644 include/linux/mfd/mt6392/registers.h
+Merging backlight/for-backlight-next (373dacfeb55e backlight: wm831x_bl: Do not include <linux/fb.h>)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/video/backlight/88pm860x_bl.c | 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/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/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 -
+ 16 files changed, 16 deletions(-)
+Merging battery/for-next (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+Merging regulator/for-next (9195e28c207c 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
+Merge made by the 'ort' strategy.
+ .../bindings/regulator/nxp,pca9450-regulator.yaml | 29 +++++--
+ .../arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi | 5 +-
+ drivers/regulator/ad5398.c | 30 ++++---
+ drivers/regulator/pca9450-regulator.c | 96 +++++++++++++++++++---
+ 4 files changed, 127 insertions(+), 33 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 (6f71ad02aae8 smack: deduplicate access to string conversion)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Already up to date.
+Merging tomoyo/master (bdc35f164b0f tomoyo: use better patterns for procfs in learning mode)
+$ 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (b795ce4bc7dd iommu/vt-d: Make intel_iommu_drain_pasid_prq() cover faults for RID)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
+Merge made by the 'ort' strategy.
+ drivers/iommu/amd/amd_iommu_types.h | 1 +
+ drivers/iommu/amd/init.c | 4 ++++
+ drivers/iommu/exynos-iommu.c | 6 +++---
+ drivers/iommu/intel/prq.c | 4 +++-
+ drivers/iommu/io-pgfault.c | 1 +
+ drivers/iommu/iommu.c | 2 +-
+ 6 files changed, 13 insertions(+), 5 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 (19a8744f3d34 dt-bindings: net: smsc,lan9115: Ensure all properties are defined)
+$ 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.
+ .../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 +-
+ Documentation/devicetree/bindings/xilinx.txt | 26 -------
+ 7 files changed, 131 insertions(+), 150 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 (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+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 (6cc789bf76b1 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 ++
+ .../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 | 465 +++++++++++++++++++++
+ drivers/spi/spi-realtek-rtl-snand.c | 1 -
+ 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 | 20 +
+ 17 files changed, 1349 insertions(+), 142 deletions(-)
+ 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 (6bd46c92bdea Merge branch into tip/master: 'x86/mm')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging arch/x86/Kconfig
+Auto-merging include/linux/module.h
+Auto-merging kernel/module/main.c
+Merge made by the 'ort' strategy.
+ .../bindings/interrupt-controller/riscv,aplic.yaml | 8 +
+ arch/um/kernel/um_arch.c | 11 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/entry/common.c | 2 +-
+ arch/x86/entry/vdso/vma.c | 3 +-
+ arch/x86/events/amd/ibs.c | 96 ++++++---
+ arch/x86/events/core.c | 13 ++
+ arch/x86/events/intel/core.c | 118 +++++++----
+ arch/x86/events/intel/ds.c | 204 +++++++++++++++++--
+ arch/x86/events/perf_event.h | 16 +-
+ arch/x86/events/perf_event_flags.h | 2 +-
+ arch/x86/include/asm/alternative.h | 14 +-
+ arch/x86/include/asm/intel-family.h | 2 +-
+ arch/x86/include/asm/perf_event.h | 16 ++
+ arch/x86/include/asm/pgtable_types.h | 2 +
+ arch/x86/include/asm/smp.h | 3 +
+ arch/x86/include/asm/tlbflush.h | 2 +-
+ arch/x86/kernel/acpi/cstate.c | 10 +
+ arch/x86/kernel/alternative.c | 181 +++++++----------
+ arch/x86/kernel/cpu/common.c | 2 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 13 +-
+ arch/x86/kernel/fpu/internal.h | 2 +-
+ arch/x86/kernel/ftrace.c | 30 ++-
+ arch/x86/kernel/module.c | 45 ++---
+ arch/x86/kernel/smpboot.c | 44 +----
+ arch/x86/kernel/tsc_msr.c | 2 +-
+ arch/x86/mm/pat/cpa-test.c | 2 +-
+ arch/x86/mm/pat/set_memory.c | 220 ++++++++++++++++++++-
+ arch/x86/mm/tlb.c | 2 +-
+ drivers/acpi/processor_idle.c | 2 +
+ drivers/idle/intel_idle.c | 14 ++
+ drivers/irqchip/irq-riscv-aplic-direct.c | 24 ++-
+ drivers/powercap/intel_rapl_common.c | 2 +-
+ .../media/atomisp/include/linux/atomisp_platform.h | 4 +-
+ drivers/thermal/intel/intel_tcc.c | 2 +-
+ include/acpi/processor.h | 5 +
+ include/linux/execmem.h | 31 +++
+ include/linux/hrtimer.h | 3 +-
+ include/linux/module.h | 16 --
+ include/linux/moduleloader.h | 4 -
+ include/linux/perf_event.h | 8 +-
+ include/linux/uprobes.h | 1 +
+ include/linux/vm_event_item.h | 2 +
+ kernel/events/core.c | 33 ++--
+ kernel/events/ring_buffer.c | 1 +
+ kernel/events/uprobes.c | 10 +-
+ kernel/module/main.c | 78 ++------
+ kernel/module/strict_rwx.c | 9 +-
+ mm/execmem.c | 39 ++--
+ mm/vmstat.c | 2 +
+ tools/power/x86/turbostat/turbostat.c | 2 +-
+ 51 files changed, 924 insertions(+), 434 deletions(-)
+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 (1d1a6ae52176 Merge edac-drivers into 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.
+Merging ftrace/for-next (04787ae88833 Merge tools/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
+Merge made by the 'ort' strategy.
+Merging rcu/next (236815038841 Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.02.05a', '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
+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 | 76 +++++++-
+ 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, 654 insertions(+), 227 deletions(-)
+Merging paulmck/non-rcu/next (b6f62437f431 Merge branches 'csd-lock.2024.10.11a', 'lkmm.2024.11.09a' and 'scftorture.2024.11.09a', tag 'nolibc.2024.11.01a' into HEAD)
+$ 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 (43fb96ae7855 KVM: x86/mmu: Ensure NX huge page recovery thread is alive before waking)
+$ 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 (01009b06a6b5 arm64/sysreg: Get rid of TRFCR_ELx SysregFields)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Already up to date.
+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 (af79caa83f6a RISC-V: KVM: Add new exit statstics for redirected traps)
+$ 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 (f0f0cbf3b767 Merge branch 'selftests')
+$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
+Merge made by the 'ort' strategy.
+ .../selftests/kvm/access_tracking_perf_test.c | 2 +-
+ tools/testing/selftests/kvm/include/test_util.h | 2 +-
+ .../testing/selftests/kvm/include/x86/processor.h | 47 ++++++++++++++++++++++
+ tools/testing/selftests/kvm/x86/hyperv_ipi.c | 6 ++-
+ .../testing/selftests/kvm/x86/pmu_counters_test.c | 15 +++----
+ 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 | 3 +-
+ tools/testing/selftests/kvm/x86/xapic_state_test.c | 4 +-
+ tools/testing/selftests/kvm/x86/xen_shinfo_test.c | 5 +--
+ 10 files changed, 68 insertions(+), 23 deletions(-)
+Merging xen-tip/linux-next (aaf5eefd374b x86/xen: remove unneeded dummy push from xen_hypercall_hvm())
+$ 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 (e76946110137 workqueue: Put the pwq after detaching the rescuer from the pool)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'ort' strategy.
+ kernel/workqueue.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+Merging sched-ext/for-next (692234c58c53 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/autogroup.c
+Auto-merging kernel/sched/core.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 3 +-
+ include/linux/sched/ext.h | 1 +
+ kernel/sched/autogroup.c | 4 +-
+ kernel/sched/build_policy.c | 1 +
+ kernel/sched/core.c | 7 +-
+ kernel/sched/ext.c | 1077 ++++++--------------
+ kernel/sched/ext.h | 4 +-
+ kernel/sched/ext_idle.c | 752 ++++++++++++++
+ kernel/sched/ext_idle.h | 39 +
+ kernel/sched/sched.h | 2 +-
+ tools/sched_ext/include/scx/common.bpf.h | 18 +-
+ tools/sched_ext/include/scx/common.h | 1 +
+ tools/sched_ext/include/scx/compat.bpf.h | 52 +
+ tools/sched_ext/include/scx/enum_defs.autogen.h | 120 +++
+ tools/sched_ext/scx_central.bpf.c | 2 +
+ tools/sched_ext/scx_qmap.bpf.c | 23 +-
+ tools/testing/selftests/sched_ext/create_dsq.c | 10 +-
+ .../selftests/sched_ext/ddsp_bogus_dsq_fail.c | 7 +-
+ .../selftests/sched_ext/ddsp_vtimelocal_fail.c | 7 +-
+ .../testing/selftests/sched_ext/dsp_local_on.bpf.c | 2 +-
+ tools/testing/selftests/sched_ext/dsp_local_on.c | 1 +
+ .../selftests/sched_ext/enq_last_no_enq_fails.c | 10 +-
+ .../selftests/sched_ext/enq_select_cpu_fails.c | 10 +-
+ tools/testing/selftests/sched_ext/exit.c | 1 +
+ tools/testing/selftests/sched_ext/hotplug.c | 6 +-
+ .../selftests/sched_ext/init_enable_count.c | 25 +-
+ tools/testing/selftests/sched_ext/maximal.c | 7 +-
+ tools/testing/selftests/sched_ext/minimal.c | 10 +-
+ tools/testing/selftests/sched_ext/prog_run.c | 10 +-
+ tools/testing/selftests/sched_ext/reload_loop.c | 9 +-
+ tools/testing/selftests/sched_ext/select_cpu_dfl.c | 7 +-
+ .../sched_ext/select_cpu_dfl_nodispatch.c | 7 +-
+ .../selftests/sched_ext/select_cpu_dispatch.c | 7 +-
+ .../sched_ext/select_cpu_dispatch_bad_dsq.c | 7 +-
+ .../sched_ext/select_cpu_dispatch_dbl_dsp.c | 7 +-
+ .../testing/selftests/sched_ext/select_cpu_vtime.c | 7 +-
+ 36 files changed, 1413 insertions(+), 850 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 (56f529ce4370 platform/x86: samsung-galaxybook: Add samsung-galaxybook driver)
+$ 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
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+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 | 13 +-
+ 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/samsung-galaxybook.c | 1423 ++++++++++++++++++++
+ drivers/platform/x86/thinkpad_acpi.c | 1 -
+ 14 files changed, 1682 insertions(+), 33 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/samsung-galaxybook.c
+Merging chrome-platform/for-next (435a3d78b87a platform/chrome: cros_ec_sysfs: Expose AP_MODE_ENTRY feature state)
+$ 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
+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 ++++++++++++++++++++++++++
+ 4 files changed, 112 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 (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Already up to date.
+Merging leds-lj/for-leds-next (59670b23bfb6 leds: lp8860: Drop unneeded assignment for cache_type)
+$ 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.
+ drivers/leds/leds-lp8860.c | 2 --
+ drivers/leds/trigger/ledtrig-netdev.c | 16 +++++++++++++---
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+Merging ipmi/for-next (83d8c79aa958 ipmi: ssif_bmc: Fix new request loss when bmc ready for a response)
+$ 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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
+Already up to date.
+Merging usb/usb-next (9682c35ff6ec usb: typec: thunderbolt: Remove IS_ERR check for plug)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Merge made by the 'ort' strategy.
+ .../driver-api/usb/writing_musb_glue_layer.rst | 2 +-
+ drivers/usb/gadget/function/uvc_queue.c | 2 -
+ drivers/usb/host/max3421-hcd.c | 7 +++
+ 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/ucsi/cros_ec_ucsi.c | 5 +-
+ 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/usb/musb.h | 2 +-
+ 19 files changed, 100 insertions(+), 101 deletions(-)
+Merging thunderbolt/next (35ad0d62da83 MAINTAINERS: Use my kernel.org address for USB4/Thunderbolt work)
+$ 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 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging usb-serial/usb-next (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+Merging tty/tty-next (b6ad40c0027c Revert "dt-bindings: serial: 8250: Add Airoha compatibles")
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/serial/pl011.yaml | 3 +
+ .../devicetree/bindings/serial/sprd-uart.yaml | 9 +-
+ Documentation/driver-api/serial/driver.rst | 2 +-
+ drivers/tty/serial/8250/8250_dw.c | 4 +-
+ drivers/tty/serial/amba-pl011.c | 143 ++++++++++++++-------
+ drivers/tty/serial/mpc52xx_uart.c | 1 -
+ drivers/tty/serial/pch_uart.c | 1 -
+ drivers/tty/serial/serial_mctrl_gpio.c | 28 +---
+ drivers/tty/serial/serial_mctrl_gpio.h | 16 +--
+ drivers/tty/tty_ldsem.c | 17 ---
+ include/linux/tty_ldisc.h | 1 -
+ 11 files changed, 113 insertions(+), 112 deletions(-)
+Merging char-misc/char-misc-next (a64dcfb451e2 Linux 6.14-rc2)
+$ 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
+Already up to date.
+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 (56e14a21cee4 coresight-tpda: Optimize the function of reading element size)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Already up to date.
+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 (0c5d8af2a5fd iio: adc: ad4130: Add filter_type attributes)
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Auto-merging MAINTAINERS
+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/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/ad7380.rst | 33 +-
+ MAINTAINERS | 8 +
+ drivers/iio/accel/mc3230.c | 95 +-
+ drivers/iio/adc/Kconfig | 2 +-
+ drivers/iio/adc/ad4130.c | 7 +
+ drivers/iio/adc/ad4695.c | 108 +-
+ drivers/iio/adc/ad7124.c | 25 +-
+ drivers/iio/adc/ad7173.c | 668 +++++---
+ drivers/iio/adc/ad7380.c | 397 ++++-
+ drivers/iio/adc/ad7625.c | 4 +-
+ drivers/iio/adc/ad_sigma_delta.c | 11 +-
+ drivers/iio/adc/stm32-adc-core.c | 6 +-
+ drivers/iio/adc/ti-ads124s08.c | 2 +-
+ 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/ad3552r-common.c | 50 +-
+ drivers/iio/dac/ad3552r-hs.c | 318 +++-
+ drivers/iio/dac/ad3552r-hs.h | 8 +
+ drivers/iio/dac/ad3552r.c | 36 -
+ drivers/iio/dac/ad3552r.h | 9 +-
+ drivers/iio/dac/ad5791.c | 2 +-
+ drivers/iio/dac/adi-axi-dac.c | 30 +-
+ drivers/iio/frequency/adf4371.c | 45 +-
+ drivers/iio/humidity/dht11.c | 3 +-
+ drivers/iio/imu/bmi270/bmi270_core.c | 48 +-
+ 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/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 +-
+ include/linux/iio/adc/ad_sigma_delta.h | 4 +-
+ include/linux/iio/iio-gts-helper.h | 1 +
+ include/uapi/linux/iio/types.h | 2 +
+ tools/iio/iio_event_monitor.c | 4 +
+ 55 files changed, 4296 insertions(+), 933 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130
+ 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 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 (88c0053baed6 phy: Use (of|device)_property_present() for non-boolean properties)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Merge made by the 'ort' strategy.
+ .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 9 +--
+ .../bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 62 +++++++++++++++------
+ drivers/phy/mediatek/phy-mtk-tphy.c | 4 +-
+ drivers/phy/phy-can-transceiver.c | 13 ++---
+ 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 | 64 +++++++++++++++++-----
+ 7 files changed, 126 insertions(+), 48 deletions(-)
+Merging soundwire/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Already up to date.
+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 (2014c95afece Linux 6.14-rc1)
+$ 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 (7b66aae77da5 staging: gpib: Remove depends on BROKEN)
+$ 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 | 1 -
+ .../staging/gpib/agilent_82350b/agilent_82350b.c | 120 ++-
+ .../staging/gpib/agilent_82350b/agilent_82350b.h | 47 --
+ drivers/staging/gpib/cb7210/cb7210.c | 89 ++-
+ drivers/staging/gpib/cb7210/cb7210.h | 45 --
+ drivers/staging/gpib/cec/cec.h | 29 -
+ drivers/staging/gpib/cec/cec_gpib.c | 51 +-
+ drivers/staging/gpib/eastwood/fluke_gpib.c | 1 -
+ drivers/staging/gpib/hp_82335/hp82335.c | 52 +-
+ drivers/staging/gpib/hp_82335/hp82335.h | 30 -
+ drivers/staging/gpib/hp_82341/hp_82341.c | 73 +-
+ drivers/staging/gpib/hp_82341/hp_82341.h | 40 -
+ drivers/staging/gpib/pc2/pc2_gpib.c | 575 +++++++-------
+ drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 872 ++++++++++-----------
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 -
+ 16 files changed, 883 insertions(+), 1145 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 a1663bf282e7] 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
+Merge made by the 'ort' strategy.
+ include/linux/cgroup-defs.h | 6 +--
+ include/linux/misc_cgroup.h | 6 ---
+ include/linux/sched/task.h | 1 +
+ init/Kconfig | 5 ++-
+ kernel/cgroup/cgroup.c | 22 ++++++-----
+ kernel/cgroup/cpuset-v1.c | 41 ++++++++++++++++++++
+ kernel/cgroup/cpuset.c | 45 ----------------------
+ kernel/cgroup/misc.c | 16 --------
+ kernel/cgroup/rstat.c | 1 -
+ .../testing/selftests/cgroup/test_cpuset_v1_hp.sh | 2 +-
+ 10 files changed, 62 insertions(+), 83 deletions(-)
+Merging scsi/for-next (2f9523091a97 Merge branch 'misc' 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/ufs/host/ufs-qcom.c
+Auto-merging tools/testing/selftests/filesystems/statmount/statmount_test.c
+Merge made by the 'ort' strategy.
+ 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 | 60 -
+ drivers/message/fusion/mptscsih.h | 1 -
+ drivers/scsi/Kconfig | 1 -
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aacraid/linit.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/isci/remote_device.h | 2 +-
+ 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/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 | 2 +-
+ 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/ufs/host/ufs-qcom.c | 37 +
+ drivers/ufs/host/ufs-qcom.h | 39 +-
+ include/scsi/scsi_device.h | 9 +
+ include/uapi/scsi/cxlflash_ioctl.h | 276 --
+ .../filesystems/statmount/statmount_test.c | 13 +-
+ 53 files changed, 505 insertions(+), 11729 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 (640a6af5099a scsi: ufs: qcom: Enable UFS Shared ICE Feature)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Already up to date.
+Merging vhost/linux-next (5820a3b08987 virtio_blk: Add support for transport error recovery)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Already up to date.
+Merging rpmsg/for-next (a64dcfb451e2 Linux 6.14-rc2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Already up to date.
+Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (5f05e9194ada gpiolib: Even more opportunities to use str_high_low() helper)
+$ 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
+Auto-merging drivers/gpio/Kconfig
+Merge made by the 'ort' strategy.
+ .../bindings/gpio/aspeed,ast2400-gpio.yaml | 6 ++
+ drivers/gpio/Kconfig | 1 -
+ 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-mvebu.c | 7 +-
+ drivers/gpio/gpio-nomadik.c | 3 +-
+ drivers/gpio/gpio-stmpe.c | 6 +-
+ drivers/gpio/gpio-virtio.c | 29 +++++----
+ drivers/gpio/gpio-wcove.c | 3 +-
+ drivers/gpio/gpio-wm831x.c | 3 +-
+ drivers/gpio/gpio-xra1403.c | 3 +-
+ drivers/gpio/gpiolib.c | 7 +-
+ 14 files changed, 84 insertions(+), 69 deletions(-)
+Merging gpio-intel/for-next (2014c95afece Linux 6.14-rc1)
+$ 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 (b1a67f9218de 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/devicetree.c | 10 ++++++++--
+ drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 4 ++--
+ drivers/pinctrl/pinctrl-mcp23s08.c | 23 ++++++++++++++++++++---
+ drivers/pinctrl/pinctrl-pistachio.c | 6 ------
+ 4 files changed, 30 insertions(+), 13 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
+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 (accabfaae094 pinctrl: renesas: rzg2l: Fix PFC_MASK for RZ/V2H and RZ/G3E)
+$ 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
+Already up to date.
+Merging pinctrl-samsung/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/pwm/for-next (e320a24059f8 pwm: gpio: Switch to use hrtimer_setup())
+$ 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/sophgo,sg2042-pwm.yaml | 58 ++++++
+ drivers/pwm/Kconfig | 10 ++
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-gpio.c | 5 +-
+ drivers/pwm/pwm-lpss.c | 1 +
+ drivers/pwm/pwm-lpss.h | 1 -
+ drivers/pwm/pwm-sophgo-sg2042.c | 194 +++++++++++++++++++++
+ 7 files changed, 266 insertions(+), 4 deletions(-)
+ 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 (336d02bc4c6b selftests/rseq: Fix handling of glibc without rseq support)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Already up to date.
+Merging kunit/test (40384c840ea1 Linux 6.13-rc1)
+$ 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 (31691914c392 kunit: Introduce autorun option)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Already up to date.
+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 (97274527e8dc rtc: pcf2127: add BSM support)
+$ 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 (e1cec5107c39 seccomp: remove the 'sd' argument from __seccomp_filter())
+$ 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 | 39 +++++++++++++--------------
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 6 +++++
+ 6 files changed, 33 insertions(+), 48 deletions(-)
+Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Merge made by the 'ort' strategy.
+ drivers/fsi/fsi-sbefifo.c | 9 ++++++++-
+ drivers/fsi/i2cr-scom.c | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Already up to date.
+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 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 (2e03358be78b Documentation: hyperv: Add overview of guest VM hibernation)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Already up to date.
+Merging auxdisplay/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
+Already up to date.
+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 (c8006fbd0f4f bus: mhi: host: Remove unused functions)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/host/main.c | 19 -------------------
+ drivers/bus/mhi/host/pm.c | 14 --------------
+ include/linux/mhi.h | 18 ------------------
+ 3 files changed, 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 (8760c1c0bf7e cxl/cdat: Remove redundant gp_port initialization)
+$ 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/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 | 327 +++++++++++++++++++-------
+ drivers/cxl/core/mbox.c | 176 +++++++-------
+ drivers/cxl/core/memdev.c | 88 ++++---
+ drivers/cxl/core/pci.c | 87 +++++++
+ drivers/cxl/core/port.c | 23 +-
+ drivers/cxl/core/region.c | 143 +++++------
+ drivers/cxl/cxl.h | 41 +---
+ drivers/cxl/cxlmem.h | 102 ++++----
+ drivers/cxl/cxlpci.h | 6 +
+ drivers/cxl/mem.c | 2 +-
+ drivers/cxl/pci.c | 7 +-
+ drivers/cxl/pmem.c | 8 +
+ 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 | 7 +-
+ 24 files changed, 912 insertions(+), 541 deletions(-)
+ delete mode 100644 drivers/firmware/efi/cper_cxl.h
+Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Auto-merging include/linux/zstd.h
+Auto-merging lib/zstd/common/mem.h
+Auto-merging lib/zstd/compress/zstd_compress.c
+Auto-merging lib/zstd/zstd_compress_module.c
+Auto-merging lib/zstd/zstd_decompress_module.c
+Merge made by the 'ort' strategy.
+ include/linux/zstd.h | 2 +-
+ include/linux/zstd_errors.h | 23 +-
+ include/linux/zstd_lib.h | 697 ++++++++--
+ lib/zstd/Makefile | 2 +-
+ lib/zstd/common/allocations.h | 56 +
+ lib/zstd/common/bits.h | 149 ++
+ lib/zstd/common/bitstream.h | 53 +-
+ lib/zstd/common/compiler.h | 14 +-
+ lib/zstd/common/cpu.h | 3 +-
+ lib/zstd/common/debug.c | 5 +-
+ lib/zstd/common/debug.h | 3 +-
+ lib/zstd/common/entropy_common.c | 42 +-
+ lib/zstd/common/error_private.c | 12 +-
+ lib/zstd/common/error_private.h | 3 +-
+ lib/zstd/common/fse.h | 89 +-
+ lib/zstd/common/fse_decompress.c | 94 +-
+ lib/zstd/common/huf.h | 234 +---
+ lib/zstd/common/mem.h | 2 +-
+ lib/zstd/common/portability_macros.h | 26 +-
+ lib/zstd/common/zstd_common.c | 38 +-
+ lib/zstd/common/zstd_deps.h | 16 +-
+ lib/zstd/common/zstd_internal.h | 99 +-
+ lib/zstd/compress/clevels.h | 3 +-
+ lib/zstd/compress/fse_compress.c | 59 +-
+ lib/zstd/compress/hist.c | 3 +-
+ lib/zstd/compress/hist.h | 3 +-
+ lib/zstd/compress/huf_compress.c | 372 +++--
+ lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++-------
+ lib/zstd/compress/zstd_compress_internal.h | 333 +++--
+ lib/zstd/compress/zstd_compress_literals.c | 155 ++-
+ lib/zstd/compress/zstd_compress_literals.h | 25 +-
+ lib/zstd/compress/zstd_compress_sequences.c | 7 +-
+ lib/zstd/compress/zstd_compress_sequences.h | 3 +-
+ lib/zstd/compress/zstd_compress_superblock.c | 47 +-
+ lib/zstd/compress/zstd_compress_superblock.h | 3 +-
+ lib/zstd/compress/zstd_cwksp.h | 149 +-
+ lib/zstd/compress/zstd_double_fast.c | 129 +-
+ lib/zstd/compress/zstd_double_fast.h | 6 +-
+ lib/zstd/compress/zstd_fast.c | 578 ++++++--
+ lib/zstd/compress/zstd_fast.h | 6 +-
+ lib/zstd/compress/zstd_lazy.c | 518 +++----
+ lib/zstd/compress/zstd_lazy.h | 7 +-
+ lib/zstd/compress/zstd_ldm.c | 11 +-
+ lib/zstd/compress/zstd_ldm.h | 3 +-
+ lib/zstd/compress/zstd_ldm_geartab.h | 3 +-
+ lib/zstd/compress/zstd_opt.c | 187 +--
+ lib/zstd/compress/zstd_opt.h | 3 +-
+ lib/zstd/decompress/huf_decompress.c | 772 +++++++----
+ lib/zstd/decompress/zstd_ddict.c | 9 +-
+ lib/zstd/decompress/zstd_ddict.h | 3 +-
+ lib/zstd/decompress/zstd_decompress.c | 259 +++-
+ lib/zstd/decompress/zstd_decompress_block.c | 283 ++--
+ lib/zstd/decompress/zstd_decompress_block.h | 8 +-
+ lib/zstd/decompress/zstd_decompress_internal.h | 7 +-
+ lib/zstd/decompress_sources.h | 2 +-
+ lib/zstd/zstd_common_module.c | 5 +-
+ lib/zstd/zstd_compress_module.c | 2 +-
+ lib/zstd/zstd_decompress_module.c | 4 +-
+ 58 files changed, 4791 insertions(+), 2596 deletions(-)
+ create mode 100644 lib/zstd/common/allocations.h
+ create mode 100644 lib/zstd/common/bits.h
+Merging efi/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Already up to date.
+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 (b5f27869c15a 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/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/slub.c
+Recorded preimage for 'kernel/rcu/tiny.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'kernel/rcu/tiny.c'.
+[master ed1cde318e92] 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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ 11 files changed, 120 insertions(+), 162 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 (cc761633a02d 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 (dccf3c99febf sysctl: remove unneeded include)
+$ 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 fs/dcache.c
+Auto-merging include/linux/dcache.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/swap.h
+Auto-merging mm/internal.h
+Auto-merging mm/mmap.c
+Auto-merging mm/swap.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/vmstat.c
+Merge made by the 'ort' strategy.
+ arch/csky/abiv1/alignment.c | 2 +-
+ arch/sh/kernel/vsyscall/vsyscall.c | 20 ++++
+ arch/x86/entry/vdso/vdso32-setup.c | 16 ++-
+ 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 ++
+ 24 files changed, 337 insertions(+), 313 deletions(-)
+Merging execve/for-next/execve (7e620b56d958 crash: Remove KEXEC_CORE_NOTE_NAME)
+$ 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 include/linux/kexec.h
+Merge made by the 'ort' strategy.
+ 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/proc/kcore.c | 12 ++--
+ include/linux/kexec.h | 2 -
+ include/linux/vmcore_info.h | 3 +-
+ include/uapi/linux/elf.h | 89 ++++++++++++++++++++++++++++--
+ kernel/crash_core.c | 2 +-
+ 10 files changed, 134 insertions(+), 75 deletions(-)
+Merging bitmap/bitmap-for-next (65b98ea8b278 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/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 (5f5104a4ad61 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 lib/Kconfig.debug
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 4 +-
+ MAINTAINERS | 19 +-
+ fs/unicode/Kconfig | 5 +-
+ fs/unicode/Makefile | 2 +-
+ fs/unicode/tests/.kunitconfig | 3 +
+ fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 149 +++++++-------
+ fs/unicode/utf8-norm.c | 2 +-
+ include/linux/thread_info.h | 8 +-
+ lib/Kconfig.debug | 54 ++++-
+ lib/Makefile | 39 +---
+ 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 | 0
+ 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/config | 1 -
+ tools/testing/selftests/lib/prime_numbers.sh | 4 -
+ 51 files changed, 690 insertions(+), 244 deletions(-)
+ create mode 100644 fs/unicode/tests/.kunitconfig
+ rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (64%)
+ 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 (100%)
+ 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
+Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
+Already up to date.
+Merging nolibc/nolibc (24728b70b036 Merge tag 'nolibc-20250113-for-6.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc into nolibc)
+$ 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 tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
+$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next
+Already up to date.
+Merging iommufd/for-next (dc10ba25d43f iommufd/fault: Remove iommufd_fault_domain_attach/detach/replace_dev())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Merge made by the 'ort' strategy.
+ drivers/iommu/iommufd/device.c | 105 ++++++++++++++++++++++++++
+ drivers/iommu/iommufd/fault.c | 128 +-------------------------------
+ drivers/iommu/iommufd/iommufd_private.h | 41 +---------
+ 3 files changed, 113 insertions(+), 161 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 (4ffd50862d41 x86/crc64: implement crc64_be and crc64_nvme using new template)
+$ 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/x86/Kconfig
+Auto-merging arch/x86/crypto/aesni-intel_glue.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 | 584 +++++++++++++++++++++++++
+ 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 | 43 +-
+ 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, 1412 insertions(+), 1593 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.
+Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
+$ git merge -m Merge branch 'header_cleanup' of git://evilpiepirate.org/bcachefs.git header_cleanup/header_cleanup
+Already up to date.
gentwo / linux / .git / commitdiff