--- /dev/null
+$ date -R
+Wed, 05 Feb 2025 09:00:41 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 0de63bb7d919 Merge tag 'pull-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
+Merging origin/master (5c8c229261f1 Merge tag 'kthreads-fixes-2025-02-04' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 0de63bb7d919..5c8c229261f1
+Fast-forward (no commit created; -m option ignored)
+ drivers/platform/x86/ideapad-laptop.c | 2 +-
+ drivers/platform/x86/intel/ifs/ifs.h | 9 ++++-----
+ drivers/platform/x86/intel/pmc/core.c | 4 ++--
+ kernel/kthread.c | 4 ++--
+ tools/testing/selftests/livepatch/functions.sh | 3 ++-
+ 5 files changed, 11 insertions(+), 11 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 (6470d2c6d423 Merge patch series "Fix for huge faults regression")
+$ 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
+Auto-merging fs/dcache.c
+Auto-merging fs/file_table.c
+Auto-merging fs/namespace.c
+Auto-merging fs/pipe.c
+Merge made by the 'ort' strategy.
+ drivers/tty/pty.c | 2 +-
+ fs/dcache.c | 2 +-
+ fs/erofs/zdata.c | 2 +-
+ fs/file_table.c | 16 ++++++
+ fs/gfs2/glock.c | 2 +-
+ fs/gfs2/main.c | 1 -
+ fs/gfs2/quota.c | 4 +-
+ fs/namespace.c | 58 ++++++++++++----------
+ fs/notify/fsnotify.c | 18 ++++---
+ fs/open.c | 11 ++--
+ fs/pipe.c | 6 +++
+ fs/stat.c | 4 +-
+ fs/vboxsf/super.c | 3 +-
+ include/linux/fs.h | 9 +++-
+ include/linux/fsnotify.h | 4 +-
+ include/linux/lockref.h | 7 +--
+ net/socket.c | 5 ++
+ .../filesystems/statmount/statmount_test.c | 22 +++++++-
+ 18 files changed, 123 insertions(+), 53 deletions(-)
+Merging fscrypt-current/for-current (8e929cb546ee Linux 6.12-rc3)
+$ 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 (8e929cb546ee Linux 6.12-rc3)
+$ 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 (e035c671070f 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/ctree.c | 2 ++
+ fs/btrfs/ordered-data.c | 12 ++++++++++++
+ fs/btrfs/qgroup.c | 11 +++++------
+ fs/btrfs/transaction.c | 4 +++-
+ 4 files changed, 22 insertions(+), 7 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 (ebbdc9429c39 NFSD: fix hang in nfsd4_shutdown_callback)
+$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
+Auto-merging fs/nfsd/filecache.c
+Auto-merging fs/nfsd/nfsfh.c
+Merge made by the 'ort' strategy.
+ fs/nfsd/filecache.c | 11 ++++++++++-
+ fs/nfsd/nfs2acl.c | 2 ++
+ fs/nfsd/nfs3acl.c | 2 ++
+ fs/nfsd/nfs4callback.c | 7 +++++--
+ fs/nfsd/nfs4state.c | 3 ++-
+ fs/nfsd/nfsfh.c | 5 +++--
+ 6 files changed, 24 insertions(+), 6 deletions(-)
+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 (63bbe0ca4167 bcachefs: Scrub)
+$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next
+Merge made by the 'ort' strategy.
+ .../filesystems/bcachefs/SubmittingPatches.rst | 98 +++++
+ fs/bcachefs/alloc_background.c | 52 ++-
+ fs/bcachefs/alloc_foreground.c | 35 +-
+ fs/bcachefs/alloc_foreground.h | 17 +
+ fs/bcachefs/alloc_types.h | 3 +
+ fs/bcachefs/backpointers.c | 36 +-
+ fs/bcachefs/bcachefs.h | 3 +-
+ fs/bcachefs/bcachefs_ioctl.h | 24 +-
+ fs/bcachefs/btree_io.c | 189 +++++++-
+ fs/bcachefs/btree_io.h | 3 +
+ fs/bcachefs/btree_key_cache.c | 1 -
+ fs/bcachefs/btree_update_interior.c | 20 +
+ fs/bcachefs/btree_update_interior.h | 4 +
+ fs/bcachefs/buckets_waiting_for_journal.c | 12 +-
+ fs/bcachefs/buckets_waiting_for_journal.h | 4 +-
+ fs/bcachefs/chardev.c | 36 +-
+ fs/bcachefs/data_update.c | 174 ++++++--
+ fs/bcachefs/data_update.h | 12 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/errcode.h | 6 +
+ fs/bcachefs/extents.c | 9 +-
+ fs/bcachefs/extents.h | 2 +-
+ fs/bcachefs/fs-io-buffered.c | 23 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/inode.h | 4 +-
+ fs/bcachefs/io_read.c | 489 ++++++++++-----------
+ fs/bcachefs/io_read.h | 75 ++--
+ fs/bcachefs/io_write.c | 95 ++--
+ fs/bcachefs/io_write.h | 29 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 23 +-
+ fs/bcachefs/journal.h | 17 +-
+ fs/bcachefs/journal_io.c | 13 +-
+ fs/bcachefs/journal_types.h | 9 +-
+ fs/bcachefs/move.c | 369 +++++++++-------
+ fs/bcachefs/move_types.h | 18 +-
+ fs/bcachefs/opts.h | 14 -
+ fs/bcachefs/rebalance.c | 12 +-
+ fs/bcachefs/rebalance.h | 20 +
+ fs/bcachefs/sb-counters.c | 90 +++-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 8 +
+ fs/bcachefs/sb-members.h | 12 +
+ fs/bcachefs/subvolume.c | 7 +-
+ fs/bcachefs/super.c | 11 +
+ fs/bcachefs/super.h | 1 +
+ fs/bcachefs/sysfs.c | 5 -
+ fs/bcachefs/trace.h | 66 +--
+ 48 files changed, 1439 insertions(+), 771 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/SubmittingPatches.rst
+Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3)
+$ 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 (2c32919597a7 Merge branch 'for-next-next-v6.14-20250123' into for-next-20250123)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Auto-merging fs/btrfs/inode.c
+Merge made by the 'ort' strategy.
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/extent-tree.c | 12 ++++-
+ fs/btrfs/inode.c | 39 ++++++++------
+ fs/btrfs/scrub.c | 142 +++++++++++++------------------------------------
+ fs/btrfs/volumes.c | 2 +-
+ fs/btrfs/zoned.c | 9 ++++
+ 6 files changed, 82 insertions(+), 123 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Already up to date.
+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 (6784ed98fde5 dlm: return -ENOENT if no comm was found)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Already up to date.
+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 (f286757b644c Merge tag 'timers-urgent-2025-02-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Already up to date.
+Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3)
+$ 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 3ba61c65edaa] 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 (bcbda32b49d1 gfs2: Add GLF_PENDING_REPLY flag)
+$ 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 | 5 +++++
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/trace_gfs2.h | 8 +++++++-
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+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 (2014c95afece Linux 6.14-rc1)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 (c92066e78600 sunrpc: Remove gss_{de,en}crypt_xdr_buf deadcode)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Already up to date.
+Merging ntfs3/master (334e1e91d5b1 fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size)
+$ 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 | 1 +
+ fs/ntfs3/file.c | 22 ++++++++------
+ fs/ntfs3/frecord.c | 6 ++--
+ fs/ntfs3/super.c | 89 ++++++++++++++++++++++++++++++++++--------------------
+ 4 files changed, 74 insertions(+), 44 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 (a9ab28b3d21a xfs: remove xfs_buf_cache.bc_lock)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Already up to date.
+Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging 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 (6554b3d21309 Merge branch 'vfs-6.14.afs' 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/dcache.c
+CONFLICT (content): Merge conflict in fs/dcache.c
+Auto-merging fs/erofs/zdata.c
+CONFLICT (content): Merge conflict in fs/erofs/zdata.c
+Auto-merging fs/gfs2/quota.c
+CONFLICT (content): Merge conflict in fs/gfs2/quota.c
+Auto-merging fs/namespace.c
+Auto-merging include/linux/lockref.h
+CONFLICT (content): Merge conflict in include/linux/lockref.h
+Auto-merging kernel/pid.c
+Auto-merging mm/shmem.c
+Recorded preimage for 'fs/dcache.c'
+Recorded preimage for 'fs/erofs/zdata.c'
+Recorded preimage for 'fs/gfs2/quota.c'
+Recorded preimage for 'include/linux/lockref.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'fs/dcache.c'.
+Recorded resolution for 'fs/erofs/zdata.c'.
+Recorded resolution for 'fs/gfs2/quota.c'.
+Recorded resolution for 'include/linux/lockref.h'.
+[fs-next 49afe6d36b57] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
+$ git diff -M --stat --summary HEAD^..
+
+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 (7b7977a3e41a 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
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Auto-merging scripts/Makefile.extrawarn
+Merge made by the 'ort' strategy.
+ fs/proc/vmcore.c | 5 ++++-
+ include/linux/page-flags.h | 37 +++++++++++++++++++++++++++++++++++++
+ include/linux/page_ref.h | 2 +-
+ lib/iov_iter.c | 3 ++-
+ mm/madvise.c | 4 +++-
+ mm/page_isolation.c | 9 ++++++++-
+ mm/zswap.c | 35 ++++++++++++++++-------------------
+ scripts/Makefile.extrawarn | 10 +++++-----
+ 8 files changed, 76 insertions(+), 29 deletions(-)
+Merging fs-current (09d79f0f5767 Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
+$ git merge -m Merge branch 'fs-current' of linux-next fs-current
+Merge made by the 'ort' strategy.
+ drivers/tty/pty.c | 2 +-
+ fs/btrfs/ctree.c | 2 +
+ fs/btrfs/ordered-data.c | 12 +++++
+ fs/btrfs/qgroup.c | 11 ++--
+ fs/btrfs/transaction.c | 4 +-
+ fs/dcache.c | 2 +-
+ fs/erofs/zdata.c | 2 +-
+ fs/file_table.c | 16 ++++++
+ fs/gfs2/glock.c | 2 +-
+ fs/gfs2/main.c | 1 -
+ fs/gfs2/quota.c | 4 +-
+ fs/namespace.c | 58 ++++++++++++----------
+ fs/nfsd/filecache.c | 11 +++-
+ fs/nfsd/nfs2acl.c | 2 +
+ fs/nfsd/nfs3acl.c | 2 +
+ fs/nfsd/nfs4callback.c | 7 ++-
+ fs/nfsd/nfs4state.c | 3 +-
+ fs/nfsd/nfsfh.c | 5 +-
+ fs/notify/fsnotify.c | 18 ++++---
+ fs/open.c | 11 ++--
+ fs/pipe.c | 6 +++
+ fs/stat.c | 4 +-
+ fs/vboxsf/super.c | 3 +-
+ include/linux/fs.h | 9 +++-
+ include/linux/fsnotify.h | 4 +-
+ include/linux/lockref.h | 7 +--
+ net/socket.c | 5 ++
+ .../filesystems/statmount/statmount_test.c | 22 +++++++-
+ 28 files changed, 169 insertions(+), 66 deletions(-)
+Merging kbuild-current/fixes (2014c95afece Linux 6.14-rc1)
+$ 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 (21fed7c223e2 arm64/hwcap: Remove stray references to SF8MMx)
+$ 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/cpufeature.c | 2 --
+ arch/arm64/mm/trans_pgd.c | 7 +++++++
+ 4 files changed, 8 insertions(+), 4 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 (40384c840ea1 Linux 6.13-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 (05aa156e156e powerpc/pseries/vas: Add close() callback in vas_vm_ops struct)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Already up to date.
+Merging net/main (a1300691aed9 net: rose: lock the socket in rose_bind())
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 27 ++++
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 16 ++-
+ drivers/net/ethernet/broadcom/tg3.c | 58 ++++++++
+ drivers/net/ethernet/intel/ice/devlink/devlink.c | 3 +
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 150 ++++++++++++++-------
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 1 -
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 43 ------
+ drivers/net/vmxnet3/vmxnet3_xdp.c | 14 +-
+ include/linux/netdevice.h | 2 +-
+ include/trace/events/rxrpc.h | 1 +
+ net/core/dev.c | 14 ++
+ net/ethtool/ioctl.c | 2 +-
+ net/ethtool/rss.c | 3 +-
+ net/ipv4/udp.c | 4 +-
+ net/ipv6/ioam6_iptunnel.c | 14 +-
+ net/ipv6/rpl_iptunnel.c | 15 ++-
+ net/ipv6/seg6_iptunnel.c | 15 ++-
+ net/ipv6/udp.c | 4 +-
+ net/rose/af_rose.c | 24 ++--
+ net/rxrpc/conn_event.c | 17 ++-
+ net/rxrpc/conn_object.c | 1 +
+ tools/testing/selftests/drivers/net/hw/rss_ctx.py | 9 +-
+ tools/testing/selftests/net/udpgso.c | 26 ++++
+ 24 files changed, 331 insertions(+), 136 deletions(-)
+Merging bpf/master (fc610c8c586c net: Add rx_skb of kfree_skb to raw_tp_null_args[].)
+$ 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/bpf_cgrp_storage.c | 2 +-
+ kernel/bpf/btf.c | 2 +
+ kernel/bpf/ringbuf.c | 4 -
+ kernel/bpf/syscall.c | 25 +-
+ 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 +++
+ 20 files changed, 638 insertions(+), 100 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 (6c9b7db96db6 xfrm: Don't disable preemption while looking up cache state.)
+$ 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 (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/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 (3319569bf9d8 Merge tag 'ath-current-20250124' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath)
+$ 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/ath/ath12k/wmi.c | 61 ++++++++++++++++------
+ drivers/net/wireless/ath/ath12k/wmi.h | 1 -
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +-
+ 3 files changed, 47 insertions(+), 19 deletions(-)
+Merging ath/for-current (3319569bf9d8 Merge tag 'ath-current-20250124' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (8c2fa44132e8 ALSA: hda/realtek: Workaround for resume on Dell Venue 11 Pro 7130)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Already up to date.
+Merging sound-asoc-fixes/for-linus (6b24e67b4056 ASoC: rockchip: i2s-tdm: fix shift config for SND_SOC_DAIFMT_DSP_[AB])
+$ 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/fsl/fsl_micfil.c | 2 ++
+ sound/soc/rockchip/rockchip_i2s_tdm.c | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+Merging regmap-fixes/for-linus (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (4fd2707e3e71 spi: atmel-quadspi: Fix warning in doc-comment)
+$ 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 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging pci-current/for-linus (be6358acefc1 PCI/ASPM: Fix L1SS saving)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
+Merge made by the 'ort' strategy.
+ drivers/pci/pcie/aspm.c | 3 ---
+ 1 file changed, 3 deletions(-)
+Merging driver-core.current/driver-core-linus (2014c95afece Linux 6.14-rc1)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (3126ea9be66b phy: rockchip: naneng-combphy: compatible reset with old DT)
+$ 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 ++++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+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 (bead181694df iio: adc: ad7606: fix wrong scale available)
+$ 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/light/apds9306.c | 4 +-
+ drivers/iio/light/hid-sensor-prox.c | 7 ++-
+ drivers/iio/proximity/hx9023s.c | 3 +-
+ 9 files changed, 58 insertions(+), 37 deletions(-)
+Merging counter-current/counter-current (fac04efc5c79 Linux 6.13-rc2)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Already up to date.
+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 (d15638bf76ad Revert "mtd: spi-nor: core: replace dummy buswidth from addr to data")
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
+$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (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 (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (a5546c2f0dc4 Merge tag 'kvm-s390-master-6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
+$ 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 (84426506171b 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 (a787ab73e2e4 platform/x86/intel/ifs: Update documentation with image download path)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (2a03d2da55b4 dt-bindings: nvmem: qcom,qfprom: Add SAR2130P compatible)
+$ 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/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 +++
+ 10 files changed, 170 insertions(+), 4 deletions(-)
+ 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
+Merge made by the 'ort' strategy.
+ drivers/scsi/qla1280.c | 2 +-
+ drivers/scsi/scsi_lib.c | 9 ++++--
+ drivers/scsi/scsi_lib_test.c | 7 ++++
+ drivers/scsi/scsi_scan.c | 2 +-
+ drivers/scsi/storvsc_drv.c | 1 +
+ drivers/target/target_core_stat.c | 4 +--
+ drivers/ufs/core/ufshcd.c | 68 ++++++++++++++++++++-------------------
+ drivers/ufs/host/ufshcd-pci.c | 2 --
+ drivers/ufs/host/ufshcd-pltfrm.c | 28 ++++++----------
+ include/ufs/ufs.h | 4 +--
+ include/ufs/ufshcd.h | 1 -
+ 11 files changed, 65 insertions(+), 63 deletions(-)
+Merging drm-fixes/drm-fixes (9b1c673a1648 Merge tag 'drm-xe-fixes-2025-01-16' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
+$ 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 (230b19bc2bcc drm/i915/dp: Iterate DSC BPP from high to low on all platforms)
+$ 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/display/intel_backlight.c | 5 +--
+ drivers/gpu/drm/i915/display/intel_dp.c | 12 +++-----
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 15 ++++++++-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ---
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +---
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 36 ++++++++++++++++++----
+ 6 files changed, 53 insertions(+), 25 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 (40384c840ea1 Linux 6.13-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 (d6179f6c6204 gpio: pca953x: Improve interrupt support)
+$ 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-pca953x.c | 19 -------------------
+ 1 file changed, 19 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 027338e578ab] 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
+Already up to date.
+Merging w1-fixes/fixes (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 (789a8cff8d2d ftrace: Fix function profiler's filtering functionality)
+$ 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 (a869ffcd79a0 Merge branch into tip/master: 'x86/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.
+ arch/x86/boot/compressed/Makefile | 1 +
+ io_uring/futex.c | 2 +-
+ kernel/futex/core.c | 5 +++--
+ kernel/futex/futex.h | 11 ++++++++---
+ kernel/futex/pi.c | 2 +-
+ kernel/futex/waitwake.c | 4 ++--
+ kernel/sched/debug.c | 2 ++
+ kernel/sched/fair.c | 19 +++++++++++++++++++
+ kernel/time/clocksource.c | 6 ++++--
+ 9 files changed, 41 insertions(+), 11 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 (789384eb1437 drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp)
+$ 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 (41a2d8286c90 accel/ivpu: Fix error handling in recovery/reset)
+$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes
+Auto-merging drivers/accel/ivpu/ivpu_drv.c
+Auto-merging drivers/accel/ivpu/ivpu_pm.c
+Auto-merging include/drm/drm_print.h
+Merge made by the 'ort' strategy.
+ drivers/accel/ivpu/ivpu_drv.c | 8 ++-
+ drivers/accel/ivpu/ivpu_pm.c | 84 ++++++++++++----------
+ .../drm/arm/display/komeda/komeda_wb_connector.c | 4 ++
+ drivers/gpu/drm/ast/ast_dp.c | 2 +-
+ include/drm/drm_print.h | 1 +
+ 5 files changed, 59 insertions(+), 40 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 (b4b0881156fb Merge tag 'docs-6.14-2' of git://git.lwn.net/linux)
+$ 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 (b4b0881156fb Merge tag 'docs-6.14-2' of git://git.lwn.net/linux)
+$ 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 (f853185cdf0f 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/x86/include/asm/tlbflush.h
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+Auto-merging fs/bcachefs/util.h
+Merge made by the 'ort' strategy.
+ .mailmap | 2 -
+ CREDITS | 3 +
+ Documentation/admin-guide/mm/zswap.rst | 10 +-
+ Documentation/admin-guide/sysctl/vm.rst | 17 +
+ Documentation/filesystems/proc.rst | 10 +
+ Documentation/mm/index.rst | 1 -
+ Documentation/mm/z3fold.rst | 28 -
+ Documentation/translations/zh_CN/mm/index.rst | 1 -
+ Documentation/translations/zh_CN/mm/z3fold.rst | 31 -
+ MAINTAINERS | 15 +-
+ arch/arm64/include/asm/tlbflush.h | 25 +-
+ arch/arm64/mm/contpte.c | 2 +-
+ arch/loongarch/configs/loongson3_defconfig | 3 +-
+ arch/riscv/include/asm/tlbflush.h | 5 +-
+ arch/riscv/mm/tlbflush.c | 5 +-
+ arch/s390/configs/debug_defconfig | 2 +-
+ arch/s390/configs/defconfig | 2 +-
+ arch/x86/include/asm/percpu.h | 33 +-
+ arch/x86/include/asm/tlbflush.h | 5 +-
+ arch/x86/kernel/kgdb.c | 2 +-
+ drivers/base/memory.c | 12 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 18 +-
+ drivers/video/fbdev/core/fb_defio.c | 38 +-
+ fs/bcachefs/util.h | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/proc/page.c | 2 +-
+ include/asm-generic/percpu.h | 39 +-
+ include/asm-generic/tlb.h | 49 +-
+ 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/fb.h | 1 +
+ include/linux/huge_mm.h | 4 +-
+ include/linux/memcontrol.h | 17 +-
+ include/linux/mm_inline.h | 18 +-
+ include/linux/mmzone.h | 26 +-
+ include/linux/page-flags.h | 23 +-
+ include/linux/pagemap.h | 2 +-
+ include/linux/part_stat.h | 2 +-
+ include/linux/percpu-defs.h | 6 +-
+ include/linux/rmap.h | 3 +
+ include/linux/swap.h | 5 -
+ include/linux/vmstat.h | 9 +-
+ include/linux/zpool.h | 5 +-
+ include/net/snmp.h | 5 +-
+ include/trace/events/mmflags.h | 4 +-
+ include/uapi/linux/kernel-page-flags.h | 2 +-
+ kernel/fork.c | 13 +-
+ kernel/locking/percpu-rwsem.c | 2 +-
+ lib/plist.c | 12 +
+ mm/Kconfig | 47 -
+ mm/Makefile | 2 -
+ mm/compaction.c | 14 +-
+ mm/debug.c | 28 +-
+ mm/filemap.c | 46 +-
+ mm/huge_memory.c | 53 +-
+ mm/internal.h | 1 -
+ mm/memcontrol-v1.c | 102 +-
+ mm/memcontrol-v1.h | 39 +-
+ mm/memcontrol.c | 203 +--
+ mm/memory.c | 4 +-
+ mm/migrate.c | 14 +-
+ mm/mmap.c | 2 +-
+ mm/oom_kill.c | 2 +-
+ mm/page-writeback.c | 16 +-
+ mm/page_io.c | 15 +-
+ mm/readahead.c | 4 +-
+ mm/rmap.c | 267 +++-
+ mm/shmem.c | 2 +-
+ mm/swap.c | 153 +--
+ mm/swap_state.c | 2 +-
+ mm/truncate.c | 5 +-
+ mm/vma.c | 331 ++---
+ mm/vma.h | 86 +-
+ mm/vmscan.c | 98 +-
+ mm/z3fold.c | 1447 ---------------------
+ mm/zbud.c | 455 -------
+ mm/zpool.c | 4 +-
+ mm/zswap.c | 2 +-
+ net/mpls/internal.h | 4 +-
+ scripts/extract-fwblobs | 31 +
+ tools/mm/page-types.c | 8 +-
+ tools/testing/selftests/mm/split_huge_page_test.c | 63 +-
+ tools/testing/vma/vma.c | 63 +-
+ tools/testing/vma/vma_internal.h | 4 +-
+ 86 files changed, 1187 insertions(+), 2991 deletions(-)
+ delete mode 100644 Documentation/mm/z3fold.rst
+ delete mode 100644 Documentation/translations/zh_CN/mm/z3fold.rst
+ delete mode 100644 mm/z3fold.c
+ delete mode 100644 mm/zbud.c
+ create mode 100755 scripts/extract-fwblobs
+Merging kbuild/for-next (2014c95afece Linux 6.14-rc1)
+$ 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 (23e0a63c6dd3 perf script: force stdin for flamegraph in live mode)
+$ 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
+Auto-merging tools/perf/builtin-trace.c
+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/scripts/python/bin/flamegraph-report | 2 +-
+ tools/perf/tests/shell/test_stat_intel_tpebs.sh | 89 +++-
+ tools/perf/util/comm.c | 2 +
+ tools/perf/util/evsel.c | 10 +
+ tools/perf/util/evsel.h | 1 +
+ tools/perf/util/pmus.c | 20 +-
+ tools/perf/util/stat-shadow.c | 3 +-
+ 46 files changed, 3178 insertions(+), 25 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 (ffc253263a13 Linux 6.6)
+$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
+Already up to date.
+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 (82a9d82d35f9 Merge branch 'devicetree-arm64/next' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Auto-merging arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 8 ++
+ arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 147 +++++++++++++++++++++++
+ 2 files changed, 155 insertions(+)
+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 (7605336e9d13 Merge branch 'v6.13-next/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
+Merge made by the 'ort' strategy.
+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 (e1fc1384cf70 Merge branch 'omap-for-v6.14/drivers' into tmp/omap-next-20250107.145157)
+$ 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.
+ drivers/input/touchscreen/tsc2007.h | 2 ++
+ drivers/input/touchscreen/tsc2007_core.c | 5 ++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+Merging qcom/for-next (aa82c3c323a6 Merge branches 'arm32-for-6.14', 'arm64-defconfig-for-6.14', 'arm64-fixes-for-6.13', 'arm64-for-6.14', 'clk-for-6.14' and 'drivers-for-6.14' 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 (7e9ab8c11f60 Merge branches 'renesas-arm-defconfig-for-v6.15', 'renesas-arm-soc-for-v6.15', 'renesas-drivers-for-v6.15', 'renesas-dt-bindings-for-v6.15' and 'renesas-dts-for-v6.15' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Merge made by the 'ort' strategy.
+ .../soc/renesas/renesas,r9a09g057-sys.yaml | 5 +-
+ .../devicetree/bindings/soc/renesas/renesas.yaml | 9 ++
+ .../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 | 4 +
+ .../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 +++-
+ 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 ++
+ 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 +++++++
+ 31 files changed, 1023 insertions(+), 294 deletions(-)
+ 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 (6399b505aad2 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
+Merge made by the 'ort' strategy.
+ .../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/rk356x-base.dtsi | 5 +++
+ .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 47 ++++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 9 +++--
+ .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 34 +++++++++++++++-
+ 15 files changed, 134 insertions(+), 29 deletions(-)
+Merging samsung-krzk/for-next (972589c50bb8 Merge branch 'next/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/google.yaml | 3 +-
+ .../bindings/clock/samsung,exynos990-clock.yaml | 19 ++
+ arch/arm/mach-s3c/devs.c | 1 -
+ arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c | 1 -
+ 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 | 8 +-
+ include/dt-bindings/clock/samsung,exynos990.h | 21 ++
+ 13 files changed, 557 insertions(+), 270 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 (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next
+Already up to date.
+Merging spacemit/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next
+Already up to date.
+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 (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Already up to date.
+Merging xilinx/for-next (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 (531936dee53e LoongArch: Extend the maximum number of watchpoints)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Already up to date.
+Merging m68k/for-next (723be3c6ab31 m68k: sun3: Fix DEBUG_MMU_EMU build)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/include/asm/processor.h | 14 ++++++++++++++
+ arch/m68k/sun3/mmu_emu.c | 7 ++++---
+ 2 files changed, 18 insertions(+), 3 deletions(-)
+Merging m68knommu/for-next (c70f5de8738e 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 (17391cb2613b powerpc/pseries/iommu: Don't unset window if it was never set)
+$ 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 (9b181f4a9538 riscv: dts: microchip: update pcie reg properties to new format)
+$ 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 +++--
+ 3 files changed, 9 insertions(+), 6 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Already up to date.
+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 (0e3c9e4d9bc8 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/fuse/dev.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/fs.rst | 25 ++
+ .../filesystems/bcachefs/SubmittingPatches.rst | 98 +++++
+ fs/bcachefs/alloc_background.c | 52 ++-
+ fs/bcachefs/alloc_foreground.c | 35 +-
+ fs/bcachefs/alloc_foreground.h | 17 +
+ fs/bcachefs/alloc_types.h | 3 +
+ fs/bcachefs/backpointers.c | 36 +-
+ fs/bcachefs/bcachefs.h | 3 +-
+ fs/bcachefs/bcachefs_ioctl.h | 24 +-
+ fs/bcachefs/btree_io.c | 189 +++++++-
+ fs/bcachefs/btree_io.h | 3 +
+ fs/bcachefs/btree_key_cache.c | 1 -
+ fs/bcachefs/btree_update_interior.c | 20 +
+ fs/bcachefs/btree_update_interior.h | 4 +
+ fs/bcachefs/buckets_waiting_for_journal.c | 12 +-
+ fs/bcachefs/buckets_waiting_for_journal.h | 4 +-
+ fs/bcachefs/chardev.c | 36 +-
+ fs/bcachefs/data_update.c | 174 ++++++--
+ fs/bcachefs/data_update.h | 12 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/errcode.h | 6 +
+ fs/bcachefs/extents.c | 9 +-
+ fs/bcachefs/extents.h | 2 +-
+ fs/bcachefs/fs-io-buffered.c | 23 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/inode.h | 4 +-
+ fs/bcachefs/io_read.c | 489 ++++++++++-----------
+ fs/bcachefs/io_read.h | 75 ++--
+ fs/bcachefs/io_write.c | 95 ++--
+ fs/bcachefs/io_write.h | 29 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 23 +-
+ fs/bcachefs/journal.h | 17 +-
+ fs/bcachefs/journal_io.c | 13 +-
+ fs/bcachefs/journal_types.h | 9 +-
+ fs/bcachefs/move.c | 369 +++++++++-------
+ fs/bcachefs/move_types.h | 18 +-
+ fs/bcachefs/opts.h | 14 -
+ fs/bcachefs/rebalance.c | 12 +-
+ fs/bcachefs/rebalance.h | 20 +
+ fs/bcachefs/sb-counters.c | 90 +++-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 8 +
+ fs/bcachefs/sb-members.h | 12 +
+ fs/bcachefs/subvolume.c | 7 +-
+ fs/bcachefs/super.c | 11 +
+ fs/bcachefs/super.h | 1 +
+ fs/bcachefs/sysfs.c | 5 -
+ fs/bcachefs/trace.h | 66 +--
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/extent-tree.c | 12 +-
+ fs/btrfs/inode.c | 39 +-
+ fs/btrfs/scrub.c | 142 ++----
+ fs/btrfs/volumes.c | 2 +-
+ fs/btrfs/zoned.c | 9 +
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/keystore.c | 4 +-
+ fs/exfat/balloc.c | 10 +-
+ fs/exfat/exfat_fs.h | 2 +-
+ fs/exfat/fatent.c | 11 +-
+ fs/exfat/namei.c | 2 +-
+ 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/glock.c | 5 +
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/trace_gfs2.h | 8 +-
+ fs/ntfs3/attrib.c | 1 +
+ fs/ntfs3/file.c | 22 +-
+ fs/ntfs3/frecord.c | 6 +-
+ fs/ntfs3/super.c | 89 ++--
+ include/uapi/linux/fuse.h | 10 +-
+ net/9p/trans_fd.c | 56 +--
+ 78 files changed, 1915 insertions(+), 986 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/SubmittingPatches.rst
+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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
+Already up to date.
+Merging pstore/for-next/pstore (067cdf020329 pstore/zone: avoid dereferencing zero sized ptr after init zones)
+$ 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
+Already up to date.
+Merging hid/for-next (899da1f9df45 Merge branch 'for-6.14/upstream-fixes' 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.
+ MAINTAINERS | 7 +
+ drivers/hid/Kconfig | 29 +-
+ drivers/hid/Makefile | 1 +
+ drivers/hid/amd-sfh-hid/Kconfig | 1 -
+ drivers/hid/hid-corsair-void.c | 3 +-
+ drivers/hid/hid-ids.h | 33 ++
+ drivers/hid/hid-lenovo.c | 7 +-
+ drivers/hid/hid-multitouch.c | 5 +-
+ drivers/hid/hid-plantronics.c | 144 ++++----
+ drivers/hid/hid-quirks.c | 1 +
+ drivers/hid/hid-steam.c | 6 +-
+ drivers/hid/hid-topre.c | 7 +
+ drivers/hid/hid-universal-pidff.c | 198 +++++++++++
+ 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/hid/usbhid/hid-core.c | 1 +
+ drivers/hid/usbhid/hid-pidff.c | 505 +++++++++++++++++++---------
+ drivers/hid/usbhid/hid-pidff.h | 33 ++
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ include/linux/hid.h | 6 -
+ net/bluetooth/hidp/Kconfig | 3 +-
+ samples/hid/Makefile | 13 +-
+ sound/usb/mixer_quirks.c | 51 +++
+ 31 files changed, 804 insertions(+), 289 deletions(-)
+ create mode 100644 drivers/hid/hid-universal-pidff.c
+ create mode 100644 drivers/hid/usbhid/hid-pidff.h
+Merging i2c/i2c/for-next (2014c95afece Linux 6.14-rc1)
+$ 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 (5eb6d3561f6c i3c: master: Improve initialization of numbered I2C adapters)
+$ 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 (bfbb730c4255 hwmon: (sht3x) Use per-client debugfs entry)
+$ 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/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 | 44 ++----------
+ drivers/hwmon/sht3x.c | 67 +++---------------
+ drivers/hwmon/tps23861.c | 31 +-------
+ 15 files changed, 196 insertions(+), 216 deletions(-)
+Merging jc_docs/docs-next (e8bcda12176c docs: admin-guide: rename GTK+ to GTK)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/README.rst | 2 +-
+ .../debug/kprobes-on-ftrace/arch-support.txt | 2 +-
+ Documentation/mm/split_page_table_lock.rst | 2 +-
+ .../translations/zh_CN/admin-guide/README.rst | 2 +-
+ .../translations/zh_CN/security/credentials.rst | 479 +++++++++++++++++++++
+ .../translations/zh_CN/security/index.rst | 4 +-
+ .../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 +-
+ 14 files changed, 945 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/translations/zh_CN/security/credentials.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
+Merging v4l-dvb/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
+Already up to date.
+Merging v4l-dvb-next/master (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 (d3b6770a5971 Merge branch 'pm-powercap' 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/powercap/powercap_sys.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (7b258df4269f 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
+Merge made by the 'ort' strategy.
+ drivers/cpufreq/Kconfig.arm | 3 ++-
+ 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 | 45 ++++++++++++++++++++--------------
+ drivers/cpufreq/davinci-cpufreq.c | 1 -
+ drivers/cpufreq/e_powersaver.c | 1 -
+ drivers/cpufreq/elanfreq.c | 1 -
+ drivers/cpufreq/freq_table.c | 15 ++++--------
+ drivers/cpufreq/imx6q-cpufreq.c | 1 -
+ drivers/cpufreq/kirkwood-cpufreq.c | 1 -
+ drivers/cpufreq/longhaul.c | 1 -
+ drivers/cpufreq/loongson2_cpufreq.c | 1 -
+ drivers/cpufreq/loongson3_cpufreq.c | 11 +--------
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 1 -
+ drivers/cpufreq/mediatek-cpufreq.c | 1 -
+ drivers/cpufreq/omap-cpufreq.c | 1 -
+ drivers/cpufreq/p4-clockmod.c | 1 -
+ drivers/cpufreq/pasemi-cpufreq.c | 1 -
+ drivers/cpufreq/pmac32-cpufreq.c | 1 -
+ drivers/cpufreq/pmac64-cpufreq.c | 1 -
+ drivers/cpufreq/powernow-k6.c | 1 -
+ drivers/cpufreq/powernow-k7.c | 1 -
+ drivers/cpufreq/powernow-k8.c | 1 -
+ drivers/cpufreq/powernv-cpufreq.c | 11 +--------
+ drivers/cpufreq/qcom-cpufreq-hw.c | 14 +----------
+ drivers/cpufreq/qoriq-cpufreq.c | 1 -
+ drivers/cpufreq/sc520_freq.c | 1 -
+ drivers/cpufreq/scmi-cpufreq.c | 19 +-------------
+ drivers/cpufreq/scpi-cpufreq.c | 6 ++---
+ drivers/cpufreq/sh-cpufreq.c | 1 -
+ drivers/cpufreq/spear-cpufreq.c | 1 -
+ drivers/cpufreq/speedstep-centrino.c | 1 -
+ drivers/cpufreq/speedstep-ich.c | 1 -
+ drivers/cpufreq/speedstep-smi.c | 1 -
+ drivers/cpufreq/tegra186-cpufreq.c | 1 -
+ drivers/cpufreq/tegra194-cpufreq.c | 1 -
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 1 -
+ drivers/cpufreq/virtual-cpufreq.c | 1 -
+ include/linux/cpufreq.h | 21 +++++-----------
+ 44 files changed, 55 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Already up to date.
+Merging net-next/main (b565a8c750ef cavium/liquidio: Remove unused lio_get_device_id)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/net/faraday,ftgmac100.yaml | 3 ++
+ drivers/net/bonding/bond_main.c | 3 --
+ .../net/ethernet/cavium/liquidio/octeon_device.c | 16 --------
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 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 ---------
+ .../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/spectrum.h | 3 --
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 48 ----------------------
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 -
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 8 ++--
+ include/linux/mlx4/device.h | 1 -
+ net/core/neighbour.c | 9 +---
+ 17 files changed, 8 insertions(+), 199 deletions(-)
+Merging bpf-next/for-next (03f3aa4a6b66 Merge branch 'selftests-bpf-migrate-test_xdp_redirect_multi-sh-to-test_progs')
+$ 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
+Merge made by the 'ort' strategy.
+ kernel/bpf/bpf_struct_ops.c | 98 +++---
+ tools/bpf/bpftool/common.c | 3 +-
+ tools/bpf/runqslower/Makefile | 3 +-
+ tools/lib/bpf/btf.c | 4 +-
+ tools/testing/selftests/bpf/Makefile | 1 +
+ tools/testing/selftests/bpf/network_helpers.c | 17 ++
+ tools/testing/selftests/bpf/network_helpers.h | 12 +
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 1 +
+ .../selftests/bpf/prog_tests/test_xdp_veth.c | 331 +++++++++++++--------
+ 9 files changed, 283 insertions(+), 187 deletions(-)
+Merging ipsec-next/master (7082a6dc84eb net/mlx5e: Update TX ESN context for IPSec hardware offload)
+$ 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 (c411c62cc133 Bluetooth: hci_uart: fix race during initialization)
+$ 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/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 | 2 ++
+ drivers/bluetooth/btusb.c | 30 +++++++++++++++++++++++++++++-
+ drivers/bluetooth/hci_ldisc.c | 3 ++-
+ include/net/bluetooth/hci_core.h | 2 --
+ net/bluetooth/l2cap_core.c | 39 ++++++++++++++++++++++++++++++++++-----
+ net/bluetooth/mgmt.c | 40 ----------------------------------------
+ net/bluetooth/mgmt_util.c | 17 -----------------
+ net/bluetooth/mgmt_util.h | 4 ----
+ 11 files changed, 77 insertions(+), 72 deletions(-)
+Merging wireless-next/for-next (22f3551b60be wifi: ipw2x00: Remove unused libipw_rx_any())
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/net/wireless/intel/ipw2x00/libipw.h | 2 -
+ drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 91 ---------------
+ 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 | 2 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c | 4 +-
+ 13 files changed, 15 insertions(+), 346 deletions(-)
+Merging ath-next/for-next (f5c90ff80b4c wifi: ath12k: Add Support to Calculate and Display TPC Values)
+$ 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 | 3 +-
+ drivers/net/wireless/ath/ath11k/core.h | 3 +-
+ drivers/net/wireless/ath/ath11k/dp.c | 35 +-
+ drivers/net/wireless/ath/ath11k/dp.h | 6 +-
+ drivers/net/wireless/ath/ath11k/dp_rx.c | 119 +-
+ drivers/net/wireless/ath/ath11k/fw.c | 3 +-
+ drivers/net/wireless/ath/ath11k/mac.c | 58 +-
+ drivers/net/wireless/ath/ath11k/pci.c | 3 +-
+ drivers/net/wireless/ath/ath11k/testmode.c | 80 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 11 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 10 +-
+ drivers/net/wireless/ath/ath12k/Makefile | 1 +
+ drivers/net/wireless/ath/ath12k/acpi.c | 202 +++-
+ drivers/net/wireless/ath/ath12k/acpi.h | 40 +-
+ drivers/net/wireless/ath/ath12k/core.c | 48 +-
+ drivers/net/wireless/ath/ath12k/core.h | 120 ++
+ drivers/net/wireless/ath/ath12k/debug.h | 3 +-
+ drivers/net/wireless/ath/ath12k/debugfs.c | 1094 +++++++++++++++++-
+ drivers/net/wireless/ath/ath12k/debugfs.h | 96 +-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 502 ++++++++-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 184 ++-
+ drivers/net/wireless/ath/ath12k/dp.c | 5 +-
+ drivers/net/wireless/ath/ath12k/dp.h | 55 +-
+ drivers/net/wireless/ath/ath12k/dp_mon.c | 394 +++----
+ 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 | 221 +++-
+ drivers/net/wireless/ath/ath12k/hal_desc.h | 5 +-
+ drivers/net/wireless/ath/ath12k/hal_rx.h | 9 +-
+ drivers/net/wireless/ath/ath12k/hal_tx.h | 10 +-
+ drivers/net/wireless/ath/ath12k/hw.c | 8 +-
+ drivers/net/wireless/ath/ath12k/mac.c | 324 ++++--
+ drivers/net/wireless/ath/ath12k/mac.h | 6 +-
+ drivers/net/wireless/ath/ath12k/pci.c | 18 +-
+ drivers/net/wireless/ath/ath12k/qmi.c | 11 +-
+ drivers/net/wireless/ath/ath12k/reg.h | 5 +-
+ drivers/net/wireless/ath/ath12k/rx_desc.h | 5 +-
+ 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 +-
+ 49 files changed, 5048 insertions(+), 664 deletions(-)
+ 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 (0ddeb4fe9d3b Merge tag 'nand/for-6.14' into mtd/next)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Already up to date.
+Merging nand/nand/next (98b34d52004b mtd: spinand: skyhigh: Align with recent read from cache variant changes)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Already up to date.
+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 (9d4f8e54cef2 rhashtable: Fix rhashtable_try_insert test)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Already up to date.
+Merging drm/drm-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
+Already up to date.
+Merging drm-exynos/for-linux-next (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 (ecee4d069506 accel/amdxdna: Add MODULE_FIRMWARE() declarations)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/accel/amdxdna/amdxdna_pci_drv.c | 5 +++++
+ drivers/gpu/drm/display/drm_dp_cec.c | 14 +++-----------
+ 2 files changed, 8 insertions(+), 11 deletions(-)
+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
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 ++
+ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 5 +++--
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 +--
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 14 +++++++++-----
+ drivers/gpu/drm/amd/display/dc/dml2/Makefile | 22 +++++++++++++---------
+ .../dc/dml2/dml21/dml21_translation_helper.c | 4 ++--
+ .../amd/display/dc/dml2/dml2_translation_helper.c | 6 +++---
+ .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 3 ++-
+ .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 3 ++-
+ .../drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c | 3 ++-
+ .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 3 ++-
+ .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 2 ++
+ .../gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 2 ++
+ .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 ++-
+ include/uapi/drm/amdgpu_drm.h | 9 ++++++++-
+ 18 files changed, 64 insertions(+), 33 deletions(-)
+Merging drm-intel/for-linux-next (71be80200507 drm/i915/dmc_wl: Track INITIATE_PM_DMD_REQ for DC5)
+$ 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/intel_cx0_phy.c
+Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
+Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.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_fb.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fb.c
+Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
+Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_execlists.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_rc6.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging include/drm/intel/pciids.h
+Recorded preimage for 'drivers/gpu/drm/i915/display/intel_dp.c'
+Resolved 'drivers/gpu/drm/i915/display/intel_fb.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/display/intel_dp.c'.
+[master f95e6b226a3d] 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/i9xx_plane.c | 64 +--
+ drivers/gpu/drm/i915/display/i9xx_plane.h | 4 +
+ drivers/gpu/drm/i915/display/i9xx_wm.c | 6 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 491 +++++++++++----------
+ drivers/gpu/drm/i915/display/intel_audio.h | 14 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_cmtg.c | 190 ++++++++
+ 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 | 6 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 4 +-
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 24 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 123 +++---
+ 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 | 22 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 190 +++++---
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +-
+ .../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 | 10 +-
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 350 +++++++++------
+ .../gpu/drm/i915/display/intel_display_params.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 9 +-
+ .../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 | 7 +-
+ drivers/gpu/drm/i915/display/intel_dmc_wl.c | 73 ++-
+ drivers/gpu/drm/i915/display/intel_dp.c | 218 ++++-----
+ drivers/gpu/drm/i915/display/intel_dp.h | 5 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 336 +++++++-------
+ 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 | 2 +-
+ 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 | 20 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +
+ 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_hdcp.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 12 -
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 6 +-
+ 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 | 3 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 3 +
+ drivers/gpu/drm/i915/display/intel_overlay.c | 20 +-
+ drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 44 +-
+ drivers/gpu/drm/i915/display/intel_psr.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 4 +-
+ 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 | 17 +-
+ 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 | 62 +--
+ 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 | 321 ++++++++------
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 218 ++++++---
+ drivers/gpu/drm/i915/display/skl_universal_plane.h | 3 +
+ drivers/gpu/drm/i915/display/skl_watermark.c | 88 +++-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
+ 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_domain.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +-
+ 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_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 | 8 +-
+ 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/xe_display.c | 2 +-
+ drivers/gpu/drm/xe/display/xe_fb_pin.c | 48 +-
+ drivers/gpu/drm/xe/display/xe_plane_initial.c | 10 -
+ include/drm/display/drm_dp_dual_mode_helper.h | 2 +-
+ include/drm/intel/pciids.h | 7 +-
+ 175 files changed, 3025 insertions(+), 1791 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 (9c9dc9ba4a00 drm/xe/pxp: Fail the load if PXP fails to initialize)
+$ 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 include/drm/intel/pciids.h
+Merge made by the 'ort' strategy.
+ 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_oa_regs.h | 6 +
+ 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 | 137 +++-
+ 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_devcoredump.c | 42 +-
+ drivers/gpu/drm/xe/xe_devcoredump.h | 2 +-
+ drivers/gpu/drm/xe/xe_device.c | 147 +++-
+ drivers/gpu/drm/xe/xe_device_types.h | 27 +-
+ 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 | 11 +-
+ 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 | 5 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 57 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 6 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 109 ++-
+ 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_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 | 7 +-
+ drivers/gpu/drm/xe/xe_guc_debugfs.c | 15 +
+ drivers/gpu/drm/xe/xe_guc_log.c | 13 +-
+ drivers/gpu/drm/xe/xe_guc_pc.c | 59 ++
+ 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_irq.c | 20 +-
+ 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_oa.c | 21 +-
+ drivers/gpu/drm/xe/xe_pci.c | 74 +-
+ 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 | 39 +-
+ 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 | 12 +-
+ drivers/gpu/drm/xe/xe_tile.h | 1 +
+ drivers/gpu/drm/xe/xe_trace_bo.h | 19 +-
+ 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 ++-
+ 102 files changed, 4640 insertions(+), 395 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 (c454bc716854 fbcon: Use correct erase colour for clearing in fbcon)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Merge made by the 'ort' strategy.
+ drivers/video/fbdev/core/bitblit.c | 5 ++--
+ drivers/video/fbdev/core/fbcon.c | 10 ++++----
+ drivers/video/fbdev/core/fbcon.h | 38 +-----------------------------
+ drivers/video/fbdev/core/fbcon_ccw.c | 5 ++--
+ drivers/video/fbdev/core/fbcon_cw.c | 5 ++--
+ drivers/video/fbdev/core/fbcon_ud.c | 5 ++--
+ drivers/video/fbdev/core/tileblit.c | 45 +++++++++++++++++++++++++++++++-----
+ 7 files changed, 54 insertions(+), 59 deletions(-)
+Merging regmap/for-next (995cf0e014b0 regmap: Reorder 'struct regmap')
+$ 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 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+Merging sound/for-next (8c2fa44132e8 ALSA: hda/realtek: Workaround for resume on Dell Venue 11 Pro 7130)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Already up to date.
+Merging ieee1394/for-next (352fafe97784 firewire: test: Fix potential null dereference in firewire kunit test)
+$ 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 (6b24e67b4056 ASoC: rockchip: i2s-tdm: fix shift config for SND_SOC_DAIFMT_DSP_[AB])
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Already up to date.
+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
+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 (ab4976976ee1 Input: drop vb2_ops_wait_prepare/finish)
+$ 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/rmi4/rmi_f54.c | 2 --
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 --
+ drivers/input/touchscreen/sur40.c | 2 --
+ 3 files changed, 6 deletions(-)
+Merging block/for-next (948a05092398 Merge branch 'for-6.15/io_uring' 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.
+ drivers/block/sunvdc.c | 4 +-
+ drivers/nvme/host/core.c | 8 +-
+ drivers/nvme/host/fc.c | 35 ++++--
+ drivers/nvme/host/pci.c | 12 +-
+ drivers/nvme/host/sysfs.c | 2 +-
+ drivers/nvme/target/admin-cmd.c | 1 +
+ drivers/nvme/target/fabrics-cmd.c | 2 +-
+ drivers/nvme/target/io-cmd-bdev.c | 2 +-
+ drivers/nvme/target/nvmet.h | 2 +-
+ io_uring/io-wq.c | 230 ++++++++++++++++++++++----------------
+ io_uring/io-wq.h | 7 +-
+ io_uring/io_uring.c | 102 +++++++++--------
+ 12 files changed, 236 insertions(+), 171 deletions(-)
+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
+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 (2816b0c949af MAINTAINERS: Adjust the file entry for the qnap-mcu header)
+$ 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
+Already up to date.
+Merging backlight/for-backlight-next (40384c840ea1 Linux 6.13-rc1)
+$ 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
+Already up to date.
+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 (3c32a4386909 regulator: Add device tree support to AD5398)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Already up to date.
+Merging apparmor/apparmor-next (e6b087676954 apparmor: fix dbus permission queries to v9 ABI)
+$ 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 | 30 +-
+ security/apparmor/audit.c | 2 +-
+ security/apparmor/capability.c | 56 +++
+ security/apparmor/domain.c | 114 +++---
+ security/apparmor/file.c | 56 ++-
+ 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 | 37 +-
+ 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 | 35 +-
+ security/apparmor/lib.c | 91 +++++
+ security/apparmor/lsm.c | 247 ++++++++++--
+ security/apparmor/net.c | 180 ++++++++-
+ security/apparmor/policy.c | 35 +-
+ 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, 1622 insertions(+), 219 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 (4785ed362a24 ima: ignore suffixed policy rule comments)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Already up to date.
+Merging selinux/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Already up to date.
+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
+Merge made by the 'ort' strategy.
+ security/tomoyo/common.c | 145 +++++++++++++++++++++++++++++++---------
+ security/tomoyo/domain.c | 2 +-
+ security/tomoyo/securityfs_if.c | 6 +-
+ security/tomoyo/tomoyo.c | 5 +-
+ 4 files changed, 117 insertions(+), 41 deletions(-)
+Merging tpmdd/next (b46c89c08f41 Merge tag 'spi-fix-v6.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Already up to date.
+Merging watchdog/master (2014c95afece Linux 6.14-rc1)
+$ 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 (125f34e4c107 Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'qualcomm/msm', 'rockchip', 'riscv', 'core', 'intel/vt-d' and 'amd/amd-vi' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
+Already up to date.
+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 (40fc0083a9db dt-bindings: xilinx: Remove desciption for 16550 uart)
+$ 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.
+ Documentation/devicetree/bindings/xilinx.txt | 26 --------------------------
+ 1 file changed, 26 deletions(-)
+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 (696d6db2b6df 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
+Merge made by the 'ort' strategy.
+ drivers/spi/spi-realtek-rtl-snand.c | 1 -
+ drivers/spi/spi-zynqmp-gqspi.c | 169 ++++++++++++++++--------------------
+ 2 files changed, 77 insertions(+), 93 deletions(-)
+Merging tip/master (3e9fc9c9698d 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/include/asm/tlbflush.h
+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 | 116 +++++++----
+ 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/perf_event.h | 16 ++
+ arch/x86/include/asm/pgtable_types.h | 2 +
+ arch/x86/include/asm/tlbflush.h | 2 +-
+ arch/x86/kernel/alternative.c | 181 +++++++----------
+ arch/x86/kernel/ftrace.c | 30 ++-
+ arch/x86/kernel/module.c | 45 ++---
+ arch/x86/mm/pat/cpa-test.c | 2 +-
+ arch/x86/mm/pat/set_memory.c | 220 ++++++++++++++++++++-
+ drivers/irqchip/irq-riscv-aplic-direct.c | 24 ++-
+ include/linux/execmem.h | 31 +++
+ 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 +
+ 34 files changed, 865 insertions(+), 377 deletions(-)
+Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties)
+$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Already up to date.
+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 (4b5c2205526c Merge branches 'fixes.2024.12.14a', 'rcutorture.2024.12.14a', 'srcu.2024.12.14a' and 'torture-test.2024.12.14a' into rcu-merge.2024.12.14a)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next
+Already up to date.
+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 (f7bafceba76e KVM: remove kvm_arch_post_init_vm)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Merge made by the 'ort' strategy.
+ arch/x86/kvm/x86.c | 7 +------
+ include/linux/kvm_host.h | 1 -
+ virt/kvm/kvm_main.c | 15 ---------------
+ 3 files changed, 1 insertion(+), 22 deletions(-)
+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
+Auto-merging virt/kvm/kvm_main.c
+Merge made by the 'ort' strategy.
+ Documentation/virt/kvm/api.rst | 2 +-
+ arch/s390/include/asm/gmap.h | 20 +-
+ arch/s390/include/asm/kvm_host.h | 6 +-
+ arch/s390/include/asm/pgtable.h | 21 +-
+ arch/s390/include/asm/uv.h | 6 +-
+ arch/s390/kernel/uv.c | 292 +---------
+ arch/s390/kvm/Makefile | 2 +-
+ arch/s390/kvm/gaccess.c | 44 +-
+ arch/s390/kvm/gmap-vsie.c | 142 +++++
+ arch/s390/kvm/gmap.c | 212 +++++++
+ arch/s390/kvm/gmap.h | 39 ++
+ arch/s390/kvm/intercept.c | 7 +-
+ arch/s390/kvm/interrupt.c | 19 +-
+ arch/s390/kvm/kvm-s390.c | 237 ++++++--
+ arch/s390/kvm/kvm-s390.h | 19 +
+ arch/s390/kvm/pv.c | 21 +
+ arch/s390/kvm/vsie.c | 106 ++--
+ arch/s390/mm/gmap.c | 681 +++++------------------
+ arch/s390/mm/pgalloc.c | 2 -
+ tools/testing/selftests/kvm/s390/ucontrol_test.c | 32 +-
+ virt/kvm/kvm_main.c | 10 +-
+ 21 files changed, 990 insertions(+), 930 deletions(-)
+ create mode 100644 arch/s390/kvm/gmap-vsie.c
+ create mode 100644 arch/s390/kvm/gmap.c
+ create mode 100644 arch/s390/kvm/gmap.h
+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 (eb723766b103 Merge branches 'memslots', 'misc', 'mmu', 'selftests', 'svm', 'vcpu_array' and 'vmx')
+$ 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 (bda50f7770e5 xen: update pvcalls_front_accept prototype)
+$ 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 (8bb761bb2d50 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 | 972 +++++----------------
+ 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 | 17 +-
+ tools/sched_ext/scx_central.bpf.c | 21 +
+ tools/sched_ext/scx_qmap.bpf.c | 19 +
+ 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 +-
+ 33 files changed, 1166 insertions(+), 833 deletions(-)
+ create mode 100644 kernel/sched/ext_idle.c
+ create mode 100644 kernel/sched/ext_idle.h
+Merging drivers-x86/for-next (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+Merging chrome-platform/for-next (d83c45aeec9b platform/chrome: cros_ec_lpc: Match on Framework ACPI device)
+$ 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.
+ MAINTAINERS | 9 +++++++--
+ drivers/platform/chrome/cros_ec_lpc.c | 22 ++++++++++++++--------
+ 2 files changed, 21 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 (daefd7fbd544 leds: triggers: Constify 'struct bin_attribute')
+$ 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
+Already up to date.
+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 (2014c95afece Linux 6.14-rc1)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Already up to date.
+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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (2014c95afece Linux 6.14-rc1)
+$ 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 (40384c840ea1 Linux 6.13-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 (46b155acbf4e fpga: dfl: destroy/recreate feature platform device on port release/assign)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Already up to date.
+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 (56fb2dd839b3 iio: pressure: zpa2326: Drop unneeded assignment for cache_type)
+$ 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.
+ .../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 | 7 +
+ drivers/iio/accel/mc3230.c | 95 +-
+ drivers/iio/adc/Kconfig | 2 +-
+ drivers/iio/adc/ad4695.c | 108 +-
+ drivers/iio/adc/ad7124.c | 17 +-
+ 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 | 33 +-
+ 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 +
+ 52 files changed, 4259 insertions(+), 927 deletions(-)
+ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Already up to date.
+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 (ceb3075433d9 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Already up to date.
+Merging cgroup/for-next (f548f3f002f7 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 --------
+ .../testing/selftests/cgroup/test_cpuset_v1_hp.sh | 2 +-
+ 9 files changed, 62 insertions(+), 82 deletions(-)
+Merging scsi/for-next (c57ef5d3d7bc 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
+Merge made by the 'ort' strategy.
+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
+Auto-merging MAINTAINERS
+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 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 (3a53ff95b0be remoteproc: st: Use syscon_regmap_lookup_by_phandle_args)
+$ 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 (de454ac4fc5a gpio: Use str_enable_disable-like helpers)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Merge made by the 'ort' strategy.
+ 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-wcove.c | 3 ++-
+ drivers/gpio/gpio-wm831x.c | 3 ++-
+ drivers/gpio/gpio-xra1403.c | 3 ++-
+ drivers/gpio/gpiolib.c | 3 ++-
+ 10 files changed, 23 insertions(+), 14 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 (1ddee69108d3 pinctrl: cy8c95x0: Respect IRQ trigger settings from firmware)
+$ 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/pinctrl-cy8c95x0.c | 42 +++++++++++++++++++++++---------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+Merging pinctrl-intel/for-next (112f5e0917cf pwm: lpss: Actually use a module namespace by defining the namespace earlier)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 5 ++++-
+ drivers/pinctrl/intel/pinctrl-intel.c | 1 +
+ drivers/pinctrl/intel/pinctrl-lynxpoint.c | 5 ++++-
+ drivers/pwm/pwm-lpss.c | 4 ++--
+ 4 files changed, 11 insertions(+), 4 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 (444053e3c42a pwm: lpss: Only include <linux/pwm.h> where needed)
+$ 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.
+ drivers/pwm/pwm-lpss.c | 1 +
+ drivers/pwm/pwm-lpss.h | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+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 (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+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 (f90877dd7fb5 seccomp: Stub for !CONFIG_SECCOMP)
+$ 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
+Already up to date.
+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 (40384c840ea1 Linux 6.13-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 (40384c840ea1 Linux 6.13-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 (40384c840ea1 Linux 6.13-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 (29904a40127c bus: mhi: host: pci_generic: Enable MSI-X if the endpoint supports)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Already up to date.
+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 (6cd498f39cf5 Merge branch 'for-6.15/dpa-partition-cleanup' into cxl-for-next)
+$ 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/cxl/core/cdat.c | 99 ++++----
+ drivers/cxl/core/core.h | 6 +-
+ drivers/cxl/core/hdm.c | 327 +++++++++++++++++++-------
+ drivers/cxl/core/mbox.c | 84 ++++---
+ drivers/cxl/core/memdev.c | 66 ++++--
+ 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 | 58 ++++-
+ drivers/cxl/cxlpci.h | 6 +
+ drivers/cxl/mem.c | 2 +-
+ drivers/cxl/pci.c | 7 +-
+ drivers/cxl/pmem.c | 8 +
+ tools/testing/cxl/test/cxl.c | 22 +-
+ tools/testing/cxl/test/mem.c | 7 +-
+ 17 files changed, 657 insertions(+), 331 deletions(-)
+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 (e492fac3657b Merge branch 'slab/for-6.14/kfree_rcu_move' 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
+Already up to date.
+Merging random/master (d18c13697b4d prandom: Include <linux/percpu.h> in <linux/prandom.h>)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Already up to date.
+Merging landlock/next (24a8e44deae4 landlock: Fix grammar error)
+$ 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.
+ security/landlock/ruleset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging rust/rust-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Already up to date.
+Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache())
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next
+Already up to date.
+Merging execve/for-next/execve (87dd41e7faf2 Merge branch 'for-next/topic/execve/AT_EXECVE_CHECK' into for-next/execve)
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Auto-merging include/linux/binfmts.h
+CONFLICT (content): Merge conflict in include/linux/binfmts.h
+Resolved 'include/linux/binfmts.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b99db32cd991] Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+$ git diff -M --stat --summary HEAD^..
+
+Merging bitmap/bitmap-for-next (404e6d88ddaf bitmap: Align documentation between bitmap_gather() and bitmap_scatter())
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Merge made by the 'ort' strategy.
+ include/linux/bitmap.h | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 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 (28d00b3e5953 stackinit: Fix comment for test_small_end)
+$ 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
+Merge made by the 'ort' strategy.
+ lib/stackinit_kunit.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+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 (e721f619e3ec iommufd: Fix struct iommu_hwpt_pgfault init and padding)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Already up to date.
+Merging turbostat/next (2c4627c8ced7 tools/power turbostat: version 2025.02.02)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next
+Already up to date.
+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 (b79059781ad0 lib/crc64: add support for arch-optimized implementations)
+$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next
+Merge made by the 'ort' strategy.
+ block/Kconfig | 2 +-
+ block/t10-pi.c | 2 +-
+ crypto/Kconfig | 11 ----
+ crypto/Makefile | 1 -
+ crypto/crc64_rocksoft_generic.c | 89 ----------------------------
+ crypto/testmgr.c | 7 ---
+ crypto/testmgr.h | 12 ----
+ include/linux/crc64.h | 38 ++++++++++--
+ lib/Kconfig | 16 +++--
+ lib/Makefile | 1 -
+ lib/crc64-rocksoft.c | 126 ----------------------------------------
+ lib/crc64.c | 49 ++++------------
+ lib/crc_kunit.c | 30 +++++++++-
+ lib/gen_crc64table.c | 10 ++--
+ 14 files changed, 87 insertions(+), 307 deletions(-)
+ delete mode 100644 crypto/crc64_rocksoft_generic.c
+ delete mode 100644 lib/crc64-rocksoft.c
+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