diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-12-16 12:45:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-12-16 12:45:51 +1100 |
| commit | 563c8dd425b59e44470e28519107b1efc99f4c7b (patch) | |
| tree | ff4964df7d6089287bdd4f958f46f779cb364073 /Next/merge.log | |
| parent | 8683cdaf60bfe8cba0a6b5885c1b4ae60c3376de (diff) | |
| download | linux-next-master.tar.gz | |
Add linux-next specific files for 20251216HEADnext-20251216master
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3308 |
1 files changed, 3308 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 00000000000000..18abfafb93935b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3308 @@ +$ date -R +Tue, 16 Dec 2025 08:17:47 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 8f0b4cce4481 Linux 6.19-rc1 +Merging origin/master (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (24835a96f21e Merge patch series "filelock: fix conflict detection with userland file delegations") +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Updating 8f0b4cce4481..24835a96f21e +Fast-forward (no commit created; -m option ignored) + Documentation/filesystems/locking.rst | 1 + + drivers/media/mc/mc-request.c | 6 +- + fs/iomap/buffered-io.c | 50 +++++++++----- + fs/iomap/iter.c | 6 +- + fs/locks.c | 119 +++++++++++++++++----------------- + fs/nfsd/nfs4layouts.c | 23 ++++++- + fs/nfsd/nfs4state.c | 19 ++++++ + fs/xfs/xfs_iomap.c | 11 ++-- + include/linux/filelock.h | 1 + + include/linux/iomap.h | 8 ++- + 10 files changed, 156 insertions(+), 88 deletions(-) +Merging fscrypt-current/for-current (1e39da974ce6 fscrypt: fix left shift underflow when inode->i_blkbits > PAGE_SHIFT) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (7022153234af Merge branch 'misc-6.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/volumes.c +Merge made by the 'ort' strategy. + fs/btrfs/file.c | 3 ++- + fs/btrfs/inode.c | 1 + + fs/btrfs/qgroup.c | 27 ++++--------------------- + fs/btrfs/tests/qgroup-tests.c | 1 - + fs/btrfs/tree-log.c | 46 +++++++++++++++++++++++++++++++++++-------- + fs/btrfs/volumes.c | 1 + + 6 files changed, 46 insertions(+), 33 deletions(-) +Merging vfs-fixes/fixes (db961296e022 shmem: fix recovery on rename failures) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + fs/libfs.c | 50 +++++++++++++++++++++----------------------------- + include/linux/fs.h | 2 +- + mm/shmem.c | 38 +++++++++++++++++--------------------- + 3 files changed, 39 insertions(+), 51 deletions(-) +Merging erofs-fixes/fixes (f2a12cc3b97f erofs: avoid infinite loop due to incomplete zstd-compressed data) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (ebae102897e7 nfsd: Mark variable __maybe_unused to avoid W=1 build break) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/export.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 3 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 +++++-- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (e8bd877fb76b ovl: fix possible double unlink) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (04da6eeaf3d1 Merge branch 'for-next-next-v6.19-20251215' into for-next-20251215) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 9 ++-- + fs/btrfs/bio.c | 19 ++++--- + fs/btrfs/bio.h | 16 +++--- + fs/btrfs/block-group.c | 11 ++-- + fs/btrfs/compression.c | 1 - + fs/btrfs/ctree.c | 49 ++++++----------- + fs/btrfs/ctree.h | 9 ++++ + fs/btrfs/defrag.c | 5 +- + fs/btrfs/delayed-inode.c | 36 +++++++------ + fs/btrfs/direct-io.c | 29 +++++----- + fs/btrfs/disk-io.c | 81 ++++++++-------------------- + fs/btrfs/extent-io-tree.c | 7 +-- + fs/btrfs/extent-tree.c | 33 ++++-------- + fs/btrfs/extent_io.c | 78 +++++++++++++++++---------- + fs/btrfs/file-item.c | 4 -- + fs/btrfs/file.c | 9 ++-- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/fs.c | 102 +++++++++++++++++++++++++++++------ + fs/btrfs/fs.h | 23 ++++++-- + fs/btrfs/inode-item.c | 7 ++- + fs/btrfs/inode.c | 63 +++++++++++++++------- + fs/btrfs/messages.c | 26 +++------ + fs/btrfs/messages.h | 76 ++++++++++++-------------- + fs/btrfs/qgroup.c | 124 +++++++++++++++++++++++++++++++++---------- + fs/btrfs/relocation.c | 5 +- + fs/btrfs/scrub.c | 39 ++++++-------- + fs/btrfs/super.c | 4 -- + fs/btrfs/sysfs.c | 6 +-- + fs/btrfs/transaction.c | 11 ++-- + fs/btrfs/tree-log.c | 6 +-- + fs/btrfs/volumes.c | 9 ++-- + include/trace/events/btrfs.h | 3 +- + 32 files changed, 496 insertions(+), 408 deletions(-) +Merging ceph/master (375068b6c206 libceph: prevent potential out-of-bounds reads in handle_auth_done()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + net/ceph/messenger_v2.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging cifs/for-next (593f214f5e14 cifs: update internal module version number) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/cifsfs.h | 4 ++-- + fs/smb/client/cifspdu.h | 2 +- + fs/smb/common/smb1pdu.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++ + fs/smb/common/smb2pdu.h | 40 --------------------------------- + fs/smb/common/smbglob.h | 2 -- + fs/smb/server/smb_common.h | 1 + + 6 files changed, 60 insertions(+), 45 deletions(-) + create mode 100644 fs/smb/common/smb1pdu.h +Merging configfs/configfs-next (f7f78098690d configfs: Constify ct_item_ops in struct config_item_type) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) +$ git merge -m Merge branch 'next' of https://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 +Auto-merging fs/ecryptfs/keystore.c +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 (8e4021078863 dlm: check for undefined release_option values) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (0bdbf89a8bbe erofs: switch on-disk header `erofs_fs.h` to MIT license) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (f5a5c9b40490 fs: exfat: improve error code handling in exfat_find_empty_entry()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/namei.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging ext3/for_next (6f7c877cc397 fs: send fsnotify_xattr()/IN_ATTRIB from vfs_fileattr_set()/chattr(1)) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/file_attr.c +Auto-merging fs/notify/fsnotify.c +Merge made by the 'ort' strategy. + fs/file_attr.c | 2 ++ + fs/notify/fsnotify.c | 9 ++++++++- + 2 files changed, 10 insertions(+), 1 deletion(-) +Merging ext4/dev (6fb67ac89690 ext4: drop the TODO comment in ext4_es_insert_extent()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Merge made by the 'ort' strategy. + fs/ext4/extents.c | 137 +++++++++++++++++++++++++++++------------------ + fs/ext4/extents_status.c | 124 ++++++++++++++++++++++++++++++++---------- + fs/ext4/inode.c | 18 +++---- + 3 files changed, 188 insertions(+), 91 deletions(-) +Merging f2fs/dev (cb015814f8b6 Merge tag 'f2fs-for-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (8da059f2a497 fuse: Uninitialized variable in fuse_epoch_work()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (02e96fafcb36 gfs2: Fix slab-use-after-free in qd_put) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/glock.c | 85 ++++++++++++++++++++++++++-------------------------- + fs/gfs2/glock.h | 6 ++-- + fs/gfs2/glops.c | 34 ++++++++++----------- + fs/gfs2/incore.h | 16 ++++++++-- + fs/gfs2/lock_dlm.c | 28 ++++++++--------- + fs/gfs2/log.c | 7 +++-- + fs/gfs2/lops.c | 70 +++++++++++++++++++++++-------------------- + fs/gfs2/lops.h | 4 +-- + fs/gfs2/meta_io.c | 6 ++-- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/quota.c | 5 ++-- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trace_gfs2.h | 48 ++++++++++++++--------------- + fs/gfs2/trans.c | 4 +-- + 14 files changed, 168 insertions(+), 149 deletions(-) +Merging jfs/jfs-next (eb0cfcf26571 jfs: Add missing set_freezable() for freezable kthread) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 6 ++++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging ksmbd/ksmbd-for-next (95d7a890e4b0 ksmbd: fix buffer validation by including null terminator size in EA length) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/common/smbdirect/smbdirect_socket.h | 12 ++ + fs/smb/server/mgmt/user_session.c | 4 +- + fs/smb/server/smb2pdu.c | 4 +- + fs/smb/server/smbacl.c | 3 - + fs/smb/server/transport_rdma.c | 175 ++++++++++++++++++++++++----- + fs/smb/server/vfs.c | 2 +- + 6 files changed, 164 insertions(+), 36 deletions(-) +Merging nfs/linux-next (bd3b04b46c7a NFSv4: Handle NFS4ERR_NOTSUPP errors for directory delegations) +$ 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 (b623390045a8 NFS: Fix LTP test failures when timestamps are delegated) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (11f6bce77e27 fs/orangefs: Replace kzalloc + copy_from_user with memdup_user_nul) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (ad1423922781 ovl: make sure that ovl_create_real() returns a hashed dentry) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (0695aef23d67 ubifs: vmalloc(array_size()) -> vmalloc_array()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (3e281113f871 9p: fix new mount API cache option handling) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (79c47bc68efb Merge branch 'xfs-6.19-merge' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_inode_item.c +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/xfs_attr_item.c | 27 ++-- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_buf_item.c | 19 +-- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_inode_item.c | 49 ++++--- + fs/xfs/xfs_log.c | 292 ++++++++++++++++------------------------- + fs/xfs/xfs_log.h | 65 ++------- + fs/xfs/xfs_log_cil.c | 111 ++++++++++++++-- + fs/xfs/xfs_log_priv.h | 20 +++ + fs/xfs/xfs_refcount_item.c | 10 +- + fs/xfs/xfs_rmap_item.c | 10 +- + fs/xfs/xfs_trans.h | 4 +- + 16 files changed, 313 insertions(+), 347 deletions(-) +Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (981be27a72d1 Merge branch 'vfs-7.0.atomic_open' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/filesystems/locking.rst | 8 - + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/porting.rst | 7 +- + Documentation/filesystems/vfs.rst | 58 +---- + arch/arm/configs/neponset_defconfig | 2 +- + fs/buffer.c | 6 +- + fs/char_dev.c | 2 +- + fs/exec.c | 2 +- + fs/ext4/mballoc.c | 3 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 2 +- + fs/fat/dir.c | 4 +- + fs/fat/file.c | 3 +- + fs/fs_context.c | 208 +--------------- + fs/fsopen.c | 10 - + fs/fuse/dev.c | 2 +- + fs/fuse/file.c | 8 +- + fs/init.c | 14 -- + fs/internal.h | 1 - + fs/locks.c | 14 +- + fs/namei.c | 80 ++++++- + fs/namespace.c | 102 +++++--- + fs/nfsd/nfs4proc.c | 11 +- + fs/open.c | 39 --- + fs/splice.c | 2 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 5 +- + include/linux/fs/super_types.h | 1 - + include/linux/init_syscalls.h | 1 - + include/linux/initrd.h | 2 - + include/linux/ns/ns_common_types.h | 4 +- + include/uapi/linux/mount.h | 10 +- + include/uapi/linux/sysctl.h | 1 - + init/do_mounts.c | 11 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +-------- + init/do_mounts_rd.c | 24 +- + kernel/pid.c | 131 +++++++---- + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + .../selftests/filesystems/statmount/statmount.h | 15 +- + .../filesystems/statmount/statmount_test.c | 261 +++++++++++++++++++-- + .../filesystems/statmount/statmount_test_ns.c | 101 +++++++- + 46 files changed, 685 insertions(+), 650 deletions(-) +Merging vfs/for-next (eb028c33451a d_make_discardable(): warn if given a non-persistent dentry) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (eced7b86cd6b kasan-unpoison-vms-addresses-with-a-common-tag-v4) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + .mailmap | 3 ++- + MAINTAINERS | 1 + + arch/x86/kernel/setup.c | 14 ++++++++++++++ + include/linux/genalloc.h | 1 + + include/linux/kasan.h | 16 ++++++++++++++++ + lib/idr.c | 2 ++ + mm/kasan/common.c | 32 ++++++++++++++++++++++++++++++++ + mm/kasan/hw_tags.c | 2 +- + mm/kasan/shadow.c | 4 +++- + mm/page_alloc.c | 10 +++++++++- + mm/vmalloc.c | 8 ++++---- + tools/testing/radix-tree/idr-test.c | 21 +++++++++++++++++++++ + 12 files changed, 106 insertions(+), 8 deletions(-) +Merging fs-current (694189b7e131 Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 1 + + drivers/media/mc/mc-request.c | 6 +- + fs/btrfs/file.c | 3 +- + fs/btrfs/inode.c | 1 + + fs/btrfs/qgroup.c | 27 ++------ + fs/btrfs/tests/qgroup-tests.c | 1 - + fs/btrfs/tree-log.c | 46 ++++++++++--- + fs/btrfs/volumes.c | 1 + + fs/iomap/buffered-io.c | 50 +++++++++----- + fs/iomap/iter.c | 6 +- + fs/libfs.c | 50 ++++++-------- + fs/locks.c | 119 +++++++++++++++++----------------- + fs/nfsd/export.c | 2 +- + fs/nfsd/nfs4layouts.c | 23 ++++++- + fs/nfsd/nfs4state.c | 19 ++++++ + fs/xfs/xfs_iomap.c | 11 ++-- + include/linux/filelock.h | 1 + + include/linux/fs.h | 2 +- + include/linux/iomap.h | 8 ++- + mm/shmem.c | 38 +++++------ + net/sunrpc/auth_gss/svcauth_gss.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 7 +- + 22 files changed, 249 insertions(+), 176 deletions(-) +Merging kbuild-current/kbuild-fixes (4ab2ee307983 kbuild: install-extmod-build: Properly fix CC expansion when ccache is used) +$ git merge -m Merge branch 'kbuild-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes +Already up to date. +Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (fd2dee1c6e22 ARM: fix branch predictor hardening) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (98a97bf41528 arm64/gcs: Flush the GCS locking state on exec) +$ git merge -m Merge branch 'for-next/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'ort' strategy. + arch/arm64/kernel/fpsimd.c | 130 +++++--------------------------- + arch/arm64/kernel/process.c | 1 + + arch/arm64/mm/mmu.c | 33 ++++---- + drivers/misc/lkdtm/bugs.c | 53 +++++++++++++ + tools/testing/selftests/lkdtm/tests.txt | 2 + + 5 files changed, 92 insertions(+), 127 deletions(-) +Merging arm-soc-fixes/arm/fixes (ececfba255bf ARM: dts: ixp4xx: Fix up Actiontec MI424WR DTS files) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + .../boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts | 11 +++++++++++ + .../boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts | 11 +++++++++++ + .../boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi | 1 - + 3 files changed, 22 insertions(+), 1 deletion(-) +Merging davinci-current/davinci/for-current (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (aaf4e92341b0 m68k: defconfig: Update defconfigs for v6.18-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (0843ba458439 powerpc/fadump: skip parameter area allocation when fadump is disabled) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (489e96651dfe s390/stacktrace: Do not fallback to RA register) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + .clang-format | 1 + + arch/s390/include/uapi/asm/ipl.h | 1 + + arch/s390/kernel/ipl.c | 48 +++++++++++++++----- + arch/s390/kernel/stacktrace.c | 18 +------- + arch/s390/pci/pci.c | 7 ++- + arch/s390/pci/pci_bus.c | 98 +++++++++++++++++++++++++++++----------- + arch/s390/pci/pci_bus.h | 15 +++++- + 7 files changed, 131 insertions(+), 57 deletions(-) +Merging net/main (885bebac9909 nfc: pn533: Fix error code in pn533_acr122_poweron_rdr()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging tools/testing/selftests/net/tls.c +Merge made by the 'ort' strategy. + drivers/net/can/Kconfig | 5 +- + drivers/net/can/Makefile | 2 +- + drivers/net/can/dev/Makefile | 5 +- + drivers/net/can/usb/gs_usb.c | 2 +- + drivers/net/dsa/lantiq/mxl-gsw1xx.c | 8 ++- + drivers/net/ethernet/broadcom/b44.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 3 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/google/gve/gve_main.c | 17 +++-- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 1 + + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 11 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 2 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 27 ++++---- + drivers/net/ethernet/realtek/r8169_main.c | 5 +- + drivers/net/ethernet/ti/Kconfig | 3 +- + drivers/net/ipvlan/ipvlan_core.c | 3 + + drivers/net/phy/marvell-88q2xxx.c | 2 +- + drivers/net/phy/realtek/realtek_main.c | 4 -- + drivers/net/phy/sfp.c | 2 + + drivers/nfc/pn533/usb.c | 2 +- + include/net/inet_frag.h | 18 +---- + include/net/ipv6_frag.h | 9 ++- + include/uapi/linux/energy_model.h | 1 + + include/uapi/linux/mptcp.h | 1 + + kernel/power/em_netlink_autogen.c | 1 + + kernel/power/em_netlink_autogen.h | 1 + + net/caif/cffrml.c | 9 ++- + net/can/Kconfig | 1 - + net/handshake/request.c | 2 + + net/hsr/hsr_forward.c | 2 + + net/ipv4/inet_fragment.c | 55 +++++++++++++-- + net/ipv4/ip_fragment.c | 22 +++--- + net/mptcp/Kconfig | 2 +- + net/mptcp/pm_netlink.c | 3 +- + net/mptcp/protocol.c | 22 +++--- + net/netfilter/ipvs/ip_vs_xmit.c | 3 + + net/netfilter/nf_conncount.c | 25 ++++--- + net/netfilter/nf_conntrack_core.c | 3 + + net/netfilter/nf_flow_table_path.c | 4 +- + net/netrom/nr_out.c | 4 +- + net/openvswitch/flow_netlink.c | 13 +++- + net/sched/sch_ets.c | 6 +- + net/unix/garbage.c | 2 +- + tools/net/ynl/Makefile.deps | 2 + + tools/testing/selftests/net/af_unix/Makefile | 7 +- + tools/testing/selftests/net/forwarding/config | 1 + + .../net/forwarding/vxlan_bridge_1q_mc_ul.sh | 76 +++++++++------------ + tools/testing/selftests/net/lib.sh | 3 +- + tools/testing/selftests/net/lib/ksft.h | 6 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 4 ++ + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 11 +++ + .../selftests/net/netfilter/conntrack_clash.sh | 9 ++- + tools/testing/selftests/net/tfo.c | 3 +- + tools/testing/selftests/net/tls.c | 2 +- + .../tc-testing/tc-tests/infra/qdiscs.json | 78 ++++++++++++++++++++++ + 56 files changed, 358 insertions(+), 168 deletions(-) +Merging bpf/master (ba34388912b5 bpf: Disable false positive -Wsuggest-attribute=format warning) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Auto-merging kernel/trace/Makefile +Merge made by the 'ort' strategy. + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/x86/kernel/unwind_orc.c | 39 +++++++--- + arch/x86/net/bpf_jit_comp.c | 12 +++ + include/linux/bpf.h | 3 + + kernel/bpf/Makefile | 4 + + kernel/bpf/core.c | 16 ++++ + kernel/bpf/dmabuf_iter.c | 56 +++++++++++-- + kernel/trace/Makefile | 3 + + kernel/trace/bpf_trace.c | 2 +- + net/smc/Kconfig | 4 +- + tools/bpf/bpftool/Makefile | 2 + + tools/lib/bpf/libbpf.c | 7 +- + tools/testing/selftests/bpf/Makefile | 2 + + tools/testing/selftests/bpf/prog_tests/d_path.c | 91 +++++++++++++++++----- + .../testing/selftests/bpf/prog_tests/dmabuf_iter.c | 47 +++++++++-- + tools/testing/selftests/bpf/progs/test_d_path.c | 23 ++++++ + 16 files changed, 264 insertions(+), 49 deletions(-) +Merging ipsec/master (3d5221af9c77 xfrm: Fix inner mode lookup in tunnel mode GSO segmentation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv4/esp4_offload.c | 4 ++-- + net/ipv6/esp6_offload.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging netfilter/main (885bebac9909 nfc: pn533: Fix error code in pn533_acr122_poweron_rdr()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (de0337d641bf net: ionic: map SKB after pseudo-header checksum prep) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (0ff8eeafba5c Merge tag 'rtw-2025-11-20' of https://github.com/pkshih/rtw) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (d0309c054362 Merge tag 'net-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (8943c0146834 wifi: iwlwifi: Implement settime64 as stub for MVM/MLD PTP) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 7 +++++++ + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 7 +++++++ + 2 files changed, 14 insertions(+) +Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (5032347c04ba ALSA: pcmcia: Fix resource leak in snd_pdacf_probe error path) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/hda/codecs/realtek/alc269.c | 1 + + sound/hda/controllers/cix-ipbloq.c | 4 +--- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 8 +++++++- + sound/pcmcia/vx/vxpocket.c | 8 +++++++- + sound/usb/endpoint.c | 8 ++++---- + sound/usb/format.c | 5 ++++- + sound/usb/quirks.c | 14 ++++++++++++-- + 7 files changed, 36 insertions(+), 12 deletions(-) +Merging sound-asoc-fixes/for-linus (cb0ae6f22790 ASoC: sdw_utils: subtract the endpoint that is not present) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ + sound/soc/fsl/fsl_sai.c | 10 ++++++++-- + sound/soc/qcom/sdm845.c | 2 ++ + sound/soc/sdw_utils/soc_sdw_utils.c | 8 ++++++-- + sound/soc/tegra/tegra210_ahub.c | 6 +++--- + 5 files changed, 26 insertions(+), 7 deletions(-) +Merging regmap-fixes/for-linus (5eb484d5b2ac Merge remote-tracking branch 'regmap/for-6.18' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (1417927df804 spi: fsl-cpm: Check length parity before switching to 16 bit mode) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-mpfs.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (94bf74830a97 PCI: rzg3s-host: Initialize MSI status bitmap before use) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (523bf0a59e67 USB: serial: option: add support for Rolling RW101R-GL) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (74f97a468356 iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/at91-sama5d2_adc.c | 1 + + 1 file changed, 1 insertion(+) +Merging counter-current/counter-current (109ff654934a counter: microchip-tcb-capture: Allow shared IRQ for multi-channel TCBs) +$ git merge -m Merge branch 'counter-current' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (e58c88f0cb2d Input: lkkbd - disable pending work before freeing device) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/keyboard/lkkbd.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging crypto-current/master (48bc9da3c97c crypto: zstd - fix double-free in per-CPU stream cleanup) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging libcrypto-fixes/libcrypto-fixes (5a0b18825068 lib/crypto: riscv: Add poly1305-core.S to .gitignore) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + arch/arm64/include/asm/simd.h | 9 ++++++++- + lib/crypto/riscv/.gitignore | 2 ++ + 2 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 lib/crypto/riscv/.gitignore +Merging vfio-fixes/for-linus (d323ad739666 vfio: selftests: replace iova=vaddr with allocated iovas) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (430f7803b69c dmaengine: ti: k3-udma: fix device leak on udma lookup) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/at_hdmac.c | 9 +++++++-- + drivers/dma/bcm-sba-raid.c | 6 +++++- + drivers/dma/cv1800b-dmamux.c | 17 ++++++++++------- + drivers/dma/dw/rzn1-dmamux.c | 4 +++- + drivers/dma/idxd/compat.c | 23 +++++++++++++++++++---- + drivers/dma/lpc18xx-dmamux.c | 19 ++++++++++++++----- + drivers/dma/lpc32xx-dmamux.c | 19 ++++++++++++++----- + drivers/dma/mmp_pdma.c | 20 ++++++++------------ + drivers/dma/sh/rz-dmac.c | 13 +++++++++++-- + drivers/dma/stm32/stm32-dmamux.c | 31 +++++++++++++++++++------------ + drivers/dma/ti/dma-crossbar.c | 35 ++++++++++++++++++++--------------- + drivers/dma/ti/k3-udma-private.c | 2 +- + drivers/dma/xilinx/xdma-regs.h | 1 + + drivers/dma/xilinx/xdma.c | 2 +- + 14 files changed, 133 insertions(+), 68 deletions(-) +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (97315e7c901a mtd: onenand: Pass correct pointer to IRQ handler) +$ git merge -m Merge branch 'mtd/fixes' of https://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 (aa6e63373d91 mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Merge made by the 'ort' strategy. + drivers/mfd/ls2k-bmc-core.c | 38 ++++++++++---------------------------- + 1 file changed, 10 insertions(+), 28 deletions(-) +Merging v4l-dvb-fixes/fixes (27afd6e066cf media: videobuf2: forbid remove_bufs when legacy fileio is active) +$ 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 (997c06330fd5 reset: imx8mp-audiomix: Fix bad mask values) +$ 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 (680ad315caaa MIPS: Fix a reference leak bug in ip22_check_gio()) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/alchemy/common/setup.c | 3 +-- + arch/mips/sgi-ip22/ip22-gio.c | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging at91-fixes/at91-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (32bd348be3fa KVM: Fix last_boosted_vcpu index assignment bug) +$ 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 (5f9df945d4e8 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (82f2aab35a1a hwmon: (tmp401) fix overflow caused by default conversion rate value) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/dell-smm-hwmon.c | 9 +++++++++ + drivers/hwmon/ibmpex.c | 9 +++++++-- + drivers/hwmon/tmp401.c | 2 +- + 3 files changed, 17 insertions(+), 3 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (214291cbaace acpi/hmat: Fix lockdep warning for hmem_register_resource()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (3a058541627a cpufreq: dt-platdev: Fix creating device on OPPv1 platforms) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/sprd,sc9860-clk.yaml | 26 ---------------------- + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +-- + .../bindings/display/ti/ti,j721e-dss.yaml | 3 +-- + drivers/cpufreq/cpufreq-dt-platdev.c | 7 +++--- + drivers/of/fdt.c | 2 +- + 5 files changed, 7 insertions(+), 34 deletions(-) +Merging dt-krzk-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (90449f2d1e1f scsi: sg: Do not sleep in atomic context) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ed724ea1b82a dt-bindings: mmc: sdhci-of-aspeed: Switch ref to sdhci-common.yaml) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (162f24cbb0f6 rtc: rx8025: fix incorrect register reference) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (8f9cee9fb521 mshv: Move function prototypes to the generic header) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + arch/x86/include/asm/mshyperv.h | 2 -- + drivers/hv/mshv_regions.c | 16 ++++++++-------- + include/asm-generic/mshyperv.h | 2 ++ + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging risc-v-fixes/fixes (e2285bd4a467 riscv: fix KUnit test_kprobes crash when building with Clang) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S | 29 ++++++++++++++++++++++ + 1 file changed, 29 insertions(+) +Merging riscv-dt-fixes/riscv-dt-fixes (5ef13c363640 riscv: dts: microchip: remove BeagleV Fire fabric.dtsi) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Auto-merging arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts +Merge made by the 'ort' strategy. + .../dts/microchip/mpfs-beaglev-fire-fabric.dtsi | 82 ---------------------- + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 5 -- + 2 files changed, 87 deletions(-) + delete mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi +Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (c33b68801fbe kunit: make FAULT_TEST default to n when PANIC_ON_OOPS) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Merge made by the 'ort' strategy. + lib/kunit/Kconfig | 2 +- + lib/kunit/device.c | 7 +++---- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging memblock-fixes/fixes (c42af83c59b6 memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (2eeb09fe1c51 libperf: Use 'extern' in LIBPERF_API visibility macro) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (e5f0a698b34e Linux 6.17) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (b07bf253ef8e iommufd/iommufd_private.h: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (559e608c4655 Merge tag 'ntfs3_for_6.19' of https://github.com/Paragon-Software-Group/linux-ntfs3) +$ 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 (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (c98c99d5dbdf pmdomain: tegra: Add GENPD_FLAG_NO_STAY_ON flag) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (3c493b524ffd Merge tag 'sunxi-clk-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1a fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (b042fdf18e89 tracing: Fix WARN_ON in tracing_buffers_mmap_close for split VMAs) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (2c22361ab628 MAINTAINERS: Add tracepoint-update.c to TRACING section) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (3a8660878839 Linux 6.18-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 (c3e82c80487b Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + Documentation/arch/x86/boot.rst | 192 ++++++++++++++++++++-------------------- + arch/x86/include/asm/uv/bios.h | 2 +- + arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + include/linux/mm_types.h | 1 - + include/trace/events/tlb.h | 5 +- + kernel/irq/manage.c | 2 +- + 7 files changed, 104 insertions(+), 104 deletions(-) +Merging slab-fixes/slab/for-next-fixes (53ca00a19d34 mm/slub: reset KASAN tag in defer_free() before accessing freed memory) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging drm-msm-fixes/msm-fixes (f5d079564c44 drm/msm/dpu: Fix adjusted mode clock check for 3d merge) +$ 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 (df447a3b4a4b um: Fix FD copy size in os_rcv_fd_msg()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/drm-rust-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://github.com/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (7bbf6d15e935 accel/amdxdna: Block running under a hypervisor) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/aie2_pci.c | 6 + + drivers/gpu/drm/drm_gem.c | 8 +- + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 2 + + drivers/gpu/drm/tests/drm_atomic_state_test.c | 40 +++++- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 143 +++++++++++++++++++++ + 5 files changed, 192 insertions(+), 7 deletions(-) +Merging rust/rust-next (559e608c4655 Merge tag 'ntfs3_for_6.19' of https://github.com/Paragon-Software-Group/linux-ntfs3) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging rust-alloc/alloc-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (42415d163e5d rust: pin-init: add references to previously initialized fields) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (4521438fb076 rust: time: Implement basic arithmetic operations for Delta) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging mm-stable/mm-stable (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (042ff77fdd18 mm: fixup pfnmap memory failure handling to use pgoff) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Merge made by the 'ort' strategy. + include/linux/memory-failure.h | 2 ++ + mm/damon/vaddr.c | 2 +- + mm/memory-failure.c | 29 ++++++++++++++++++----------- + 3 files changed, 21 insertions(+), 12 deletions(-) +Merging mm-nonmm-unstable/mm-nonmm-unstable (735be8c5b5ba .mailmap: remove one of the entries for WangYuli) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Merge made by the 'ort' strategy. + .mailmap | 1 - + Documentation/core-api/liveupdate.rst | 11 + + MAINTAINERS | 1 + + include/linux/kho/abi/luo.h | 81 +++++ + include/linux/liveupdate.h | 143 ++++++++ + kernel/liveupdate/Makefile | 1 + + kernel/liveupdate/luo_core.c | 7 +- + kernel/liveupdate/luo_file.c | 32 +- + kernel/liveupdate/luo_flb.c | 656 ++++++++++++++++++++++++++++++++++ + kernel/liveupdate/luo_internal.h | 15 + + kernel/watchdog.c | 16 +- + lib/Kconfig.debug | 23 ++ + lib/build_OID_registry | 26 +- + lib/tests/Makefile | 1 + + lib/tests/liveupdate.c | 158 ++++++++ + 15 files changed, 1152 insertions(+), 20 deletions(-) + create mode 100644 kernel/liveupdate/luo_flb.c + create mode 100644 lib/tests/liveupdate.c +Merging kbuild/kbuild-next (2a9c8c0b59d3 kbuild: add target to build a cpio containing modules) +$ git merge -m Merge branch 'kbuild-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-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 (cb015814f8b6 Merge tag 'f2fs-for-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Already up to date. +Merging compiler-attributes/compiler-attributes (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/dma-mapping-for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Already up to date. +Merging asm-generic/master (edcc8a38b5ac once: fix race by moving DO_ONCE to separate section) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (dd9143371a86 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Already up to date. +Merging arm64/for-next/core (edde060637b9 Merge branch 'for-next/set_memory' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (e6a27290d800 perf: arm_spe: Add support for filtering on data source) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e5b2299997d3 soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 177 +++++++++++++++++++++++++++++++++ + 1 file changed, 177 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (3b2ecf0c3cc3 Merge branch 'v6.19/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (5d21b7ca05c8 Merge branch 'apple-soc/drivers-6.19' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (fde90d654751 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (e0808393bf81 ARM: dts: aspeed: g6: Drop clocks property from arm,armv7-timer) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts | 7 +- + .../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 6 - + .../dts/aspeed/aspeed-bmc-facebook-clemente.dts | 43 +++- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 +- + .../aspeed/aspeed-bmc-facebook-santabarbara.dts | 29 ++- + .../boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts | 246 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 12 +- + 9 files changed, 320 insertions(+), 33 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts +Merging broadcom/next (37c3a91e9730 arm64: dts: broadcom: bcm2712: Add watchdog DT node) +$ 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.dtsi | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) +Merging cix/for-next (4889f68b824d Merge remote-tracking branch 'cix/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging fsl/soc_fsl (c8dff80a3108 bus: fsl-mc: Convert to bus callbacks) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/bus/fsl-mc/fsl-mc-bus.c | 77 +++++++++++++++++------------------------ + 1 file changed, 32 insertions(+), 45 deletions(-) +Merging imx-mxs/for-next (89d95dbad2a3 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of https://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 (67ed5843a67b Merge branch 'v6.18-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (f0e6bc0c3ef4 clk: mvebu: cp110 add CLK_IGNORE_UNUSED to pcie_x10, pcie_x11 & pcie_x4) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Already up to date. +Merging omap/for-next (2c85858e7c68 Merge branch 'omap-for-v6.19/drivers' into tmp/omap-next-20251117.085514) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (82ed018b3df9 Merge branches 'arm32-fixes-for-6.19', 'arm64-defconfig-for-6.19', 'arm64-fixes-for-6.19', 'clk-for-6.19' and 'drivers-for-6.19' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging .mailmap +Auto-merging drivers/pmdomain/qcom/rpmhpd.c +Auto-merging include/dt-bindings/power/qcom,rpmhpd.h +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 13 ------ + .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 12 ------ + .../boot/dts/qcom/qcom-msm8974-samsung-hlte.dts | 12 ------ + .../dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 12 ------ + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 50 ++++++++++++++++++++-- + .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 8 ---- + arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts | 11 ----- + .../dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 9 ---- + .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 11 ++--- + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 12 ------ + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 +++++-- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 - + arch/arm64/boot/dts/qcom/sm8650.dtsi | 3 -- + arch/arm64/boot/dts/qcom/talos.dtsi | 4 +- + drivers/pmdomain/qcom/rpmhpd.c | 4 ++ + include/dt-bindings/power/qcom,rpmhpd.h | 1 + + 18 files changed, 73 insertions(+), 112 deletions(-) +Merging renesas/next (fec0b9c25cfb Merge branches 'renesas-arm-defconfig-for-v6.20' and 'renesas-dts-for-v6.20' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 6 + + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 65 ++++ + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 30 ++ + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 11 +- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 350 +++++++++++++++++++++ + .../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 28 ++ + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 60 ++++ + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 30 ++ + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 72 +++++ + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 3 + + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 72 +++++ + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 3 + + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 8 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 5 + + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 11 + + arch/arm64/configs/defconfig | 2 + + 16 files changed, 755 insertions(+), 1 deletion(-) +Merging reset/reset/next (a0d57f7504b6 reset: gpio: add the "compatible" property) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + drivers/reset/core.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging rockchip/for-next (4a4070c80fe6 Merge branch 'v6.20-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/rockchip/rk3288.dtsi | 17 +++++++++++- + arch/arm64/boot/dts/rockchip/Makefile | 5 ++++ + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 10 +++++-- + .../boot/dts/rockchip/rk3576-evb1-v10-pcie1.dtso | 31 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 23 ++++++++++++++++ + 5 files changed, 83 insertions(+), 3 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-pcie1.dtso +Merging samsung-krzk/for-next (ce39d255dea5 dt-bindings: samsung: exynos-pmu: Add compatible for ARTPEC-9 SoC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging scmi/for-linux-next (334c3c2d5f66 Merge branches 'for-next/juno/updates', 'for-next/ffa/updates' and 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/arm/morello-sdp.dts | 7 +++ + drivers/firmware/arm_ffa/driver.c | 15 +++-- + drivers/firmware/arm_scmi/perf.c | 2 +- + drivers/firmware/arm_scmi/pinctrl.c | 108 ++++++++++++++------------------ + drivers/firmware/arm_scmi/reset.c | 56 +++++++++++------ + drivers/firmware/arm_scmi/shmem.c | 5 +- + 6 files changed, 107 insertions(+), 86 deletions(-) +Merging sophgo/for-next (c7f013d4c8c0 Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (5a97a38c2279 riscv: dts: spacemit: define all missing I2C controller nodes) +$ 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 (a6961e2ced51 arm64: dts: st: set RIFSC as an access controller on stm32mp21x platforms) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (ef541cc2e208 Merge branch 'sunxi/fixes-for-6.18' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (eb4bb32c8117 Merge branch 'qcomtee_fixes_for_6.18' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (e016a50e00e6 Merge branch for-6.19/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging tenstorrent-dt/tenstorrent-dt-for-next (a71e6e8eea8a riscv: defconfig: Enable Tenstorrent SoCs) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://github.com/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (d8a174babf64 riscv: dts: thead: Add reset controllers of more subsystems for TH1520) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (35d822aa1faf Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso | 2 +- + .../ti/k3-am642-phyboard-electra-peb-c-010.dtso | 7 ++---- + ...m642-phyboard-electra-x27-gpio1-spi1-uart3.dtso | 8 +++--- + drivers/firmware/ti_sci.h | 29 ++++++++++++---------- + 4 files changed, 23 insertions(+), 23 deletions(-) +Merging xilinx/for-next (43da9849395e Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/watchdog/xlnx,versal-wwdt.yaml | 3 ++ + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 4 +-- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 25 ++++++------- + arch/arm64/configs/defconfig | 42 ++++++++++++++++++++++ + drivers/soc/xilinx/zynqmp_power.c | 6 ++-- + 6 files changed, 61 insertions(+), 21 deletions(-) +Merging clk/clk-next (6f172175b6f3 Merge branches 'clk-visconti', 'clk-imx', 'clk-microchip', 'clk-rockchip' and 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (fdc1dc7dd53b clk: imx: add driver for imx8ulp's sim lpav) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (d8921e42a198 clk: renesas: r9a09g056: Add entries for the RSPIs) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r9a09g056-cpg.c | 46 +++++ + drivers/clk/renesas/r9a09g077-cpg.c | 195 ++++++++++++++++++++- + drivers/clk/renesas/rzg2l-cpg.c | 6 +- + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 2 + + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 2 + + 5 files changed, 244 insertions(+), 7 deletions(-) +Merging thead-clk/thead-clk-for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging csky/linux-next (817d21578d51 csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (be77cf43d2fd LoongArch: Adjust default config files for 32BIT/64BIT) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (aaf4e92341b0 m68k: defconfig: Update defconfigs for v6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (8c30b0018f9d openrisc: Add jump label support) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (9b36c7fc5aa5 macintosh/via-pmu-backlight: Include <linux/fb.h> and <linux/of.h>) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (7e40c6791cc8 kselftest/riscv: add kselftest for user mode cfi) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/riscv/extensions.yaml +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/include/asm/hwcap.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/cpufeature.c +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging tools/testing/selftests/riscv/hwprobe/which-cpus.c +Resolved 'arch/riscv/include/asm/hwcap.h' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ca6ca8f52f60] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/arch/riscv/hwprobe.rst | 12 + + Documentation/arch/riscv/index.rst | 2 + + Documentation/arch/riscv/zicfilp.rst | 122 +++++ + Documentation/arch/riscv/zicfiss.rst | 194 ++++++++ + .../devicetree/bindings/riscv/extensions.yaml | 50 ++ + arch/riscv/Kconfig | 22 + + arch/riscv/Makefile | 8 +- + arch/riscv/configs/hardening.config | 4 + + arch/riscv/include/asm/asm-prototypes.h | 1 + + arch/riscv/include/asm/assembler.h | 44 ++ + arch/riscv/include/asm/atomic.h | 8 +- + arch/riscv/include/asm/cpufeature.h | 12 + + arch/riscv/include/asm/csr.h | 14 + + arch/riscv/include/asm/entry-common.h | 2 + + arch/riscv/include/asm/hwcap.h | 4 + + arch/riscv/include/asm/hwprobe.h | 3 +- + arch/riscv/include/asm/mman.h | 26 + + arch/riscv/include/asm/mmu_context.h | 7 + + arch/riscv/include/asm/pgtable.h | 46 +- + arch/riscv/include/asm/processor.h | 1 + + arch/riscv/include/asm/sbi.h | 29 ++ + arch/riscv/include/asm/thread_info.h | 3 + + arch/riscv/include/asm/usercfi.h | 97 ++++ + arch/riscv/include/asm/vdso.h | 13 +- + arch/riscv/include/asm/vector.h | 3 + + arch/riscv/include/uapi/asm/hwprobe.h | 7 + + arch/riscv/include/uapi/asm/ptrace.h | 34 ++ + arch/riscv/include/uapi/asm/sigcontext.h | 1 + + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 10 + + arch/riscv/kernel/cpufeature.c | 49 ++ + arch/riscv/kernel/entry.S | 38 ++ + arch/riscv/kernel/head.S | 27 + + arch/riscv/kernel/process.c | 27 +- + arch/riscv/kernel/ptrace.c | 95 ++++ + arch/riscv/kernel/signal.c | 148 +++++- + arch/riscv/kernel/sys_hwprobe.c | 168 ++++--- + arch/riscv/kernel/sys_riscv.c | 10 + + arch/riscv/kernel/traps.c | 54 ++ + arch/riscv/kernel/usercfi.c | 544 +++++++++++++++++++++ + arch/riscv/kernel/vdso.c | 7 + + arch/riscv/kernel/vdso/Makefile | 40 +- + arch/riscv/kernel/vdso/flush_icache.S | 4 + + arch/riscv/kernel/vdso/gen_vdso_offsets.sh | 4 +- + arch/riscv/kernel/vdso/getcpu.S | 4 + + arch/riscv/kernel/vdso/note.S | 3 + + arch/riscv/kernel/vdso/rt_sigreturn.S | 4 + + arch/riscv/kernel/vdso/sys_hwprobe.S | 4 + + arch/riscv/kernel/vdso/vgetrandom-chacha.S | 5 +- + arch/riscv/kernel/vdso_cfi/Makefile | 25 + + arch/riscv/kernel/vdso_cfi/vdso-cfi.S | 11 + + arch/riscv/mm/init.c | 2 +- + arch/riscv/mm/pgtable.c | 16 + + include/linux/cpu.h | 4 + + include/linux/mm.h | 5 + + include/uapi/linux/elf.h | 2 + + include/uapi/linux/prctl.h | 27 + + kernel/sys.c | 30 ++ + tools/testing/selftests/riscv/Makefile | 2 +- + tools/testing/selftests/riscv/cfi/.gitignore | 2 + + tools/testing/selftests/riscv/cfi/Makefile | 23 + + tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 82 ++++ + tools/testing/selftests/riscv/cfi/cfitests.c | 173 +++++++ + tools/testing/selftests/riscv/cfi/shadowstack.c | 385 +++++++++++++++ + tools/testing/selftests/riscv/cfi/shadowstack.h | 27 + + tools/testing/selftests/riscv/hwprobe/which-cpus.c | 18 +- + 67 files changed, 2738 insertions(+), 120 deletions(-) + create mode 100644 Documentation/arch/riscv/zicfilp.rst + create mode 100644 Documentation/arch/riscv/zicfiss.rst + create mode 100644 arch/riscv/configs/hardening.config + create mode 100644 arch/riscv/include/asm/mman.h + create mode 100644 arch/riscv/include/asm/usercfi.h + create mode 100644 arch/riscv/kernel/usercfi.c + create mode 100644 arch/riscv/kernel/vdso_cfi/Makefile + create mode 100644 arch/riscv/kernel/vdso_cfi/vdso-cfi.S + create mode 100644 tools/testing/selftests/riscv/cfi/.gitignore + create mode 100644 tools/testing/selftests/riscv/cfi/Makefile + create mode 100644 tools/testing/selftests/riscv/cfi/cfi_rv_test.h + create mode 100644 tools/testing/selftests/riscv/cfi/cfitests.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.h +Merging riscv-dt/riscv-dt-for-next (a4aad736716d riscv: dts: microchip: convert clock and reset to use syscon) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 34 +++++++++++++++++++++++---------- + 1 file changed, 24 insertions(+), 10 deletions(-) +Merging riscv-soc/riscv-soc-for-next (719362b8a972 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging s390/for-next (46034da07381 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (8f5ae30d69d7 Linux 6.17-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (fe0126702a40 sparc: Replace deprecated strcpy() with strscpy() in handle_nextprop_quirks()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (a3209bb94b36 um: Disable KASAN_INLINE when STATIC_LINK is selected) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (0d4b3ca115b5 xtensa: align: validate access in fast_load_store) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/kernel/align.S | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fs-next (e9e86ea52163 Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/filesystems/locking.rst | 8 - + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/porting.rst | 7 +- + Documentation/filesystems/vfs.rst | 58 +--- + arch/arm/configs/neponset_defconfig | 2 +- + fs/btrfs/Kconfig | 9 +- + fs/btrfs/bio.c | 19 +- + fs/btrfs/bio.h | 16 +- + fs/btrfs/block-group.c | 11 +- + fs/btrfs/compression.c | 1 - + fs/btrfs/ctree.c | 49 ++-- + fs/btrfs/ctree.h | 9 + + fs/btrfs/defrag.c | 5 +- + fs/btrfs/delayed-inode.c | 36 +-- + fs/btrfs/direct-io.c | 29 +- + fs/btrfs/disk-io.c | 81 ++---- + fs/btrfs/extent-io-tree.c | 7 +- + fs/btrfs/extent-tree.c | 33 +-- + fs/btrfs/extent_io.c | 78 ++++-- + fs/btrfs/file-item.c | 4 - + fs/btrfs/file.c | 9 +- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/fs.c | 102 +++++-- + fs/btrfs/fs.h | 23 +- + fs/btrfs/inode-item.c | 7 +- + fs/btrfs/inode.c | 63 +++-- + fs/btrfs/messages.c | 26 +- + fs/btrfs/messages.h | 76 +++--- + fs/btrfs/qgroup.c | 124 +++++++-- + fs/btrfs/relocation.c | 5 +- + fs/btrfs/scrub.c | 39 ++- + fs/btrfs/super.c | 4 - + fs/btrfs/sysfs.c | 6 +- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/tree-log.c | 6 +- + fs/btrfs/volumes.c | 9 +- + fs/buffer.c | 6 +- + fs/char_dev.c | 2 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/exec.c | 2 +- + fs/exfat/namei.c | 4 +- + fs/ext4/extents.c | 137 ++++++---- + fs/ext4/extents_status.c | 124 +++++++-- + fs/ext4/inode.c | 18 +- + fs/ext4/mballoc.c | 3 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 2 +- + fs/fat/dir.c | 4 +- + fs/fat/file.c | 3 +- + fs/file_attr.c | 2 + + fs/fs_context.c | 208 +-------------- + fs/fsopen.c | 10 - + fs/fuse/dev.c | 2 +- + fs/fuse/file.c | 8 +- + fs/gfs2/glock.c | 85 +++--- + fs/gfs2/glock.h | 6 +- + fs/gfs2/glops.c | 34 +-- + fs/gfs2/incore.h | 16 +- + fs/gfs2/lock_dlm.c | 28 +- + fs/gfs2/log.c | 7 +- + fs/gfs2/lops.c | 70 ++--- + fs/gfs2/lops.h | 4 +- + fs/gfs2/meta_io.c | 6 +- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/quota.c | 5 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trace_gfs2.h | 48 ++-- + fs/gfs2/trans.c | 4 +- + fs/init.c | 14 - + fs/internal.h | 1 - + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 6 +- + fs/locks.c | 14 +- + fs/namei.c | 80 +++++- + fs/namespace.c | 102 ++++--- + fs/nfsd/nfs4proc.c | 11 +- + fs/notify/fsnotify.c | 9 +- + fs/open.c | 39 --- + fs/smb/client/cifsfs.h | 4 +- + fs/smb/client/cifspdu.h | 2 +- + fs/smb/common/smb1pdu.h | 56 ++++ + fs/smb/common/smb2pdu.h | 40 --- + fs/smb/common/smbdirect/smbdirect_socket.h | 12 + + fs/smb/common/smbglob.h | 2 - + fs/smb/server/mgmt/user_session.c | 4 +- + fs/smb/server/smb2pdu.c | 4 +- + fs/smb/server/smb_common.h | 1 + + fs/smb/server/smbacl.c | 3 - + fs/smb/server/transport_rdma.c | 175 ++++++++++-- + fs/smb/server/vfs.c | 2 +- + fs/splice.c | 2 +- + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/xfs_attr_item.c | 27 +- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_buf_item.c | 19 +- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_inode_item.c | 49 ++-- + fs/xfs/xfs_log.c | 292 ++++++++------------- + fs/xfs/xfs_log.h | 65 +---- + fs/xfs/xfs_log_cil.c | 111 +++++++- + fs/xfs/xfs_log_priv.h | 20 ++ + fs/xfs/xfs_refcount_item.c | 10 +- + fs/xfs/xfs_rmap_item.c | 10 +- + fs/xfs/xfs_trans.h | 4 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 5 +- + include/linux/fs/super_types.h | 1 - + include/linux/init_syscalls.h | 1 - + include/linux/initrd.h | 2 - + include/linux/ns/ns_common_types.h | 4 +- + include/trace/events/btrfs.h | 3 +- + include/uapi/linux/mount.h | 10 +- + include/uapi/linux/sysctl.h | 1 - + init/do_mounts.c | 11 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +------- + init/do_mounts_rd.c | 24 +- + kernel/pid.c | 131 +++++---- + net/ceph/messenger_v2.c | 2 + + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + .../selftests/filesystems/statmount/statmount.h | 15 +- + .../filesystems/statmount/statmount_test.c | 261 ++++++++++++++++-- + .../filesystems/statmount/statmount_test_ns.c | 101 ++++++- + 132 files changed, 2096 insertions(+), 1735 deletions(-) + create mode 100644 fs/smb/common/smb1pdu.h +Merging printk/for-next (34793812e592 Merge branch 'rework/atomic-flush-softlockup' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + kernel/printk/nbcon.c | 45 +++++++++++++++++++++++---------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) +Merging pci/next (43dfc13ca972 Merge tag 'pci-v6.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (b69255357368 pstore/ram: Update module parameters from platform data) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (1c772200c9dc Merge branch 'for-6.18/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (d202341d9b0c i2c: qcom-cci: Add msm8953 compatible) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merging i2c-host/i2c/i2c-host (172368d01390 dt-bindings: i2c: qcom-cci: Document SM8750 compatible) +$ git merge -m Merge branch 'i2c/i2c-host' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 2 ++ + .../bindings/i2c/snps,designware-i2c.yaml | 7 ++++++ + Documentation/i2c/busses/i2c-i801.rst | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-bcm-iproc.c | 3 +-- + drivers/i2c/busses/i2c-designware-master.c | 27 ++++++++++++---------- + drivers/i2c/busses/i2c-designware-platdrv.c | 4 ++-- + drivers/i2c/busses/i2c-i801.c | 3 +++ + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + 10 files changed, 34 insertions(+), 18 deletions(-) +Merging i3c/i3c/next (136209e6bd98 i3c: adi: Fix confusing cleanup.h syntax) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (c6bb982894b5 hwmon: (sht3x) add support for SHT85) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Merge made by the 'ort' strategy. + Documentation/hwmon/asus_ec_sensors.rst | 2 ++ + Documentation/hwmon/sht3x.rst | 18 +++++++++++++----- + Documentation/hwmon/submitting-patches.rst | 5 ++++- + drivers/hwmon/Kconfig | 4 ++-- + drivers/hwmon/asus-ec-sensors.c | 12 ++++++++++++ + drivers/hwmon/sht3x.c | 1 + + 6 files changed, 34 insertions(+), 8 deletions(-) +Merging jc_docs/docs-next (464257baf992 docs: makefile: move rustdoc check to the build wrapper) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/next (f7231cff1f3f media: uapi: c3-isp: Fix documentation warning) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Already up to date. +Merging v4l-dvb-next/master (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (31aaa151cda5 Merge branch 'fixes' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + Documentation/power/runtime_pm.rst | 7 +++---- + drivers/acpi/acpi_pcc.c | 2 +- + drivers/acpi/cppc_acpi.c | 3 ++- + drivers/base/power/main.c | 7 ++++--- + drivers/powercap/powercap_sys.c | 22 ++++++++++++++-------- + .../int340x_thermal/processor_thermal_device_pci.c | 3 ++- + drivers/thermal/thermal_core.c | 4 ++-- + kernel/power/main.c | 2 +- + 8 files changed, 29 insertions(+), 21 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (f98c414030d2 dt-bindings: cpufreq: qcom-hw: document Milos CPUFREQ Hardware) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 ++ + rust/helpers/cpufreq.c | 3 ++- + rust/kernel/cpufreq.rs | 2 ++ + 3 files changed, 6 insertions(+), 1 deletion(-) +Merging cpupower/cpupower (ff72619e1134 tools/power cpupower: Show C0 in idle-info dump) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/lib/cpuidle.c | 7 +++---- + tools/power/cpupower/utils/cpufreq-info.c | 2 +- + tools/power/cpupower/utils/cpuidle-info.c | 2 +- + tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c | 2 +- + 4 files changed, 6 insertions(+), 7 deletions(-) +Merging devfreq/devfreq-next (d9600d57668c PM / devfreq: Fix typo in DFSO_DOWNDIFFERENTIAL macro name) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging pmdomain/next (1f67707fafa5 pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (33ffb0aa8ce8 rust: opp: simplify callers of `to_c_str_array`) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (c411d8bf0699 thermal/drivers/imx91: Add support for i.MX91 thermal monitoring unit) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (835a50753579 selftests/bpf: Add -fms-extensions to bpf build flags) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (5422318e27d7 net/mlx5: Expose definition for 1600Gbps link mode) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (c9dfb92de073 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (3a7cf69ce3cf Bluetooth: btusb: revert use of devm_kzalloc in btusb) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 12 +++++++++--- + drivers/bluetooth/hci_qca.c | 33 +++++++++++++++++++++++++++++++++ + include/net/bluetooth/hci_core.h | 2 ++ + net/bluetooth/hci_conn.c | 17 +++++++++++------ + net/bluetooth/hci_event.c | 30 +++++++++++++++++++++++++++--- + net/bluetooth/mgmt.c | 6 ++++++ + 6 files changed, 88 insertions(+), 12 deletions(-) +Merging wireless-next/for-next (8f7aa3d3c732 Merge tag 'net-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (631ee338f04d Merge branch 'ath12k-ng' into ath-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath12k/Makefile | 8 +- + drivers/net/wireless/ath/ath12k/ahb.c | 171 +- + drivers/net/wireless/ath/ath12k/ahb.h | 31 +- + drivers/net/wireless/ath/ath12k/ce.c | 326 +- + drivers/net/wireless/ath/ath12k/ce.h | 7 +- + drivers/net/wireless/ath/ath12k/cmn_defs.h | 20 + + drivers/net/wireless/ath/ath12k/core.c | 75 +- + drivers/net/wireless/ath/ath12k/core.h | 176 +- + drivers/net/wireless/ath/ath12k/dbring.c | 6 +- + drivers/net/wireless/ath/ath12k/debug.c | 8 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 8 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 4 +- + drivers/net/wireless/ath/ath12k/debugfs_sta.c | 62 +- + drivers/net/wireless/ath/ath12k/dp.c | 563 +--- + drivers/net/wireless/ath/ath12k/dp.h | 1752 ++-------- + drivers/net/wireless/ath/ath12k/dp_cmn.h | 106 + + drivers/net/wireless/ath/ath12k/dp_htt.c | 1353 ++++++++ + drivers/net/wireless/ath/ath12k/dp_htt.h | 1546 +++++++++ + drivers/net/wireless/ath/ath12k/dp_mon.c | 3517 +------------------- + drivers/net/wireless/ath/ath12k/dp_mon.h | 58 +- + drivers/net/wireless/ath/ath12k/dp_peer.c | 690 ++++ + drivers/net/wireless/ath/ath12k/dp_peer.h | 182 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 3482 ++----------------- + drivers/net/wireless/ath/ath12k/dp_rx.h | 191 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 1638 +-------- + drivers/net/wireless/ath/ath12k/dp_tx.h | 39 +- + drivers/net/wireless/ath/ath12k/hal.c | 2258 ++----------- + drivers/net/wireless/ath/ath12k/hal.h | 1475 ++++---- + drivers/net/wireless/ath/ath12k/htc.c | 3 +- + drivers/net/wireless/ath/ath12k/hw.c | 1680 ---------- + drivers/net/wireless/ath/ath12k/hw.h | 94 +- + drivers/net/wireless/ath/ath12k/mac.c | 1076 +++--- + drivers/net/wireless/ath/ath12k/mac.h | 139 +- + drivers/net/wireless/ath/ath12k/mhi.c | 132 +- + drivers/net/wireless/ath/ath12k/mhi.h | 5 +- + drivers/net/wireless/ath/ath12k/pci.c | 241 +- + drivers/net/wireless/ath/ath12k/pci.h | 42 +- + drivers/net/wireless/ath/ath12k/peer.c | 453 +-- + drivers/net/wireless/ath/ath12k/peer.h | 112 +- + drivers/net/wireless/ath/ath12k/testmode.c | 3 +- + drivers/net/wireless/ath/ath12k/wifi7/Makefile | 19 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.c | 75 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.h | 20 + + drivers/net/wireless/ath/ath12k/wifi7/ce.c | 973 ++++++ + drivers/net/wireless/ath/ath12k/wifi7/ce.h | 22 + + drivers/net/wireless/ath/ath12k/wifi7/core.c | 68 + + drivers/net/wireless/ath/ath12k/wifi7/core.h | 11 + + drivers/net/wireless/ath/ath12k/wifi7/dp.c | 181 + + drivers/net/wireless/ath/ath12k/wifi7/dp.h | 20 + + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 3385 +++++++++++++++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.h | 23 + + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 2202 ++++++++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h | 59 + + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c | 978 ++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.h | 16 + + drivers/net/wireless/ath/ath12k/wifi7/hal.c | 705 ++++ + drivers/net/wireless/ath/ath12k/wifi7/hal.h | 564 ++++ + .../net/wireless/ath/ath12k/{ => wifi7}/hal_desc.h | 298 +- + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.c | 1032 ++++++ + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.h | 45 + + .../net/wireless/ath/ath12k/{ => wifi7}/hal_rx.c | 221 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_rx.h | 422 +-- + .../ath/ath12k/{rx_desc.h => wifi7/hal_rx_desc.h} | 55 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_tx.c | 23 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_tx.h | 30 +- + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.c | 805 +++++ + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.h | 39 + + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 945 ++++++ + drivers/net/wireless/ath/ath12k/wifi7/hw.h | 13 + + drivers/net/wireless/ath/ath12k/wifi7/mhi.c | 138 + + drivers/net/wireless/ath/ath12k/wifi7/mhi.h | 11 + + drivers/net/wireless/ath/ath12k/wifi7/pci.c | 191 ++ + drivers/net/wireless/ath/ath12k/wifi7/pci.h | 12 + + drivers/net/wireless/ath/ath12k/wifi7/wmi.c | 105 + + drivers/net/wireless/ath/ath12k/wifi7/wmi.h | 15 + + drivers/net/wireless/ath/ath12k/wmi.c | 138 +- + drivers/net/wireless/ath/ath12k/wmi.h | 7 +- + drivers/net/wireless/ath/ath12k/wow.c | 5 +- + 78 files changed, 20196 insertions(+), 17407 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath12k/cmn_defs.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_cmn.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_htt.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_htt.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_peer.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_peer.h + delete mode 100644 drivers/net/wireless/ath/ath12k/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/Makefile + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ahb.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ahb.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ce.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ce.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/core.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/core.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_mon.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal.h + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_desc.h (91%) + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.h + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_rx.c (84%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_rx.h (75%) + rename drivers/net/wireless/ath/ath12k/{rx_desc.h => wifi7/hal_rx_desc.h} (97%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_tx.c (87%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_tx.h (88%) + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hw.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/mhi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/mhi.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/pci.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/pci.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/wmi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/wmi.h +Merging iwlwifi-next/next (85d002b2ac56 wifi: iwlwifi: mld: remove unused variable in d3.c) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 12 - + drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c | 12 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 158 +++++++++++- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 41 ++- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 95 ++++++- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mld/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 2 - + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 88 ++++++- + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 3 + + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 3 + + drivers/net/wireless/intel/iwlwifi/mld/nan.c | 287 +++++++++++++++++++++ + drivers/net/wireless/intel/iwlwifi/mld/nan.h | 28 ++ + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 13 + + drivers/net/wireless/intel/iwlwifi/mld/notif.h | 1 + + drivers/net/wireless/intel/iwlwifi/mld/power.c | 39 ++- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 142 +++++++++- + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mld/tlc.c | 85 +++++- + drivers/net/wireless/intel/iwlwifi/mld/tx.c | 11 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 14 + + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 10 +- + 26 files changed, 1009 insertions(+), 85 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/nan.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/nan.h +Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (801b0840b09d Merge tag 'nand/for-6.19' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (f6dffe2a9ed1 mtd: spinand: add support for FudanMicro FM25S01BI3) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (ed26bd40df11 mailmap: update Pratyush Yadav's email address) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (48bc9da3c97c crypto: zstd - fix double-free in per-CPU stream cleanup) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging libcrypto/libcrypto-next (3f9f0252130e Merge tag 'random-6.19-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Already up to date. +Merging drm/drm-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (97f27573837e accel/amdxdna: Fix potential NULL pointer dereference in context cleanup) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/accel/amdxdna/aie2_pci.c +Auto-merging drivers/gpu/drm/drm_gem.c +Merge made by the 'ort' strategy. + .../display/rockchip/rockchip,dw-hdmi.yaml | 1 + + .../bindings/display/sitronix,st7571.yaml | 25 + + .../bindings/display/sitronix,st7920.yaml | 58 ++ + Documentation/gpu/drm-mm.rst | 29 +- + Documentation/gpu/todo.rst | 45 + + Documentation/process/debugging/kgdb.rst | 28 - + MAINTAINERS | 10 + + drivers/accel/amdxdna/aie2_message.c | 68 +- + drivers/accel/amdxdna/aie2_pci.c | 2 +- + drivers/accel/amdxdna/aie2_pci.h | 3 + + drivers/accel/amdxdna/aie2_pm.c | 17 +- + drivers/accel/amdxdna/aie2_psp.c | 15 + + drivers/accel/amdxdna/aie2_smu.c | 27 +- + drivers/accel/amdxdna/amdxdna_mailbox.c | 46 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 1 - + drivers/accel/amdxdna/amdxdna_pm.c | 22 +- + drivers/accel/amdxdna/npu1_regs.c | 2 + + drivers/accel/amdxdna/npu2_regs.c | 2 + + drivers/accel/amdxdna/npu4_regs.c | 2 + + drivers/accel/amdxdna/npu5_regs.c | 2 + + drivers/accel/amdxdna/npu6_regs.c | 2 + + drivers/dma-buf/Kconfig | 2 +- + drivers/dma-buf/dma-buf.c | 77 +- + drivers/dma-buf/dma-fence.c | 100 +- + drivers/dma-buf/st-dma-fence.c | 4 +- + drivers/gpu/drm/Kconfig | 213 ++--- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +- + drivers/gpu/drm/ast/ast_cursor.c | 83 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 86 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/drm_atomic.c | 1 + + drivers/gpu/drm/drm_bridge.c | 62 ++ + drivers/gpu/drm/drm_fb_helper.c | 108 --- + drivers/gpu/drm/drm_gem.c | 203 +++- + drivers/gpu/drm/drm_gem_shmem_helper.c | 79 +- + drivers/gpu/drm/drm_panic.c | 77 +- + drivers/gpu/drm/drm_plane.c | 4 +- + drivers/gpu/drm/drm_vblank.c | 52 +- + drivers/gpu/drm/hyperv/Kconfig | 14 + + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 58 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 71 -- + drivers/gpu/drm/i915/gem/i915_gemfs.h | 14 - + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 15 +- + drivers/gpu/drm/i915/i915_drv.h | 5 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 24 +- + drivers/gpu/drm/panel/panel-edp.c | 3 + + drivers/gpu/drm/panfrost/panfrost_device.c | 3 + + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 107 ++- + drivers/gpu/drm/panfrost/panfrost_drv.h | 9 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 257 +++++ + drivers/gpu/drm/panfrost/panfrost_gem.h | 12 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 26 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 10 +- + drivers/gpu/drm/panthor/panthor_device.c | 13 +- + drivers/gpu/drm/panthor/panthor_drv.c | 87 +- + drivers/gpu/drm/panthor/panthor_drv.h | 9 + + drivers/gpu/drm/panthor/panthor_fw.c | 4 +- + drivers/gpu/drm/panthor/panthor_gem.c | 258 ++++- + drivers/gpu/drm/panthor/panthor_gem.h | 8 + + drivers/gpu/drm/panthor/panthor_gpu.c | 21 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 314 +++--- + drivers/gpu/drm/panthor/panthor_sched.c | 252 ++--- + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/pl111/pl111_drv.c | 29 +- + drivers/gpu/drm/pl111/pl111_nomadik.c | 4 +- + drivers/gpu/drm/pl111/pl111_nomadik.h | 4 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 53 +- + drivers/gpu/drm/pl111/pl111_versatile.h | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 74 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 23 +- + drivers/gpu/drm/radeon/radeon_mode.h | 10 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 + + drivers/gpu/drm/scheduler/sched_main.c | 40 +- + drivers/gpu/drm/sitronix/Kconfig | 48 +- + drivers/gpu/drm/sitronix/Makefile | 3 + + drivers/gpu/drm/sitronix/st7571-i2c.c | 1003 +------------------- + drivers/gpu/drm/sitronix/st7571-spi.c | 76 ++ + drivers/gpu/drm/sitronix/st7571.c | 918 ++++++++++++++++++ + drivers/gpu/drm/sitronix/st7571.h | 91 ++ + drivers/gpu/drm/sitronix/st7920.c | 867 +++++++++++++++++ + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 64 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 57 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +- + drivers/gpu/drm/ttm/ttm_device.c | 5 +- + drivers/gpu/drm/ttm/ttm_pool.c | 26 +- + drivers/gpu/drm/ttm/ttm_resource.c | 14 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/v3d/Makefile | 3 +- + drivers/gpu/drm/v3d/v3d_bo.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.c | 2 +- + drivers/gpu/drm/v3d/v3d_drv.h | 11 +- + drivers/gpu/drm/v3d/v3d_gem.c | 21 +- + drivers/gpu/drm/v3d/v3d_gemfs.c | 62 -- + drivers/gpu/drm/vgem/Kconfig | 9 + + drivers/gpu/drm/xe/xe_hw_fence.c | 4 +- + drivers/video/fbdev/core/fbcon.c | 24 - + drivers/video/fbdev/core/fbcon.h | 1 - + include/drm/drm_atomic.h | 5 + + include/drm/drm_bridge.h | 12 + + include/drm/drm_device.h | 15 + + include/drm/drm_fb_helper.h | 21 - + include/drm/drm_gem.h | 45 +- + include/drm/drm_gem_shmem_helper.h | 3 - + include/drm/drm_modeset_helper_vtables.h | 23 - + include/drm/drm_vblank.h | 3 +- + include/drm/gpu_scheduler.h | 52 + + include/linux/dma-fence.h | 35 +- + include/linux/fb.h | 4 - + include/uapi/drm/panfrost_drm.h | 76 +- + include/uapi/drm/panthor_drm.h | 157 ++- + 117 files changed, 4823 insertions(+), 2498 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7920.yaml + create mode 100644 drivers/gpu/drm/hyperv/Kconfig + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.c + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_drv.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.h + create mode 100644 drivers/gpu/drm/sitronix/st7571-spi.c + create mode 100644 drivers/gpu/drm/sitronix/st7571.c + create mode 100644 drivers/gpu/drm/sitronix/st7571.h + create mode 100644 drivers/gpu/drm/sitronix/st7920.c + delete mode 100644 drivers/gpu/drm/v3d/v3d_gemfs.c + create mode 100644 drivers/gpu/drm/vgem/Kconfig +Merging amdgpu/drm-next (f24e96d69f5b drm/amdgpu: Set xcp id for mes ring) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/amd_overview_block.svg | 687 + + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 48 + + Documentation/gpu/amdgpu/display/dc-glossary.rst | 3 - + Documentation/gpu/amdgpu/driver-core.rst | 31 + + Documentation/gpu/amdgpu/enforce_isolation.svg | 654 + + Documentation/gpu/amdgpu/gc/index.rst | 24 +- + Documentation/gpu/amdgpu/gfx_pipeline_seq.svg | 413 + + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/amdgpu/no_enforce_isolation.svg | 707 + + Documentation/gpu/amdgpu/process-isolation.rst | 1 + + Documentation/gpu/amdgpu/ring-buffer.rst | 95 + + Documentation/gpu/amdgpu/ring_buffers.svg | 1633 + + Documentation/gpu/amdgpu/userq.rst | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 108 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 281 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 3 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 3 - + drivers/gpu/drm/amd/amdgpu/cik.c | 5 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 3969 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 475 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 64 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 64 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c | 890 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 606 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_1.c | 160 + + drivers/gpu/drm/amd/amdgpu/imu_v12_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 43 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 1864 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 915 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 13 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 4 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 5 - + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 342 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 1813 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_1_0_pkt_open.h | 5673 +++ + drivers/gpu/drm/amd/amdgpu/si.c | 5 - + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.c | 213 + + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 1 - + drivers/gpu/drm/amd/amdgpu/soc21.c | 5 - + drivers/gpu/drm/amd/amdgpu/soc24.c | 5 - + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 786 + + drivers/gpu/drm/amd/amdgpu/soc_v1_0.h | 34 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/Makefile | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 89 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 75 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 34 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + .../amd/amdkfd/kfd_device_queue_manager_v12_1.c | 98 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c | 391 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 61 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 657 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 34 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 245 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 41 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 23 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 6 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 51 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 + + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h | 8 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 224 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 22 + + drivers/gpu/drm/amd/display/dc/dc.h | 89 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 18 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 47 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 8 +- + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 3 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 3 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 43 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.h | 11 +- + .../amd/display/dc/dio/dcn20/dcn20_link_encoder.c | 3 + + .../display/dc/dio/dcn30/dcn30_dio_link_encoder.c | 3 + + .../dc/dio/dcn301/dcn301_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn32/dcn32_dio_link_encoder.c | 3 + + .../dc/dio/dcn321/dcn321_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn35/dcn35_dio_link_encoder.c | 4 +- + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 3 + + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 8 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 3 +- + .../amd/display/dc/dml2_0/dml21/dml21_wrapper.h | 7 +- + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 + + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c | 599 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.h | 9 + + .../drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c | 604 + + .../drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.h | 25 + + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 6 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 14 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 22 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 8 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 17 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 37 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 7 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 55 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 7 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 290 +- + .../display/dc/link/protocols/link_dp_capability.c | 2 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 177 +- + .../dc/link/protocols/link_edp_panel_control.h | 7 +- + .../drm/amd/display/dc/link/protocols/link_hpd.c | 171 +- + .../drm/amd/display/dc/link/protocols/link_hpd.h | 1 - + drivers/gpu/drm/amd/display/dc/os_types.h | 2 - + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 6 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 5 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 186 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h | 8 - + .../gpu/drm/amd/display/dc/sspl/dc_spl_filters.c | 4 +- + .../gpu/drm/amd/display/dc/sspl/dc_spl_filters.h | 4 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.c | 31 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.h | 16 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.c | 155 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.h | 35 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.c | 27 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.h | 3 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.c | 11 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.h | 4 +- + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c | 78 +- + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h | 56 +- + drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h | 9 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 33 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 57 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 6 + + .../amd/display/modules/info_packet/info_packet.c | 369 +- + .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h | 12407 ++++++ + .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h | 44620 +++++++++++++++++++ + .../include/asic_reg/mmhub/mmhub_4_2_0_offset.h | 802 + + .../include/asic_reg/mmhub/mmhub_4_2_0_sh_mask.h | 3013 ++ + .../drm/amd/include/asic_reg/mp/mp_15_0_8_offset.h | 868 + + .../amd/include/asic_reg/mp/mp_15_0_8_sh_mask.h | 616 + + .../amd/include/asic_reg/oss/osssys_7_1_0_offset.h | 280 + + .../include/asic_reg/oss/osssys_7_1_0_sh_mask.h | 1024 + + .../include/asic_reg/smuio/smuio_15_0_8_offset.h | 512 + + .../include/asic_reg/smuio/smuio_15_0_8_sh_mask.h | 1113 + + .../drm/amd/include/ivsrcid/vmc/irqsrcs_vmc_1_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 +- + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 39 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 2 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + + drivers/gpu/drm/amd/include/soc_v1_0_enum.h | 38 + + drivers/gpu/drm/amd/include/v12_structs.h | 2054 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 19 - + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 81 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 16 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 65 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 87 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 141 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 52 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 211 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 28 - + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 31 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 8 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 49 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 47 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 47 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 188 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 17 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 387 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 212 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 40 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 39 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 52 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 249 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 86 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 226 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 34 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 24 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 25 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 385 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 4 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 226 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 81 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 24 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 236 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 118 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 10 + + drivers/gpu/drm/amd/ras/ras_mgr/Makefile | 1 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 5 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 45 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 1 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c | 469 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h | 57 + + drivers/gpu/drm/amd/ras/rascore/ras_cmd.h | 33 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.c | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.h | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 29 +- + include/uapi/drm/amdgpu_drm.h | 3 +- + include/uapi/linux/kfd_ioctl.h | 9 +- + 273 files changed, 96864 insertions(+), 4684 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/amd_overview_block.svg + create mode 100644 Documentation/gpu/amdgpu/enforce_isolation.svg + create mode 100644 Documentation/gpu/amdgpu/gfx_pipeline_seq.svg + create mode 100644 Documentation/gpu/amdgpu/no_enforce_isolation.svg + create mode 100644 Documentation/gpu/amdgpu/ring-buffer.rst + create mode 100644 Documentation/gpu/amdgpu/ring_buffers.svg + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1_0_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v1_0_enum.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h +Merging drm-intel/for-linux-next (b8304863a399 Merge drm/drm-next into drm-intel-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 19 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 5 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 9 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 5 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 6 +- + drivers/gpu/drm/i915/display/intel_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_bios.c | 76 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 + + drivers/gpu/drm/i915/display/intel_bo.c | 6 + + drivers/gpu/drm/i915/display/intel_bo.h | 1 + + drivers/gpu/drm/i915/display/intel_bw.c | 5 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 13 +- + drivers/gpu/drm/i915/display/intel_cmtg.c | 3 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 31 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 2 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 5 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 1074 +++++++++++--------- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 29 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 116 ++- + drivers/gpu/drm/i915/display/intel_display.c | 94 +- + drivers/gpu/drm/i915/display/intel_display.h | 1 + + drivers/gpu/drm/i915/display/intel_display_core.h | 18 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.c | 5 + + .../gpu/drm/i915/display/intel_display_device.h | 9 +- + .../gpu/drm/i915/display/intel_display_driver.c | 13 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 203 ++-- + drivers/gpu/drm/i915/display/intel_display_irq.h | 2 + + drivers/gpu/drm/i915/display/intel_display_power.c | 40 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 48 +- + .../drm/i915/display/intel_display_power_well.c | 64 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 23 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_rps.c | 31 +- + drivers/gpu/drm/i915/display/intel_display_rps.h | 21 - + drivers/gpu/drm/i915/display/intel_display_types.h | 52 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 4 + + drivers/gpu/drm/i915/display/intel_display_wa.h | 2 + + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 20 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 16 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 24 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 336 +++++- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 +- + drivers/gpu/drm/i915/{soc => display}/intel_dram.c | 397 ++++---- + drivers/gpu/drm/i915/{soc => display}/intel_dram.h | 12 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 42 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.c | 43 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.h | 13 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 266 +++-- + drivers/gpu/drm/i915/display/intel_fbc.h | 3 + + drivers/gpu/drm/i915/display/intel_fbc_regs.h | 12 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 109 ++ + drivers/gpu/drm/i915/display/intel_gmbus.c | 10 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 22 - + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 78 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 8 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 5 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 1 - + drivers/gpu/drm/i915/display/intel_lt_phy.c | 18 +- + drivers/gpu/drm/i915/display/intel_lt_phy.h | 2 - + drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 1 - + drivers/gpu/drm/i915/display/intel_panic.c | 27 - + drivers/gpu/drm/i915/display/intel_panic.h | 14 - + drivers/gpu/drm/i915/display/intel_parent.c | 197 ++++ + drivers/gpu/drm/i915/display/intel_parent.h | 66 ++ + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 8 +- + drivers/gpu/drm/i915/display/intel_plane.c | 96 +- + drivers/gpu/drm/i915/display/intel_plane.h | 4 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 6 +- + drivers/gpu/drm/i915/display/intel_pps.c | 63 +- + drivers/gpu/drm/i915/display/intel_pps.h | 14 +- + drivers/gpu/drm/i915/display/intel_psr.c | 317 +++--- + drivers/gpu/drm/i915/display/intel_psr.h | 5 +- + drivers/gpu/drm/i915/{soc => display}/intel_rom.c | 0 + drivers/gpu/drm/i915/{soc => display}/intel_rom.h | 0 + drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- + drivers/gpu/drm/i915/display/intel_tc.c | 40 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- + drivers/gpu/drm/i915/display/intel_vga.c | 44 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 19 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 8 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 21 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 40 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 2 + + drivers/gpu/drm/i915/i915_driver.c | 60 +- + drivers/gpu/drm/i915/i915_drv.h | 3 - + drivers/gpu/drm/i915/i915_edram.c | 44 + + drivers/gpu/drm/i915/i915_edram.h | 11 + + drivers/gpu/drm/i915/i915_freq.c | 111 ++ + drivers/gpu/drm/i915/i915_freq.h | 13 + + drivers/gpu/drm/i915/i915_gem.c | 4 +- + .../gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} | 61 +- + drivers/gpu/drm/i915/i915_gmch.h | 13 + + .../{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} | 22 +- + drivers/gpu/drm/i915/i915_hdcp_gsc.h | 9 + + drivers/gpu/drm/i915/i915_irq.c | 16 + + drivers/gpu/drm/i915/i915_irq.h | 2 + + drivers/gpu/drm/i915/i915_panic.c | 35 + + drivers/gpu/drm/i915/i915_panic.h | 9 + + drivers/gpu/drm/i915/intel_clock_gating.c | 10 +- + drivers/gpu/drm/i915/intel_clock_gating.h | 6 +- + drivers/gpu/drm/i915/intel_mchbar_regs.h | 68 +- + drivers/gpu/drm/i915/soc/intel_gmch.h | 20 - + drivers/gpu/drm/i915/vlv_suspend.c | 2 +- + drivers/gpu/drm/xe/Makefile | 19 +- + .../xe/compat-i915-headers/gem/i915_gem_object.h | 13 - + .../xe/compat-i915-headers/gem/i915_gem_stolen.h | 40 - + .../drm/xe/compat-i915-headers/gt/intel_gt_types.h | 11 - + .../gpu/drm/xe/compat-i915-headers/i915_active.h | 22 - + .../drm/xe/compat-i915-headers/i915_active_types.h | 13 - + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 15 - + drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h | 6 - + .../gpu/drm/xe/compat-i915-headers/i915_utils.h | 6 - + drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h | 18 - + .../gpu/drm/xe/compat-i915-headers/intel_wakeref.h | 10 - + .../gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h | 29 - + .../drm/xe/compat-i915-headers/soc/intel_dram.h | 6 - + .../drm/xe/compat-i915-headers/soc/intel_gmch.h | 6 - + .../gpu/drm/xe/compat-i915-headers/soc/intel_rom.h | 6 - + drivers/gpu/drm/xe/display/ext/i915_irq.c | 85 -- + drivers/gpu/drm/xe/display/intel_bo.c | 8 +- + drivers/gpu/drm/xe/display/xe_display.c | 28 +- + drivers/gpu/drm/xe/display/xe_display_misc.c | 16 - + drivers/gpu/drm/xe/display/xe_display_rpm.c | 3 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 49 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 27 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.h | 9 + + drivers/gpu/drm/xe/display/xe_panic.c | 16 +- + drivers/gpu/drm/xe/display/xe_panic.h | 9 + + drivers/gpu/drm/xe/display/xe_plane_initial.c | 6 +- + drivers/gpu/drm/xe/display/xe_stolen.c | 62 +- + drivers/gpu/drm/xe/display/xe_stolen.h | 9 + + drivers/gpu/drm/xe/xe_device_types.h | 8 - + include/drm/intel/display_parent_interface.h | 79 ++ + 148 files changed, 3520 insertions(+), 2234 deletions(-) + rename drivers/gpu/drm/i915/{soc => display}/intel_dram.c (57%) + rename drivers/gpu/drm/i915/{soc => display}/intel_dram.h (68%) + delete mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.h + create mode 100644 drivers/gpu/drm/i915/display/intel_parent.c + create mode 100644 drivers/gpu/drm/i915/display/intel_parent.h + rename drivers/gpu/drm/i915/{soc => display}/intel_rom.c (100%) + rename drivers/gpu/drm/i915/{soc => display}/intel_rom.h (100%) + create mode 100644 drivers/gpu/drm/i915/i915_edram.c + create mode 100644 drivers/gpu/drm/i915/i915_edram.h + create mode 100644 drivers/gpu/drm/i915/i915_freq.c + create mode 100644 drivers/gpu/drm/i915/i915_freq.h + rename drivers/gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} (68%) + create mode 100644 drivers/gpu/drm/i915/i915_gmch.h + rename drivers/gpu/drm/i915/{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} (89%) + create mode 100644 drivers/gpu/drm/i915/i915_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/i915/i915_panic.c + create mode 100644 drivers/gpu/drm/i915/i915_panic.h + delete mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_active.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_active_types.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h + delete mode 100644 drivers/gpu/drm/xe/display/ext/i915_irq.c + delete mode 100644 drivers/gpu/drm/xe/display/xe_display_misc.c + create mode 100644 drivers/gpu/drm/xe/display/xe_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/xe/display/xe_panic.h + create mode 100644 drivers/gpu/drm/xe/display/xe_stolen.h +Merging drm-msm/msm-next (7bc29d5fb6fa dt-bindings: display/msm/gmu: Add Adreno X2-85 GMU) +$ 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 (e2f085ab8636 dt-bindings: display: msm: sm6150-mdss: Fix example indentation and OPP values) +$ 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-rust/drm-rust-next (60c7398bded2 rust: drm: add __rust_helper to helpers) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Merge made by the 'ort' strategy. + rust/helpers/drm.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging drm-xe/drm-xe-next (2b277b506138 drm/xe: Add more GT stats around pagefault mode switch flows) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_hdcp_gsc.c +Auto-merging drivers/gpu/drm/xe/tests/xe_mocs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/tests/xe_mocs.c +Auto-merging drivers/gpu/drm/xe/xe_devcoredump.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_irq.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vram.c +Auto-merging drivers/vfio/pci/Kconfig +Auto-merging drivers/vfio/pci/Makefile +Resolved 'drivers/gpu/drm/xe/tests/xe_mocs.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_ct.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_submit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c8ca4910d798] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + .../ABI/testing/sysfs-driver-intel-xe-sriov | 2 +- + Documentation/gpu/xe/xe_exec_queue.rst | 14 + + MAINTAINERS | 1 - + drivers/gpu/drm/drm_gpusvm.c | 3 + + drivers/gpu/drm/xe/Makefile | 2 + + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 6 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 67 +- + drivers/gpu/drm/xe/abi/guc_lfd_abi.h | 171 +++++ + drivers/gpu/drm/xe/abi/guc_lic_abi.h | 77 +++ + drivers/gpu/drm/xe/abi/guc_log_abi.h | 42 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 23 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 31 +- + drivers/gpu/drm/xe/instructions/xe_gpu_commands.h | 1 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 1 + + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_mert_regs.h | 21 + + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 8 + + drivers/gpu/drm/xe/tests/xe_bo.c | 10 +- + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 3 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 10 +- + drivers/gpu/drm/xe/tests/xe_mocs.c | 27 +- + drivers/gpu/drm/xe/xe_bo.c | 26 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_debugfs.c | 143 +++- + drivers/gpu/drm/xe/xe_devcoredump.c | 30 +- + drivers/gpu/drm/xe/xe_device.c | 102 ++- + drivers/gpu/drm/xe/xe_device.h | 5 + + drivers/gpu/drm/xe/xe_device_sysfs.c | 33 +- + drivers/gpu/drm/xe/xe_device_types.h | 27 + + drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- + drivers/gpu/drm/xe/xe_drm_client.c | 67 +- + drivers/gpu/drm/xe/xe_exec.c | 12 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 455 ++++++++++++- + drivers/gpu/drm/xe/xe_exec_queue.h | 68 ++ + drivers/gpu/drm/xe/xe_exec_queue_types.h | 62 ++ + drivers/gpu/drm/xe/xe_execlist.c | 2 +- + drivers/gpu/drm/xe/xe_force_wake.c | 7 + + drivers/gpu/drm/xe/xe_force_wake.h | 40 ++ + drivers/gpu/drm/xe/xe_ggtt.c | 3 +- + drivers/gpu/drm/xe/xe_gsc.c | 21 +- + drivers/gpu/drm/xe/xe_gsc_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 17 +- + drivers/gpu/drm/xe/xe_gt.c | 181 +++--- + drivers/gpu/drm/xe/xe_gt.h | 2 + + drivers/gpu/drm/xe/xe_gt_debugfs.c | 30 +- + drivers/gpu/drm/xe/xe_gt_freq.c | 31 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 49 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 12 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 172 +++-- + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 12 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 13 + + drivers/gpu/drm/xe/xe_gt_stats.c | 10 + + drivers/gpu/drm/xe/xe_gt_stats.h | 32 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 5 + + drivers/gpu/drm/xe/xe_gt_throttle.c | 11 +- + drivers/gpu/drm/xe/xe_gt_types.h | 5 + + drivers/gpu/drm/xe/xe_guc.c | 80 ++- + drivers/gpu/drm/xe/xe_guc.h | 2 + + drivers/gpu/drm/xe/xe_guc_ads.c | 2 +- + drivers/gpu/drm/xe/xe_guc_buf.c | 2 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 16 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 273 +++++--- + drivers/gpu/drm/xe/xe_guc_ct.h | 2 + + drivers/gpu/drm/xe/xe_guc_debugfs.c | 15 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 10 +- + drivers/gpu/drm/xe/xe_guc_log.c | 507 ++++++++++++--- + drivers/gpu/drm/xe/xe_guc_log.h | 30 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 62 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 717 +++++++++++++++++++-- + drivers/gpu/drm/xe/xe_guc_submit.h | 9 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 13 + + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 41 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 4 +- + drivers/gpu/drm/xe/xe_huc.c | 7 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 79 ++- + drivers/gpu/drm/xe/xe_hw_engine_group.h | 4 +- + drivers/gpu/drm/xe/xe_hwmon.c | 52 +- + drivers/gpu/drm/xe/xe_i2c.c | 2 +- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lmtt.c | 25 +- + drivers/gpu/drm/xe/xe_lrc.c | 73 ++- + drivers/gpu/drm/xe/xe_lrc.h | 7 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 3 + + drivers/gpu/drm/xe/xe_mert.c | 82 +++ + drivers/gpu/drm/xe/xe_mert.h | 32 + + drivers/gpu/drm/xe/xe_migrate.c | 57 +- + drivers/gpu/drm/xe/xe_migrate.h | 3 + + drivers/gpu/drm/xe/xe_mocs.c | 18 +- + drivers/gpu/drm/xe/xe_oa.c | 52 +- + drivers/gpu/drm/xe/xe_oa_types.h | 1 + + drivers/gpu/drm/xe/xe_page_reclaim.c | 136 ++++ + drivers/gpu/drm/xe/xe_page_reclaim.h | 105 +++ + drivers/gpu/drm/xe/xe_pat.c | 220 +++++-- + drivers/gpu/drm/xe/xe_pat.h | 21 + + drivers/gpu/drm/xe/xe_pci.c | 28 + + drivers/gpu/drm/xe/xe_pci_sriov.c | 10 +- + drivers/gpu/drm/xe/xe_pci_types.h | 6 + + drivers/gpu/drm/xe/xe_pcode_api.h | 2 + + drivers/gpu/drm/xe/xe_pm.c | 10 +- + drivers/gpu/drm/xe/xe_pt.c | 135 +++- + drivers/gpu/drm/xe/xe_pt_types.h | 5 + + drivers/gpu/drm/xe/xe_pxp.c | 55 +- + drivers/gpu/drm/xe/xe_query.c | 23 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 17 +- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 62 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 70 +- + drivers/gpu/drm/xe/xe_sa.c | 67 +- + drivers/gpu/drm/xe/xe_sa.h | 20 +- + drivers/gpu/drm/xe/xe_sa_types.h | 3 + + drivers/gpu/drm/xe/xe_sriov_packet.c | 2 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 4 + + drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c | 6 +- + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_sriov_vf.c | 84 ++- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 27 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 1 + + drivers/gpu/drm/xe/xe_survivability_mode.c | 270 +++++--- + drivers/gpu/drm/xe/xe_survivability_mode_types.h | 28 +- + drivers/gpu/drm/xe/xe_svm.c | 88 ++- + drivers/gpu/drm/xe/xe_svm.h | 2 +- + drivers/gpu/drm/xe/xe_sync.c | 35 +- + drivers/gpu/drm/xe/xe_sync.h | 2 + + drivers/gpu/drm/xe/xe_tile.c | 5 + + drivers/gpu/drm/xe/xe_tile_debugfs.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_tlb_inval.c | 27 +- + drivers/gpu/drm/xe/xe_tlb_inval.h | 2 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.c | 36 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.h | 4 + + drivers/gpu/drm/xe/xe_tlb_inval_types.h | 5 +- + drivers/gpu/drm/xe/xe_trace.h | 46 ++ + drivers/gpu/drm/xe/xe_uc.c | 35 +- + drivers/gpu/drm/xe/xe_uc.h | 2 + + drivers/gpu/drm/xe/xe_uc_fw.c | 10 +- + drivers/gpu/drm/xe/xe_vm.c | 158 ++++- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_types.h | 3 +- + drivers/gpu/drm/xe/xe_vram.c | 6 +- + drivers/gpu/drm/xe/xe_wa.c | 60 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 7 +- + include/uapi/drm/xe_drm.h | 79 ++- + 146 files changed, 5130 insertions(+), 1460 deletions(-) + create mode 100644 drivers/gpu/drm/xe/abi/guc_lfd_abi.h + create mode 100644 drivers/gpu/drm/xe/abi/guc_lic_abi.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_mert_regs.h + create mode 100644 drivers/gpu/drm/xe/xe_mert.c + create mode 100644 drivers/gpu/drm/xe/xe_mert.h + create mode 100644 drivers/gpu/drm/xe/xe_page_reclaim.c + create mode 100644 drivers/gpu/drm/xe/xe_page_reclaim.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 (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (82845bc8d13c Merge branch 'regmap-linus' into regmap-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (ae0a0c45200c Merge branch 'for-linus' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + include/sound/seq_device.h | 2 ++ + sound/core/seq/oss/seq_oss.c | 4 ++-- + sound/core/seq/oss/seq_oss_synth.c | 12 ++++-------- + sound/core/seq/oss/seq_oss_synth.h | 4 ++-- + sound/core/seq/seq_midi.c | 15 ++++++--------- + sound/core/seq/seq_ump_client.c | 11 ++++------- + sound/core/seq_device.c | 26 +++++++++++++++++++++++++- + sound/drivers/opl3/opl3_seq.c | 13 +++++-------- + sound/drivers/opl4/opl4_seq.c | 13 +++++-------- + sound/isa/sb/emu8000_synth.c | 13 +++++-------- + sound/pci/emu10k1/emu10k1_synth.c | 13 +++++-------- + 11 files changed, 65 insertions(+), 61 deletions(-) +Merging ieee1394/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (522a323f41f5 Merge remote-tracking branch 'asoc/for-6.20' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + drivers/firmware/cirrus/cs_dsp.c | 31 +++++--- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 8 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 8 +- + sound/soc/codecs/rt274.c | 12 +-- + sound/soc/codecs/sdw-mockup.c | 6 -- + sound/soc/codecs/wm0010.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/intel/catpt/core.h | 7 +- + sound/soc/intel/catpt/device.c | 6 +- + sound/soc/intel/catpt/ipc.c | 12 +-- + sound/soc/intel/catpt/loader.c | 8 +- + sound/soc/intel/catpt/messages.c | 89 +++------------------ + sound/soc/intel/catpt/pcm.c | 46 +++++------ + sound/soc/intel/catpt/sysfs.c | 2 +- + sound/soc/mediatek/mt8189/mt8189-nau8825.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 44 +++------- + sound/soc/qcom/qdsp6/audioreach.c | 28 ++++--- + sound/soc/qcom/qdsp6/q6adm.c | 2 + + sound/soc/qcom/qdsp6/q6afe.c | 20 ++--- + sound/soc/qcom/qdsp6/q6apm.c | 9 ++- + sound/soc/qcom/qdsp6/q6asm.c | 19 ++++- + sound/soc/qcom/qdsp6/q6prm.c | 16 ++-- + sound/soc/renesas/rz-ssi.c | 119 ++++++++++++++++++---------- + sound/soc/sdca/sdca_functions.c | 28 +++---- + sound/soc/ti/davinci-mcasp.c | 7 +- + 25 files changed, 247 insertions(+), 290 deletions(-) +Merging modules/modules-next (1ddac5cd7f27 MAINTAINERS: Add myself as reviewer for module support) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (686c64557be4 MAINTAINERS: adjust file entry in HIMAX HX83112B TOUCHSCREEN SUPPORT) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 3 ++- + drivers/input/keyboard/omap4-keypad.c | 4 ---- + drivers/input/misc/cs40l50-vibra.c | 4 ---- + drivers/input/misc/pf1550-onkey.c | 2 +- + drivers/input/mouse/byd.c | 6 ++---- + drivers/input/mouse/cyapa.c | 3 --- + drivers/input/mouse/cyapa_gen5.c | 1 - + 8 files changed, 6 insertions(+), 19 deletions(-) +Merging block/for-next (48038aad40bf Merge branch 'block-6.19' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/blockdev/zoned_loop.rst | 2 +- + block/bfq-iosched.c | 2 +- + block/blk-sysfs.c | 2 +- + block/blk-wbt.c | 20 +++++-- + block/blk-wbt.h | 5 ++ + block/elevator.c | 4 -- + block/elevator.h | 1 - + drivers/block/loop.c | 22 ++++---- + drivers/block/zloop.c | 8 +-- + include/linux/bio.h | 30 +++++------ + tools/testing/selftests/ublk/Makefile | 8 +++ + tools/testing/selftests/ublk/file_backed.c | 7 +-- + tools/testing/selftests/ublk/kublk.c | 64 ++++++++++++++++++++--- + tools/testing/selftests/ublk/kublk.h | 23 +++++--- + tools/testing/selftests/ublk/stripe.c | 2 +- + tools/testing/selftests/ublk/test_common.sh | 5 +- + tools/testing/selftests/ublk/test_generic_04.sh | 2 +- + tools/testing/selftests/ublk/test_generic_05.sh | 2 +- + tools/testing/selftests/ublk/test_generic_11.sh | 2 +- + tools/testing/selftests/ublk/test_generic_14.sh | 40 ++++++++++++++ + tools/testing/selftests/ublk/test_loop_06.sh | 25 +++++++++ + tools/testing/selftests/ublk/test_loop_07.sh | 21 ++++++++ + tools/testing/selftests/ublk/test_null_03.sh | 24 +++++++++ + tools/testing/selftests/ublk/test_stress_04.sh | 12 +++-- + tools/testing/selftests/ublk/test_stress_05.sh | 10 ++-- + tools/testing/selftests/ublk/test_stress_06.sh | 39 ++++++++++++++ + tools/testing/selftests/ublk/test_stress_07.sh | 39 ++++++++++++++ + tools/testing/selftests/ublk/test_stripe_05.sh | 26 +++++++++ + tools/testing/selftests/ublk/test_stripe_06.sh | 21 ++++++++ + tools/testing/selftests/ublk/trace/seq_io.bt | 3 +- + 30 files changed, 398 insertions(+), 73 deletions(-) + create mode 100755 tools/testing/selftests/ublk/test_generic_14.sh + create mode 100755 tools/testing/selftests/ublk/test_loop_06.sh + create mode 100755 tools/testing/selftests/ublk/test_loop_07.sh + create mode 100755 tools/testing/selftests/ublk/test_null_03.sh + create mode 100755 tools/testing/selftests/ublk/test_stress_06.sh + create mode 100755 tools/testing/selftests/ublk/test_stress_07.sh + create mode 100755 tools/testing/selftests/ublk/test_stripe_05.sh + create mode 100755 tools/testing/selftests/ublk/test_stripe_06.sh +Merging device-mapper/for-next (13ea55ea2017 dm pcache: fix segment info indexing) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (f474c70065e1 ata: libata: Allow more quirks) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + drivers/ata/libata-core.c | 233 ++++++++++++++++++------ + drivers/ata/libata-eh.c | 3 +- + drivers/ata/libata-scsi.c | 8 +- + drivers/ata/libata.h | 1 + + include/linux/ata.h | 3 - + include/linux/libata.h | 70 ++++--- + 7 files changed, 225 insertions(+), 98 deletions(-) +Merging pcmcia/pcmcia-next (4a81f78caa53 pcmcia: Add error handling for add_interval() in do_validate_mem()) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (0461da87d338 mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/mmc.c | 12 ++ + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/host/dw_mmc.c | 155 +++++++--------------- + drivers/mmc/host/dw_mmc.h | 3 - + drivers/mmc/host/mtk-sd.c | 32 ++++- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 +++ + drivers/mmc/host/sdhci-msm.c | 77 +++++++++++ + include/linux/mmc/card.h | 1 + + 10 files changed, 198 insertions(+), 112 deletions(-) +Merging mfd/for-mfd-next (44c603f35cad mfd: sec: Drop a stray semicolon) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (d3cc7cd7bc46 backlight: aw99706: Fix unused function warnings from suspend/resume ops) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (2bb202416d33 Add support for MAX77675 device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/adi,max77675.yaml | 184 ++++ + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/max77675-regulator.c | 1056 ++++++++++++++++++++ + rust/helpers/regulator.c | 24 +- + 5 files changed, 1264 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/adi,max77675.yaml + create mode 100644 drivers/regulator/max77675-regulator.c +Merging security/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (8f5ae30d69d7 Linux 6.17-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (738c9738e690 ima: Handle error code returned by ima_filter_rule_match()) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (29c701f90b93 Smack: function parameter 'gfp' not described) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (9575ce3f015e RDMA/core: add device registration debugging) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Merge made by the 'ort' strategy. + drivers/infiniband/core/cache.c | 105 +++++++++++++++++- + drivers/infiniband/core/core_priv.h | 6 ++ + drivers/infiniband/core/device.c | 32 ++++++ + drivers/infiniband/core/roce_gid_mgmt.c | 17 ++- + include/linux/netdevice.h | 15 +++ + kernel/softirq.c | 4 + + kernel/workqueue.c | 4 + + net/can/j1939/j1939-priv.h | 6 ++ + net/can/j1939/main.c | 93 ++++++++++++++++ + net/can/j1939/transport.c | 3 + + net/core/dev.c | 184 ++++++++++++++++++++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++-- + 13 files changed, 493 insertions(+), 9 deletions(-) +Merging tpmdd/next (416f99c3b16f Merge tag 'driver-core-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (5bcc5786a0cf watchdog: starfive: Fix resource leak in probe error path) +$ 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 (0d081b16946e Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'nvidia/tegra', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Already up to date. +Merging audit/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (954c55c658e1 dt-bindings: kbuild: Skip validating empty examples) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (1ec6e0e8c0dd mailbox: mtk-cmdq: Add driver data to support for MT8196) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Merge made by the 'ort' strategy. + .../bindings/mailbox/mediatek,mt8196-vcp-mbox.yaml | 49 ++++++ + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 6 +- + .../bindings/mailbox/qcom,cpucp-mbox.yaml | 1 + + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + drivers/mailbox/Kconfig | 22 ++- + drivers/mailbox/Makefile | 4 + + drivers/mailbox/mailbox-mchp-ipc-sbi.c | 22 +-- + drivers/mailbox/mailbox.c | 6 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 74 ++++++++- + drivers/mailbox/mtk-vcp-mailbox.c | 170 +++++++++++++++++++++ + drivers/mailbox/pcc.c | 118 +++----------- + drivers/mailbox/rcar-mfis-mailbox.c | 168 ++++++++++++++++++++ + include/acpi/pcc.h | 29 ---- + include/linux/mailbox/mtk-cmdq-mailbox.h | 19 +++ + include/linux/mailbox/mtk-vcp-mailbox.h | 32 ++++ + 15 files changed, 578 insertions(+), 144 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/mediatek,mt8196-vcp-mbox.yaml + create mode 100644 drivers/mailbox/mtk-vcp-mailbox.c + create mode 100644 drivers/mailbox/rcar-mfis-mailbox.c + create mode 100644 include/linux/mailbox/mtk-vcp-mailbox.h +Merging spi/for-next (f470d80b1fc3 Merge remote-tracking branch 'spi/for-6.20' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/renesas,rzv2h-rspi.yaml | 8 + + drivers/spi/spi-cadence-quadspi.c | 16 +- + drivers/spi/spi-cadence-xspi.c | 47 +- + drivers/spi/spi-fsl-lpspi.c | 10 +- + drivers/spi/spi-geni-qcom.c | 127 ++-- + drivers/spi/spi-imx.c | 647 +++++++++++++++++---- + drivers/spi/spi-qpic-snand.c | 4 - + drivers/spi/spi-rzv2h-rspi.c | 281 +++++++-- + drivers/spi/spi-stm32-ospi.c | 107 ++-- + drivers/spi/spi-stm32-qspi.c | 111 ++-- + drivers/spi/spi-virtio.c | 4 +- + 11 files changed, 950 insertions(+), 412 deletions(-) +Merging tip/master (52aac28c48c4 Merge branch into tip/master: 'x86/cpu') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/kernel/setup.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/e820/api.h | 3 +- + arch/x86/include/asm/e820/types.h | 2 +- + arch/x86/kernel/acpi/boot.c | 12 +- + arch/x86/kernel/cpu/amd.c | 40 +--- + arch/x86/kernel/cpu/centaur.c | 6 - + arch/x86/kernel/cpu/cyrix.c | 6 - + arch/x86/kernel/cpu/hygon.c | 6 - + arch/x86/kernel/cpu/topology.c | 15 -- + arch/x86/kernel/e820.c | 477 ++++++++++++++++++++------------------ + arch/x86/kernel/setup.c | 10 +- + arch/x86/platform/efi/efi.c | 3 +- + include/linux/compiler_types.h | 19 ++ + include/linux/sched.h | 13 +- + kernel/sched/core.c | 45 +++- + kernel/sched/deadline.c | 14 +- + kernel/sched/ext.c | 7 +- + kernel/sched/fair.c | 361 +++++++++++++++-------------- + kernel/sched/idle.c | 3 - + kernel/sched/rt.c | 9 +- + kernel/sched/sched.h | 59 ++--- + kernel/sched/stop_task.c | 3 - + 21 files changed, 560 insertions(+), 553 deletions(-) +Merging clockevents/timers/drivers/next (d1780dce9575 clocksource/drivers: Add Realtek system timer driver) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (814b332921b6 Merge ras/edac-amd-atl into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (5a63f3faf656 Merge unused-tracepoints/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/next (9a08942f1701 Merge branch 'rcu/misc' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (7f8fcc6f09fb memory-barriers.txt: Sort wait_event* and wait_on_bit* list alphabetically) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (e0c26d47def7 Merge tag 'kvm-s390-next-6.19-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (3eef0c83c3f3 Merge branch 'kvm-arm64/nv-xnx-haf' into kvmarm/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (2bd1337a1295 KVM: s390: Use generic VIRT_XFER_TO_GUEST_WORK functions) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (c17b750b3ad9 Linux 6.17-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (3239c52fd212 RISC-V: KVM: Flush VS-stage TLB after VCPU migration for Andes cores) +$ 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 (58e10b63777d Merge branch 'fixes') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/kvm/cpuid.c | 11 +++++++++-- + arch/x86/kvm/svm/nested.c | 4 ++-- + arch/x86/kvm/svm/svm.c | 2 ++ + arch/x86/kvm/svm/svm.h | 7 ++++--- + arch/x86/kvm/vmx/nested.c | 3 ++- + arch/x86/kvm/vmx/vmx.c | 9 --------- + arch/x86/kvm/x86.c | 7 +++++++ + tools/testing/selftests/kvm/rseq_test.c | 1 + + tools/testing/selftests/kvm/x86/cpuid_test.c | 15 +++++++++++++++ + virt/kvm/kvm_main.c | 17 ++++++++++++++++- + 10 files changed, 58 insertions(+), 18 deletions(-) +Merging xen-tip/linux-next (150215b89bcf drivers/xen: use min() instead of min_t()) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (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 https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (51cd2d2decf3 workqueue: Process extra works in rescuer on memory pressure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 121 ++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 92 insertions(+), 29 deletions(-) +Merging sched-ext/for-next (bb27226f0d00 sched_ext: Remove unused code in the do_pick_task_scx()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging kernel/sched/ext.c +Merge made by the 'ort' strategy. + kernel/sched/ext.c | 72 ++++++++++++++++++++---------- + tools/testing/selftests/sched_ext/runner.c | 8 ++++ + 2 files changed, 56 insertions(+), 24 deletions(-) +Merging drivers-x86/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (072cd5f458d7 leds: rgb: leds-qcom-lpg: Don't enable TRILED when configuring PWM) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Already up to date. +Merging ipmi/for-next (35bcedc1a793 MAINTAINERS: Add entry on Loongson-2K IPMI driver) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (072f2c495725 USB: serial: option: move Telit 0x10c7 composition in the right place) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging 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 https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (9e9182cab5eb coresight: etm4x: Remove the state_needs_restore flag) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (c9243d6df0d6 fpga: altera-cvp: Use pci_find_vsec_capability() when probing FPGA device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (60b52af082b1 Merge branch 'icc-sm6350' into icc-next) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (f9e057916428 staging: iio: adt7316: replace sprintf() with sysfs_emit()) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (b4338338aa3d extcon: usbc-tusb320: Make typec-power-opmode optional) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 3 ++ + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-intel-int3496.c | 4 +- + drivers/extcon/extcon-ptn5150.c | 56 ++++++++++++++++++++++ + drivers/extcon/extcon-usbc-tusb320.c | 24 +++++----- + drivers/extcon/extcon.c | 4 +- + 6 files changed, 75 insertions(+), 17 deletions(-) +Merging gnss/gnss-next (f5ef3f722d76 dt-bindings: gnss: fix timepulse description) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (d721f52e3155 vfio: selftests: Add vfio_pci_device_init_perf_test) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (d358e5254674 Merge tag 'for-6.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (b462fcd08dd5 MAINTAINERS: Update Intel Quadrature Encoder Peripheral maintainer) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of https://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 (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (6ee43047e8ad cpuset: Remove unnecessary checks in rebuild_sched_domains_locked) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + fs/fs-writeback.c | 2 +- + include/linux/memcontrol.h | 2 +- + kernel/cgroup/cgroup.c | 4 +- + kernel/cgroup/cpuset.c | 52 +++++++--------------- + kernel/cgroup/rstat.c | 13 +++--- + mm/memcontrol.c | 2 +- + mm/page_owner.c | 2 +- + tools/testing/selftests/cgroup/lib/cgroup_util.c | 21 +++++++++ + .../selftests/cgroup/lib/include/cgroup_util.h | 5 +++ + tools/testing/selftests/cgroup/test_kmem.c | 33 +++++++------- + tools/testing/selftests/cgroup/test_memcontrol.c | 20 ++++++++- + 11 files changed, 90 insertions(+), 66 deletions(-) +Merging scsi/for-next (98bcf5e5ddfd Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://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 (946574434aa9 scsi: ufs: qcom: Fix confusing cleanup.h syntax) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (1bac705c2ce7 vhost/vsock: improve RCU read sections around vhost_vsock_get()) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Auto-merging tools/virtio/linux/compiler.h +Merge made by the 'ort' strategy. + drivers/vhost/vhost.c | 8 +-- + drivers/vhost/vsock.c | 15 ++++-- + include/linux/virtio.h | 2 + + include/linux/virtio_features.h | 2 + + tools/virtio/Makefile | 8 +-- + tools/virtio/linux/compiler.h | 6 +++ + tools/virtio/linux/cpumask.h | 4 ++ + tools/virtio/linux/device.h | 8 +++ + tools/virtio/linux/dma-mapping.h | 4 ++ + tools/virtio/linux/kernel.h | 16 ++++++ + tools/virtio/linux/module.h | 2 + + tools/virtio/linux/ucopysize.h | 21 ++++++++ + tools/virtio/linux/virtio.h | 73 +------------------------- + tools/virtio/linux/virtio_config.h | 102 +------------------------------------ + tools/virtio/oot-stubs.h | 10 ++++ + 15 files changed, 97 insertions(+), 184 deletions(-) + create mode 100644 tools/virtio/linux/ucopysize.h + create mode 100644 tools/virtio/oot-stubs.h +Merging rpmsg/for-next (6a95c70e60a0 Merge branches 'rproc-next' and 'rpmsg-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/ti,keystone-rproc.txt | 2 +- + drivers/remoteproc/imx_dsp_rproc.c | 37 +++++--- + drivers/rpmsg/rpmsg_core.c | 66 ++++++-------- + drivers/rpmsg/virtio_rpmsg_bus.c | 101 +++++++-------------- + 4 files changed, 86 insertions(+), 120 deletions(-) +Merging gpio-brgl/gpio/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (666065caa31a pinctrl: add CONFIG_OF dependencies for microchip drivers) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (3b0cf6ab3590 pinctrl: renesas: rzg2l: Refactor OEN register PWPR handling) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (9580ecfbc57d rust: pwm: Add UnregisteredChip wrapper around Chip) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + drivers/pwm/pwm_th1520.rs | 2 +- + rust/kernel/pwm.rs | 71 ++++++++++++++++++++++++++++++----------------- + 2 files changed, 47 insertions(+), 26 deletions(-) +Merging ktest/for-next (d3042cbe84a0 ktest.pl: Fix uninitialized var in config-bisect.pl) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (2115b53400fb rust: kunit: add __rust_helper to helpers) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + rust/helpers/kunit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging livepatching/for-next (51ab33fc0a8b Merge tag 'livepatching-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Already up to date. +Merging rtc/rtc-next (16bd954c9336 rtc: spacemit: MFD_SPACEMIT_P1 as dependencies) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (30065e73d7c0 nvdimm: Prevent integer overflow in ramdax_get_config_data()) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (68113d260674 NTB/msi: Remove unused functions) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 14 ++++++-- + drivers/ntb/msi.c | 64 ---------------------------------- + include/linux/ntb.h | 14 -------- + 3 files changed, 11 insertions(+), 81 deletions(-) +Merging seccomp/for-next/seccomp (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (863810caeb3c XArray: Add CONFIG_DEBUG_XARRAY) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging lib/Kconfig.debug +Auto-merging lib/idr.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 63 ++++++++++++++++++++---------------- + lib/Kconfig.debug | 8 +++++ + lib/idr.c | 1 - + lib/test_xarray.c | 10 ++++-- + lib/xarray.c | 11 ++++--- + tools/testing/radix-tree/xarray.c | 2 +- + tools/testing/shared/xarray-shared.h | 2 +- + 7 files changed, 59 insertions(+), 38 deletions(-) +Merging hyperv/hyperv-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (fdbdd0ccb30a kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (ac35e04f8000 bus: mhi: host: pci_generic: Add Foxconn T99W760 modem) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (83c8f7b5e194 mm/mm_init: Introduce a boot parameter for check_pages) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (ea5514e30056 Merge branch 'for-6.19/cxl-misc' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (7a2ff00c3b5e docs: efi: add CPER functions to driver-api) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/slab/for-next (58d6fcb6ee94 slub: keep empty main sheaf as spare in __pcs_replace_empty_main()) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging random/master (3f9f0252130e Merge tag 'random-6.19-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (1a3cedbdc156 landlock: Fix wrong type usage) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + security/landlock/audit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sysctl/sysctl-next (564195c1a33c sysctl: Wrap do_proc_douintvec with the public function proc_douintvec_conv) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (43368eecb56a rust: bitmap: add __rust_helper to helpers) +$ 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. + rust/helpers/bitmap.c | 6 ++++-- + rust/helpers/bitops.c | 11 +++++++---- + rust/helpers/cpumask.c | 32 +++++++++++++++++++------------- + 3 files changed, 30 insertions(+), 19 deletions(-) +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (7454048db27d kbuild: Enable GCC diagnostic context for value-tracking warnings) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging nolibc/for-next (5203a78a7c60 tools/nolibc: always use 64-bit mode for s390 header checks) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 6 +++- + tools/include/nolibc/nolibc.h | 1 + + tools/include/nolibc/sys/ptrace.h | 44 ++++++++++++++++++++++++++++ + tools/testing/selftests/nolibc/nolibc-test.c | 2 ++ + 4 files changed, 52 insertions(+), 1 deletion(-) + create mode 100644 tools/include/nolibc/sys/ptrace.h +Merging iommufd/for-next (c8ed57e24380 iommufd/selftest: Do not leak the hwpt if IOMMU_TEST_OP_MD_CHECK_MAP fails) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Merge made by the 'ort' strategy. + drivers/iommu/iommufd/io_pagetable.c | 6 +++++- + drivers/iommu/iommufd/selftest.c | 6 ++++-- + tools/testing/selftests/iommu/iommufd.c | 8 +++----- + 3 files changed, 12 insertions(+), 8 deletions(-) +Merging turbostat/next (b65a8280c766 tools/power turbostat.8: Document the "--force" option) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 4 + + tools/power/x86/turbostat/turbostat.c | 143 +++++++++++++++++++++------------- + 2 files changed, 94 insertions(+), 53 deletions(-) +Merging pwrseq/pwrseq/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (9891d2f79a9f Clarify the rootid_owns_currentns) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +Merging ipe/next (7d0a66e4bb90 Linux 6.18) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (dcb6fa37fd7b Linux 6.18-rc3) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging fwctl/for-next (211ddde0823f Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (7dfbe9a67519 crypto/ccp: Fix CONFIG_PCI=n build) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (6c177775dcc5 Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. |