diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-11-28 16:27:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-11-28 16:27:47 +1100 |
| commit | 7d31f578f3230f3b7b33b0930b08f9afd8429817 (patch) | |
| tree | 8b195dde0a40b65ec0e00567e0f0840cfbbdef17 /Next/merge.log | |
| parent | 18e3018237068bb2a3e75c2530af188356c6a2ac (diff) | |
| download | linux-next-master.tar.gz | |
Add linux-next specific files for 20251128HEADnext-20251128master
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 17630 |
1 files changed, 17630 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 00000000000000..2ae54ecee17125 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,17630 @@ +$ date -R +Fri, 28 Nov 2025 08:34:35 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 94% (11213/11834)
Updating files: 95% (11243/11834)
Updating files: 96% (11361/11834)
Updating files: 97% (11479/11834)
Updating files: 98% (11598/11834)
Updating files: 99% (11716/11834)
Updating files: 100% (11834/11834)
Updating files: 100% (11834/11834), done. +HEAD is now at 4941a17751c9 Merge tag 'trace-ringbuffer-v6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace +Merging origin/master (e1afacb68573 Merge tag 'ceph-for-6.18-rc8' of https://github.com/ceph/ceph-client) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 4941a17751c9..e1afacb68573 +Fast-forward (no commit created; -m option ignored) + MAINTAINERS | 19 ++- + drivers/atm/fore200e.c | 2 + + drivers/bluetooth/btusb.c | 39 +++++- + drivers/net/can/rcar/rcar_canfd.c | 53 ++++---- + drivers/net/can/sja1000/sja1000.c | 4 +- + drivers/net/can/sun4i_can.c | 4 +- + drivers/net/can/usb/gs_usb.c | 102 +++++++++++++-- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 31 +++-- + drivers/net/dsa/microchip/ksz_ptp.c | 22 ++-- + drivers/net/dsa/sja1105/sja1105_main.c | 7 - + .../net/ethernet/aquantia/atlantic/aq_hw_utils.c | 22 ++++ + .../net/ethernet/aquantia/atlantic/aq_hw_utils.h | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 5 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 19 +-- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +- + drivers/net/ethernet/freescale/fec.h | 1 + + drivers/net/ethernet/freescale/fec_ptp.c | 64 +++++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 2 +- + drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 5 +- + drivers/net/ethernet/realtek/r8169_main.c | 19 ++- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + drivers/net/phy/mxl-gpy.c | 20 +-- + drivers/net/team/team_core.c | 23 ++-- + drivers/net/tun_vnet.h | 2 +- + drivers/net/veth.c | 7 +- + drivers/net/virtio_net.c | 3 +- + drivers/net/wwan/mhi_wwan_mbim.c | 2 +- + drivers/platform/arm64/lenovo-thinkpad-t14s.c | 16 ++- + drivers/platform/x86/intel/punit_ipc.c | 2 +- + drivers/vhost/net.c | 53 +++++--- + drivers/vhost/vhost.c | 76 +++++++++-- + drivers/vhost/vhost.h | 10 +- + fs/ceph/super.c | 2 +- + fs/smb/client/connect.c | 1 + + include/linux/ceph/libceph.h | 3 +- + include/linux/virtio_net.h | 7 +- + include/net/bluetooth/hci_core.h | 21 ++- + include/net/pkt_cls.h | 2 + + net/atm/common.c | 2 +- + net/bluetooth/hci_core.c | 89 ++++++------- + net/bluetooth/hci_sock.c | 2 + + net/bluetooth/iso.c | 30 ++++- + net/bluetooth/l2cap_core.c | 23 +++- + net/bluetooth/sco.c | 35 +++-- + net/bluetooth/smp.c | 31 +---- + net/ceph/auth_x.c | 2 + + net/ceph/ceph_common.c | 58 +++++---- + net/ceph/debugfs.c | 16 ++- + net/ceph/messenger_v2.c | 11 +- + net/ceph/osdmap.c | 18 ++- + net/mctp/route.c | 1 + + net/mptcp/protocol.c | 19 ++- + net/sched/em_canid.c | 3 + + net/sched/em_cmp.c | 5 +- + net/sched/em_nbyte.c | 2 + + net/sched/em_text.c | 11 +- + net/xdp/xsk.c | 143 +++++++++++++-------- + 59 files changed, 780 insertions(+), 404 deletions(-) +Merging fixes/fixes (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'fixes' of ../next-fixes fixes/fixes +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 (7b6dcd9bfd86 fs/namespace: fix reference leak in grab_requested_mnt_ns) +$ 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 +Merge made by the 'ort' strategy. + fs/namespace.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 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 (62f1c85f62b3 Merge branch 'misc-6.18' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/ctree.c | 2 +- + fs/btrfs/ioctl.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfs-fixes/fixes (00e782110428 nfs4_setup_readdir(): insufficient locking for ->d_parent->d_inode dereferencing) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/nfs/nfs4proc.c +Merge made by the 'ort' strategy. +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 (324be6dcbf09 Revert "SUNRPC: Make RPCSEC_GSS_KRB5 select CRYPTO instead of depending on it") +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of 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 (42ea4b8c679c Merge branch 'for-next-current-v6.17-20251125' into for-next-20251125) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/ctree.c +CONFLICT (content): Merge conflict in fs/btrfs/ctree.c +Auto-merging fs/btrfs/ioctl.c +Resolved 'fs/btrfs/ctree.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 443c030aab15] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/accessors.h | 1 + + fs/btrfs/acl.c | 25 +- + fs/btrfs/backref.c | 37 +- + fs/btrfs/backref.h | 7 +- + fs/btrfs/bio.c | 290 +++++++++---- + fs/btrfs/bio.h | 39 +- + fs/btrfs/block-group.c | 83 ++-- + fs/btrfs/block-group.h | 2 +- + fs/btrfs/block-rsv.c | 14 +- + fs/btrfs/btrfs_inode.h | 20 +- + fs/btrfs/compression.c | 47 +-- + fs/btrfs/compression.h | 15 +- + fs/btrfs/ctree.c | 238 ++++++----- + fs/btrfs/ctree.h | 18 +- + fs/btrfs/defrag.c | 5 +- + fs/btrfs/delalloc-space.c | 4 +- + fs/btrfs/delayed-inode.c | 26 +- + fs/btrfs/delayed-ref.c | 45 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/dir-item.c | 4 +- + fs/btrfs/direct-io.c | 10 +- + fs/btrfs/disk-io.c | 64 ++- + fs/btrfs/disk-io.h | 3 +- + fs/btrfs/extent-tree.c | 172 ++++---- + fs/btrfs/extent-tree.h | 27 +- + fs/btrfs/extent_io.c | 57 ++- + fs/btrfs/extent_io.h | 1 - + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file-item.c | 89 ++-- + fs/btrfs/file-item.h | 4 +- + fs/btrfs/file.c | 32 +- + fs/btrfs/free-space-cache.c | 24 +- + fs/btrfs/free-space-tree.c | 55 +-- + fs/btrfs/fs.h | 36 +- + fs/btrfs/inode-item.c | 5 +- + fs/btrfs/inode.c | 194 +++++---- + fs/btrfs/ioctl.c | 169 ++++---- + fs/btrfs/messages.c | 1 + + fs/btrfs/messages.h | 3 +- + fs/btrfs/misc.h | 7 + + fs/btrfs/ordered-data.c | 74 ++-- + fs/btrfs/print-tree.c | 16 +- + fs/btrfs/qgroup.c | 182 ++++---- + fs/btrfs/raid-stripe-tree.c | 18 +- + fs/btrfs/raid56.c | 859 ++++++++++++++++++++++---------------- + fs/btrfs/raid56.h | 103 ++++- + fs/btrfs/reflink.c | 15 +- + fs/btrfs/relocation.c | 85 ++-- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/scrub.c | 270 +++++++----- + fs/btrfs/send.c | 113 +++-- + fs/btrfs/space-info.c | 464 ++++++++++---------- + fs/btrfs/space-info.h | 43 +- + fs/btrfs/subpage.c | 67 ++- + fs/btrfs/subpage.h | 1 - + fs/btrfs/super.c | 77 +++- + fs/btrfs/sysfs.c | 58 ++- + fs/btrfs/sysfs.h | 3 +- + fs/btrfs/tests/extent-io-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 6 +- + fs/btrfs/tests/qgroup-tests.c | 16 +- + fs/btrfs/transaction.c | 48 ++- + fs/btrfs/transaction.h | 4 - + fs/btrfs/tree-checker.c | 23 +- + fs/btrfs/tree-log.c | 183 ++++---- + fs/btrfs/tree-log.h | 8 +- + fs/btrfs/uuid-tree.c | 120 ++---- + fs/btrfs/verity.c | 32 +- + fs/btrfs/volumes.c | 199 ++++----- + fs/btrfs/volumes.h | 10 +- + fs/btrfs/xattr.c | 41 +- + fs/btrfs/zoned.c | 53 ++- + fs/btrfs/zoned.h | 7 +- + include/uapi/linux/btrfs.h | 9 + + 74 files changed, 2786 insertions(+), 2308 deletions(-) +Merging ceph/master (7fce830ecd0a libceph: prevent potential out-of-bounds writes in handle_auth_session_key()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (bda97f51ec68 cifs: Use netfs_alloc/free_folioq_buffer()) +$ 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/cifs_debug.c | 23 +++++++++++---- + fs/smb/client/smb2ops.c | 73 +++++++--------------------------------------- + 2 files changed, 27 insertions(+), 69 deletions(-) +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 +Merge made by the 'ort' strategy. + fs/configfs/dir.c | 2 +- + fs/configfs/file.c | 2 +- + include/linux/configfs.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +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 +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 (0c4e8e72ff4f erofs: tidy up z_erofs_lz4_handle_overlap()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/decompressor.c | 85 ++++++++++++++++++++++++++----------------------- + fs/erofs/super.c | 38 +++++++++++++++------- + 2 files changed, 73 insertions(+), 50 deletions(-) +Merging exfat/dev (3577231895ec exfat: fix divide-by-zero in exfat_allocate_bitmap) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/super.c +Merge made by the 'ort' strategy. + fs/exfat/balloc.c | 30 +++++++++++++++++++++++++----- + fs/exfat/dir.c | 5 +++++ + fs/exfat/exfat_fs.h | 5 +++-- + fs/exfat/fatent.c | 6 +++--- + fs/exfat/file.c | 5 +++++ + fs/exfat/namei.c | 20 ++++++++++---------- + fs/exfat/super.c | 11 +++++++++++ + 7 files changed, 62 insertions(+), 20 deletions(-) +Merging exportfs/exportfs-next (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'exportfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (25554ea0b42b Pull udf extent block verification.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (690243606a4f ext4: mark inodes without acls in __ext4_iget()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/ext4/inodes.rst | 2 + + Documentation/filesystems/ext4/super.rst | 4 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 48 +- + fs/ext4/ext4_jbd2.c | 3 +- + fs/ext4/extents.c | 118 ++--- + fs/ext4/extents_status.c | 31 +- + fs/ext4/extents_status.h | 2 +- + fs/ext4/hash.c | 2 +- + fs/ext4/ialloc.c | 1 - + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 169 +++---- + fs/ext4/ioctl.c | 14 +- + fs/ext4/mballoc.c | 188 ++++--- + fs/ext4/move_extent.c | 814 ++++++++++++++---------------- + fs/ext4/namei.c | 18 +- + fs/ext4/orphan.c | 4 +- + fs/ext4/readpage.c | 7 +- + fs/ext4/super.c | 72 ++- + fs/ext4/sysfs.c | 6 + + fs/ext4/verity.c | 2 +- + fs/ext4/xattr.c | 6 +- + fs/jbd2/checkpoint.c | 2 +- + fs/jbd2/journal.c | 35 +- + fs/jbd2/transaction.c | 26 +- + include/linux/jbd2.h | 6 + + include/trace/events/ext4.h | 99 +++- + 28 files changed, 932 insertions(+), 771 deletions(-) +Merging f2fs/dev (c0ee17208345 docs: f2fs: wrap ASCII tables in literal blocks to fix LaTeX build) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 6 + + Documentation/filesystems/f2fs.rst | 129 ++++++++++---------- + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/compress.c | 17 ++- + fs/f2fs/data.c | 63 +++++++--- + fs/f2fs/extent_cache.c | 5 +- + fs/f2fs/f2fs.h | 166 +++++++++++++++---------- + fs/f2fs/file.c | 26 ++-- + fs/f2fs/gc.c | 163 ++++++++++++++----------- + fs/f2fs/gc.h | 2 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 6 + + fs/f2fs/namei.c | 39 +++--- + fs/f2fs/node.c | 47 ++++++-- + fs/f2fs/node.h | 8 -- + fs/f2fs/recovery.c | 31 ++--- + fs/f2fs/segment.c | 53 +++++--- + fs/f2fs/segment.h | 37 +++--- + fs/f2fs/super.c | 208 ++++++++++++++++---------------- + fs/f2fs/sysfs.c | 9 ++ + fs/f2fs/verity.c | 2 +- + fs/f2fs/xattr.c | 32 ++--- + fs/f2fs/xattr.h | 10 +- + include/linux/f2fs_fs.h | 5 +- + include/trace/events/f2fs.h | 40 +++++- + 25 files changed, 659 insertions(+), 453 deletions(-) +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 +Merge made by the 'ort' strategy. + fs/dcache.c | 18 ++-- + fs/fuse/dev.c | 9 +- + fs/fuse/dev_uring.c | 12 ++- + fs/fuse/dir.c | 256 +++++++++++++++++++++++++++++++++++++++++++------ + fs/fuse/file.c | 37 +++++-- + fs/fuse/fuse_dev_i.h | 1 + + fs/fuse/fuse_i.h | 28 +++++- + fs/fuse/inode.c | 42 ++++---- + fs/overlayfs/super.c | 12 ++- + include/linux/dcache.h | 2 + + 10 files changed, 343 insertions(+), 74 deletions(-) +Merging gfs2/for-next (83348905e413 gfs2: Clean up SDF_JOURNAL_LIVE flag handling) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../{gfs2-glocks.rst => gfs2/glocks.rst} | 0 + .../filesystems/{gfs2.rst => gfs2/index.rst} | 12 + + .../{gfs2-uevents.rst => gfs2/uevents.rst} | 0 + Documentation/filesystems/index.rst | 4 +- + MAINTAINERS | 2 +- + fs/gfs2/aops.c | 2 +- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 227 +++++--------- + fs/gfs2/glock.h | 12 +- + fs/gfs2/glops.c | 98 +----- + fs/gfs2/incore.h | 22 +- + fs/gfs2/inode.c | 15 + + fs/gfs2/inode.h | 1 + + fs/gfs2/lock_dlm.c | 57 +--- + fs/gfs2/log.c | 59 +--- + fs/gfs2/lops.c | 10 +- + fs/gfs2/meta_io.c | 13 +- + fs/gfs2/ops_fstype.c | 37 ++- + fs/gfs2/quota.c | 66 ++--- + fs/gfs2/recovery.c | 8 +- + fs/gfs2/super.c | 35 +-- + fs/gfs2/super.h | 1 - + fs/gfs2/sys.c | 64 ++-- + fs/gfs2/trace_gfs2.h | 1 - + fs/gfs2/trans.c | 32 +- + fs/gfs2/util.c | 328 +++++++-------------- + fs/gfs2/util.h | 56 +--- + 27 files changed, 396 insertions(+), 768 deletions(-) + rename Documentation/filesystems/{gfs2-glocks.rst => gfs2/glocks.rst} (100%) + rename Documentation/filesystems/{gfs2.rst => gfs2/index.rst} (94%) + rename Documentation/filesystems/{gfs2-uevents.rst => gfs2/uevents.rst} (100%) +Merging jfs/jfs-next (cafc6679824a jfs: replace hardcoded magic number with DTPAGEMAXSLOT constant) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (8d86324b3544 ksmbd: Replace strcpy + strcat to improve convert_to_nt_pathname) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/smb/client/smb2ops.c +Merge made by the 'ort' strategy. + fs/smb/client/cifsglob.h | 31 +- + fs/smb/client/cifspdu.h | 601 +++++++++++--------------------------- + fs/smb/client/cifssmb.c | 18 +- + fs/smb/client/cifstransport.c | 8 +- + fs/smb/client/connect.c | 6 +- + fs/smb/client/inode.c | 4 +- + fs/smb/client/misc.c | 2 +- + fs/smb/client/ntlmssp.h | 8 +- + fs/smb/client/readdir.c | 12 +- + fs/smb/client/reparse.h | 8 +- + fs/smb/client/rfc1002pdu.h | 8 +- + fs/smb/client/smb1ops.c | 2 +- + fs/smb/client/smb2inode.c | 2 +- + fs/smb/client/smb2ops.c | 18 +- + fs/smb/client/smb2pdu.c | 45 ++- + fs/smb/client/smb2pdu.h | 112 ------- + fs/smb/common/cifsglob.h | 30 -- + fs/smb/common/fscc.h | 174 +++++++++++ + fs/smb/common/smb2pdu.h | 279 +++++++++++++++++- + fs/smb/common/smbacl.h | 8 +- + fs/smb/common/smbglob.h | 72 +++++ + fs/smb/server/Kconfig | 6 +- + fs/smb/server/auth.c | 390 +++++-------------------- + fs/smb/server/auth.h | 10 +- + fs/smb/server/crypto_ctx.c | 24 -- + fs/smb/server/crypto_ctx.h | 15 +- + fs/smb/server/mgmt/tree_connect.c | 18 +- + fs/smb/server/mgmt/tree_connect.h | 1 - + fs/smb/server/misc.c | 15 +- + fs/smb/server/oplock.c | 8 +- + fs/smb/server/server.c | 4 - + fs/smb/server/smb2misc.c | 2 +- + fs/smb/server/smb2ops.c | 38 +-- + fs/smb/server/smb2pdu.c | 217 +++++++------- + fs/smb/server/smb2pdu.h | 107 ------- + fs/smb/server/smb_common.h | 276 +---------------- + fs/smb/server/transport_tcp.c | 41 +-- + fs/smb/server/vfs.c | 7 +- + 38 files changed, 1002 insertions(+), 1625 deletions(-) + delete mode 100644 fs/smb/common/cifsglob.h + create mode 100644 fs/smb/common/fscc.h + create mode 100644 fs/smb/common/smbglob.h +Merging nfs/linux-next (6a23ae0a96a6 Linux 6.18-rc6) +$ 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 (99f5aa14f03e NFSD: Add trace point for SCSI fencing operation.) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../nfs/nfsd-maintainer-entry-profile.rst | 547 +++++++++++++++++++++ + .../maintainer/maintainer-entry-profile.rst | 1 + + MAINTAINERS | 5 + + fs/lockd/svclock.c | 12 + + fs/lockd/svcshare.c | 6 + + fs/nfsd/Kconfig | 6 +- + fs/nfsd/blocklayout.c | 162 ++++-- + fs/nfsd/blocklayoutxdr.c | 36 +- + fs/nfsd/blocklayoutxdr.h | 14 + + fs/nfsd/debugfs.c | 2 + + fs/nfsd/nfs4recover.c | 195 +++----- + fs/nfsd/nfs4state.c | 85 ++-- + fs/nfsd/nfs4xdr.c | 28 +- + fs/nfsd/nfsd.h | 4 +- + fs/nfsd/nfssvc.c | 28 +- + fs/nfsd/trace.h | 39 ++ + fs/nfsd/vfs.c | 102 +++- + fs/nfsd/vfs.h | 2 +- + fs/nfsd/xdr4.h | 21 - + include/linux/lockd/lockd.h | 9 +- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svcsock.h | 3 + + net/sunrpc/svcsock.c | 62 ++- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 +- + tools/net/sunrpc/xdrgen/generators/__init__.py | 11 +- + tools/net/sunrpc/xdrgen/generators/union.py | 34 +- + .../xdrgen/templates/C/pointer/decoder/close.j2 | 2 +- + .../xdrgen/templates/C/pointer/encoder/close.j2 | 2 +- + .../xdrgen/templates/C/struct/decoder/close.j2 | 2 +- + .../C/struct/decoder/variable_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/struct/encoder/close.j2 | 2 +- + .../xdrgen/templates/C/typedef/decoder/basic.j2 | 2 +- + .../C/typedef/decoder/fixed_length_array.j2 | 2 +- + .../C/typedef/decoder/fixed_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/typedef/decoder/string.j2 | 2 +- + .../C/typedef/decoder/variable_length_array.j2 | 2 +- + .../C/typedef/decoder/variable_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/typedef/encoder/basic.j2 | 2 +- + .../C/typedef/encoder/fixed_length_array.j2 | 2 +- + .../C/typedef/encoder/fixed_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/typedef/encoder/string.j2 | 2 +- + .../C/typedef/encoder/variable_length_array.j2 | 2 +- + .../C/typedef/encoder/variable_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/union/declaration/close.j2 | 4 + + .../xdrgen/templates/C/union/decoder/close.j2 | 2 +- + .../xdrgen/templates/C/union/encoder/close.j2 | 2 +- + .../xdrgen/templates/C/union/encoder/string.j2 | 6 + + tools/net/sunrpc/xdrgen/xdrgen | 5 + + 48 files changed, 1121 insertions(+), 367 deletions(-) + create mode 100644 Documentation/filesystems/nfs/nfsd-maintainer-entry-profile.rst + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 +Merging ntfs3/master (1b2ae190ea43 fs/ntfs3: check for shutdown in fsync) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 88 ++++++++++----------- + fs/ntfs3/dir.c | 3 +- + fs/ntfs3/file.c | 109 ++++++++++++++++++++++---- + fs/ntfs3/frecord.c | 219 +++++++++++++++++++---------------------------------- + fs/ntfs3/fsntfs.c | 136 ++++++++++++++++----------------- + fs/ntfs3/index.c | 3 +- + fs/ntfs3/inode.c | 27 ++++--- + fs/ntfs3/namei.c | 6 +- + fs/ntfs3/ntfs_fs.h | 40 ++++++---- + fs/ntfs3/record.c | 2 +- + fs/ntfs3/run.c | 17 ++++- + fs/ntfs3/super.c | 88 ++++++++++++++++----- + fs/ntfs3/xattr.c | 18 ++++- + 13 files changed, 423 insertions(+), 333 deletions(-) +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 (99dbb2a1bd66 ubifs: stop using write_cache_pages) +$ 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 (1f3e4142c0eb 9p: convert to the new mount API) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + fs/9p/v9fs.c | 568 +++++++++++++++++++++++---------------------- + fs/9p/v9fs.h | 7 +- + fs/9p/vfs_dentry.c | 1 - + fs/9p/vfs_file.c | 11 +- + fs/9p/vfs_inode.c | 3 +- + fs/9p/vfs_inode_dotl.c | 2 +- + fs/9p/vfs_super.c | 130 +++++++---- + include/linux/fs_parser.h | 2 + + include/net/9p/client.h | 98 +++++++- + include/net/9p/transport.h | 15 +- + net/9p/client.c | 165 ++----------- + net/9p/mod.c | 2 +- + net/9p/trans_fd.c | 136 ++--------- + net/9p/trans_rdma.c | 134 +---------- + net/9p/trans_usbg.c | 5 +- + net/9p/trans_virtio.c | 11 +- + net/9p/trans_xen.c | 7 +- + 17 files changed, 576 insertions(+), 721 deletions(-) +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 +Merge made by the 'ort' strategy. + .../filesystems/xfs/xfs-online-fsck-design.rst | 236 +--------- + fs/xfs/libxfs/xfs_group.h | 9 + + fs/xfs/libxfs/xfs_log_format.h | 45 +- + fs/xfs/libxfs/xfs_ondisk.h | 6 +- + fs/xfs/libxfs/xfs_quota_defs.h | 4 +- + fs/xfs/libxfs/xfs_rtgroup.h | 14 +- + fs/xfs/scrub/quota.c | 8 +- + fs/xfs/scrub/quota_repair.c | 18 +- + fs/xfs/scrub/quotacheck.c | 11 +- + fs/xfs/scrub/quotacheck_repair.c | 21 +- + 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.c | 145 +++--- + fs/xfs/xfs_dquot.h | 22 +- + fs/xfs/xfs_dquot_item.c | 15 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_icache.c | 31 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_inode_item.c | 49 +- + fs/xfs/xfs_log.c | 498 ++++++++------------- + fs/xfs/xfs_log.h | 65 +-- + fs/xfs/xfs_log_cil.c | 117 ++++- + fs/xfs/xfs_log_priv.h | 53 ++- + fs/xfs/xfs_log_recover.c | 45 +- + fs/xfs/xfs_qm.c | 154 ++----- + fs/xfs/xfs_qm.h | 2 +- + fs/xfs/xfs_qm_bhv.c | 4 +- + fs/xfs/xfs_qm_syscalls.c | 10 +- + fs/xfs/xfs_quotaops.c | 2 +- + fs/xfs/xfs_refcount_item.c | 10 +- + fs/xfs/xfs_rmap_item.c | 10 +- + fs/xfs/xfs_trace.h | 8 +- + fs/xfs/xfs_trans.h | 4 +- + fs/xfs/xfs_trans_dquot.c | 18 +- + fs/xfs/xfs_zone_alloc.c | 26 +- + fs/xfs/xfs_zone_gc.c | 14 +- + fs/xfs/xfs_zone_priv.h | 1 + + fs/xfs/xfs_zone_space_resv.c | 10 +- + 40 files changed, 677 insertions(+), 1091 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 (73612a36da1a Merge branch 'vfs-6.19.fd_prepare' 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 MAINTAINERS +Auto-merging fs/9p/vfs_file.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging fs/btrfs/block-group.c +Auto-merging fs/btrfs/compression.h +Auto-merging fs/btrfs/defrag.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/misc.h +Auto-merging fs/btrfs/ordered-data.c +Auto-merging fs/btrfs/subpage.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/dcache.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/orphan.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/glops.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/nfsd/nfs4recover.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/vfs.h +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/super.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/smb/client/inode.c +Auto-merging fs/smb/client/smb1ops.c +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/smb/server/vfs.c +Auto-merging fs/xfs/xfs_icache.c +Auto-merging fs/xfs/xfs_inode_item.c +Auto-merging fs/xfs/xfs_zone_alloc.c +Auto-merging mm/filemap.c +Auto-merging mm/memfd.c +Resolved 'fs/btrfs/file.c' using previous resolution. +Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 886f26f73990] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/iomap/operations.rst | 50 +- + Documentation/filesystems/porting.rst | 15 +- + MAINTAINERS | 1 + + Makefile | 3 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/kernel/vdso32/Makefile | 3 +- + arch/arm64/tools/syscall_32.tbl | 1 + + arch/loongarch/vdso/Makefile | 2 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/boot/compressed/Makefile | 2 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/boot/Makefile | 3 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 42 +- + arch/powerpc/platforms/pseries/papr-hvpipe.c | 39 +- + .../powerpc/platforms/pseries/papr-platform-dump.c | 30 +- + arch/powerpc/platforms/pseries/papr-rtas-common.c | 27 +- + arch/s390/Makefile | 3 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/purgatory/Makefile | 3 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/Makefile | 4 +- + arch/x86/boot/compressed/Makefile | 7 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/bdev.c | 23 +- + block/fops.c | 5 +- + drivers/base/devtmpfs.c | 6 +- + drivers/base/firmware_loader/main.c | 59 +- + drivers/block/nbd.c | 50 +- + drivers/crypto/ccp/sev-dev.c | 17 +- + drivers/dax/super.c | 2 +- + drivers/dma-buf/dma-buf.c | 10 +- + drivers/dma-buf/sw_sync.c | 39 +- + drivers/dma-buf/sync_file.c | 55 +- + drivers/firmware/efi/libstub/Makefile | 4 +- + drivers/gpio/gpiolib-cdev.c | 66 +- + drivers/hv/mshv_root_main.c | 30 +- + drivers/media/mc/mc-request.c | 34 +- + drivers/misc/ntsync.c | 21 +- + drivers/target/target_core_configfs.c | 14 +- + drivers/tty/pty.c | 51 +- + drivers/vfio/group.c | 28 +- + fs/9p/acl.c | 1 + + fs/9p/vfs_file.c | 17 +- + fs/9p/vfs_inode.c | 2 +- + fs/9p/vfs_inode_dotl.c | 2 +- + fs/Makefile | 2 +- + fs/affs/inode.c | 2 +- + fs/afs/dir.c | 4 +- + fs/afs/dynroot.c | 6 +- + fs/afs/inode.c | 8 +- + fs/aio.c | 6 +- + fs/anon_inodes.c | 23 +- + fs/attr.c | 2 +- + fs/autofs/autofs_i.h | 5 + + fs/autofs/dev-ioctl.c | 31 +- + fs/autofs/inode.c | 1 + + fs/autofs/root.c | 8 + + fs/backing-file.c | 155 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/binfmt_misc.c | 7 +- + fs/btrfs/block-group.c | 10 +- + fs/btrfs/compression.h | 4 +- + fs/btrfs/defrag.c | 14 +- + fs/btrfs/extent_io.c | 21 +- + fs/btrfs/file.c | 8 +- + fs/btrfs/inode.c | 84 +- + fs/btrfs/ioctl.c | 41 +- + fs/btrfs/misc.h | 5 - + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/subpage.c | 5 +- + fs/btrfs/volumes.c | 20 +- + fs/buffer.c | 6 +- + fs/cachefiles/interface.c | 11 +- + fs/cachefiles/namei.c | 98 +- + fs/cachefiles/volume.c | 9 +- + fs/ceph/addr.c | 6 +- + fs/ceph/cache.c | 2 +- + fs/ceph/crypto.c | 4 +- + fs/ceph/file.c | 4 +- + fs/ceph/inode.c | 28 +- + fs/coda/cnode.c | 4 +- + fs/coredump.c | 146 +- + fs/cramfs/inode.c | 2 +- + fs/crypto/keyring.c | 2 +- + fs/crypto/keysetup.c | 2 +- + fs/dax.c | 30 +- + fs/dcache.c | 20 +- + fs/debugfs/inode.c | 76 +- + fs/drop_caches.c | 2 +- + fs/ecryptfs/Kconfig | 2 +- + fs/ecryptfs/crypto.c | 90 +- + fs/ecryptfs/ecryptfs_kernel.h | 13 +- + fs/ecryptfs/inode.c | 169 +- + fs/ecryptfs/keystore.c | 65 +- + fs/ecryptfs/main.c | 7 + + fs/ecryptfs/super.c | 5 +- + fs/efs/inode.c | 2 +- + fs/erofs/data.c | 5 +- + fs/erofs/fileio.c | 6 +- + fs/erofs/inode.c | 2 +- + fs/eventfd.c | 29 +- + fs/eventpoll.c | 32 +- + fs/exec.c | 3 +- + fs/ext2/inode.c | 2 +- + fs/ext4/inode.c | 28 +- + fs/ext4/mmp.c | 8 +- + fs/ext4/orphan.c | 4 +- + fs/f2fs/acl.c | 1 + + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 7 +- + fs/f2fs/inode.c | 2 +- + fs/f2fs/namei.c | 4 +- + fs/f2fs/super.c | 2 +- + fs/fat/inode.c | 1 + + fs/fcntl.c | 13 + + fs/fhandle.c | 30 +- + fs/file.c | 54 +- + fs/file_attr.c | 4 - + fs/freevxfs/vxfs_inode.c | 2 +- + fs/fs-writeback.c | 187 +- + fs/{fs_types.c => fs_dirent.c} | 2 +- + fs/fs_struct.c | 6 - + fs/fuse/dir.c | 22 +- + fs/fuse/file.c | 286 ++- + fs/fuse/fuse_i.h | 8 - + fs/fuse/inode.c | 17 +- + fs/gfs2/aops.c | 14 +- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 4 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfs/btree.c | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/options.c | 1 + + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/dir.c | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hpfs/super.c | 1 + + fs/init.c | 6 +- + fs/inode.c | 311 +-- + fs/internal.h | 3 + + fs/iomap/Makefile | 3 +- + fs/iomap/bio.c | 88 + + fs/iomap/buffered-io.c | 650 +++-- + fs/iomap/direct-io.c | 272 +- + fs/iomap/internal.h | 12 + + fs/iomap/ioend.c | 2 - + fs/iomap/iter.c | 20 +- + fs/iomap/seek.c | 8 +- + fs/iomap/trace.h | 7 +- + fs/isofs/inode.c | 2 +- + fs/jffs2/fs.c | 4 +- + fs/jfs/file.c | 4 +- + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_incore.h | 6 +- + fs/jfs/jfs_txnmgr.c | 2 +- + fs/kernfs/inode.c | 2 +- + fs/libfs.c | 43 +- + fs/locks.c | 100 +- + fs/minix/inode.c | 18 +- + fs/minix/minix.h | 9 + + fs/minix/namei.c | 39 +- + fs/mount.h | 3 +- + fs/namei.c | 1061 ++++++-- + fs/namespace.c | 152 +- + fs/netfs/buffered_write.c | 2 +- + fs/netfs/misc.c | 10 +- + fs/netfs/read_single.c | 6 +- + fs/nfs/inode.c | 2 +- + fs/nfs/localio.c | 86 +- + fs/nfs/nfs4file.c | 2 + + fs/nfs/nfs4idmap.c | 7 +- + fs/nfs/pnfs.c | 2 +- + fs/nfsd/filecache.c | 57 +- + fs/nfsd/filecache.h | 2 + + fs/nfsd/nfs3proc.c | 16 +- + fs/nfsd/nfs4proc.c | 36 +- + fs/nfsd/nfs4recover.c | 40 +- + fs/nfsd/nfs4state.c | 103 +- + fs/nfsd/nfsproc.c | 14 +- + fs/nfsd/state.h | 5 + + fs/nfsd/vfs.c | 173 +- + fs/nfsd/vfs.h | 2 +- + fs/nilfs2/cpfile.c | 2 +- + fs/nilfs2/dat.c | 2 +- + fs/nilfs2/ifile.c | 2 +- + fs/nilfs2/inode.c | 10 +- + fs/nilfs2/nilfs.h | 1 + + fs/nilfs2/sufile.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 60 +- + fs/notify/fsnotify.c | 2 +- + fs/nsfs.c | 148 +- + fs/ntfs3/inode.c | 2 +- + fs/ntfs3/super.c | 1 + + fs/ocfs2/acl.c | 1 + + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/inode.c | 27 +- + fs/ocfs2/inode.h | 1 - + fs/ocfs2/journal.c | 11 +- + fs/ocfs2/ocfs2_trace.h | 2 - + fs/ocfs2/super.c | 2 +- + fs/omfs/inode.c | 3 +- + fs/open.c | 44 +- + fs/openpromfs/inode.c | 2 +- + fs/orangefs/inode.c | 6 +- + fs/orangefs/orangefs-utils.c | 6 +- + fs/overlayfs/copy_up.c | 143 +- + fs/overlayfs/dir.c | 587 ++--- + fs/overlayfs/file.c | 91 +- + fs/overlayfs/inode.c | 124 +- + fs/overlayfs/namei.c | 400 ++- + fs/overlayfs/overlayfs.h | 63 +- + fs/overlayfs/readdir.c | 110 +- + fs/overlayfs/super.c | 140 +- + fs/overlayfs/util.c | 39 +- + fs/overlayfs/xattrs.c | 35 +- + fs/pidfs.c | 189 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 8 +- + fs/qnx4/inode.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/quota/dquot.c | 2 +- + fs/romfs/super.c | 2 +- + fs/signalfd.c | 29 +- + fs/smb/client/cifs_spnego.c | 6 +- + fs/smb/client/cifsfs.c | 5 +- + fs/smb/client/file.c | 1 + + fs/smb/client/inode.c | 15 +- + fs/smb/client/smb1ops.c | 1 + + fs/smb/server/smb2pdu.c | 6 +- + fs/smb/server/vfs.c | 123 +- + fs/smb/server/vfs.h | 8 +- + fs/splice.c | 2 +- + fs/squashfs/inode.c | 2 +- + fs/super.c | 1 + + fs/sync.c | 19 +- + fs/timerfd.c | 29 +- + fs/ubifs/file.c | 2 +- + fs/ubifs/super.c | 2 +- + fs/udf/inode.c | 2 +- + fs/ufs/inode.c | 2 +- + fs/userfaultfd.c | 30 +- + fs/utimes.c | 5 +- + fs/xattr.c | 12 +- + fs/xfs/libxfs/xfs_errortag.h | 6 +- + fs/xfs/scrub/common.c | 2 +- + fs/xfs/scrub/inode_repair.c | 2 +- + fs/xfs/scrub/orphanage.c | 13 +- + fs/xfs/scrub/parent.c | 2 +- + fs/xfs/scrub/xfarray.c | 2 +- + fs/xfs/xfs_aops.c | 7 +- + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_file.c | 50 +- + fs/xfs/xfs_handle.c | 56 +- + fs/xfs/xfs_health.c | 4 +- + fs/xfs/xfs_icache.c | 6 +- + fs/xfs/xfs_inode.c | 6 +- + fs/xfs/xfs_inode_item.c | 4 +- + fs/xfs/xfs_ioctl.c | 6 +- + fs/xfs/xfs_iomap.c | 38 +- + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_reflink.h | 2 +- + fs/xfs/xfs_zone_alloc.c | 28 +- + fs/zonefs/file.c | 5 +- + fs/zonefs/super.c | 4 +- + include/asm-generic/vmlinux.lds.h | 3 +- + include/linux/backing-dev-defs.h | 2 + + include/linux/backing-dev.h | 5 +- + include/linux/cleanup.h | 22 +- + include/linux/cred.h | 22 + + include/linux/file.h | 123 + + include/linux/filelock.h | 98 +- + include/linux/fs.h | 723 +----- + include/linux/fs/super.h | 238 ++ + include/linux/fs/super_types.h | 336 +++ + include/linux/{fs_types.h => fs_dirent.h} | 11 +- + include/linux/fs_struct.h | 6 + + include/linux/init_task.h | 1 - + include/linux/iomap.h | 86 +- + include/linux/mm.h | 8 +- + include/linux/namei.h | 83 + + include/linux/ns/ns_common_types.h | 196 ++ + include/linux/ns/nstree_types.h | 55 + + include/linux/ns_common.h | 229 +- + include/linux/nsfs.h | 3 + + include/linux/nsproxy.h | 9 +- + include/linux/nstree.h | 52 +- + include/linux/pagemap.h | 18 +- + include/linux/pid_namespace.h | 3 +- + include/linux/pipe_fs_i.h | 23 +- + include/linux/pseudo_fs.h | 1 + + include/linux/sched/coredump.h | 2 +- + include/linux/shmem_fs.h | 2 +- + include/linux/syscalls.h | 4 + + include/linux/types.h | 1 + + include/linux/user_namespace.h | 4 +- + include/linux/writeback.h | 15 +- + include/linux/xattr.h | 4 +- + include/trace/events/writeback.h | 8 +- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fcntl.h | 11 + + include/uapi/linux/nsfs.h | 58 + + include/uapi/linux/pidfd.h | 11 +- + init/do_mounts.c | 3 +- + init/do_mounts_rd.c | 3 +- + init/init_task.c | 27 + + init/version-timestamp.c | 7 +- + io_uring/mock_file.c | 43 +- + io_uring/rw.c | 16 +- + ipc/mqueue.c | 85 +- + ipc/msgutil.c | 7 +- + ipc/namespace.c | 3 +- + kernel/acct.c | 29 +- + kernel/bpf/bpf_iter.c | 27 +- + kernel/bpf/token.c | 47 +- + kernel/cgroup/cgroup.c | 21 +- + kernel/cgroup/namespace.c | 2 +- + kernel/cred.c | 33 +- + kernel/exit.c | 3 +- + kernel/fork.c | 3 +- + kernel/nscommon.c | 246 +- + kernel/nsproxy.c | 57 +- + kernel/nstree.c | 784 +++++- + kernel/pid.c | 12 +- + kernel/pid_namespace.c | 2 +- + kernel/time/namespace.c | 5 +- + kernel/trace/trace_events_user.c | 22 +- + kernel/user.c | 7 +- + kernel/watch_queue.c | 4 +- + mm/backing-dev.c | 2 +- + mm/fadvise.c | 3 +- + mm/filemap.c | 177 +- + mm/memfd.c | 29 +- + mm/page-writeback.c | 6 - + mm/secretmem.c | 20 +- + mm/shmem.c | 8 +- + mm/truncate.c | 10 +- + mm/vmscan.c | 2 +- + mm/workingset.c | 2 +- + net/core/net_namespace.c | 2 +- + net/dns_resolver/dns_query.c | 6 +- + net/handshake/netlink.c | 36 +- + net/kcm/kcmsock.c | 22 +- + net/sctp/socket.c | 92 +- + net/socket.c | 34 +- + net/unix/af_unix.c | 35 +- + scripts/Makefile.extrawarn | 4 +- + scripts/syscall.tbl | 1 + + security/apparmor/apparmorfs.c | 8 +- + security/keys/process_keys.c | 2 +- + security/landlock/fs.c | 2 +- + security/selinux/selinuxfs.c | 15 +- + tools/include/uapi/linux/nsfs.h | 70 + + tools/testing/selftests/coredump/.gitignore | 4 + + tools/testing/selftests/coredump/Makefile | 8 +- + .../coredump/coredump_socket_protocol_test.c | 1568 ++++++++++++ + .../selftests/coredump/coredump_socket_test.c | 742 ++++++ + tools/testing/selftests/coredump/coredump_test.h | 59 + + .../selftests/coredump/coredump_test_helpers.c | 383 +++ + tools/testing/selftests/coredump/stackdump_test.c | 1662 +----------- + tools/testing/selftests/filesystems/utils.c | 2 +- + tools/testing/selftests/namespaces/.gitignore | 9 + + tools/testing/selftests/namespaces/Makefile | 24 +- + .../selftests/namespaces/cred_change_test.c | 814 ++++++ + .../selftests/namespaces/listns_efault_test.c | 530 ++++ + .../selftests/namespaces/listns_pagination_bug.c | 138 + + .../selftests/namespaces/listns_permissions_test.c | 759 ++++++ + tools/testing/selftests/namespaces/listns_test.c | 679 +++++ + .../selftests/namespaces/ns_active_ref_test.c | 2672 ++++++++++++++++++++ + tools/testing/selftests/namespaces/nsid_test.c | 107 +- + .../namespaces/regression_pidfd_setns_test.c | 113 + + .../testing/selftests/namespaces/siocgskns_test.c | 1824 +++++++++++++ + tools/testing/selftests/namespaces/stress_test.c | 626 +++++ + tools/testing/selftests/namespaces/wrappers.h | 35 + + tools/testing/selftests/pidfd/pidfd.h | 15 +- + tools/testing/selftests/pidfd/pidfd_info_test.c | 73 + + virt/kvm/guest_memfd.c | 36 +- + virt/kvm/kvm_main.c | 19 +- + 392 files changed, 19124 insertions(+), 7445 deletions(-) + rename fs/{fs_types.c => fs_dirent.c} (98%) + create mode 100644 fs/iomap/bio.c + create mode 100644 include/linux/fs/super.h + create mode 100644 include/linux/fs/super_types.h + rename include/linux/{fs_types.h => fs_dirent.h} (92%) + create mode 100644 include/linux/ns/ns_common_types.h + create mode 100644 include/linux/ns/nstree_types.h + create mode 100644 tools/testing/selftests/coredump/.gitignore + create mode 100644 tools/testing/selftests/coredump/coredump_socket_protocol_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_socket_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_test.h + create mode 100644 tools/testing/selftests/coredump/coredump_test_helpers.c + create mode 100644 tools/testing/selftests/namespaces/cred_change_test.c + create mode 100644 tools/testing/selftests/namespaces/listns_efault_test.c + create mode 100644 tools/testing/selftests/namespaces/listns_pagination_bug.c + create mode 100644 tools/testing/selftests/namespaces/listns_permissions_test.c + create mode 100644 tools/testing/selftests/namespaces/listns_test.c + create mode 100644 tools/testing/selftests/namespaces/ns_active_ref_test.c + create mode 100644 tools/testing/selftests/namespaces/regression_pidfd_setns_test.c + create mode 100644 tools/testing/selftests/namespaces/siocgskns_test.c + create mode 100644 tools/testing/selftests/namespaces/stress_test.c + create mode 100644 tools/testing/selftests/namespaces/wrappers.h +$ git am -3 ../patches/vfs_add_needed_headers_for_new_struct_delegation_definition.patch +Applying: vfs: add needed headers for new struct delegation definition +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/fcntl.h +$ git add -A . +$ git commit -v -a --amend +[fs-next 0810f3d2f2ca] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Fri Nov 28 09:02:20 2025 +1100 +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 +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging arch/powerpc/platforms/cell/spufs/inode.c +Auto-merging drivers/base/devtmpfs.c +Auto-merging fs/autofs/inode.c +Auto-merging fs/autofs/root.c +Auto-merging fs/binfmt_misc.c +Auto-merging fs/configfs/dir.c +Auto-merging fs/dcache.c +CONFLICT (content): Merge conflict in fs/dcache.c +Auto-merging fs/debugfs/inode.c +CONFLICT (content): Merge conflict in fs/debugfs/inode.c +Auto-merging fs/efivarfs/super.c +Auto-merging fs/internal.h +Auto-merging fs/libfs.c +Auto-merging fs/super.c +Auto-merging include/linux/dcache.h +Auto-merging include/linux/fs.h +Auto-merging init/do_mounts.c +Auto-merging ipc/mqueue.c +Auto-merging mm/shmem.c +Auto-merging security/apparmor/apparmorfs.c +CONFLICT (content): Merge conflict in security/apparmor/apparmorfs.c +Auto-merging security/selinux/selinuxfs.c +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Resolved 'fs/dcache.c' using previous resolution. +Resolved 'fs/debugfs/inode.c' using previous resolution. +Resolved 'security/apparmor/apparmorfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 14ebe81f7d10] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 7 ++ + arch/powerpc/platforms/cell/spufs/inode.c | 17 ++- + arch/s390/hypfs/hypfs.h | 6 +- + arch/s390/hypfs/hypfs_diag_fs.c | 60 ++++------ + arch/s390/hypfs/hypfs_vm_fs.c | 21 ++-- + arch/s390/hypfs/inode.c | 82 +++++-------- + drivers/android/binder/rust_binderfs.c | 121 ++++++------------- + drivers/android/binderfs.c | 82 +++---------- + drivers/base/devtmpfs.c | 2 +- + drivers/misc/ibmasm/ibmasmfs.c | 24 ++-- + drivers/usb/gadget/function/f_fs.c | 144 +++++++++++++---------- + drivers/usb/gadget/legacy/inode.c | 49 ++++---- + drivers/xen/xenfs/super.c | 2 +- + fs/autofs/inode.c | 2 +- + fs/autofs/root.c | 11 +- + fs/binfmt_misc.c | 69 ++++++----- + fs/configfs/dir.c | 10 +- + fs/configfs/inode.c | 3 +- + fs/configfs/mount.c | 2 +- + fs/dcache.c | 111 +++++++++++------- + fs/debugfs/inode.c | 32 ++---- + fs/devpts/inode.c | 57 ++++----- + fs/efivarfs/inode.c | 7 +- + fs/efivarfs/super.c | 5 +- + fs/fuse/control.c | 36 +++--- + fs/hugetlbfs/inode.c | 12 +- + fs/internal.h | 1 - + fs/libfs.c | 52 +++++++-- + fs/nfsd/nfsctl.c | 18 +-- + fs/ocfs2/dlmfs/dlmfs.c | 8 +- + fs/proc/base.c | 6 +- + fs/proc/internal.h | 1 + + fs/proc/root.c | 14 +-- + fs/proc/self.c | 10 +- + fs/proc/thread_self.c | 11 +- + fs/pstore/inode.c | 7 +- + fs/ramfs/inode.c | 8 +- + fs/super.c | 8 -- + fs/tracefs/event_inode.c | 7 +- + fs/tracefs/inode.c | 13 +-- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 6 +- + include/linux/proc_fs.h | 2 - + include/linux/security.h | 2 - + init/do_mounts.c | 2 +- + ipc/mqueue.c | 12 +- + kernel/bpf/inode.c | 15 +-- + mm/shmem.c | 38 ++---- + net/sunrpc/rpc_pipe.c | 27 ++--- + security/apparmor/apparmorfs.c | 13 ++- + security/inode.c | 35 +++--- + security/selinux/selinuxfs.c | 185 +++++++++++++----------------- + security/smack/smackfs.c | 2 +- + 53 files changed, 648 insertions(+), 833 deletions(-) +Merging mm-hotfixes/mm-hotfixes-unstable (12299cbb821b arm64: kernel: initialize missing kexec_buf->random field) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/arm64/kernel/kexec_image.c | 3 +++ + arch/arm64/kernel/machine_kexec_file.c | 6 +++++- + include/linux/genalloc.h | 1 + + 4 files changed, 10 insertions(+), 1 deletion(-) +Merging fs-current (5dac3972a319 Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/btrfs/ctree.c | 2 +- + fs/btrfs/ioctl.c | 4 +--- + fs/namespace.c | 7 ++++--- + 3 files changed, 6 insertions(+), 7 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 +Merge made by the 'ort' strategy. + scripts/package/install-extmod-build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ 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 (165eb13e485c arm64: proton-pack: Fix hard lockup when !MITIGATE_SPECTRE_BRANCH_HISTORY) +$ 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 +Already up to date. +Merging arm-soc-fixes/arm/fixes (e9191383d28d Merge tag 'sunxi-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 4 ++-- + arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi | 5 +++++ + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 4 ++-- + arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- + drivers/tee/qcomtee/call.c | 2 +- + drivers/tee/qcomtee/core.c | 2 +- + 8 files changed, 15 insertions(+), 8 deletions(-) +Merging davinci-current/davinci/for-current (3a8660878839 Linux 6.18-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 (6f37469a9330 memory: tegra210: Fix incorrect client ids) +$ 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 (695f2c0c25f3 m68k: defconfig: Update defconfigs for v6.17-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 (31475b88110c s390/mm: Fix __ptep_rdp() inline assembly) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (1f5e808aa63a Merge tag 'net-6.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Already up to date. +Merging bpf/master (30f09200cc4a Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Already up to date. +Merging ipsec/master (a55ef3bff84f xfrm: fix memory leak in xfrm_add_acquire()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (8a4dfa8fa6b5 Merge tag 'for-net-2025-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ 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 (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-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 (1a222625b468 wifi: iwlwifi: mld: always take beacon ies in link grading) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (ac3fd01e4c1e Linux 6.18-rc7) +$ 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 (d01a3aad7f2c Merge tag 'asoc-fix-v6.18-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ 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/soc/codecs/Kconfig | 1 + + sound/soc/codecs/pm4125.c | 21 ++++++++++-- + sound/soc/codecs/tas2781-comlib-i2c.c | 2 +- + sound/soc/codecs/tas2781-i2c.c | 2 +- + sound/soc/codecs/wcd937x.c | 43 ++++++++++++++++++----- + sound/soc/fsl/fsl_xcvr.c | 2 +- + sound/soc/renesas/rz-ssi.c | 64 +++++++++++++++++++++++++---------- + 7 files changed, 103 insertions(+), 32 deletions(-) +Merging sound-asoc-fixes/for-linus (73b97d46dde6 ASoC: fsl_xcvr: clear the channel status control memory) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (6146a0f1dfae Linux 6.18-rc4) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (8684229e19c4 regulator: rtq2208: Correct LDO2 logic judgment bits) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/rtq2208-regulator.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (40ad64ac25bb spi: nxp-fspi: Propagate fwnode in ACPI case as well) +$ 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/Kconfig | 4 ++-- + drivers/spi/spi-amlogic-spifc-a1.c | 4 +++- + drivers/spi/spi-bcm63xx.c | 14 ++++++++++++++ + drivers/spi/spi-cadence-quadspi.c | 18 ++++++++---------- + drivers/spi/spi-fsl-lpspi.c | 8 +++++++- + drivers/spi/spi-nxp-fspi.c | 10 +++++----- + 6 files changed, 39 insertions(+), 19 deletions(-) +Merging pci-current/for-linus (3a8660878839 Linux 6.18-rc1) +$ 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 (dcb6fa37fd7b Linux 6.18-rc3) +$ 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 (2bf95a9bcb50 serial: 8250: Fix 8250_rsa symbol loop) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250.h | 4 ++-- + drivers/tty/serial/8250/8250_platform.c | 2 +- + drivers/tty/serial/8250/8250_rsa.c | 26 +++++++++++++++++--------- + drivers/tty/serial/8250/Makefile | 2 +- + drivers/tty/serial/amba-pl011.c | 2 +- + 5 files changed, 22 insertions(+), 14 deletions(-) +Merging usb.current/usb-linus (74851fbb6d64 usb: gadget: renesas_usbf: Handle devm_pm_runtime_enable() errors) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/thunderbolt/nhi.c | 2 + + drivers/thunderbolt/nhi.h | 1 + + drivers/usb/cdns3/cdns3-pci-wrap.c | 5 +- + drivers/usb/dwc3/core.c | 3 +- + drivers/usb/dwc3/dwc3-pci.c | 82 ++++++++++++++------------- + drivers/usb/dwc3/ep0.c | 1 + + drivers/usb/dwc3/gadget.c | 7 +++ + drivers/usb/gadget/function/f_eem.c | 7 ++- + drivers/usb/gadget/udc/core.c | 17 +++++- + drivers/usb/gadget/udc/renesas_usbf.c | 4 +- + drivers/usb/host/xhci-dbgcap.h | 1 + + drivers/usb/host/xhci-dbgtty.c | 23 +++++++- + drivers/usb/host/xhci-ring.c | 15 +++-- + drivers/usb/host/xhci-sideband.c | 102 +++++++++++++++++++--------------- + drivers/usb/host/xhci.c | 1 + + drivers/usb/renesas_usbhs/common.c | 14 ++--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 1 + + drivers/usb/serial/option.c | 10 +++- + drivers/usb/storage/sddr55.c | 6 ++ + drivers/usb/storage/transport.c | 16 ++++++ + drivers/usb/storage/uas.c | 5 ++ + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/usb/typec/ucsi/psy.c | 5 ++ + include/linux/usb/gadget.h | 5 ++ + 25 files changed, 228 insertions(+), 108 deletions(-) +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 (3a8660878839 Linux 6.18-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 (dcb6fa37fd7b Linux 6.18-rc3) +$ 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/accel/adxl355_core.c | 44 +++++++++++-- + drivers/iio/accel/bmc150-accel-core.c | 5 ++ + drivers/iio/accel/bmc150-accel.h | 1 + + drivers/iio/adc/ad4030.c | 2 +- + drivers/iio/adc/ad7124.c | 12 ++-- + drivers/iio/adc/ad7280a.c | 2 +- + drivers/iio/adc/ad7380.c | 8 +++ + drivers/iio/adc/at91-sama5d2_adc.c | 1 + + drivers/iio/adc/rtq6056.c | 2 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 5 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 6 ++ + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 2 + + drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +- + drivers/iio/humidity/hdc3020.c | 73 +++++++++++++--------- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 40 ++++++++---- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 19 +++--- + drivers/iio/industrialio-buffer.c | 21 +++++-- + drivers/iio/pressure/bmp280-core.c | 15 +++-- + include/linux/iio/buffer-dma.h | 1 + + include/linux/iio/buffer_impl.h | 2 + + 20 files changed, 186 insertions(+), 79 deletions(-) +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 +Merge made by the 'ort' strategy. + drivers/counter/microchip-tcb-capture.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (03bc4831ef06 nvmem: layouts: fix nvmem_layout_bus_uevent) +$ 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 +Merge made by the 'ort' strategy. + drivers/firmware/stratix10-svc.c | 7 ++++--- + drivers/misc/mei/pci-me.c | 13 ++++++------- + drivers/misc/mei/pci-txe.c | 13 ++++++------- + drivers/misc/mei/platform-vsc.c | 11 +++++------ + drivers/most/most_usb.c | 14 +++++--------- + drivers/nvmem/layouts.c | 2 +- + drivers/slimbus/qcom-ngd-ctrl.c | 1 + + 7 files changed, 28 insertions(+), 33 deletions(-) +Merging soundwire-fixes/fixes (3a8660878839 Linux 6.18-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 (3575254546a2 thunderbolt: Add support for Intel Wildcat Lake) +$ 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 (ae8966b7b5bd Input: rename INPUT_PROP_HAPTIC_TOUCHPAD to INPUT_PROP_PRESSUREPAD) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (8b36669b5f73 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 +Merge made by the 'ort' strategy. + crypto/zstd.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging libcrypto-fixes/libcrypto-fixes (141fbbecec0e lib/crypto: tests: Fix KMSAN warning in test_sha256_finup_2x()) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (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 (dd4adb986a86 selftests/tracing: Run sample events to clear page cache events) +$ 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 (f52c6c5eb159 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 (1613e604df0c Linux 6.10-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 (3a8660878839 Linux 6.18-rc1) +$ 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 +Already up to date. +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 (ac3fd01e4c1e Linux 6.18-rc7) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (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 +Merge made by the 'ort' strategy. + virt/kvm/kvm_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (6a23ae0a96a6 Linux 6.18-rc6) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (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 (d0d08f4bd7f6 dma-direct: Fix missing sg_dma_len assignment in P2PDMA bus mappings) +$ 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 +Merge made by the 'ort' strategy. + drivers/iommu/dma-iommu.c | 5 +++-- + kernel/dma/direct.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging drivers-x86-fixes/fixes (9b9c0adbc3f8 platform/x86: intel: punit_ipc: fix memory corruption) +$ 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 (3a8660878839 Linux 6.18-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 (3a8660878839 Linux 6.18-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 (7209ff310083 of/irq: Export of_msi_xlate() for module usage) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (3a8660878839 Linux 6.18-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 (ac3fd01e4c1e Linux 6.18-rc7) +$ 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 (7c373b3bd03c drm/i915/psr: Reject async flips when selective fetch is enabled) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 8 ++++++++ + drivers/gpu/drm/i915/display/intel_psr.c | 6 ------ + 2 files changed, 8 insertions(+), 6 deletions(-) +Merging mmc-fixes/fixes (747528729c9b mmc: sdhci-of-dwcmshc: Promote the th1520 reset handling to ip level) +$ 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. + drivers/mmc/host/sdhci-of-dwcmshc.c | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) +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 (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +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 +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 (89373f5695dc LICENSES: Add modern form of the LGPL-2.1 tags to the usage guide section) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'ort' strategy. + LICENSES/preferred/LGPL-2.1 | 4 ++++ + 1 file changed, 4 insertions(+) +Merging gpio-brgl-fixes/gpio/for-current (2b6d546ba83e MAINTAINERS: update my email address) +$ 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 (6a23ae0a96a6 Linux 6.18-rc6) +$ 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 (3a8660878839 Linux 6.18-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 (3a8660878839 Linux 6.18-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 (f3903ec76ae6 MAINTAINERS: Update KUnit email address for Rae Moar) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (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 (6a23ae0a96a6 Linux 6.18-rc6) +$ 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 (3a8660878839 Linux 6.18-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 (ac3fd01e4c1e Linux 6.18-rc7) +$ 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 (3a8660878839 Linux 6.18-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 +Merge made by the 'ort' strategy. + drivers/pmdomain/mediatek/mtk-pm-domains.c | 18 +++++++++++++++--- + drivers/pmdomain/tegra/powergate-bpmp.c | 1 + + 2 files changed, 16 insertions(+), 3 deletions(-) +Merging i2c-host-fixes/i2c/i2c-host-fixes (8738d626030f i2c: fix reference leak in MP2 PCI device) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-amd-mp2-pci.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +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 (3a8660878839 Linux 6.18-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 +Merge made by the 'ort' strategy. + kernel/trace/fgraph.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +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 (53afec2c8fb2 tracing/tools: Fix incorrcet short option in usage text for --threads) +$ 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 (a1ef372dbe4b Merge branch into tip/master: 'timers/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + kernel/time/timekeeping.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging slab-fixes/slab/for-next-fixes (ec33b59542d9 mm/mempool: fix poisoning order>0 pages with HIGHMEM) +$ 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 +Already up to date. +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 (211ddde0823f Linux 6.18-rc2) +$ 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 (eb76d0f55535 drm, fbcon, vga_switcheroo: Avoid race condition in fbcon setup) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/sii902x.c | 20 ++++++++------------ + drivers/gpu/drm/drm_fb_helper.c | 14 -------------- + drivers/gpu/drm/imagination/pvr_device.h | 8 ++++++++ + drivers/gpu/drm/sti/sti_vtg.c | 7 ++++++- + drivers/video/fbdev/core/fbcon.c | 9 +++++++++ + 5 files changed, 31 insertions(+), 27 deletions(-) +Merging mm-stable/mm-stable (84a8d467cc42 pagemap: update BUDDY flag documentation) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging MAINTAINERS +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/s390/mm/pgtable.c +Auto-merging include/linux/fs.h +Auto-merging mm/page_alloc.c +Auto-merging mm/shmem.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + .clang-format | 4 +- + Documentation/ABI/testing/sysfs-kernel-mm-damon | 13 + + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/mm/damon/lru_sort.rst | 22 + + Documentation/admin-guide/mm/damon/reclaim.rst | 22 + + Documentation/admin-guide/mm/damon/stat.rst | 35 +- + Documentation/admin-guide/mm/damon/usage.rst | 29 +- + Documentation/admin-guide/mm/index.rst | 1 - + Documentation/admin-guide/mm/pagemap.rst | 3 +- + Documentation/admin-guide/mm/swap_numa.rst | 78 -- + Documentation/admin-guide/mm/transhuge.rst | 5 + + Documentation/admin-guide/mm/zswap.rst | 10 +- + .../devicetree/bindings/riscv/extensions.yaml | 6 + + Documentation/filesystems/porting.rst | 5 + + Documentation/filesystems/proc.rst | 5 +- + Documentation/filesystems/vfs.rst | 4 + + Documentation/mm/damon/design.rst | 23 +- + Documentation/mm/damon/maintainer-profile.rst | 10 +- + Documentation/mm/memory-model.rst | 2 +- + Documentation/mm/page_owner.rst | 32 +- + Documentation/mm/process_addrs.rst | 9 +- + MAINTAINERS | 6 + + arch/arm64/mm/mmu.c | 2 - + arch/csky/include/asm/pgtable.h | 3 - + arch/mips/alchemy/common/setup.c | 9 +- + arch/mips/include/asm/pgtable.h | 5 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 7 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/riscv/Kconfig | 16 + + arch/riscv/include/asm/hwcap.h | 1 + + arch/riscv/include/asm/pgtable-bits.h | 37 + + arch/riscv/include/asm/pgtable.h | 143 ++- + arch/riscv/kernel/cpufeature.c | 1 + + arch/s390/boot/vmem.c | 1 - + arch/s390/mm/gmap.c | 5 +- + arch/s390/mm/gmap_helpers.c | 20 +- + arch/s390/mm/pgtable.c | 12 +- + arch/sparc/include/asm/pgtable_32.h | 12 +- + arch/sparc/include/asm/pgtable_64.h | 12 +- + arch/sparc/kernel/sys_sparc_64.c | 6 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/cpu/sgx/driver.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/numa.c | 4 +- + arch/x86/mm/pat/set_memory.c | 2 +- + arch/x86/mm/pgtable.c | 12 +- + drivers/acpi/apei/ghes.c | 6 - + drivers/base/memory.c | 6 +- + drivers/base/node.c | 90 +- + drivers/block/zram/zram_drv.c | 481 ++++++-- + drivers/block/zram/zram_drv.h | 2 +- + drivers/char/mem.c | 86 +- + drivers/dax/device.c | 37 +- + drivers/firmware/efi/arm-runtime.c | 4 +- + drivers/firmware/efi/riscv-runtime.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 7 +- + drivers/gpu/drm/drm_pagemap.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 311 +++-- + drivers/gpu/drm/nouveau/nouveau_svm.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_svm.h | 3 +- + drivers/iommu/iommu-sva.c | 29 +- + drivers/pci/p2pdma.c | 5 +- + drivers/s390/char/sclp_sd.c | 3 +- + drivers/vdpa/vdpa_user/iova_domain.h | 2 - + drivers/vfio/pci/nvgrace-gpu/main.c | 45 +- + fs/dax.c | 2 +- + fs/hugetlbfs/inode.c | 49 +- + fs/ntfs3/file.c | 2 +- + fs/proc/inode.c | 2 +- + fs/proc/task_mmu.c | 320 +++--- + fs/ramfs/file-mmu.c | 2 +- + fs/resctrl/pseudo_lock.c | 20 +- + fs/userfaultfd.c | 135 ++- + include/asm-generic/hugetlb.h | 8 - + include/asm-generic/pgalloc.h | 24 +- + include/asm-generic/pgtable_uffd.h | 17 + + include/linux/damon.h | 39 +- + include/linux/fs.h | 6 +- + include/linux/gfp.h | 2 +- + include/linux/huge_mm.h | 112 +- + include/linux/hugetlb.h | 13 +- + include/linux/hugetlb_inline.h | 15 +- + include/linux/iommu.h | 4 + + include/linux/kasan.h | 20 +- + include/linux/kmsan.h | 6 +- + include/linux/ksm.h | 4 +- + include/linux/leafops.h | 619 ++++++++++ + include/linux/memcontrol.h | 87 +- + include/linux/memory-failure.h | 17 + + include/linux/memory.h | 28 +- + include/linux/memremap.h | 57 +- + include/linux/migrate.h | 4 +- + include/linux/mm.h | 298 ++++- + include/linux/mm_inline.h | 16 +- + include/linux/mm_types.h | 78 ++ + include/linux/mmap_lock.h | 37 +- + include/linux/mmzone.h | 4 - + include/linux/node.h | 10 +- + include/linux/pgtable.h | 12 + + include/linux/sched/mm.h | 12 +- + include/linux/shmem_fs.h | 9 +- + include/linux/swap.h | 15 +- + include/linux/swapops.h | 241 +--- + include/linux/userfaultfd_k.h | 96 +- + include/linux/vmalloc.h | 8 +- + include/linux/vmstat.h | 48 +- + include/net/sock.h | 6 +- + include/ras/ras_event.h | 86 -- + include/trace/events/huge_memory.h | 3 +- + include/trace/events/memory-failure.h | 98 ++ + include/trace/events/mmflags.h | 1 + + io_uring/memmap.c | 2 +- + kernel/bpf/arena.c | 2 +- + kernel/bpf/syscall.c | 2 +- + kernel/cgroup/cgroup.c | 1 + + kernel/dma/swiotlb.c | 2 - + kernel/fork.c | 4 +- + kernel/relay.c | 33 +- + lib/alloc_tag.c | 2 +- + lib/test_hmm.c | 455 ++++++-- + lib/test_hmm_uapi.h | 3 + + lib/test_vmalloc.c | 28 +- + mm/Kconfig | 105 +- + mm/Makefile | 2 +- + mm/damon/core.c | 129 ++- + mm/damon/lru_sort.c | 3 +- + mm/damon/ops-common.c | 40 +- + mm/damon/reclaim.c | 3 +- + mm/damon/stat.c | 3 +- + mm/damon/sysfs-schemes.c | 59 +- + mm/damon/sysfs.c | 53 +- + mm/damon/tests/core-kunit.h | 708 +++++++++++- + mm/damon/tests/sysfs-kunit.h | 25 + + mm/damon/tests/vaddr-kunit.h | 26 +- + mm/damon/vaddr.c | 145 +-- + mm/debug.c | 4 +- + mm/debug_vm_pgtable.c | 111 +- + mm/filemap.c | 99 +- + mm/gup.c | 12 +- + mm/hmm.c | 43 +- + mm/huge_memory.c | 1212 ++++++++++++-------- + mm/hugetlb.c | 989 +++------------- + mm/hugetlb_internal.h | 117 ++ + mm/hugetlb_sysctl.c | 134 +++ + mm/hugetlb_sysfs.c | 502 ++++++++ + mm/hugetlb_vmemmap.c | 9 +- + mm/internal.h | 73 +- + mm/kasan/common.c | 3 - + mm/kasan/generic.c | 5 +- + mm/kasan/kasan.h | 7 +- + mm/kasan/shadow.c | 32 +- + mm/kasan/tags.c | 2 +- + mm/khugepaged.c | 209 ++-- + mm/kmsan/core.c | 2 +- + mm/kmsan/shadow.c | 6 +- + mm/ksm.c | 159 ++- + mm/madvise.c | 162 ++- + mm/mapping_dirty_helpers.c | 2 +- + mm/memcontrol.c | 70 +- + mm/memory-failure.c | 192 +++- + mm/memory-tiers.c | 2 +- + mm/memory.c | 327 +++--- + mm/memory_hotplug.c | 10 +- + mm/mempolicy.c | 86 +- + mm/memremap.c | 40 +- + mm/migrate.c | 74 +- + mm/migrate_device.c | 631 ++++++++-- + mm/mincore.c | 25 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 2 +- + mm/mmap.c | 37 +- + mm/mmap_lock.c | 41 +- + mm/mmu_gather.c | 2 +- + mm/mprotect.c | 150 +-- + mm/mremap.c | 26 +- + mm/mseal.c | 9 +- + mm/oom_kill.c | 1 + + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 186 +-- + mm/page_idle.c | 15 +- + mm/page_owner.c | 98 +- + mm/page_table_check.c | 33 +- + mm/page_vma_mapped.c | 68 +- + mm/pagewalk.c | 52 +- + mm/percpu-vm.c | 2 +- + mm/pgtable-generic.c | 44 +- + mm/pt_reclaim.c | 3 +- + mm/ptdump.c | 10 +- + mm/rmap.c | 91 +- + mm/secretmem.c | 4 +- + mm/shmem.c | 123 +- + mm/slab_common.c | 2 +- + mm/slub.c | 31 +- + mm/sparse-vmemmap.c | 2 +- + mm/swap.h | 21 - + mm/swap_state.c | 15 +- + mm/swapfile.c | 229 ++-- + mm/userfaultfd.c | 127 +- + mm/util.c | 146 ++- + mm/vma.c | 229 ++-- + mm/vma.h | 136 ++- + mm/vma_exec.c | 5 +- + mm/vmalloc.c | 271 ++++- + mm/vmscan.c | 76 +- + mm/vmstat.c | 53 +- + mm/workingset.c | 2 +- + mm/zswap.c | 7 +- + tools/mm/page_owner_sort.c | 14 +- + tools/testing/selftests/damon/_damon_sysfs.py | 11 +- + .../selftests/damon/drgn_dump_damon_status.py | 9 +- + tools/testing/selftests/damon/sysfs.py | 71 +- + tools/testing/selftests/mm/guard-regions.c | 185 +++ + tools/testing/selftests/mm/gup_test.c | 24 +- + tools/testing/selftests/mm/hmm-tests.c | 907 ++++++++++++++- + tools/testing/selftests/mm/ksm_functional_tests.c | 57 + + tools/testing/selftests/mm/mremap_test.c | 5 +- + tools/testing/selftests/mm/soft-dirty.c | 127 +- + tools/testing/selftests/mm/uffd-common.c | 24 +- + tools/testing/selftests/mm/vm_util.c | 5 + + tools/testing/selftests/mm/vm_util.h | 1 + + tools/testing/vma/vma.c | 92 +- + tools/testing/vma/vma_internal.h | 167 ++- + 222 files changed, 10867 insertions(+), 4847 deletions(-) + delete mode 100644 Documentation/admin-guide/mm/swap_numa.rst + create mode 100644 include/linux/leafops.h + create mode 100644 include/linux/memory-failure.h + create mode 100644 include/trace/events/memory-failure.h + create mode 100644 mm/hugetlb_internal.h + create mode 100644 mm/hugetlb_sysctl.c + create mode 100644 mm/hugetlb_sysfs.c +Merging mm-nonmm-stable/mm-nonmm-stable (aa514a297a0c calibrate: update header inclusion) +$ 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 +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging include/linux/shmem_fs.h +Auto-merging kernel/fork.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/internal.h +Auto-merging mm/memblock.c +Auto-merging mm/shmem.c +Auto-merging tools/testing/selftests/mm/guard-regions.c +Auto-merging tools/testing/selftests/mm/gup_test.c +Auto-merging tools/testing/selftests/mm/hmm-tests.c +Auto-merging tools/testing/selftests/mm/ksm_functional_tests.c +Auto-merging tools/testing/selftests/mm/mremap_test.c +Auto-merging tools/testing/selftests/mm/soft-dirty.c +Auto-merging tools/testing/selftests/mm/vm_util.c +Auto-merging tools/testing/selftests/mm/vm_util.h +Auto-merging tools/testing/selftests/vfio/lib/include/vfio_util.h +Auto-merging tools/testing/selftests/vfio/lib/vfio_pci_device.c +Auto-merging tools/testing/selftests/vfio/vfio_dma_mapping_test.c +Auto-merging tools/testing/selftests/vfio/vfio_pci_driver_test.c +Merge made by the 'ort' strategy. + .mailmap | 9 +- + CREDITS | 9 +- + .../ABI/obsolete/sysfs-kernel-kexec-kdump | 71 ++ + Documentation/ABI/testing/sysfs-kernel-kexec-kdump | 61 ++ + Documentation/admin-guide/dynamic-debug-howto.rst | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 32 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/kho/concepts.rst | 2 +- + Documentation/core-api/liveupdate.rst | 61 ++ + Documentation/dev-tools/checkpatch.rst | 10 + + Documentation/driver-api/hw-recoverable-errors.rst | 60 ++ + Documentation/driver-api/index.rst | 1 + + Documentation/mm/index.rst | 1 + + Documentation/mm/memfd_preservation.rst | 23 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + Documentation/userspace-api/liveupdate.rst | 20 + + MAINTAINERS | 34 +- + arch/Kconfig | 19 +- + arch/arm/Kconfig | 2 - + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/powerpc/include/asm/crash_reserve.h | 8 + + arch/x86/include/asm/div64.h | 39 +- + arch/x86/kernel/cpu/mce/core.c | 4 + + drivers/acpi/apei/ghes.c | 36 + + drivers/nvme/common/auth.c | 4 +- + drivers/pci/pcie/aer.c | 2 + + fs/ceph/crypto.c | 60 +- + fs/ceph/crypto.h | 6 +- + fs/ceph/dir.c | 5 +- + fs/ceph/inode.c | 2 +- + fs/crypto/fname.c | 89 +-- + fs/nilfs2/ioctl.c | 35 +- + fs/ocfs2/dir.c | 42 +- + fs/ocfs2/inode.c | 49 +- + fs/ocfs2/move_extents.c | 14 +- + fs/ocfs2/ocfs2_fs.h | 22 +- + fs/ocfs2/refcounttree.c | 5 +- + fs/ocfs2/xattr.c | 2 +- + fs/proc/page.c | 1 - + include/linux/base64.h | 10 +- + include/linux/compiler.h | 6 - + include/linux/crash_reserve.h | 6 + + include/linux/dynamic_debug.h | 17 +- + include/linux/kexec_handover.h | 57 +- + include/linux/kho/abi/luo.h | 166 ++++ + include/linux/kho/abi/memfd.h | 77 ++ + include/linux/liveupdate.h | 138 ++++ + include/linux/math.h | 13 +- + include/linux/math64.h | 59 +- + include/linux/once_lite.h | 2 +- + include/linux/panic.h | 1 - + include/linux/rbtree.h | 32 +- + include/linux/shmem_fs.h | 23 + + include/linux/sys_info.h | 2 +- + include/linux/uaccess.h | 6 +- + include/linux/util_macros.h | 4 +- + include/linux/vmcore_info.h | 8 + + include/linux/xxhash.h | 46 +- + include/uapi/linux/liveupdate.h | 216 +++++ + include/uapi/linux/vmcore.h | 9 + + init/Kconfig | 20 + + init/calibrate.c | 13 +- + init/main.c | 97 ++- + ipc/namespace.c | 9 +- + kernel/Kconfig.kexec | 24 - + kernel/Makefile | 3 +- + kernel/configs/debug.config | 2 +- + kernel/crash_reserve.c | 3 + + kernel/exit.c | 4 +- + kernel/fork.c | 63 +- + kernel/hung_task.c | 56 +- + kernel/kexec_core.c | 161 +++- + kernel/kexec_handover_internal.h | 20 - + kernel/ksysfs.c | 68 +- + kernel/liveupdate/Kconfig | 75 ++ + kernel/liveupdate/Makefile | 12 + + kernel/{ => liveupdate}/kexec_handover.c | 722 ++++++++--------- + kernel/{ => liveupdate}/kexec_handover_debug.c | 0 + kernel/liveupdate/kexec_handover_debugfs.c | 221 +++++ + kernel/liveupdate/kexec_handover_internal.h | 55 ++ + kernel/liveupdate/luo_core.c | 450 +++++++++++ + kernel/liveupdate/luo_file.c | 889 +++++++++++++++++++++ + kernel/liveupdate/luo_internal.h | 110 +++ + kernel/liveupdate/luo_session.c | 646 +++++++++++++++ + kernel/module/main.c | 2 +- + kernel/panic.c | 52 +- + kernel/resource.c | 10 +- + kernel/scs.c | 2 +- + kernel/vmcore_info.c | 17 + + kernel/watchdog.c | 44 +- + lib/Kconfig.debug | 63 +- + lib/base64.c | 189 +++-- + lib/dynamic_debug.c | 1 + + lib/math/div64.c | 217 +++-- + lib/math/test_mul_u64_u64_div_u64.c | 191 +++-- + lib/plist.c | 4 +- + lib/ratelimit.c | 2 +- + lib/rbtree.c | 29 - + lib/sys_info.c | 163 ++-- + lib/test_kho.c | 146 ++-- + lib/tests/Makefile | 1 + + lib/tests/base64_kunit.c | 294 +++++++ + lib/usercopy.c | 4 +- + lib/xxhash.c | 29 - + lib/xz/xz_dec_bcj.c | 95 --- + lib/xz/xz_private.h | 4 - + mm/Makefile | 1 + + mm/internal.h | 6 + + mm/memblock.c | 93 ++- + mm/memfd_luo.c | 516 ++++++++++++ + mm/shmem.c | 49 +- + rust/helpers/rbtree.c | 10 + + rust/helpers/uaccess.c | 12 + + samples/Kconfig | 22 +- + samples/vfs/Makefile | 1 + + scripts/checkpatch.pl | 11 + + scripts/gdb/linux/bpf.py | 253 ++++++ + scripts/gdb/linux/constants.py.in | 3 + + scripts/gdb/linux/radixtree.py | 139 +++- + scripts/gdb/linux/symbols.py | 105 ++- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/acct/acct_syscall.c | 2 +- + tools/testing/selftests/alsa/conf.c | 2 +- + tools/testing/selftests/alsa/mixer-test.c | 2 +- + tools/testing/selftests/alsa/pcm-test.c | 2 +- + tools/testing/selftests/alsa/test-pcmtest-driver.c | 2 +- + tools/testing/selftests/alsa/utimer-test.c | 2 +- + tools/testing/selftests/arm64/abi/hwcap.c | 2 +- + tools/testing/selftests/arm64/abi/ptrace.c | 2 +- + tools/testing/selftests/arm64/abi/syscall-abi.c | 2 +- + tools/testing/selftests/arm64/fp/fp-ptrace.c | 2 +- + tools/testing/selftests/arm64/fp/fp-stress.c | 2 +- + tools/testing/selftests/arm64/fp/sve-probe-vls.c | 2 +- + tools/testing/selftests/arm64/fp/sve-ptrace.c | 2 +- + tools/testing/selftests/arm64/fp/vec-syscfg.c | 2 +- + tools/testing/selftests/arm64/fp/za-ptrace.c | 2 +- + tools/testing/selftests/arm64/fp/zt-ptrace.c | 2 +- + tools/testing/selftests/arm64/gcs/gcs-stress.c | 2 +- + tools/testing/selftests/arm64/pauth/pac.c | 2 +- + tools/testing/selftests/arm64/tags/tags_test.c | 2 +- + tools/testing/selftests/bpf/xskxceiver.c | 2 +- + .../selftests/breakpoints/breakpoint_test.c | 2 +- + .../selftests/breakpoints/breakpoint_test_arm64.c | 2 +- + .../breakpoints/step_after_suspend_test.c | 2 +- + tools/testing/selftests/cachestat/test_cachestat.c | 2 +- + tools/testing/selftests/capabilities/test_execve.c | 2 +- + .../testing/selftests/capabilities/validate_cap.c | 2 +- + tools/testing/selftests/cgroup/test_core.c | 2 +- + tools/testing/selftests/cgroup/test_cpu.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset.c | 2 +- + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 2 +- + tools/testing/selftests/cgroup/test_kill.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 2 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- + tools/testing/selftests/cgroup/test_pids.c | 2 +- + tools/testing/selftests/cgroup/test_zswap.c | 2 +- + tools/testing/selftests/clone3/clone3.c | 2 +- + .../clone3/clone3_cap_checkpoint_restore.c | 2 +- + .../selftests/clone3/clone3_clear_sighand.c | 2 +- + tools/testing/selftests/clone3/clone3_selftests.h | 2 +- + tools/testing/selftests/clone3/clone3_set_tid.c | 2 +- + tools/testing/selftests/connector/proc_filter.c | 2 +- + tools/testing/selftests/core/close_range_test.c | 2 +- + tools/testing/selftests/core/unshare_test.c | 2 +- + tools/testing/selftests/coredump/stackdump_test.c | 2 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 2 +- + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 2 +- + tools/testing/selftests/drivers/ntsync/ntsync.c | 2 +- + .../drivers/s390x/uvdevice/test_uvdevice.c | 2 +- + tools/testing/selftests/exec/check-exec.c | 2 +- + tools/testing/selftests/exec/execveat.c | 2 +- + tools/testing/selftests/exec/load_address.c | 2 +- + tools/testing/selftests/exec/non-regular.c | 2 +- + tools/testing/selftests/exec/null-argv.c | 2 +- + tools/testing/selftests/exec/recursion-depth.c | 2 +- + tools/testing/selftests/fchmodat2/fchmodat2_test.c | 2 +- + tools/testing/selftests/filelock/ofdlocks.c | 2 +- + .../selftests/filesystems/anon_inode_test.c | 2 +- + .../selftests/filesystems/binderfs/binderfs_test.c | 2 +- + tools/testing/selftests/filesystems/devpts_pts.c | 2 +- + .../filesystems/epoll/epoll_wakeup_test.c | 2 +- + .../selftests/filesystems/eventfd/eventfd_test.c | 2 +- + tools/testing/selftests/filesystems/fclog.c | 2 +- + .../testing/selftests/filesystems/file_stressor.c | 2 +- + .../selftests/filesystems/fuse/fusectl_test.c | 2 +- + tools/testing/selftests/filesystems/kernfs_test.c | 2 +- + .../filesystems/mount-notify/mount-notify_test.c | 2 +- + .../mount-notify/mount-notify_test_ns.c | 2 +- + .../selftests/filesystems/nsfs/iterate_mntns.c | 2 +- + .../selftests/filesystems/overlayfs/dev_in_maps.c | 2 +- + .../filesystems/overlayfs/set_layers_via_fds.c | 2 +- + .../filesystems/statmount/listmount_test.c | 2 +- + .../filesystems/statmount/statmount_test.c | 2 +- + .../filesystems/statmount/statmount_test_ns.c | 2 +- + tools/testing/selftests/filesystems/utils.c | 2 +- + .../selftests/futex/functional/futex_numa_mpol.c | 2 +- + .../selftests/futex/functional/futex_priv_hash.c | 2 +- + .../selftests/futex/functional/futex_requeue.c | 2 +- + .../selftests/futex/functional/futex_requeue_pi.c | 2 +- + .../functional/futex_requeue_pi_mismatched_ops.c | 2 +- + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + .../selftests/futex/functional/futex_wait.c | 2 +- + .../functional/futex_wait_private_mapped_file.c | 2 +- + .../futex/functional/futex_wait_timeout.c | 2 +- + .../functional/futex_wait_uninitialized_heap.c | 2 +- + .../futex/functional/futex_wait_wouldblock.c | 2 +- + .../selftests/futex/functional/futex_waitv.c | 2 +- + tools/testing/selftests/hid/hid_common.h | 2 +- + tools/testing/selftests/intel_pstate/aperf.c | 2 +- + tools/testing/selftests/iommu/iommufd_utils.h | 2 +- + tools/testing/selftests/ipc/msgque.c | 2 +- + tools/testing/selftests/ir/ir_loopback.c | 2 +- + tools/testing/selftests/kcmp/kcmp_test.c | 2 +- + tools/testing/selftests/kho/vmtest.sh | 1 + + tools/testing/selftests/kselftest_harness.h | 2 +- + .../selftests/kselftest_harness/harness-selftest.c | 2 +- + tools/testing/selftests/landlock/audit.h | 2 +- + tools/testing/selftests/landlock/common.h | 2 +- + tools/testing/selftests/lib.mk | 3 + + tools/testing/selftests/liveupdate/.gitignore | 9 + + tools/testing/selftests/liveupdate/Makefile | 34 + + tools/testing/selftests/liveupdate/config | 11 + + tools/testing/selftests/liveupdate/do_kexec.sh | 16 + + tools/testing/selftests/liveupdate/liveupdate.c | 348 ++++++++ + .../selftests/liveupdate/luo_kexec_simple.c | 89 +++ + .../selftests/liveupdate/luo_multi_session.c | 162 ++++ + .../testing/selftests/liveupdate/luo_test_utils.c | 266 ++++++ + .../testing/selftests/liveupdate/luo_test_utils.h | 44 + + .../testing/selftests/lsm/lsm_get_self_attr_test.c | 2 +- + .../testing/selftests/lsm/lsm_list_modules_test.c | 2 +- + .../testing/selftests/lsm/lsm_set_self_attr_test.c | 2 +- + .../selftests/media_tests/media_device_open.c | 2 +- + .../selftests/media_tests/media_device_test.c | 2 +- + .../selftests/membarrier/membarrier_test_impl.h | 2 +- + tools/testing/selftests/mincore/mincore_selftest.c | 4 +- + tools/testing/selftests/mm/compaction_test.c | 2 +- + tools/testing/selftests/mm/cow.c | 2 +- + tools/testing/selftests/mm/droppable.c | 2 +- + tools/testing/selftests/mm/guard-regions.c | 2 +- + tools/testing/selftests/mm/gup_longterm.c | 2 +- + tools/testing/selftests/mm/gup_test.c | 2 +- + tools/testing/selftests/mm/hmm-tests.c | 2 +- + tools/testing/selftests/mm/hugepage-mmap.c | 2 +- + tools/testing/selftests/mm/hugepage-mremap.c | 2 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 2 +- + tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 2 +- + tools/testing/selftests/mm/hugetlb-soft-offline.c | 2 +- + tools/testing/selftests/mm/hugetlb_dio.c | 2 +- + .../selftests/mm/hugetlb_fault_after_madv.c | 2 +- + tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 2 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 2 +- + tools/testing/selftests/mm/ksm_tests.c | 2 +- + tools/testing/selftests/mm/madv_populate.c | 2 +- + tools/testing/selftests/mm/map_fixed_noreplace.c | 2 +- + tools/testing/selftests/mm/map_hugetlb.c | 2 +- + tools/testing/selftests/mm/map_populate.c | 2 +- + tools/testing/selftests/mm/mdwe_test.c | 2 +- + tools/testing/selftests/mm/memfd_secret.c | 2 +- + tools/testing/selftests/mm/merge.c | 2 +- + tools/testing/selftests/mm/migration.c | 2 +- + tools/testing/selftests/mm/mkdirty.c | 2 +- + tools/testing/selftests/mm/mlock-random-test.c | 2 +- + tools/testing/selftests/mm/mlock2-tests.c | 2 +- + tools/testing/selftests/mm/mrelease_test.c | 2 +- + tools/testing/selftests/mm/mremap_dontunmap.c | 2 +- + tools/testing/selftests/mm/mremap_test.c | 2 +- + tools/testing/selftests/mm/mseal_test.c | 2 +- + tools/testing/selftests/mm/on-fault-limit.c | 2 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 2 +- + tools/testing/selftests/mm/pfnmap.c | 2 +- + tools/testing/selftests/mm/pkey-helpers.h | 2 +- + tools/testing/selftests/mm/prctl_thp_disable.c | 2 +- + tools/testing/selftests/mm/process_madv.c | 2 +- + tools/testing/selftests/mm/rmap.c | 2 +- + tools/testing/selftests/mm/soft-dirty.c | 2 +- + tools/testing/selftests/mm/split_huge_page_test.c | 2 +- + tools/testing/selftests/mm/thuge-gen.c | 2 +- + tools/testing/selftests/mm/transhuge-stress.c | 2 +- + tools/testing/selftests/mm/uffd-common.h | 2 +- + tools/testing/selftests/mm/uffd-wp-mremap.c | 2 +- + tools/testing/selftests/mm/va_high_addr_switch.c | 2 +- + tools/testing/selftests/mm/virtual_address_range.c | 2 +- + tools/testing/selftests/mm/vm_util.c | 2 +- + tools/testing/selftests/mm/vm_util.h | 2 +- + .../selftests/mount_setattr/mount_setattr_test.c | 2 +- + .../move_mount_set_group_test.c | 2 +- + tools/testing/selftests/mqueue/mq_open_tests.c | 2 +- + tools/testing/selftests/mqueue/mq_perf_tests.c | 2 +- + .../mseal_system_mappings/sysmap_is_sealed.c | 4 +- + .../selftests/namespaces/file_handle_test.c | 2 +- + tools/testing/selftests/namespaces/init_ino_test.c | 2 +- + tools/testing/selftests/namespaces/nsid_test.c | 2 +- + tools/testing/selftests/nci/nci_dev.c | 2 +- + tools/testing/selftests/net/af_unix/diag_uid.c | 2 +- + tools/testing/selftests/net/af_unix/msg_oob.c | 2 +- + tools/testing/selftests/net/af_unix/scm_inq.c | 2 +- + tools/testing/selftests/net/af_unix/scm_pidfd.c | 2 +- + tools/testing/selftests/net/af_unix/scm_rights.c | 2 +- + tools/testing/selftests/net/af_unix/unix_connect.c | 2 +- + tools/testing/selftests/net/bind_timewait.c | 2 +- + tools/testing/selftests/net/bind_wildcard.c | 2 +- + tools/testing/selftests/net/can/test_raw_filter.c | 2 +- + tools/testing/selftests/net/cmsg_sender.c | 2 +- + tools/testing/selftests/net/epoll_busy_poll.c | 2 +- + tools/testing/selftests/net/gro.c | 2 +- + tools/testing/selftests/net/ip_local_port_range.c | 2 +- + tools/testing/selftests/net/ipsec.c | 2 +- + tools/testing/selftests/net/ipv6_fragmentation.c | 2 +- + .../selftests/net/netfilter/conntrack_dump_flush.c | 2 +- + tools/testing/selftests/net/netlink-dumps.c | 2 +- + tools/testing/selftests/net/ovpn/ovpn-cli.c | 2 +- + tools/testing/selftests/net/proc_net_pktgen.c | 2 +- + tools/testing/selftests/net/psock_fanout.c | 2 +- + tools/testing/selftests/net/psock_tpacket.c | 2 +- + .../selftests/net/reuseaddr_ports_exhausted.c | 2 +- + tools/testing/selftests/net/reuseport_bpf.c | 2 +- + tools/testing/selftests/net/reuseport_bpf_numa.c | 2 +- + tools/testing/selftests/net/rxtimestamp.c | 2 +- + tools/testing/selftests/net/sk_so_peek_off.c | 2 +- + tools/testing/selftests/net/so_incoming_cpu.c | 2 +- + tools/testing/selftests/net/socket.c | 2 +- + tools/testing/selftests/net/tap.c | 2 +- + tools/testing/selftests/net/tcp_ao/lib/setup.c | 2 +- + .../selftests/net/tcp_fastopen_backup_key.c | 2 +- + tools/testing/selftests/net/tcp_port_share.c | 2 +- + tools/testing/selftests/net/tls.c | 2 +- + tools/testing/selftests/net/toeplitz.c | 2 +- + tools/testing/selftests/net/tun.c | 2 +- + tools/testing/selftests/net/udpgso_bench_tx.c | 2 +- + tools/testing/selftests/openat2/helpers.h | 2 +- + tools/testing/selftests/openat2/openat2_test.c | 2 +- + .../testing/selftests/openat2/rename_attack_test.c | 2 +- + tools/testing/selftests/openat2/resolve_test.c | 2 +- + .../selftests/pci_endpoint/pci_endpoint_test.c | 2 +- + tools/testing/selftests/perf_events/mmap.c | 2 +- + .../testing/selftests/perf_events/remove_on_exec.c | 2 +- + .../selftests/perf_events/sigtrap_threads.c | 2 +- + .../selftests/perf_events/watermark_signal.c | 2 +- + tools/testing/selftests/pid_namespace/pid_max.c | 2 +- + .../selftests/pid_namespace/regression_enomem.c | 2 +- + tools/testing/selftests/pidfd/pidfd.h | 2 +- + tools/testing/selftests/pidfd/pidfd_bind_mount.c | 2 +- + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- + .../selftests/pidfd/pidfd_file_handle_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_getfd_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_info_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_open_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_setattr_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_setns_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_wait.c | 2 +- + tools/testing/selftests/pidfd/pidfd_xattr_test.c | 2 +- + .../selftests/prctl/set-anon-vma-name-test.c | 2 +- + tools/testing/selftests/prctl/set-process-name.c | 2 +- + tools/testing/selftests/proc/proc-maps-race.c | 2 +- + tools/testing/selftests/proc/proc-pid-vm.c | 2 +- + tools/testing/selftests/proc/proc-pidns.c | 2 +- + tools/testing/selftests/ptrace/get_set_sud.c | 2 +- + tools/testing/selftests/ptrace/get_syscall_info.c | 2 +- + tools/testing/selftests/ptrace/set_syscall_info.c | 2 +- + tools/testing/selftests/ptrace/vmaccess.c | 2 +- + tools/testing/selftests/resctrl/resctrl.h | 2 +- + tools/testing/selftests/ring-buffer/map_test.c | 2 +- + .../testing/selftests/riscv/abi/pointer_masking.c | 2 +- + tools/testing/selftests/riscv/hwprobe/cbo.c | 2 +- + tools/testing/selftests/riscv/hwprobe/hwprobe.c | 2 +- + tools/testing/selftests/riscv/hwprobe/which-cpus.c | 2 +- + tools/testing/selftests/riscv/mm/mmap_bottomup.c | 2 +- + tools/testing/selftests/riscv/mm/mmap_default.c | 2 +- + tools/testing/selftests/riscv/mm/mmap_test.h | 2 +- + .../testing/selftests/riscv/sigreturn/sigreturn.c | 2 +- + tools/testing/selftests/riscv/vector/v_initval.c | 2 +- + .../testing/selftests/riscv/vector/vstate_prctl.c | 2 +- + .../testing/selftests/rseq/basic_percpu_ops_test.c | 2 +- + tools/testing/selftests/rseq/rseq.c | 2 +- + tools/testing/selftests/rtc/rtctest.c | 2 +- + .../testing/selftests/seccomp/seccomp_benchmark.c | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +- + tools/testing/selftests/sgx/main.c | 2 +- + tools/testing/selftests/signal/mangle_uc_sigmask.c | 2 +- + tools/testing/selftests/signal/sas.c | 2 +- + tools/testing/selftests/sparc64/drivers/adi-test.c | 2 +- + tools/testing/selftests/sync/sync_test.c | 2 +- + .../selftests/syscall_user_dispatch/sud_test.c | 2 +- + tools/testing/selftests/tdx/tdx_guest_test.c | 2 +- + tools/testing/selftests/timens/timens.h | 2 +- + tools/testing/selftests/timers/adjtick.c | 2 +- + .../testing/selftests/timers/alarmtimer-suspend.c | 2 +- + tools/testing/selftests/timers/change_skew.c | 2 +- + .../testing/selftests/timers/clocksource-switch.c | 2 +- + tools/testing/selftests/timers/freq-step.c | 2 +- + .../testing/selftests/timers/inconsistency-check.c | 2 +- + tools/testing/selftests/timers/leap-a-day.c | 2 +- + tools/testing/selftests/timers/leapcrash.c | 2 +- + tools/testing/selftests/timers/mqueue-lat.c | 2 +- + tools/testing/selftests/timers/nanosleep.c | 2 +- + tools/testing/selftests/timers/nsleep-lat.c | 2 +- + tools/testing/selftests/timers/posix_timers.c | 2 +- + tools/testing/selftests/timers/raw_skew.c | 2 +- + tools/testing/selftests/timers/rtcpie.c | 2 +- + tools/testing/selftests/timers/set-2038.c | 2 +- + tools/testing/selftests/timers/set-tai.c | 2 +- + tools/testing/selftests/timers/set-timer-lat.c | 2 +- + tools/testing/selftests/timers/set-tz.c | 2 +- + tools/testing/selftests/timers/skew_consistency.c | 2 +- + tools/testing/selftests/timers/threadtest.c | 2 +- + tools/testing/selftests/timers/valid-adjtimex.c | 2 +- + tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 2 +- + tools/testing/selftests/tty/tty_tstamp_update.c | 2 +- + tools/testing/selftests/uevent/uevent_filtering.c | 2 +- + tools/testing/selftests/user_events/abi_test.c | 2 +- + tools/testing/selftests/user_events/dyn_test.c | 2 +- + tools/testing/selftests/user_events/ftrace_test.c | 2 +- + tools/testing/selftests/user_events/perf_test.c | 2 +- + .../selftests/user_events/user_events_selftests.h | 2 +- + tools/testing/selftests/vDSO/vdso_test_abi.c | 2 +- + tools/testing/selftests/vDSO/vdso_test_chacha.c | 2 +- + .../testing/selftests/vDSO/vdso_test_correctness.c | 2 +- + tools/testing/selftests/vDSO/vdso_test_getcpu.c | 2 +- + tools/testing/selftests/vDSO/vdso_test_getrandom.c | 2 +- + .../selftests/vDSO/vdso_test_gettimeofday.c | 2 +- + .../testing/selftests/vfio/lib/include/vfio_util.h | 2 +- + tools/testing/selftests/vfio/lib/vfio_pci_device.c | 2 +- + tools/testing/selftests/vfio/lib/vfio_pci_driver.c | 2 +- + .../testing/selftests/vfio/vfio_dma_mapping_test.c | 2 +- + .../selftests/vfio/vfio_iommufd_setup_test.c | 2 +- + .../testing/selftests/vfio/vfio_pci_device_test.c | 2 +- + .../testing/selftests/vfio/vfio_pci_driver_test.c | 2 +- + .../testing/selftests/wireguard/qemu/kernel.config | 2 +- + .../testing/selftests/x86/corrupt_xstate_header.c | 2 +- + tools/testing/selftests/x86/helpers.h | 2 +- + tools/testing/selftests/x86/lam.c | 2 +- + tools/testing/selftests/x86/syscall_numbering.c | 2 +- + tools/testing/selftests/x86/test_mremap_vdso.c | 2 +- + tools/testing/selftests/x86/test_vsyscall.c | 2 +- + tools/testing/selftests/x86/xstate.h | 2 +- + 440 files changed, 8051 insertions(+), 1821 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-kexec-kdump + create mode 100644 Documentation/ABI/testing/sysfs-kernel-kexec-kdump + create mode 100644 Documentation/core-api/liveupdate.rst + create mode 100644 Documentation/driver-api/hw-recoverable-errors.rst + create mode 100644 Documentation/mm/memfd_preservation.rst + create mode 100644 Documentation/userspace-api/liveupdate.rst + create mode 100644 include/linux/kho/abi/luo.h + create mode 100644 include/linux/kho/abi/memfd.h + create mode 100644 include/linux/liveupdate.h + create mode 100644 include/uapi/linux/liveupdate.h + delete mode 100644 kernel/kexec_handover_internal.h + create mode 100644 kernel/liveupdate/Kconfig + create mode 100644 kernel/liveupdate/Makefile + rename kernel/{ => liveupdate}/kexec_handover.c (75%) + rename kernel/{ => liveupdate}/kexec_handover_debug.c (100%) + create mode 100644 kernel/liveupdate/kexec_handover_debugfs.c + create mode 100644 kernel/liveupdate/kexec_handover_internal.h + create mode 100644 kernel/liveupdate/luo_core.c + create mode 100644 kernel/liveupdate/luo_file.c + create mode 100644 kernel/liveupdate/luo_internal.h + create mode 100644 kernel/liveupdate/luo_session.c + create mode 100644 lib/tests/base64_kunit.c + create mode 100644 mm/memfd_luo.c + create mode 100644 scripts/gdb/linux/bpf.py + create mode 100644 tools/testing/selftests/liveupdate/.gitignore + create mode 100644 tools/testing/selftests/liveupdate/Makefile + create mode 100644 tools/testing/selftests/liveupdate/config + create mode 100755 tools/testing/selftests/liveupdate/do_kexec.sh + create mode 100644 tools/testing/selftests/liveupdate/liveupdate.c + create mode 100644 tools/testing/selftests/liveupdate/luo_kexec_simple.c + create mode 100644 tools/testing/selftests/liveupdate/luo_multi_session.c + create mode 100644 tools/testing/selftests/liveupdate/luo_test_utils.c + create mode 100644 tools/testing/selftests/liveupdate/luo_test_utils.h +Merging mm-unstable/mm-unstable (f74b906e6ae7 mm/swapfile: use plist_for_each_entry in __folio_throttle_swaprate) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + drivers/block/zram/zram_drv.c | 2 +- + fs/proc/task_mmu.c | 8 +- + include/linux/memcontrol.h | 10 - + include/linux/mm.h | 419 +++++++++++++----------- + include/linux/mm_types.h | 78 ++++- + kernel/fork.c | 4 +- + mm/Kconfig.debug | 6 +- + mm/kfence/core.c | 24 ++ + mm/khugepaged.c | 2 +- + mm/madvise.c | 2 +- + mm/page_alloc.c | 33 +- + mm/swapfile.c | 19 +- + mm/vmscan.c | 7 +- + mm/workingset.c | 2 +- + rust/bindgen_parameters | 25 ++ + rust/bindings/bindings_helper.h | 25 ++ + rust/kernel/mm/virt.rs | 2 +- + tools/testing/selftests/mm/uffd-stress.c | 2 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 8 +- + tools/testing/vma/vma.c | 20 +- + tools/testing/vma/vma_internal.h | 456 ++++++++++++++++++++++----- + 21 files changed, 835 insertions(+), 319 deletions(-) +Merging mm-nonmm-unstable/mm-nonmm-unstable (10758ed2f446 ocfs2: check tl_used after reading it from trancate log inode) +$ 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 +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/core-api/liveupdate.rst | 11 + + MAINTAINERS | 1 + + fs/ocfs2/alloc.c | 6 +- + 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 + + lib/Kconfig.debug | 23 ++ + lib/build_OID_registry | 26 +- + lib/tests/Makefile | 1 + + lib/tests/liveupdate.c | 158 ++++++++ + 14 files changed, 1147 insertions(+), 14 deletions(-) + create mode 100644 kernel/liveupdate/luo_flb.c + create mode 100644 lib/tests/liveupdate.c +Merging kbuild/kbuild-next (deab487e0f9b kbuild: allow architectures to override CC_CAN_LINK) +$ git merge -m Merge branch 'kbuild-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/x86/Makefile +Auto-merging drivers/gpu/drm/Makefile +Auto-merging fs/btrfs/send.c +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + .mailmap | 4 +- + Documentation/kbuild/kbuild.rst | 10 +- + MAINTAINERS | 2 +- + Makefile | 18 +++- + arch/arm64/kernel/vdso32/Makefile | 3 +- + arch/loongarch/vdso/Makefile | 2 +- + arch/parisc/boot/compressed/Makefile | 2 +- + arch/powerpc/boot/Makefile | 3 +- + arch/s390/Makefile | 3 +- + arch/s390/purgatory/Makefile | 3 +- + arch/x86/Makefile | 4 +- + arch/x86/boot/compressed/Makefile | 7 +- + drivers/firmware/efi/libstub/Makefile | 4 +- + drivers/gpu/drm/Makefile | 2 +- + fs/btrfs/send.c | 39 ++++---- + fs/jfs/jfs_incore.h | 6 +- + init/Kconfig | 8 +- + scripts/Kconfig.include | 3 + + scripts/Makefile.modinst | 2 +- + scripts/{Makefile.extrawarn => Makefile.warn} | 4 +- + scripts/cc-can-link.sh | 2 +- + scripts/clang-tools/gen_compile_commands.py | 135 ++++++++++++++++++++++++-- + scripts/headers_install.sh | 2 - + usr/include/Makefile | 11 +-- + usr/include/headers_check.pl | 63 ------------ + 25 files changed, 214 insertions(+), 128 deletions(-) + rename scripts/{Makefile.extrawarn => Makefile.warn} (98%) +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 (834ebb5678d7 perf tools: Don't read build-ids from non-regular files) +$ 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 +Auto-merging tools/build/feature/Makefile +Auto-merging tools/perf/Makefile.config +Auto-merging tools/perf/util/header.c +Auto-merging tools/perf/util/libbfd.c +Auto-merging tools/perf/util/symbol.c +Merge made by the 'ort' strategy. + tools/arch/arm64/include/asm/cputype.h | 2 + + tools/build/Makefile.feature | 2 - + tools/build/feature/Makefile | 4 - + tools/build/feature/test-all.c | 5 - + tools/build/feature/test-get_cpuid.c | 8 - + tools/include/uapi/linux/perf_event.h | 2 + + tools/lib/perf/cpumap.c | 29 +- + tools/perf/Documentation/perf-arm-spe.txt | 102 +- + tools/perf/Documentation/perf-c2c.txt | 7 + + tools/perf/Documentation/perf-check.txt | 1 - + tools/perf/Makefile.config | 13 - + tools/perf/Makefile.perf | 23 +- + tools/perf/arch/arm/annotate/instructions.c | 1 + + tools/perf/arch/arm/util/Build | 2 +- + tools/perf/arch/arm/util/auxtrace.c | 1 + + tools/perf/arch/arm/util/pmu.c | 2 - + tools/perf/arch/arm64/annotate/instructions.c | 1 + + tools/perf/arch/arm64/util/Build | 23 +- + tools/perf/arch/arm64/util/arm-spe.c | 1 + + tools/perf/arch/arm64/util/hisi-ptt.c | 1 + + tools/perf/arch/powerpc/util/Build | 2 +- + tools/perf/arch/powerpc/util/auxtrace.c | 2 +- + tools/perf/arch/s390/util/Build | 2 +- + tools/perf/arch/s390/util/auxtrace.c | 1 + + tools/perf/arch/x86/annotate/instructions.c | 183 +- + tools/perf/arch/x86/tests/Build | 4 +- + tools/perf/arch/x86/tests/arch-tests.c | 4 - + tools/perf/arch/x86/tests/intel-pt-test.c | 6 +- + tools/perf/arch/x86/tests/topdown.c | 1 + + tools/perf/arch/x86/util/Build | 6 +- + tools/perf/arch/x86/util/intel-pt.c | 6 +- + tools/perf/arch/x86/util/pmu.c | 2 - + tools/perf/arch/x86/util/topdown.c | 1 + + tools/perf/bench/evlist-open-close.c | 1 + + tools/perf/bench/futex.c | 1 + + tools/perf/bench/inject-buildid.c | 2 +- + tools/perf/bench/pmu-scan.c | 1 + + tools/perf/bench/synthesize.c | 1 + + tools/perf/builtin-annotate.c | 5 +- + tools/perf/builtin-buildid-cache.c | 8 +- + tools/perf/builtin-c2c.c | 159 +- + tools/perf/builtin-check.c | 1 - + tools/perf/builtin-evlist.c | 3 +- + tools/perf/builtin-inject.c | 51 +- + tools/perf/builtin-list.c | 169 +- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-record.c | 161 +- + tools/perf/builtin-report.c | 5 +- + tools/perf/builtin-script.c | 299 +- + tools/perf/builtin-stat.c | 268 +- + tools/perf/builtin-top.c | 8 +- + tools/perf/builtin-trace.c | 4 +- + tools/perf/pmu-events/Build | 27 +- + .../arch/arm64/ampere/ampereonex/metrics.json | 16 +- + .../pmu-events/arch/arm64/ampere/emag/cache.json | 2 +- + .../arch/arm64/freescale/imx94/sys/ddrc.json | 9 + + .../arch/arm64/freescale/imx94/sys/metrics.json | 450 +++ + .../arch/common/common/legacy-hardware.json | 72 + + .../pmu-events/arch/common/common/metrics.json | 151 ++ + .../pmu-events/arch/common/common/software.json | 6 +- + tools/perf/pmu-events/arch/common/common/tool.json | 12 + + tools/perf/pmu-events/arch/riscv/mapfile.csv | 1 + + .../pmu-events/arch/s390/cf_z16/transaction.json | 8 +- + .../pmu-events/arch/s390/cf_z17/transaction.json | 8 +- + tools/perf/pmu-events/empty-pmu-events.c | 2854 +++++++++++++++++++- + tools/perf/pmu-events/jevents.py | 66 +- + tools/perf/pmu-events/make_legacy_cache.py | 129 + + tools/perf/pmu-events/pmu-events.h | 3 + + tools/perf/python/ilist.py | 24 +- + tools/perf/tests/builtin-test.c | 2 +- + tools/perf/tests/code-reading.c | 11 +- + tools/perf/tests/hwmon_pmu.c | 1 + + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/make | 4 +- + tools/perf/tests/maps.c | 82 +- + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/parse-events.c | 2036 +++++++------- + tools/perf/tests/parse-metric.c | 3 +- + tools/perf/tests/pe-file-parsing.c | 4 +- + tools/perf/tests/perf-time-to-tsc.c | 4 +- + tools/perf/tests/pfm.c | 1 + + tools/perf/tests/pmu-events.c | 26 +- + tools/perf/tests/pmu.c | 3 +- + tools/perf/tests/sdt.c | 2 +- + .../perf/tests/shell/lib/perf_json_output_lint.py | 9 +- + tools/perf/tests/shell/lib/stat_output.sh | 2 +- + tools/perf/tests/shell/record_weak_term.sh | 37 + + tools/perf/tests/shell/stat+csv_output.sh | 2 +- + tools/perf/tests/shell/stat+json_output.sh | 2 +- + tools/perf/tests/shell/stat+shadow_stat.sh | 4 +- + tools/perf/tests/shell/stat+std_output.sh | 4 +- + tools/perf/tests/shell/stat.sh | 6 +- + tools/perf/tests/shell/stat_all_metricgroups.sh | 3 + + tools/perf/tests/shell/stat_all_metrics.sh | 30 +- + tools/perf/tests/shell/test_event_open_fallback.sh | 86 + + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/tests.h | 2 +- + tools/perf/tests/workloads/thloop.c | 45 +- + tools/perf/ui/browsers/annotate.c | 74 +- + tools/perf/ui/browsers/hists.c | 2 +- + tools/perf/ui/hist.c | 1 + + tools/perf/util/Build | 24 +- + tools/perf/util/annotate-data.c | 92 +- + tools/perf/util/annotate-data.h | 14 +- + tools/perf/util/annotate.c | 24 +- + tools/perf/util/annotate.h | 2 + + tools/perf/util/arm-spe-decoder/Build | 2 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 56 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 57 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 53 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 40 +- + tools/perf/util/arm-spe.c | 27 +- + tools/perf/util/auxtrace.c | 25 +- + tools/perf/util/auxtrace.h | 228 +- + tools/perf/util/bpf-filter.h | 2 + + tools/perf/util/bpf-trace-summary.c | 1 + + tools/perf/util/bpf_counter.c | 7 +- + tools/perf/util/bpf_counter_cgroup.c | 80 +- + tools/perf/util/bpf_ftrace.c | 3 +- + tools/perf/util/bpf_lock_contention.c | 6 +- + tools/perf/util/bpf_map.c | 1 + + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 4 +- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 18 +- + tools/perf/util/bpf_skel/bperf_cgroup.h | 15 + + tools/perf/util/build-id.c | 4 +- + tools/perf/util/cgroup.c | 1 + + tools/perf/util/config.c | 3 +- + tools/perf/util/cs-etm-decoder/Build | 2 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 44 +- + tools/perf/util/cs-etm.c | 7 +- + tools/perf/util/debuginfo.c | 2 +- + tools/perf/util/drm_pmu.c | 3 +- + tools/perf/util/dsos.c | 4 +- + tools/perf/util/evlist.c | 18 +- + tools/perf/util/evsel.c | 28 +- + tools/perf/util/evsel.h | 2 +- + tools/perf/util/evswitch.c | 1 + + tools/perf/util/expr.c | 8 +- + tools/perf/util/header.c | 9 +- + tools/perf/util/header.h | 6 +- + tools/perf/util/hisi-ptt-decoder/Build | 2 +- + tools/perf/util/hist.h | 12 +- + tools/perf/util/hwmon_pmu.c | 5 +- + tools/perf/util/intel-bts.c | 4 +- + tools/perf/util/intel-pt-decoder/Build | 8 +- + tools/perf/util/intel-pt.c | 4 +- + tools/perf/util/intel-tpebs.c | 4 +- + tools/perf/util/jitdump.c | 3 +- + tools/perf/util/kvm-stat.h | 1 + + tools/perf/util/libbfd.c | 9 +- + tools/perf/util/libbfd.h | 5 +- + tools/perf/util/maps.c | 22 +- + tools/perf/util/metricgroup.c | 95 +- + tools/perf/util/metricgroup.h | 2 +- + tools/perf/util/mmap.c | 1 + + tools/perf/util/parse-events.c | 320 +-- + tools/perf/util/parse-events.h | 23 +- + tools/perf/util/parse-events.l | 55 +- + tools/perf/util/parse-events.y | 114 +- + tools/perf/util/perf_api_probe.c | 25 +- + tools/perf/util/pfm.c | 1 + + tools/perf/util/pmu.c | 317 ++- + tools/perf/util/pmu.h | 33 + + tools/perf/util/powerpc-vpadtl.c | 5 +- + tools/perf/util/print-events.c | 112 - + tools/perf/util/print-events.h | 4 - + tools/perf/util/python.c | 6 +- + tools/perf/util/s390-sample-raw.c | 55 +- + tools/perf/util/session.c | 35 +- + tools/perf/util/session.h | 3 +- + tools/perf/util/setup.py | 13 +- + tools/perf/util/stat-display.c | 68 +- + tools/perf/util/stat-shadow.c | 545 +--- + tools/perf/util/stat.c | 3 +- + tools/perf/util/stat.h | 28 +- + tools/perf/util/symbol-elf.c | 13 +- + tools/perf/util/symbol-minimal.c | 11 +- + tools/perf/util/symbol.c | 5 +- + tools/perf/util/symbol.h | 2 +- + tools/perf/util/synthetic-events.c | 4 +- + tools/perf/util/synthetic-events.h | 15 - + tools/perf/util/tool.c | 217 +- + tools/perf/util/tool.h | 19 +- + tools/perf/util/tool_pmu.c | 102 +- + tools/perf/util/tool_pmu.h | 10 +- + 185 files changed, 7761 insertions(+), 3432 deletions(-) + delete mode 100644 tools/build/feature/test-get_cpuid.c + create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx94/sys/ddrc.json + create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx94/sys/metrics.json + create mode 100644 tools/perf/pmu-events/arch/common/common/legacy-hardware.json + create mode 100644 tools/perf/pmu-events/arch/common/common/metrics.json + create mode 100755 tools/perf/pmu-events/make_legacy_cache.py + create mode 100755 tools/perf/tests/shell/record_weak_term.sh + create mode 100755 tools/perf/tests/shell/test_event_open_fallback.sh + create mode 100644 tools/perf/util/bpf_skel/bperf_cgroup.h +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 (131971f67e25 dma-mapping: remove unused map_page callback) +$ 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 +Merge made by the 'ort' strategy. + arch/alpha/kernel/pci_iommu.c | 48 +++--- + arch/arm/mm/dma-mapping.c | 180 ++++++--------------- + arch/mips/jazz/jazzdma.c | 20 ++- + arch/powerpc/include/asm/iommu.h | 8 +- + arch/powerpc/kernel/dma-iommu.c | 22 ++- + arch/powerpc/kernel/iommu.c | 14 +- + arch/powerpc/platforms/ps3/system-bus.c | 33 ++-- + arch/powerpc/platforms/pseries/ibmebus.c | 15 +- + arch/powerpc/platforms/pseries/vio.c | 21 +-- + arch/sparc/kernel/iommu.c | 30 ++-- + arch/sparc/kernel/pci_sun4v.c | 31 ++-- + arch/sparc/mm/io-unit.c | 38 ++--- + arch/sparc/mm/iommu.c | 46 +++--- + arch/x86/kernel/amd_gart_64.c | 19 +-- + drivers/parisc/ccio-dma.c | 54 ++++--- + drivers/parisc/iommu-helpers.h | 10 +- + drivers/parisc/sba_iommu.c | 54 +++---- + drivers/xen/grant-dma-ops.c | 20 ++- + drivers/xen/swiotlb-xen.c | 63 ++++---- + include/linux/dma-map-ops.h | 14 +- + include/{ => uapi}/linux/map_benchmark.h | 13 +- + kernel/dma/dummy.c | 13 +- + kernel/dma/map_benchmark.c | 2 +- + kernel/dma/mapping.c | 26 +-- + kernel/dma/ops_helpers.c | 12 +- + tools/Makefile | 13 +- + tools/dma/.gitignore | 3 + + tools/dma/Makefile | 55 +++++++ + tools/{testing/selftests => }/dma/config | 0 + .../selftests => }/dma/dma_map_benchmark.c | 1 - + tools/testing/selftests/dma/Makefile | 7 - + 31 files changed, 435 insertions(+), 450 deletions(-) + rename include/{ => uapi}/linux/map_benchmark.h (80%) + create mode 100644 tools/dma/.gitignore + create mode 100644 tools/dma/Makefile + rename tools/{testing/selftests => }/dma/config (100%) + rename tools/{testing/selftests => }/dma/dma_map_benchmark.c (99%) + delete mode 100644 tools/testing/selftests/dma/Makefile +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 (eca2ec8c85ae 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 +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (c203c24f85a3 Merge branch 'for-next/sysreg' 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/alternative.h +Auto-merging arch/arm64/include/asm/el2_setup.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/el2_setup.h +Auto-merging arch/arm64/include/asm/page.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/scs.h +Auto-merging arch/arm64/include/asm/spectre.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kernel/acpi.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/entry-common.c +Auto-merging arch/arm64/kernel/pi/map_kernel.c +Auto-merging arch/arm64/kvm/arch_timer.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/hyp/nvhe/ffa.c +Auto-merging arch/arm64/kvm/nested.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/mm/mmu.c +CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging drivers/acpi/arm64/gtdt.c +Auto-merging drivers/base/arch_topology.c +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/pgtable.h +Auto-merging mm/huge_memory.c +Auto-merging mm/internal.h +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging tools/arch/arm64/include/asm/cputype.h +Auto-merging tools/testing/selftests/arm64/fp/fp-ptrace.c +Auto-merging tools/testing/selftests/arm64/fp/sve-ptrace.c +Auto-merging tools/testing/selftests/kvm/arm64/set_id_regs.c +Resolved 'arch/arm64/include/asm/el2_setup.h' using previous resolution. +Resolved 'arch/arm64/mm/mmu.c' using previous resolution. +Resolved 'mm/memory.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7b648a2ca677] Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/arm64/booting.rst | 8 +- + Documentation/arch/arm64/sve.rst | 5 + + .../devicetree/bindings/perf/fsl-imx-ddr.yaml | 29 +- + MAINTAINERS | 10 + + arch/arm64/Kconfig | 26 +- + arch/arm64/include/asm/alternative-macros.h | 8 +- + arch/arm64/include/asm/alternative.h | 4 +- + arch/arm64/include/asm/arch_gicv3.h | 4 +- + arch/arm64/include/asm/asm-extable.h | 6 +- + arch/arm64/include/asm/assembler.h | 12 +- + arch/arm64/include/asm/atomic_lse.h | 20 +- + arch/arm64/include/asm/barrier.h | 4 +- + arch/arm64/include/asm/cache.h | 4 +- + arch/arm64/include/asm/cpucaps.h | 4 +- + arch/arm64/include/asm/cpufeature.h | 8 +- + arch/arm64/include/asm/cputype.h | 6 +- + arch/arm64/include/asm/current.h | 4 +- + arch/arm64/include/asm/debug-monitors.h | 4 +- + arch/arm64/include/asm/efi.h | 13 +- + arch/arm64/include/asm/el2_setup.h | 4 +- + arch/arm64/include/asm/elf.h | 4 +- + arch/arm64/include/asm/esr.h | 4 +- + arch/arm64/include/asm/fixmap.h | 4 +- + arch/arm64/include/asm/fpsimd.h | 2 +- + arch/arm64/include/asm/ftrace.h | 6 +- + arch/arm64/include/asm/gpr-num.h | 6 +- + arch/arm64/include/asm/hwcap.h | 2 +- + arch/arm64/include/asm/image.h | 4 +- + arch/arm64/include/asm/insn.h | 4 +- + arch/arm64/include/asm/jump_label.h | 4 +- + arch/arm64/include/asm/kasan.h | 2 +- + arch/arm64/include/asm/kexec.h | 4 +- + arch/arm64/include/asm/kgdb.h | 4 +- + arch/arm64/include/asm/kvm_asm.h | 4 +- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/include/asm/kvm_mte.h | 4 +- + arch/arm64/include/asm/kvm_ptrauth.h | 6 +- + arch/arm64/include/asm/linkage.h | 2 +- + arch/arm64/include/asm/memory.h | 5 +- + arch/arm64/include/asm/mmu.h | 4 +- + arch/arm64/include/asm/mmu_context.h | 20 +- + arch/arm64/include/asm/mte-kasan.h | 4 +- + arch/arm64/include/asm/mte.h | 4 +- + arch/arm64/include/asm/page.h | 4 +- + arch/arm64/include/asm/pgtable-hwdef.h | 125 +- + arch/arm64/include/asm/pgtable-prot.h | 6 +- + arch/arm64/include/asm/pgtable.h | 22 +- + arch/arm64/include/asm/proc-fns.h | 4 +- + arch/arm64/include/asm/processor.h | 4 +- + arch/arm64/include/asm/ptrace.h | 4 +- + arch/arm64/include/asm/rsi_smc.h | 4 +- + arch/arm64/include/asm/rwonce.h | 4 +- + arch/arm64/include/asm/scs.h | 4 +- + arch/arm64/include/asm/sdei.h | 4 +- + arch/arm64/include/asm/simd.h | 2 +- + arch/arm64/include/asm/smp.h | 4 +- + arch/arm64/include/asm/spectre.h | 4 +- + arch/arm64/include/asm/stacktrace/frame.h | 4 +- + arch/arm64/include/asm/suspend.h | 2 +- + arch/arm64/include/asm/sysreg.h | 12 +- + arch/arm64/include/asm/system_misc.h | 4 +- + arch/arm64/include/asm/thread_info.h | 2 +- + arch/arm64/include/asm/tlbflush.h | 85 +- + arch/arm64/include/asm/vdso.h | 4 +- + arch/arm64/include/asm/vdso/compat_barrier.h | 4 +- + arch/arm64/include/asm/vdso/compat_gettimeofday.h | 4 +- + arch/arm64/include/asm/vdso/getrandom.h | 4 +- + arch/arm64/include/asm/vdso/gettimeofday.h | 4 +- + arch/arm64/include/asm/vdso/processor.h | 4 +- + arch/arm64/include/asm/vdso/vsyscall.h | 4 +- + arch/arm64/include/asm/virt.h | 4 +- + arch/arm64/include/asm/vmap_stack.h | 4 - + arch/arm64/include/uapi/asm/kvm.h | 2 +- + arch/arm64/include/uapi/asm/ptrace.h | 4 +- + arch/arm64/include/uapi/asm/sigcontext.h | 4 +- + arch/arm64/kernel/acpi.c | 4 +- + arch/arm64/kernel/cpufeature.c | 6 +- + arch/arm64/kernel/efi.c | 46 +- + arch/arm64/kernel/entry-common.c | 28 +- + arch/arm64/kernel/entry-ftrace.S | 2 +- + arch/arm64/kernel/fpsimd.c | 29 +- + arch/arm64/kernel/ftrace.c | 2 +- + arch/arm64/kernel/irq.c | 2 +- + arch/arm64/kernel/machine_kexec.c | 2 +- + arch/arm64/kernel/pi/map_kernel.c | 8 +- + arch/arm64/kernel/probes/uprobes.c | 2 +- + arch/arm64/kernel/ptrace.c | 40 +- + arch/arm64/kernel/sdei.c | 6 +- + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/syscall.c | 2 +- + arch/arm64/kernel/topology.c | 67 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/kernel/vmcore_info.c | 2 +- + arch/arm64/kvm/arch_timer.c | 2 +- + arch/arm64/kvm/arm.c | 2 +- + arch/arm64/kvm/hyp/nvhe/ffa.c | 2 +- + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/kvm/nested.c | 2 +- + arch/arm64/mm/contpte.c | 3 +- + arch/arm64/mm/fault.c | 8 +- + arch/arm64/mm/mmu.c | 218 +- + arch/arm64/mm/pageattr.c | 7 +- + arch/arm64/mm/pgd.c | 2 +- + arch/arm64/mm/proc.S | 36 +- + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/arm64/tools/gen-sysreg.awk | 146 +- + arch/arm64/tools/sysreg | 21 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/arm64/Kconfig | 3 + + drivers/acpi/arm64/Makefile | 1 + + drivers/acpi/arm64/gtdt.c | 34 - + drivers/acpi/arm64/mpam.c | 411 +++ + drivers/acpi/pptt.c | 280 +- + drivers/acpi/tables.c | 2 +- + drivers/base/arch_topology.c | 9 +- + drivers/cpufreq/cpufreq.c | 6 + + drivers/firmware/efi/efi.c | 3 + + drivers/firmware/efi/runtime-wrappers.c | 17 +- + drivers/perf/arm-ni.c | 97 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 52 +- + drivers/perf/arm_cspmu/arm_cspmu.h | 39 +- + drivers/perf/arm_cspmu/nvidia_cspmu.c | 194 +- + drivers/perf/arm_pmu.c | 6 + + drivers/perf/arm_pmuv3.c | 24 + + drivers/perf/arm_spe_pmu.c | 37 + + drivers/perf/fsl_imx8_ddr_perf.c | 95 +- + drivers/resctrl/Kconfig | 24 + + drivers/resctrl/Makefile | 4 + + drivers/resctrl/mpam_devices.c | 2723 ++++++++++++++++++++ + drivers/resctrl/mpam_internal.h | 658 +++++ + drivers/resctrl/test_mpam_devices.c | 389 +++ + include/linux/acpi.h | 27 +- + include/linux/arch_topology.h | 17 +- + include/linux/arm_mpam.h | 66 + + include/linux/cpufreq.h | 5 + + include/linux/efi.h | 2 + + include/linux/huge_mm.h | 2 +- + include/linux/perf/arm_pmu.h | 1 + + include/linux/pgtable.h | 4 + + include/linux/platform_device.h | 1 + + include/uapi/linux/perf_event.h | 2 + + mm/huge_memory.c | 33 +- + mm/internal.h | 2 +- + mm/memory.c | 62 +- + tools/arch/arm64/include/asm/cputype.h | 4 +- + tools/arch/arm64/include/asm/esr.h | 4 +- + tools/arch/arm64/include/asm/gpr-num.h | 6 +- + tools/arch/arm64/include/asm/sysreg.h | 12 +- + tools/arch/arm64/include/uapi/asm/kvm.h | 2 +- + tools/testing/selftests/arm64/fp/fp-ptrace.c | 5 +- + tools/testing/selftests/arm64/fp/sve-ptrace.c | 61 + + tools/testing/selftests/arm64/fp/zt-test.S | 2 +- + tools/testing/selftests/kvm/arm64/set_id_regs.c | 10 +- + 154 files changed, 6075 insertions(+), 713 deletions(-) + create mode 100644 drivers/acpi/arm64/mpam.c + create mode 100644 drivers/resctrl/Kconfig + create mode 100644 drivers/resctrl/Makefile + create mode 100644 drivers/resctrl/mpam_devices.c + create mode 100644 drivers/resctrl/mpam_internal.h + create mode 100644 drivers/resctrl/test_mpam_devices.c + create mode 100644 include/linux/arm_mpam.h +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 +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts +Auto-merging arch/x86/kernel/amd_gart_64.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging kernel/time/timekeeping.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + .mailmap | 3 + + Documentation/devicetree/bindings/arm/altera.yaml | 24 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 3 + + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 3 + + Documentation/devicetree/bindings/arm/bst.yaml | 31 + + Documentation/devicetree/bindings/arm/fsl.yaml | 17 + + .../devicetree/bindings/arm/intel,socfpga.yaml | 7 + + .../devicetree/bindings/arm/mediatek.yaml | 8 + + Documentation/devicetree/bindings/arm/qcom.yaml | 17 +- + .../devicetree/bindings/arm/rockchip.yaml | 39 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 5 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 15 + + Documentation/devicetree/bindings/arm/ti/omap.yaml | 7 + + .../bindings/board/fsl,fpga-qixis-i2c.yaml | 58 + + .../devicetree/bindings/board/fsl,fpga-qixis.yaml | 10 + + .../bindings/bus/st,stm32mp25-rifsc.yaml | 8 +- + .../devicetree/bindings/cache/qcom,llcc.yaml | 2 + + .../devicetree/bindings/cache/sifive,ccache0.yaml | 5 + + .../bindings/clock/qcom,ipq9574-nsscc.yaml | 63 +- + .../bindings/clock/qcom,x1e80100-gcc.yaml | 62 +- + .../bindings/devfreq/nvidia,tegra30-actmon.yaml | 13 +- + .../display/tegra/nvidia,tegra114-tsec.yaml | 68 + + .../bindings/display/tegra/nvidia,tegra20-csi.yaml | 138 + + .../bindings/display/tegra/nvidia,tegra20-epp.yaml | 14 +- + .../bindings/display/tegra/nvidia,tegra20-isp.yaml | 15 +- + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 18 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 5 +- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 3 + + .../traverse,ten64-controller.yaml | 40 + + .../bindings/firmware/google,gs101-acpm-ipc.yaml | 11 + + .../bindings/firmware/intel,stratix10-svc.yaml | 15 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 3 + + .../bindings/hwinfo/samsung,exynos-chipid.yaml | 2 + + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-omap.txt | 43 - + .../devicetree/bindings/mmc/ti,omap2430-sdhci.yaml | 169 ++ + .../devicetree/bindings/mtd/cdns,hp-nfc.yaml | 3 + + .../bindings/reset/eswin,eic7700-reset.yaml | 42 + + .../devicetree/bindings/reset/microchip,rst.yaml | 11 +- + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 41 +- + .../bindings/reset/thead,th1520-reset.yaml | 8 +- + .../devicetree/bindings/riscv/anlogic.yaml | 27 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 2 + + .../devicetree/bindings/riscv/spacemit.yaml | 2 + + .../devicetree/bindings/riscv/starfive.yaml | 7 + + .../devicetree/bindings/riscv/tenstorrent.yaml | 28 + + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + .../bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml | 16 + + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 1 + + .../microchip/microchip,mpfs-mss-top-sysreg.yaml | 47 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 2 + + .../bindings/soc/samsung/exynos-pmu.yaml | 2 + + .../soc/samsung/samsung,exynos-sysreg.yaml | 23 + + .../soc/sophgo/sophgo,cv1800b-top-syscon.yaml | 80 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + .../bindings/timer/thead,c900-aclint-mtimer.yaml | 17 +- + .../bindings/usb/nvidia,tegra234-xusb.yaml | 31 +- + .../devicetree/bindings/vendor-prefixes.yaml | 14 + + Documentation/driver-api/reset.rst | 1 - + MAINTAINERS | 52 +- + arch/arm/arm-soc-for-next-contents.txt | 177 ++ + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-facebook-clemente.dts | 9 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 + + .../aspeed/aspeed-bmc-facebook-santabarbara.dts | 919 +++++- + .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 14 + + .../dts/aspeed/aspeed-bmc-facebook-yosemite5.dts | 1067 +++++++ + .../boot/dts/aspeed/aspeed-bmc-ibm-balcones.dts | 609 ++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 4 - + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 8 - + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 12 - + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts | 36 - + arch/arm/boot/dts/aspeed/ibm-power11-dual.dtsi | 779 +++++ + arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi | 769 +---- + arch/arm/boot/dts/intel/socfpga/Makefile | 25 +- + .../intel/socfpga/socfpga_arria10_mercury_aa1.dtsi | 143 +- + .../socfpga_arria10_mercury_aa1_pe1_emmc.dts | 16 + + .../socfpga_arria10_mercury_aa1_pe1_qspi.dts | 16 + + .../socfpga_arria10_mercury_aa1_pe1_sdmmc.dts | 16 + + .../socfpga_arria10_mercury_aa1_pe3_emmc.dts | 16 + + .../socfpga_arria10_mercury_aa1_pe3_qspi.dts | 16 + + .../socfpga_arria10_mercury_aa1_pe3_sdmmc.dts | 16 + + .../socfpga_arria10_mercury_aa1_st1_emmc.dts | 16 + + .../socfpga_arria10_mercury_aa1_st1_qspi.dts | 16 + + .../socfpga_arria10_mercury_aa1_st1_sdmmc.dts | 16 + + .../intel/socfpga/socfpga_arria10_mercury_pe1.dts | 55 - + .../socfpga/socfpga_cyclone5_mercury_sa1.dtsi | 143 + + .../socfpga_cyclone5_mercury_sa1_pe1_emmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_pe1_qspi.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_pe1_sdmmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_pe3_emmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_pe3_qspi.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_pe3_sdmmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_st1_emmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_st1_qspi.dts | 16 + + .../socfpga_cyclone5_mercury_sa1_st1_sdmmc.dts | 16 + + .../socfpga/socfpga_cyclone5_mercury_sa2.dtsi | 146 + + .../socfpga_cyclone5_mercury_sa2_pe1_qspi.dts | 16 + + .../socfpga_cyclone5_mercury_sa2_pe1_sdmmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa2_pe3_qspi.dts | 16 + + .../socfpga_cyclone5_mercury_sa2_pe3_sdmmc.dts | 16 + + .../socfpga_cyclone5_mercury_sa2_st1_qspi.dts | 16 + + .../socfpga_cyclone5_mercury_sa2_st1_sdmmc.dts | 16 + + .../socfpga_enclustra_mercury_bootmode_emmc.dtsi | 12 + + .../socfpga_enclustra_mercury_bootmode_qspi.dtsi | 8 + + .../socfpga_enclustra_mercury_bootmode_sdmmc.dtsi | 8 + + .../socfpga/socfpga_enclustra_mercury_pe1.dtsi | 33 + + .../socfpga/socfpga_enclustra_mercury_pe3.dtsi | 55 + + .../socfpga/socfpga_enclustra_mercury_st1.dtsi | 15 + + arch/arm/boot/dts/marvell/armada-38x.dtsi | 2 +- + arch/arm/boot/dts/marvell/armada-xp-98dx3236.dtsi | 2 +- + arch/arm/boot/dts/mediatek/Makefile | 1 + + arch/arm/boot/dts/mediatek/mt2701.dtsi | 2 +- + .../boot/dts/mediatek/mt6582-alcatel-yarisxl.dts | 61 + + arch/arm/boot/dts/mediatek/mt6582.dtsi | 144 +- + arch/arm/boot/dts/mediatek/mt7623.dtsi | 3 +- + arch/arm/boot/dts/microchip/sama5d2.dtsi | 10 +- + arch/arm/boot/dts/microchip/sama7d65.dtsi | 6 +- + arch/arm/boot/dts/microchip/sama7g5.dtsi | 4 +- + arch/arm/boot/dts/nvidia/Makefile | 3 +- + arch/arm/boot/dts/nvidia/tegra114.dtsi | 64 + + arch/arm/boot/dts/nvidia/tegra124-xiaomi-mocha.dts | 2790 +++++++++++++++++ + arch/arm/boot/dts/nvidia/tegra124.dtsi | 64 + + arch/arm/boot/dts/nvidia/tegra20.dtsi | 19 +- + arch/arm/boot/dts/nvidia/tegra30.dtsi | 24 +- + arch/arm/boot/dts/nxp/imx/e70k02.dtsi | 25 +- + arch/arm/boot/dts/nxp/imx/imx53-ppd.dts | 2 + + arch/arm/boot/dts/nxp/imx/imx53-qsrb.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx53-usbarmory.dts | 39 +- + .../boot/dts/nxp/imx/imx6dl-aristainetos2_7.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6dl-b1x5v2.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6dl-lanmcu.dts | 8 + + arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6dl-prtvt7.dts | 8 +- + arch/arm/boot/dts/nxp/imx/imx6dl-qmx6.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6dl-victgo.dts | 10 +- + arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi | 44 +- + arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-lynx.dts | 8 + + .../arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi | 63 +- + arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi | 4 + + arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts | 34 +- + arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts | 10 +- + arch/arm/boot/dts/nxp/imx/imx6q-evi.dts | 12 +- + arch/arm/boot/dts/nxp/imx/imx6q-icore-ofcap10.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-icore-ofcap12.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-pistachio.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts | 8 + + arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts | 5 +- + .../boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-yapp4-pegasus.dts | 8 + + arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5903.dtsi | 2 - + arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi | 1 + + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 9 +- + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_som2.dtsi | 3 + + arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi | 2 + + arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi | 5 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 11 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-ts4900.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tx6-mb7.dtsi | 3 + + arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi | 3 - + .../boot/dts/nxp/imx/imx6qp-yapp4-pegasus-plus.dts | 8 + + arch/arm/boot/dts/nxp/imx/imx6sl-tolino-vision.dts | 1 - + .../arm/boot/dts/nxp/imx/imx6sl-tolino-vision5.dts | 24 + + .../arm/boot/dts/nxp/imx/imx6sll-kobo-librah2o.dts | 24 + + arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 8 + + arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi | 12 +- + arch/arm/boot/dts/nxp/imx/imx6ul-pico-dwarf.dts | 2 + + arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-pdk2.dts | 2 +- + .../arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts | 8 + + arch/arm/boot/dts/nxp/imx/imx7d-pico-dwarf.dts | 2 + + arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 2 + + arch/arm/boot/dts/nxp/imx/imx7s-warp.dts | 9 + + arch/arm/boot/dts/nxp/imx/imx7ulp-evk.dts | 1 - + arch/arm/boot/dts/nxp/mxs/imx28-amarula-rmm.dts | 50 + + .../boot/dts/qcom/qcom-msm8226-samsung-ms013g.dts | 31 +- + arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 10 +- + arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi | 61 - + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 12 +- + .../boot/dts/qcom/qcom-msm8960-sony-huashan.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 1082 ++++--- + arch/arm/boot/dts/renesas/r7s72100.dtsi | 4 +- + arch/arm/boot/dts/renesas/r7s9210.dtsi | 1 - + arch/arm/boot/dts/renesas/r8a7742.dtsi | 26 +- + arch/arm/boot/dts/renesas/r8a7743.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a7744.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a7745.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a77470.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a7790.dtsi | 26 +- + arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 34 +- + arch/arm/boot/dts/renesas/r8a7791.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a7792.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a7793-gose.dts | 1 - + arch/arm/boot/dts/renesas/r8a7793.dtsi | 14 +- + arch/arm/boot/dts/renesas/r8a7794.dtsi | 14 +- + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 2 - + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 13 +- + arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts | 1 + + arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts | 34 +- + arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts | 34 +- + arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts | 35 +- + arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi | 2 +- + arch/arm/boot/dts/rockchip/rk3288.dtsi | 9 +- + arch/arm/boot/dts/st/stm32mp131.dtsi | 17 + + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 5 + + .../arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi | 3 - + .../dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi | 8 +- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 3 - + arch/arm/boot/dts/ti/omap/Makefile | 1 + + arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi | 6 +- + arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi | 17 + + arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-evm.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-guardian.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-icev2.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-mba335x.dts | 633 ++++ + arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts | 2 +- + .../boot/dts/ti/omap/am335x-netcom-plus-2xx.dts | 8 +- + .../arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-pdu001.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-pepper.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts | 2 +- + .../ti/omap/am335x-sancloud-bbe-extended-wifi.dts | 1 - + arch/arm/boot/dts/ti/omap/am335x-sl50.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-tqma335x.dtsi | 270 ++ + arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi | 2 - + arch/arm/boot/dts/ti/omap/am33xx.dtsi | 3 +- + arch/arm/boot/dts/ti/omap/am4372.dtsi | 1 - + arch/arm/boot/dts/ti/omap/am437x-l4.dtsi | 2 - + arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 - + arch/arm/boot/dts/ti/omap/am57xx-cl-som-am57x.dts | 1 - + arch/arm/boot/dts/ti/omap/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/ti/omap/omap3-n900.dts | 2 +- + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/mxs_defconfig | 2 + + arch/arm/configs/shmobile_defconfig | 4 +- + arch/arm/configs/tegra_defconfig | 4 - + arch/arm/mach-exynos/mcpm-exynos.c | 12 +- + arch/arm/mach-exynos/suspend.c | 48 +- + arch/arm/mach-gemini/board-dt.c | 2 +- + arch/arm/mach-mediatek/Kconfig | 4 + + arch/arm/mach-mediatek/mediatek.c | 1 + + arch/arm/mach-mediatek/platsmp.c | 1 + + arch/arm/mach-omap2/omap-secure.h | 2 +- + arch/arm/mach-omap2/omap-smc.S | 2 +- + arch/arm/mach-pxa/generic.h | 6 +- + arch/arm/mach-pxa/irq.c | 10 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 10 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 10 +- + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/pxa27x.c | 4 +- + arch/arm/mach-pxa/pxa3xx.c | 4 +- + arch/arm/mach-pxa/smemc.c | 12 +- + arch/arm/mach-s3c/irq-pm-s3c64xx.c | 12 +- + arch/arm/mach-s5pv210/pm.c | 10 +- + arch/arm/mach-versatile/integrator_ap.c | 12 +- + arch/arm/mach-versatile/versatile.c | 2 +- + arch/arm/mm/cache-b15-rac.c | 12 +- + arch/arm64/Kconfig | 2 + + arch/arm64/Kconfig.platforms | 8 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 52 + + arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi | 204 ++ + .../boot/dts/allwinner/sun55i-a527-cubie-a5e.dts | 28 +- + .../boot/dts/allwinner/sun55i-t527-avaota-a1.dts | 26 +- + .../boot/dts/allwinner/sun55i-t527-orangepi-4a.dts | 23 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 9 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 15 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 13 - + .../boot/dts/altera/socfpga_stratix10_swvp.dts | 3 - + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 90 + + .../boot/dts/amlogic/amlogic-c3-c308l-aw419.dts | 84 + + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 88 + + arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi | 28 + + arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi | 28 + + arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 28 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxm-tx9-pro.dts | 90 + + arch/arm64/boot/dts/bst/Makefile | 2 + + .../boot/dts/bst/bstc1200-cdcu1.0-adas_4c2g.dts | 24 + + arch/arm64/boot/dts/bst/bstc1200.dtsi | 97 + + arch/arm64/boot/dts/cix/sky1-orion-o6.dts | 52 + + arch/arm64/boot/dts/cix/sky1-pinfunc.h | 401 +++ + arch/arm64/boot/dts/cix/sky1.dtsi | 156 + + .../arm64/boot/dts/exynos/exynos7870-a2corelte.dts | 58 +- + arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts | 39 +- + arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts | 58 +- + arch/arm64/boot/dts/exynos/exynos7870.dtsi | 84 + + arch/arm64/boot/dts/exynos/exynos990.dtsi | 12 + + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 26 + + .../boot/dts/exynos/google/gs101-pixel-common.dtsi | 7 + + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 315 +- + arch/arm64/boot/dts/freescale/Makefile | 32 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 52 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 9 +- + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 80 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 +- + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 5 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 5 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 5 +- + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 51 +- + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 20 +- + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 14 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 9 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 1 + + ...8mm-phyboard-polis-peb-av-10-etml1010g3dra.dtso | 44 + + ...x8mm-phyboard-polis-peb-av-10-ph128800t006.dtso | 44 + + .../freescale/imx8mm-phyboard-polis-peb-av-10.dtsi | 189 ++ + .../freescale/imx8mm-phyboard-polis-peb-av-10.dtso | 234 +- + .../imx8mm-phyboard-polis-peb-eval-01.dtso | 3 +- + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 11 +- + .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 28 +- + .../boot/dts/freescale/imx8mm-phygate-tauri-l.dts | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 3 +- + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 11 - + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 1 + + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mp-aipstz.h | 33 + + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 4 +- + .../dts/freescale/imx8mp-debix-som-a-bmb-08.dts | 47 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 6 + + .../imx8mp-phyboard-pollux-etml1010g3dra.dtso | 44 + + ...mp-phyboard-pollux-peb-av-10-etml1010g3dra.dtso | 45 + + ...8mp-phyboard-pollux-peb-av-10-ph128800t006.dtso | 45 + + .../imx8mp-phyboard-pollux-peb-av-10.dtsi | 198 ++ + .../imx8mp-phyboard-pollux-peb-av-10.dtso | 9 + + .../imx8mp-phyboard-pollux-ph128800t006.dtso | 45 + + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 52 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-prt8ml.dts | 504 ++++ + .../boot/dts/freescale/imx8mp-skov-revc-hdmi.dts | 8 + + .../imx8mp-skov-revc-jutouch-jt101tm023.dts | 79 + + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 7 + + .../boot/dts/freescale/imx8mp-venice-gw702x.dtsi | 54 +- + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 11 - + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 81 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 3 + + .../boot/dts/freescale/imx8qm-apalis-v1.1.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi | 2 - + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 156 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 176 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 9 + + .../boot/dts/freescale/imx91-phyboard-segin.dts | 345 +++ + .../boot/dts/freescale/imx91-phycore-som.dtsi | 304 ++ + arch/arm64/boot/dts/freescale/imx91_93_common.dtsi | 2 +- + .../dts/freescale/imx93-phyboard-nash-jtag.dtso | 31 + + .../dts/freescale/imx93-phyboard-nash-pwm-fan.dtso | 75 + + .../boot/dts/freescale/imx93-phyboard-nash.dts | 24 + + .../boot/dts/freescale/imx93-phyboard-segin.dts | 24 + + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx93-var-som.dtsi | 332 +- + arch/arm64/boot/dts/freescale/imx94.dtsi | 6 + + arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts | 3 + + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 3 + + .../boot/dts/freescale/imx95-19x19-verdin-evk.dts | 695 +++++ + .../boot/dts/freescale/imx95-toradex-smarc-dev.dts | 277 ++ + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 1155 +++++++ + .../dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts | 75 +- + .../arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi | 153 +- + arch/arm64/boot/dts/freescale/imx95.dtsi | 2 +- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 7 + + arch/arm64/boot/dts/freescale/mba8xx.dtsi | 7 + + arch/arm64/boot/dts/freescale/s32g2.dtsi | 58 +- + arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 18 +- + arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 16 + + arch/arm64/boot/dts/freescale/s32g3.dtsi | 58 +- + arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts | 18 +- + .../boot/dts/freescale/tqma8xxs-mb-smarc-2.dtsi | 7 + + arch/arm64/boot/dts/intel/Makefile | 2 + + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 1 + + .../arm64/boot/dts/intel/socfpga_agilex3_socdk.dts | 132 + + arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 115 +- + .../arm64/boot/dts/intel/socfpga_agilex5_socdk.dts | 2 + + .../boot/dts/intel/socfpga_agilex5_socdk_013b.dts | 126 + + .../boot/dts/intel/socfpga_agilex5_socdk_nand.dts | 18 + + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 2 + + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 2 +- + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 2 + + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9132-clearfog.dts | 16 +- + .../marvell/mmp/pxa1908-samsung-coreprimevelte.dts | 267 +- + arch/arm64/boot/dts/marvell/mmp/pxa1908.dtsi | 51 +- + arch/arm64/boot/dts/mediatek/Makefile | 11 + + arch/arm64/boot/dts/mediatek/mt6878-pinfunc.h | 1201 ++++++++ + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 4 + + .../boot/dts/mediatek/mt7981b-openwrt-one.dts | 150 + + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 35 +- + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 4 + + .../dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts | 1 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-4e.dts | 16 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-8x.dts | 16 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-cn15.dtso | 20 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-cn18.dtso | 20 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-emmc.dtso | 33 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-sd.dtso | 31 + + .../dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi | 534 ++++ + arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 7 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 4 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8196-gce.h | 612 ++++ + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 9 + + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 43 +- + .../dts/mediatek/mt8370-grinn-genio-510-sbc.dts | 20 + + .../dts/mediatek/mt8390-grinn-genio-700-sbc.dts | 20 + + .../boot/dts/mediatek/mt8390-grinn-genio-sbc.dtsi | 538 ++++ + .../boot/dts/mediatek/mt8390-grinn-genio-som.dtsi | 210 ++ + .../dts/mediatek/mt8395-genio-1200-evk-ufs.dts | 29 + + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 1189 +------- + .../boot/dts/mediatek/mt8395-genio-common.dtsi | 1230 ++++++++ + arch/arm64/boot/dts/nvidia/Makefile | 2 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 3 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 1 - + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 13 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 6 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 12 +- + arch/arm64/boot/dts/nvidia/tegra210-p3541-0000.dts | 59 + + .../boot/dts/nvidia/tegra210-peripherals-opp.dtsi | 135 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 90 +- + arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 11 + + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 15 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 72 +- + arch/arm64/boot/dts/nvidia/tegra264-p3971.dtsi | 108 + + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 3190 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/Makefile | 12 + + .../boot/dts/qcom/{qcm2290.dtsi => agatti.dtsi} | 172 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 4 + + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 38 +- + arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 7 +- + .../qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 20 + + .../boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 171 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 95 +- + .../boot/dts/qcom/{sc7280.dtsi => kodiak.dtsi} | 300 ++ + arch/arm64/boot/dts/qcom/lemans-evk-camera.dtso | 105 + + arch/arm64/boot/dts/qcom/lemans-evk.dts | 28 + + arch/arm64/boot/dts/qcom/lemans-pmics.dtsi | 9 + + arch/arm64/boot/dts/qcom/lemans.dtsi | 133 +- + arch/arm64/boot/dts/qcom/monaco-evk.dts | 6 +- + .../qcom/{qcs8300-pmics.dtsi => monaco-pmics.dtsi} | 1 - + .../boot/dts/qcom/{qcs8300.dtsi => monaco.dtsi} | 7 + + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 46 + + .../dts/qcom/msm8916-samsung-rossa-common.dtsi | 22 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts | 20 - + arch/arm64/boot/dts/qcom/msm8937-xiaomi-land.dts | 381 +++ + arch/arm64/boot/dts/qcom/msm8937.dtsi | 2133 +++++++++++++ + arch/arm64/boot/dts/qcom/msm8939-asus-z00t.dts | 256 ++ + arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- + .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 6 +- + .../boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts | 6 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 14 +- + .../boot/dts/qcom/{x1p42100.dtsi => purwa.dtsi} | 4 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 51 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +- + .../boot/dts/qcom/qcm6490-particle-tachyon.dts | 2 +- + arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 82 +- + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 155 +- + .../boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 1095 +++++++ + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 76 +- + arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 4 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 65 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 6 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 7 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 14 +- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 9 +- + arch/arm64/boot/dts/qcom/sc7180-el2.dtso | 6 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 12 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 12 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 9 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 19 + + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 12 +- + arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso | 6 +- + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 12 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 20 +- + .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 12 +- + .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 12 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 185 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 7 +- + arch/arm64/boot/dts/qcom/sdm670.dtsi | 14 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 21 +- + arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 6 +- + arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts | 6 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 7 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 146 +- + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 2 +- + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 23 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 27 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 7 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 7 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 7 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 13 + + .../dts/qcom/sdm850-huawei-matebook-e-2019.dts | 971 ++++++ + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 9 +- + arch/arm64/boot/dts/qcom/sdx75-idp.dts | 6 +- + arch/arm64/boot/dts/qcom/sdx75.dtsi | 68 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 6 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 6 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 59 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 6 + + .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 5 + + arch/arm64/boot/dts/qcom/sm7325.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 7 +- + .../arm64/boot/dts/qcom/sm8250-samsung-common.dtsi | 3 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 7 +- + arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 7 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 13 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 57 +- + .../boot/dts/qcom/sm8550-hdk-rear-camera-card.dtso | 91 + + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 52 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 226 +- + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 83 +- + arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 79 +- + arch/arm64/boot/dts/qcom/sm8750-qrd.dts | 73 + + arch/arm64/boot/dts/qcom/sm8750.dtsi | 161 +- + .../boot/dts/qcom/{sm6150.dtsi => talos.dtsi} | 330 +- + arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 9 +- + arch/arm64/boot/dts/qcom/x1-crd.dtsi | 9 +- + arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 7 +- + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 10 +- + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 10 +- + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 10 +- + .../boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 104 +- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +- + .../qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +- + .../boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +- + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 10 +- + .../dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts | 6 +- + .../boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 +- + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 10 +- + .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 12 +- + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 10 +- + .../dts/qcom/x1p42100-asus-zenbook-a14-lcd.dts | 62 + + .../boot/dts/qcom/x1p42100-asus-zenbook-a14.dts | 135 +- + .../boot/dts/qcom/x1p42100-asus-zenbook-a14.dtsi | 138 + + arch/arm64/boot/dts/qcom/x1p42100-crd.dts | 2 +- + .../boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 4 +- + .../boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 4 +- + arch/arm64/boot/dts/renesas/Makefile | 11 + + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 1 - + arch/arm64/boot/dts/renesas/draak.dtsi | 5 + + arch/arm64/boot/dts/renesas/ebisu.dtsi | 5 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 36 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 49 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 49 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 41 +- + .../renesas/r8a77970-eagle-function-expansion.dtso | 17 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 11 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 1 - + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 41 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 24 +- + .../renesas/r8a779g3-sparrow-hawk-fan-argon40.dtso | 51 + + .../r8a779g3-sparrow-hawk-rpi-display-2-5in.dtso | 13 + + .../r8a779g3-sparrow-hawk-rpi-display-2-7in.dtso | 13 + + .../r8a779g3-sparrow-hawk-rpi-display-2.dtsi | 90 + + .../boot/dts/renesas/r8a779g3-sparrow-hawk.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a78000-ironhide.dts | 85 + + arch/arm64/boot/dts/renesas/r8a78000.dtsi | 787 +++++ + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 179 +- + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 10 +- + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 60 +- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 17 +- + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 107 +- + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 17 + + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 565 +++- + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 98 + + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 568 +++- + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 142 + + .../boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi | 1 - + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 4 - + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 57 + + .../boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 149 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 5 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 5 + + arch/arm64/boot/dts/rockchip/Makefile | 7 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 12 + + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 75 + + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3528-rock-2a.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3528.dtsi | 56 +- + .../boot/dts/rockchip/rk3566-orangepi-3b.dtsi | 5 + + arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts | 1 + + .../boot/dts/rockchip/rk3566-tinker-board-3.dts | 13 + + .../boot/dts/rockchip/rk3566-tinker-board-3.dtsi | 278 ++ + .../boot/dts/rockchip/rk3566-tinker-board-3s.dts | 30 + + .../boot/dts/rockchip/rk3568-9tripod-x3568-v4.dts | 880 ++++++ + arch/arm64/boot/dts/rockchip/rk3568-easepi-r1.dts | 623 ++++ + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233.dts | 131 + + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 604 +--- + .../arm64/boot/dts/rockchip/rk3568-qnap-tsx33.dtsi | 608 ++++ + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 51 +- + .../boot/dts/rockchip/rk3576-100ask-dshanpi-a1.dts | 838 +++++ + .../arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 860 ++++++ + arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts | 48 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 21 +- + .../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 13 +- + .../boot/dts/rockchip/rk3588-rock-5b-plus.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 1 - + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 34 + + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 165 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 25 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 9 + + arch/arm64/boot/dts/sprd/sc9860.dtsi | 62 - + arch/arm64/boot/dts/sprd/whale2.dtsi | 54 +- + arch/arm64/boot/dts/st/stm32mp211.dtsi | 4 +- + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 4 + + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 1 + + arch/arm64/boot/dts/ti/Makefile | 49 + + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 64 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 64 + + arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-ivy.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62.dtsi | 22 + + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 10 + + arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62a.dtsi | 27 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 71 +- + arch/arm64/boot/dts/ti/k3-am62d2-evm.dts | 103 +- + arch/arm64/boot/dts/ti/k3-am62l-main.dtsi | 580 ++++ + arch/arm64/boot/dts/ti/k3-am62l-wakeup.dtsi | 141 + + arch/arm64/boot/dts/ti/k3-am62l.dtsi | 118 + + arch/arm64/boot/dts/ti/k3-am62l3-evm.dts | 361 +++ + arch/arm64/boot/dts/ti/k3-am62l3.dtsi | 67 + + .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 18 + + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 20 - + arch/arm64/boot/dts/ti/k3-am62p-verdin-dev.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62p-verdin-ivy.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62p.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 73 +- + arch/arm64/boot/dts/ti/k3-am62p5-var-som.dtsi | 148 +- + arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 7 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 4 +- + .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 20 +- + arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi | 15 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 4 - + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts | 2 +- + .../boot/dts/ti/k3-am67a-kontron-sa67-ads2.dtso | 146 + + .../boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 1091 +++++++ + .../boot/dts/ti/k3-am67a-kontron-sa67-gbe1.dtso | 26 + + .../boot/dts/ti/k3-am67a-kontron-sa67-gpios.dtso | 61 + + .../dts/ti/k3-am67a-kontron-sa67-rtc-rv8263.dtso | 31 + + arch/arm64/boot/dts/ti/k3-am68-phyboard-izar.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 451 +++ + arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 576 ++++ + arch/arm64/boot/dts/ti/k3-am69-aquila.dtsi | 1840 +++++++++++ + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 10 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 3 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 3 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 3 +- + .../boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso | 8 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 15 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 3 +- + .../boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 7 +- + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 18 - + .../boot/dts/ti/k3-j784s4-evm-pcie0-pcie1-ep.dtso | 1 + + .../boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi | 18 +- + arch/arm64/boot/dts/ti/k3-pinctrl.h | 2 + + arch/arm64/configs/defconfig | 50 +- + arch/loongarch/kernel/smp.c | 12 +- + arch/mips/alchemy/common/dbdma.c | 12 +- + arch/mips/alchemy/common/irq.c | 24 +- + arch/mips/alchemy/common/usb.c | 12 +- + arch/mips/pci/pci-alchemy.c | 16 +- + arch/powerpc/platforms/cell/spu_base.c | 10 +- + arch/powerpc/platforms/powermac/pic.c | 12 +- + arch/powerpc/sysdev/fsl_lbc.c | 12 +- + arch/powerpc/sysdev/fsl_pci.c | 12 +- + arch/powerpc/sysdev/ipic.c | 12 +- + arch/powerpc/sysdev/mpic.c | 14 +- + arch/powerpc/sysdev/mpic_timer.c | 10 +- + arch/riscv/Kconfig.socs | 13 + + arch/riscv/boot/dts/Makefile | 2 + + arch/riscv/boot/dts/anlogic/Makefile | 2 + + arch/riscv/boot/dts/anlogic/dr1v90-mlkpai-fs01.dts | 28 + + arch/riscv/boot/dts/anlogic/dr1v90.dtsi | 100 + + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 96 + + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 10 + + arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts | 5 + + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 42 + + arch/riscv/boot/dts/sophgo/cv1812h-huashan-pi.dts | 5 + + .../boot/dts/sophgo/sg2002-licheerv-nano-b.dts | 5 + + arch/riscv/boot/dts/sophgo/sg2042-evb-v1.dts | 36 + + arch/riscv/boot/dts/sophgo/sg2042-evb-v2.dts | 24 + + .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 36 + + arch/riscv/boot/dts/sophgo/sg2042.dtsi | 112 + + arch/riscv/boot/dts/spacemit/Makefile | 2 + + arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 172 ++ + arch/riscv/boot/dts/spacemit/k1-musepi-pro.dts | 79 + + arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts | 90 + + arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts | 52 + + arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 465 ++- + arch/riscv/boot/dts/spacemit/k1.dtsi | 122 + + arch/riscv/boot/dts/starfive/Makefile | 3 + + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 19 - + .../dts/starfive/jh7110-deepcomputing-fml13v01.dts | 27 + + arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 27 + + .../boot/dts/starfive/jh7110-milkv-marscm-emmc.dts | 9 + + .../boot/dts/starfive/jh7110-milkv-marscm-lite.dts | 1 + + .../boot/dts/starfive/jh7110-milkv-marscm.dtsi | 13 + + .../riscv/boot/dts/starfive/jh7110-orangepi-rv.dts | 76 + + .../boot/dts/starfive/jh7110-pine64-star64.dts | 27 + + .../jh7110-starfive-visionfive-2-lite-emmc.dts | 22 + + .../starfive/jh7110-starfive-visionfive-2-lite.dts | 20 + + .../jh7110-starfive-visionfive-2-lite.dtsi | 161 + + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 24 + + arch/riscv/boot/dts/tenstorrent/Makefile | 2 + + arch/riscv/boot/dts/tenstorrent/blackhole-card.dts | 14 + + arch/riscv/boot/dts/tenstorrent/blackhole.dtsi | 108 + + arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts | 67 + + arch/riscv/boot/dts/thead/th1520.dtsi | 72 +- + arch/riscv/configs/defconfig | 3 + + arch/sh/mm/pmb.c | 10 +- + arch/x86/events/amd/ibs.c | 12 +- + arch/x86/hyperv/hv_init.c | 12 +- + arch/x86/kernel/amd_gart_64.c | 10 +- + arch/x86/kernel/apic/apic.c | 12 +- + arch/x86/kernel/apic/io_apic.c | 17 +- + arch/x86/kernel/cpu/aperfmperf.c | 20 +- + arch/x86/kernel/cpu/intel_epb.c | 16 +- + arch/x86/kernel/cpu/mce/core.c | 14 +- + arch/x86/kernel/cpu/microcode/core.c | 15 +- + arch/x86/kernel/cpu/mtrr/legacy.c | 12 +- + arch/x86/kernel/cpu/umwait.c | 10 +- + arch/x86/kernel/i8237.c | 10 +- + arch/x86/kernel/i8259.c | 14 +- + arch/x86/kernel/kvm.c | 12 +- + arch/x86/mm/pat/set_memory.c | 2 +- + drivers/acpi/pci_link.c | 10 +- + drivers/acpi/sleep.c | 12 +- + drivers/amba/tegra-ahb.c | 1 + + drivers/base/firmware_loader/main.c | 12 +- + drivers/base/swnode.c | 30 +- + drivers/base/syscore.c | 82 +- + drivers/bus/mvebu-mbus.c | 16 +- + drivers/bus/stm32_rifsc.c | 597 +++- + drivers/bus/sunxi-rsb.c | 2 - + drivers/bus/ti-sysc.c | 11 +- + drivers/cache/Kconfig | 37 +- + drivers/cache/Makefile | 2 + + drivers/cache/hisi_soc_hha.c | 194 ++ + drivers/clk/at91/pmc.c | 12 +- + drivers/clk/davinci/psc-da850.c | 7 - + drivers/clk/imx/clk-vf610.c | 12 +- + drivers/clk/ingenic/jz4725b-cgu.c | 2 +- + drivers/clk/ingenic/jz4740-cgu.c | 2 +- + drivers/clk/ingenic/jz4755-cgu.c | 2 +- + drivers/clk/ingenic/jz4760-cgu.c | 2 +- + drivers/clk/ingenic/jz4770-cgu.c | 2 +- + drivers/clk/ingenic/jz4780-cgu.c | 2 +- + drivers/clk/ingenic/pm.c | 14 +- + drivers/clk/ingenic/pm.h | 2 +- + drivers/clk/ingenic/tcu.c | 12 +- + drivers/clk/ingenic/x1000-cgu.c | 2 +- + drivers/clk/ingenic/x1830-cgu.c | 2 +- + drivers/clk/mvebu/common.c | 12 +- + drivers/clk/mvebu/cp110-system-controller.c | 20 + + drivers/clk/rockchip/clk-rk3288.c | 12 +- + drivers/clk/samsung/clk-s5pv210-audss.c | 12 +- + drivers/clk/samsung/clk.c | 12 +- + drivers/clk/tegra/clk-tegra210.c | 12 +- + drivers/clocksource/timer-armada-370-xp.c | 12 +- + drivers/cpuidle/cpuidle-psci.c | 12 +- + drivers/cxl/core/region.c | 5 +- + drivers/firmware/imx/imx-scu-irq.c | 32 +- + drivers/firmware/imx/imx-scu.c | 11 +- + drivers/firmware/ti_sci.c | 155 +- + drivers/firmware/ti_sci.h | 7 + + drivers/firmware/xilinx/zynqmp-debug.c | 13 + + drivers/firmware/xilinx/zynqmp.c | 114 +- + drivers/gpio/gpio-mxc.c | 12 +- + drivers/gpio/gpio-pxa.c | 12 +- + drivers/gpio/gpio-sa1100.c | 12 +- + drivers/gpio/gpiolib-swnode.c | 3 +- + drivers/hv/vmbus_drv.c | 14 +- + drivers/iommu/amd/init.c | 16 +- + drivers/iommu/intel/iommu.c | 12 +- + drivers/irqchip/exynos-combiner.c | 14 +- + drivers/irqchip/irq-armada-370-xp.c | 12 +- + drivers/irqchip/irq-bcm7038-l1.c | 12 +- + drivers/irqchip/irq-gic-v3-its.c | 12 +- + drivers/irqchip/irq-i8259.c | 12 +- + drivers/irqchip/irq-imx-gpcv2.c | 16 +- + drivers/irqchip/irq-loongson-eiointc.c | 12 +- + drivers/irqchip/irq-loongson-htpic.c | 10 +- + drivers/irqchip/irq-loongson-htvec.c | 12 +- + drivers/irqchip/irq-loongson-pch-lpc.c | 12 +- + drivers/irqchip/irq-loongson-pch-pic.c | 12 +- + drivers/irqchip/irq-mchp-eic.c | 12 +- + drivers/irqchip/irq-mst-intc.c | 12 +- + drivers/irqchip/irq-mtk-cirq.c | 12 +- + drivers/irqchip/irq-renesas-rzg2l.c | 12 +- + drivers/irqchip/irq-sa11x0.c | 12 +- + drivers/irqchip/irq-sifive-plic.c | 12 +- + drivers/irqchip/irq-sun6i-r.c | 18 +- + drivers/irqchip/irq-tegra.c | 12 +- + drivers/irqchip/irq-vic.c | 12 +- + drivers/leds/trigger/ledtrig-cpu.c | 14 +- + drivers/macintosh/via-pmu.c | 12 +- + drivers/memory/renesas-rpc-if.c | 56 +- + drivers/memory/tegra/tegra124-emc.c | 140 +- + drivers/memory/tegra/tegra186-emc.c | 35 +- + drivers/memory/tegra/tegra20-emc.c | 150 +- + drivers/memory/tegra/tegra30-emc.c | 119 +- + drivers/nvdimm/region.c | 2 +- + drivers/nvdimm/region_devs.c | 2 +- + drivers/pinctrl/pinctrl-zynqmp.c | 7 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 29 +- + drivers/power/reset/sc27xx-poweroff.c | 10 +- + drivers/reset/Kconfig | 14 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 270 +- + drivers/reset/reset-eic7700.c | 429 +++ + drivers/reset/reset-gpio.c | 19 +- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 60 + + drivers/reset/reset-th1520.c | 837 ++++- + drivers/sh/clk/core.c | 10 +- + drivers/sh/intc/core.c | 12 +- + drivers/soc/amlogic/meson-canvas.c | 12 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 6 + + drivers/soc/apple/mailbox.c | 15 +- + drivers/soc/apple/sart.c | 13 +- + drivers/soc/bcm/brcmstb/biuctrl.c | 12 +- + drivers/soc/fsl/qbman/qman.c | 2 +- + drivers/soc/fsl/qbman/qman_test_stash.c | 2 +- + drivers/soc/mediatek/mtk-socinfo.c | 3 + + drivers/soc/microchip/Kconfig | 12 + + drivers/soc/microchip/Makefile | 1 + + drivers/soc/microchip/mpfs-control-scb.c | 38 + + drivers/soc/microchip/mpfs-mss-top-sysreg.c | 44 + + drivers/soc/qcom/ice.c | 81 +- + drivers/soc/qcom/llcc-qcom.c | 373 +++ + drivers/soc/qcom/mdt_loader.c | 52 +- + drivers/soc/qcom/ocmem.c | 2 +- + drivers/soc/qcom/pmic_glink.c | 9 +- + drivers/soc/qcom/qcom-pbs.c | 2 + + drivers/soc/qcom/qcom_gsbi.c | 8 - + drivers/soc/qcom/qcom_pd_mapper.c | 10 + + drivers/soc/qcom/smem.c | 33 +- + drivers/soc/qcom/socinfo.c | 106 +- + drivers/soc/qcom/ubwc_config.c | 24 + + drivers/soc/renesas/r9a08g045-sysc.c | 69 + + drivers/soc/renesas/r9a09g047-sys.c | 79 + + drivers/soc/renesas/r9a09g056-sys.c | 69 + + drivers/soc/renesas/r9a09g057-sys.c | 101 + + drivers/soc/renesas/rcar-rst.c | 3 +- + drivers/soc/renesas/rz-sysc.c | 2 + + drivers/soc/renesas/rz-sysc.h | 4 + + drivers/soc/rockchip/grf.c | 15 + + drivers/soc/samsung/Makefile | 3 +- + drivers/soc/samsung/exynos-chipid.c | 18 +- + drivers/soc/samsung/exynos-pmu.c | 138 +- + drivers/soc/samsung/exynos-pmu.h | 37 + + drivers/soc/samsung/gs101-pmu.c | 446 +++ + drivers/soc/tegra/cbb/tegra194-cbb.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 2 - + drivers/soc/tegra/fuse/speedo-tegra210.c | 59 +- + drivers/soc/tegra/pmc.c | 38 +- + drivers/soc/xilinx/xlnx_event_manager.c | 8 +- + drivers/soc/xilinx/zynqmp_power.c | 10 +- + drivers/spi/spi-cs42l43.c | 40 +- + drivers/thermal/intel/intel_hfi.c | 12 +- + drivers/xen/xen-acpi-processor.c | 12 +- + include/dt-bindings/arm/qcom,ids.h | 2 + + include/dt-bindings/clock/google,gs101-acpm.h | 26 + + include/dt-bindings/clock/qcom,dispcc-sm6350.h | 4 + + include/dt-bindings/clock/qcom,ipq5424-gcc.h | 3 +- + include/dt-bindings/clock/qcom,ipq5424-nsscc.h | 65 + + include/dt-bindings/clock/qcom,x1e80100-gcc.h | 61 + + include/dt-bindings/clock/r8a779a0-cpg-mssr.h | 1 + + include/dt-bindings/clock/rk3568-cru.h | 6 + + include/dt-bindings/interconnect/qcom,ipq5424.h | 33 + + include/dt-bindings/power/nvidia,tegra264-bpmp.h | 24 + + include/dt-bindings/reset/eswin,eic7700-reset.h | 298 ++ + include/dt-bindings/reset/qcom,ipq5424-nsscc.h | 46 + + include/dt-bindings/reset/thead,th1520-reset.h | 219 +- + include/linux/cache_coherency.h | 61 + + include/linux/err.h | 8 + + include/linux/firmware/qcom/qcom_tzmem.h | 15 +- + include/linux/firmware/xlnx-zynqmp.h | 30 +- + include/linux/memregion.h | 16 +- + include/linux/property.h | 13 +- + include/linux/reset-controller.h | 33 - + include/linux/reset.h | 1 + + include/linux/soc/qcom/llcc-qcom.h | 7 + + include/linux/soc/qcom/socinfo.h | 4 + + include/linux/soc/qcom/ubwc.h | 1 + + include/linux/soc/samsung/exynos-regs-pmu.h | 343 ++- + include/linux/syscore_ops.h | 17 +- + kernel/cpu_pm.c | 12 +- + kernel/irq/generic-chip.c | 14 +- + kernel/irq/pm.c | 11 +- + kernel/printk/printk.c | 11 +- + kernel/time/sched_clock.c | 22 +- + kernel/time/timekeeping.c | 22 +- + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/cache_maint.c | 138 + + virt/kvm/kvm_main.c | 18 +- + 984 files changed, 59795 insertions(+), 7336 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bst.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-tsec.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-csi.yaml + create mode 100644 Documentation/devicetree/bindings/embedded-controller/traverse,ten64-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-omap.txt + create mode 100644 Documentation/devicetree/bindings/mmc/ti,omap2430-sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/reset/eswin,eic7700-reset.yaml + create mode 100644 Documentation/devicetree/bindings/riscv/anlogic.yaml + create mode 100644 Documentation/devicetree/bindings/riscv/tenstorrent.yaml + create mode 100644 Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-mss-top-sysreg.yaml + create mode 100644 Documentation/devicetree/bindings/soc/sophgo/sophgo,cv1800b-top-syscon.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite5.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-balcones.dts + create mode 100644 arch/arm/boot/dts/aspeed/ibm-power11-dual.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_pe1_emmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_pe1_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_pe1_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_pe3_emmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_pe3_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_pe3_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_st1_emmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_st1_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1_st1_sdmmc.dts + delete mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_pe1_emmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_pe1_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_pe1_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_pe3_emmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_pe3_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_pe3_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_st1_emmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_st1_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa1_st1_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2_pe1_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2_pe1_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2_pe3_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2_pe3_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2_st1_qspi.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mercury_sa2_st1_sdmmc.dts + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_enclustra_mercury_bootmode_emmc.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_enclustra_mercury_bootmode_qspi.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_enclustra_mercury_bootmode_sdmmc.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_enclustra_mercury_pe1.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_enclustra_mercury_pe3.dtsi + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_enclustra_mercury_st1.dtsi + create mode 100644 arch/arm/boot/dts/mediatek/mt6582-alcatel-yarisxl.dts + create mode 100644 arch/arm/boot/dts/nvidia/tegra124-xiaomi-mocha.dts + delete mode 100644 arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi + create mode 100644 arch/arm/boot/dts/ti/omap/am335x-mba335x.dts + create mode 100644 arch/arm/boot/dts/ti/omap/am335x-tqma335x.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-tx9-pro.dts + create mode 100644 arch/arm64/boot/dts/bst/Makefile + create mode 100644 arch/arm64/boot/dts/bst/bstc1200-cdcu1.0-adas_4c2g.dts + create mode 100644 arch/arm64/boot/dts/bst/bstc1200.dtsi + create mode 100644 arch/arm64/boot/dts/cix/sky1-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-av-10-etml1010g3dra.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-av-10-ph128800t006.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-av-10.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aipstz.h + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-etml1010g3dra.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-av-10-etml1010g3dra.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-av-10-ph128800t006.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-av-10.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-av-10.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-ph128800t006.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-prt8ml.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revc-hdmi.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revc-jutouch-jt101tm023.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-phyboard-segin.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-phyboard-nash-jtag.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-phyboard-nash-pwm-fan.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx95-19x19-verdin-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-toradex-smarc-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-toradex-smarc.dtsi + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex3_socdk.dts + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_013b.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6878-pinfunc.h + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-4e.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-8x.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn15.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn18.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-emmc.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-sd.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8196-gce.h + create mode 100644 arch/arm64/boot/dts/mediatek/mt8370-grinn-genio-510-sbc.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-700-sbc.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-sbc.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-som.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk-ufs.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-genio-common.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p3541-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-peripherals-opp.dtsi + rename arch/arm64/boot/dts/qcom/{qcm2290.dtsi => agatti.dtsi} (93%) + rename arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} (96%) + rename arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} (98%) + rename arch/arm64/boot/dts/qcom/{sc7280.dtsi => kodiak.dtsi} (97%) + create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-camera.dtso + rename arch/arm64/boot/dts/qcom/{qcs8300-pmics.dtsi => monaco-pmics.dtsi} (98%) + rename arch/arm64/boot/dts/qcom/{qcs8300.dtsi => monaco.dtsi} (99%) + create mode 100644 arch/arm64/boot/dts/qcom/msm8937-xiaomi-land.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8937.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-asus-z00t.dts + rename arch/arm64/boot/dts/qcom/{x1p42100.dtsi => purwa.dtsi} (99%) + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-hdk-rear-camera-card.dtso + rename arch/arm64/boot/dts/qcom/{sm6150.dtsi => talos.dtsi} (92%) + create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-asus-zenbook-a14-lcd.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-asus-zenbook-a14.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-fan-argon40.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-rpi-display-2-5in.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-rpi-display-2-7in.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-rpi-display-2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a78000-ironhide.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a78000.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-tinker-board-3.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-tinker-board-3.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-tinker-board-3s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-9tripod-x3568-v4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-easepi-r1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-qnap-tsx33.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-100ask-dshanpi-a1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62l-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62l-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62l.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62l3-evm.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62l3.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-ads2.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-gbe1.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-gpios.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-rtc-rv8263.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am69-aquila.dtsi + create mode 100644 arch/riscv/boot/dts/anlogic/Makefile + create mode 100644 arch/riscv/boot/dts/anlogic/dr1v90-mlkpai-fs01.dts + create mode 100644 arch/riscv/boot/dts/anlogic/dr1v90.dtsi + create mode 100644 arch/riscv/boot/dts/spacemit/k1-musepi-pro.dts + create mode 100644 arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-orangepi-rv.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-lite-emmc.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-lite.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-lite.dtsi + create mode 100644 arch/riscv/boot/dts/tenstorrent/Makefile + create mode 100644 arch/riscv/boot/dts/tenstorrent/blackhole-card.dts + create mode 100644 arch/riscv/boot/dts/tenstorrent/blackhole.dtsi + create mode 100644 drivers/cache/hisi_soc_hha.c + create mode 100644 drivers/reset/reset-eic7700.c + create mode 100644 drivers/soc/microchip/mpfs-control-scb.c + create mode 100644 drivers/soc/microchip/mpfs-mss-top-sysreg.c + create mode 100644 drivers/soc/samsung/gs101-pmu.c + create mode 100644 include/dt-bindings/clock/google,gs101-acpm.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5424-nsscc.h + create mode 100644 include/dt-bindings/power/nvidia,tegra264-bpmp.h + create mode 100644 include/dt-bindings/reset/eswin,eic7700-reset.h + create mode 100644 include/dt-bindings/reset/qcom,ipq5424-nsscc.h + create mode 100644 include/linux/cache_coherency.h + create mode 100644 lib/cache_maint.c +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 +Auto-merging drivers/reset/Kconfig +Merge made by the 'ort' strategy. + .../bindings/clock/microchip,mpfs-clkcfg.yaml | 36 ++-- + drivers/clk/clk-lan966x.c | 2 - + drivers/clk/microchip/Kconfig | 2 + + drivers/clk/microchip/clk-mpfs.c | 227 +++++++++++++++++---- + drivers/reset/Kconfig | 1 + + drivers/reset/reset-mpfs.c | 91 +++++---- + include/soc/microchip/mpfs.h | 3 +- + 7 files changed, 266 insertions(+), 96 deletions(-) +Merging bmc/for-next (028f6e376cb6 Merge branch 'aspeed/arm/dt' into for-next) +$ 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. + .../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 6 ---- + .../dts/aspeed/aspeed-bmc-facebook-clemente.dts | 32 +++++++++++++++++++++- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++++-- + .../aspeed/aspeed-bmc-facebook-santabarbara.dts | 29 +++++++++++++++++--- + 4 files changed, 62 insertions(+), 13 deletions(-) +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 (3a8660878839 Linux 6.18-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 (84ac371ee4b3 Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. +Merging fsl/soc_fsl (760b8eec2cf8 soc: fsl: qbman: use kmalloc_array() instead of kmalloc()) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Already up to date. +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 (c17e270dfb34 Merge branches 'arm32-for-6.19', 'arm64-defconfig-for-6.19', 'arm64-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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 5 +- + .../bindings/clock/qcom,sm8550-tcsr.yaml | 1 + + .../devicetree/bindings/clock/qcom,sm8750-gcc.yaml | 8 +- + drivers/clk/qcom/Kconfig | 32 +- + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/apss-ipq5424.c | 7 - + drivers/clk/qcom/camcc-sdm845.c | 3 + + drivers/clk/qcom/camcc-sm6350.c | 13 +- + drivers/clk/qcom/camcc-sm7150.c | 9 +- + drivers/clk/qcom/camcc-sm8250.c | 3 + + drivers/clk/qcom/camcc-sm8450.c | 3 + + drivers/clk/qcom/camcc-sm8550.c | 10 + + drivers/clk/qcom/clk-branch.c | 8 +- + drivers/clk/qcom/clk-branch.h | 4 + + drivers/clk/qcom/clk-rpmh.c | 1 + + drivers/clk/qcom/dispcc-sm6350.c | 7 + + drivers/clk/qcom/dispcc-sm7150.c | 9 +- + drivers/clk/qcom/dispcc-x1e80100.c | 3 + + drivers/clk/qcom/ecpricc-qdu1000.c | 30 + + drivers/clk/qcom/gcc-glymur.c | 25 +- + drivers/clk/qcom/gcc-ipq5424.c | 28 +- + drivers/clk/qcom/gcc-qcs615.c | 6 +- + drivers/clk/qcom/gcc-sc8280xp.c | 1 - + drivers/clk/qcom/gcc-sm8750.c | 1 + + drivers/clk/qcom/gcc-x1e80100.c | 699 +++++++++- + drivers/clk/qcom/mmcc-sdm660.c | 1 + + drivers/clk/qcom/nsscc-ipq5424.c | 1340 ++++++++++++++++++++ + drivers/clk/qcom/tcsrcc-glymur.c | 54 +- + drivers/clk/qcom/videocc-sm8750.c | 463 +++++++ + include/dt-bindings/clock/qcom,kaanapali-gcc.h | 241 ++++ + include/dt-bindings/clock/qcom,mmcc-sdm660.h | 1 + + include/dt-bindings/clock/qcom,sm7150-dispcc.h | 3 + + include/dt-bindings/clock/qcom,sm8750-videocc.h | 40 + + include/dt-bindings/clock/qcom,x1e80100-dispcc.h | 3 + + 35 files changed, 2974 insertions(+), 91 deletions(-) + create mode 100644 drivers/clk/qcom/nsscc-ipq5424.c + create mode 100644 drivers/clk/qcom/videocc-sm8750.c + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8750-videocc.h +Merging renesas/next (fbec5d4783d5 Merge branches 'renesas-drivers-for-v6.19' and 'renesas-dts-for-v6.19' 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. +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 (8e0b927d5848 Merge branch 'v6.19-clk/next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/rockchip,rk3506-cru.yaml | 55 + + .../bindings/clock/rockchip,rv1126b-cru.yaml | 52 + + drivers/clk/rockchip/Kconfig | 14 + + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-cpu.c | 165 +++ + drivers/clk/rockchip/clk-rk3506.c | 869 +++++++++++++++ + drivers/clk/rockchip/clk-rk3568.c | 5 +- + drivers/clk/rockchip/clk-rv1126b.c | 1117 ++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 24 + + drivers/clk/rockchip/clk.h | 96 ++ + drivers/clk/rockchip/rst-rk3506.c | 226 ++++ + drivers/clk/rockchip/rst-rv1126b.c | 443 ++++++++ + include/dt-bindings/clock/rk3568-cru.h | 2 - + include/dt-bindings/clock/rockchip,rk3506-cru.h | 285 +++++ + include/dt-bindings/clock/rockchip,rv1126b-cru.h | 392 +++++++ + include/dt-bindings/reset/rockchip,rk3506-cru.h | 211 ++++ + include/dt-bindings/reset/rockchip,rv1126b-cru.h | 405 +++++++ + 17 files changed, 4360 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3506-cru.yaml + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1126b-cru.yaml + create mode 100644 drivers/clk/rockchip/clk-rk3506.c + create mode 100644 drivers/clk/rockchip/clk-rv1126b.c + create mode 100644 drivers/clk/rockchip/rst-rk3506.c + create mode 100644 drivers/clk/rockchip/rst-rv1126b.c + create mode 100644 include/dt-bindings/clock/rockchip,rk3506-cru.h + create mode 100644 include/dt-bindings/clock/rockchip,rv1126b-cru.h + create mode 100644 include/dt-bindings/reset/rockchip,rk3506-cru.h + create mode 100644 include/dt-bindings/reset/rockchip,rv1126b-cru.h +Merging samsung-krzk/for-next (bca42080637c Merge branch 'next/drivers-late' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/google,gs101-clock.yaml | 3 + + .../clock/samsung,exynosautov920-clock.yaml | 42 +++++ + .../bindings/soc/samsung/exynos-pmu.yaml | 1 + + MAINTAINERS | 3 +- + arch/arm/boot/dts/samsung/exynos4210-i9100.dts | 1 + + arch/arm/boot/dts/samsung/exynos4210-trats.dts | 1 + + .../boot/dts/samsung/exynos4210-universal_c210.dts | 1 + + arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 1 + + drivers/clk/samsung/Kconfig | 10 ++ + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-acpm.c | 185 +++++++++++++++++++++ + drivers/clk/samsung/clk-exynosautov920.c | 90 ++++++++++ + drivers/clk/samsung/clk-pll.c | 41 ++--- + drivers/firmware/samsung/Makefile | 4 +- + drivers/firmware/samsung/exynos-acpm-dvfs.c | 80 +++++++++ + drivers/firmware/samsung/exynos-acpm-dvfs.h | 21 +++ + drivers/firmware/samsung/exynos-acpm.c | 26 +++ + drivers/soc/samsung/exynos-pmu.c | 9 +- + include/dt-bindings/clock/samsung,exynosautov920.h | 10 ++ + .../linux/firmware/samsung/exynos-acpm-protocol.h | 19 +++ + 20 files changed, 512 insertions(+), 37 deletions(-) + create mode 100644 drivers/clk/samsung/clk-acpm.c + create mode 100644 drivers/firmware/samsung/exynos-acpm-dvfs.c + create mode 100644 drivers/firmware/samsung/exynos-acpm-dvfs.h +Merging scmi/for-linux-next (e5db90f4c044 Merge branch 'for-next/ffa/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_ffa/driver.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 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 (34729c8b27fd Merge branch 'ti-k3-dts-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. +Merging xilinx/for-next (a35dc981c5d8 Merge branch 'zynqmp/defconfig' 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. + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 4 +-- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +-- + arch/arm64/configs/defconfig | 42 ++++++++++++++++++++++++++++++ + 3 files changed, 46 insertions(+), 4 deletions(-) +Merging clk/clk-next (e1132ddd5d4c Merge branch 'clk-imx' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../bindings/clock/airoha,en7523-scu.yaml | 3 +- + .../bindings/clock/fsl,imx8ulp-sim-lpav.yaml | 72 +++ + drivers/clk/actions/owl-common.h | 2 +- + drivers/clk/actions/owl-composite.h | 2 +- + drivers/clk/actions/owl-divider.h | 2 +- + drivers/clk/actions/owl-factor.h | 2 +- + drivers/clk/actions/owl-gate.h | 2 +- + drivers/clk/actions/owl-mux.h | 2 +- + drivers/clk/actions/owl-pll.h | 2 +- + drivers/clk/clk-en7523.c | 64 ++- + drivers/clk/imx/Kconfig | 1 + + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-composite-7ulp.c | 13 + + drivers/clk/imx/clk-imx8mp-audiomix.c | 39 +- + drivers/clk/imx/clk-imx8ulp-sim-lpav.c | 156 ++++++ + drivers/clk/keystone/sci-clk.c | 4 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 7 +- + drivers/clk/renesas/r9a06g032-clocks.c | 6 +- + drivers/clk/renesas/r9a09g047-cpg.c | 144 +++++- + drivers/clk/renesas/r9a09g056-cpg.c | 118 ++++- + drivers/clk/renesas/r9a09g057-cpg.c | 102 +++- + drivers/clk/renesas/r9a09g077-cpg.c | 57 ++- + drivers/clk/renesas/rcar-cpg-lib.c | 2 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 9 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 187 +++++-- + drivers/clk/renesas/rzg2l-cpg.c | 2 +- + drivers/clk/renesas/rzv2h-cpg.c | 514 ++++++++++++++++++- + drivers/clk/renesas/rzv2h-cpg.h | 31 +- + drivers/clk/socfpga/Kconfig | 2 +- + drivers/clk/socfpga/Makefile | 2 +- + drivers/clk/socfpga/clk-agilex5.c | 561 +++++++++++++++++++++ + drivers/clk/socfpga/clk-gate-s10.c | 53 ++ + drivers/clk/socfpga/clk-periph-s10.c | 41 ++ + drivers/clk/socfpga/clk-pll-s10.c | 36 ++ + drivers/clk/socfpga/stratix10-clk.h | 43 ++ + drivers/clk/spacemit/ccu-k1.c | 4 +- + drivers/clk/spacemit/ccu_mix.h | 2 +- + drivers/clk/sprd/sc9860-clk.c | 8 +- + drivers/clk/visconti/clkc-tmpv770x.c | 79 ++- + drivers/clk/visconti/pll-tmpv770x.c | 5 +- + include/dt-bindings/clock/imx8ulp-clock.h | 5 + + include/dt-bindings/clock/renesas,r9a09g047-cpg.h | 2 + + include/dt-bindings/clock/renesas,r9a09g056-cpg.h | 2 + + include/dt-bindings/clock/renesas,r9a09g057-cpg.h | 4 + + include/dt-bindings/clock/toshiba,tmpv770x.h | 14 +- + include/dt-bindings/reset/airoha,en7523-reset.h | 61 +++ + include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h | 16 + + include/dt-bindings/reset/toshiba,tmpv770x.h | 9 +- + include/linux/clk/renesas.h | 145 ++++++ + 49 files changed, 2497 insertions(+), 143 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx8ulp-sim-lpav.yaml + create mode 100644 drivers/clk/imx/clk-imx8ulp-sim-lpav.c + create mode 100644 drivers/clk/socfpga/clk-agilex5.c + create mode 100644 include/dt-bindings/reset/airoha,en7523-reset.h + create mode 100644 include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h +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 (5fb2f67341bd clk: renesas: r9a09g077: Add SPI module clocks) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +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 +Merge made by the 'ort' strategy. + arch/csky/abiv1/inc/abi/regdef.h | 2 +- + arch/csky/abiv2/inc/abi/regdef.h | 2 +- + arch/csky/include/asm/barrier.h | 4 ++-- + arch/csky/include/asm/cache.h | 2 +- + arch/csky/include/asm/ftrace.h | 4 ++-- + arch/csky/include/asm/jump_label.h | 4 ++-- + arch/csky/include/asm/page.h | 4 ++-- + arch/csky/include/asm/ptrace.h | 4 ++-- + arch/csky/include/asm/sections.h | 1 + + arch/csky/include/asm/string.h | 2 +- + arch/csky/include/asm/thread_info.h | 4 ++-- + arch/csky/include/uapi/asm/ptrace.h | 4 ++-- + arch/csky/mm/fault.c | 4 ++-- + 13 files changed, 21 insertions(+), 20 deletions(-) +Merging loongarch/loongarch-next (b1ca4204c312 KVM: LoongArch: selftests: Add time counter test case) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/kvm_eiointc.h | 55 +----- + arch/loongarch/include/asm/kvm_host.h | 8 + + arch/loongarch/include/asm/kvm_vcpu.h | 1 + + arch/loongarch/include/asm/loongarch.h | 2 + + arch/loongarch/include/uapi/asm/kvm.h | 1 + + arch/loongarch/kvm/intc/eiointc.c | 80 ++++----- + arch/loongarch/kvm/interrupt.c | 15 +- + arch/loongarch/kvm/vcpu.c | 19 +- + arch/loongarch/kvm/vm.c | 44 +++-- + tools/testing/selftests/kvm/Makefile.kvm | 1 + + .../selftests/kvm/include/loongarch/arch_timer.h | 85 +++++++++ + .../selftests/kvm/include/loongarch/processor.h | 81 ++++++++- + .../selftests/kvm/lib/loongarch/exception.S | 6 + + .../selftests/kvm/lib/loongarch/processor.c | 47 ++++- + tools/testing/selftests/kvm/loongarch/arch_timer.c | 197 +++++++++++++++++++++ + 15 files changed, 533 insertions(+), 109 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/loongarch/arch_timer.h + create mode 100644 tools/testing/selftests/kvm/loongarch/arch_timer.c +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 +Merge made by the 'ort' strategy. + arch/m68k/configs/amiga_defconfig | 3 +-- + arch/m68k/configs/apollo_defconfig | 3 +-- + arch/m68k/configs/atari_defconfig | 3 +-- + arch/m68k/configs/bvme6000_defconfig | 3 +-- + arch/m68k/configs/hp300_defconfig | 3 +-- + arch/m68k/configs/mac_defconfig | 3 +-- + arch/m68k/configs/multi_defconfig | 3 +-- + arch/m68k/configs/mvme147_defconfig | 3 +-- + arch/m68k/configs/mvme16x_defconfig | 3 +-- + arch/m68k/configs/q40_defconfig | 3 +-- + arch/m68k/configs/sun3_defconfig | 3 +-- + arch/m68k/configs/sun3x_defconfig | 3 +-- + 12 files changed, 12 insertions(+), 24 deletions(-) +Merging m68knommu/for-next (ac3fd01e4c1e Linux 6.18-rc7) +$ 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 (7f7072574127 Merge tag 'kbuild-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux) +$ 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 (ac3fd01e4c1e Linux 6.18-rc7) +$ 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 (dca7da244349 parisc: Do not reprogram affinitiy on ASP chip) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/bug.h | 2 -- + arch/parisc/kernel/asm-offsets.c | 2 ++ + arch/parisc/kernel/drivers.c | 8 +------- + arch/parisc/kernel/entry.S | 16 ++++++++++++---- + arch/parisc/kernel/perf_regs.c | 2 +- + drivers/parisc/gsc.c | 4 +++- + 6 files changed, 19 insertions(+), 15 deletions(-) +Merging powerpc/next (5b3a426affbd powerpc/64s/slb: Add no_slb_preload early cmdline param) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + arch/powerpc/boot/addnote.c | 7 +- + arch/powerpc/boot/dts/asp834x-redboot.dts | 2 +- + arch/powerpc/boot/dts/fsl/ge_imp3a.dts | 4 +- + arch/powerpc/boot/dts/fsl/gef_ppc9a.dts | 4 +- + arch/powerpc/boot/dts/fsl/gef_sbc310.dts | 4 +- + arch/powerpc/boot/dts/fsl/gef_sbc610.dts | 4 +- + arch/powerpc/boot/dts/mpc5121.dtsi | 2 +- + arch/powerpc/boot/dts/mpc8313erdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8315erdb.dts | 2 +- + arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8349emitx.dts | 2 +- + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 2 +- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_wlan.dts | 2 +- + arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +- + arch/powerpc/boot/wrapper | 4 +- + arch/powerpc/include/asm/book3s/32/tlbflush.h | 5 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 - + arch/powerpc/include/asm/kexec.h | 2 + + arch/powerpc/include/asm/topology.h | 11 ++- + arch/powerpc/kernel/entry_32.S | 33 ++++--- + arch/powerpc/kernel/interrupt.c | 2 +- + arch/powerpc/kernel/process.c | 5 -- + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/smp.c | 23 +++++ + arch/powerpc/kernel/vmlinux.lds.S | 1 - + arch/powerpc/kexec/core.c | 37 +++++--- + arch/powerpc/kexec/ranges.c | 45 +++++++--- + arch/powerpc/mm/book3s32/tlb.c | 9 ++ + arch/powerpc/mm/book3s64/hash_utils.c | 41 ++++++--- + arch/powerpc/mm/book3s64/internal.h | 9 +- + arch/powerpc/mm/book3s64/mmu_context.c | 2 - + arch/powerpc/mm/book3s64/pgtable.c | 23 ++--- + arch/powerpc/mm/book3s64/slb.c | 109 ++++-------------------- + arch/powerpc/mm/ptdump/8xx.c | 5 ++ + arch/powerpc/mm/ptdump/book3s64.c | 5 ++ + arch/powerpc/mm/ptdump/hashpagetable.c | 6 ++ + arch/powerpc/mm/ptdump/ptdump.c | 1 + + arch/powerpc/mm/ptdump/ptdump.h | 1 + + arch/powerpc/mm/ptdump/shared.c | 5 ++ + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 2 + + arch/powerpc/platforms/pseries/lparcfg.c | 17 +++- + arch/powerpc/tools/head_check.sh | 1 + + drivers/macintosh/mac_hid.c | 3 +- + 47 files changed, 267 insertions(+), 197 deletions(-) +Merging risc-v/for-next (0f226cf6026f 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/cbo.c +Auto-merging tools/testing/selftests/riscv/hwprobe/which-cpus.c +Recorded preimage for 'arch/riscv/include/asm/hwcap.h' +Recorded preimage for 'include/linux/mm.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/riscv/include/asm/hwcap.h'. +Recorded resolution for 'include/linux/mm.h'. +[master 34569cc209eb] 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 | 23 +- + Documentation/arch/riscv/index.rst | 2 + + Documentation/arch/riscv/zicfilp.rst | 122 +++++ + Documentation/arch/riscv/zicfiss.rst | 194 ++++++++ + .../devicetree/bindings/riscv/extensions.yaml | 55 +++ + arch/riscv/Kconfig | 24 +- + arch/riscv/Makefile | 8 +- + arch/riscv/configs/hardening.config | 4 + + arch/riscv/include/asm/arch_hweight.h | 24 +- + 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/bitops.h | 32 +- + arch/riscv/include/asm/checksum.h | 13 +- + arch/riscv/include/asm/cmpxchg.h | 12 +- + 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 | 7 +- + arch/riscv/include/asm/hwprobe.h | 3 +- + arch/riscv/include/asm/insn-def.h | 79 +++ + arch/riscv/include/asm/mman.h | 26 + + arch/riscv/include/asm/mmu_context.h | 7 + + arch/riscv/include/asm/pgtable.h | 61 ++- + 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 | 4 + + arch/riscv/include/uapi/asm/hwprobe.h | 10 + + 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 | 50 ++ + arch/riscv/kernel/entry.S | 38 ++ + arch/riscv/kernel/head.S | 27 + + arch/riscv/kernel/process.c | 27 +- + arch/riscv/kernel/ptrace.c | 119 ++++- + arch/riscv/kernel/signal.c | 148 +++++- + arch/riscv/kernel/smpboot.c | 15 + + arch/riscv/kernel/sys_hwprobe.c | 171 ++++--- + 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/kernel/vector.c | 2 + + arch/riscv/lib/csum.c | 53 +- + arch/riscv/mm/init.c | 6 +- + arch/riscv/mm/pgtable.c | 38 +- + 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 ++ + lib/raid6/recov_rvv.c | 7 +- + lib/raid6/rvv.c | 299 +++++------ + lib/raid6/rvv.h | 17 + + lib/raid6/test/Makefile | 8 + + 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/cbo.c | 163 ++++-- + tools/testing/selftests/riscv/hwprobe/which-cpus.c | 18 +- + tools/testing/selftests/riscv/vector/Makefile | 5 +- + .../testing/selftests/riscv/vector/vstate_ptrace.c | 134 +++++ + 82 files changed, 3392 insertions(+), 423 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 + create mode 100644 tools/testing/selftests/riscv/vector/vstate_ptrace.c +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 (2f44a03a8d80 Merge branch 'features' 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 +Auto-merging arch/s390/Makefile +Auto-merging arch/s390/crypto/phmac_s390.c +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/s390/mm/pgtable.c +Auto-merging drivers/base/memory.c +Auto-merging drivers/s390/char/sclp_sd.c +Auto-merging drivers/s390/net/ctcm_mpc.c +Auto-merging include/linux/memory.h +CONFLICT (content): Merge conflict in include/linux/memory.h +Auto-merging include/linux/memremap.h +Auto-merging mm/memory_hotplug.c +Resolved 'include/linux/memory.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 713091684931] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/s390/s390dbf.rst | 5 +- + arch/s390/Kconfig | 21 +- + arch/s390/Makefile | 14 +- + arch/s390/appldata/appldata_base.c | 3 +- + arch/s390/appldata/appldata_os.c | 3 +- + arch/s390/boot/Makefile | 1 + + arch/s390/boot/boot.h | 4 + + arch/s390/boot/ipl_data.c | 3 +- + arch/s390/boot/ipl_parm.c | 6 + + arch/s390/boot/stackprotector.c | 6 + + arch/s390/boot/startup.c | 8 + + arch/s390/configs/compat.config | 3 - + arch/s390/crypto/aes_s390.c | 3 +- + arch/s390/crypto/hmac_s390.c | 3 +- + arch/s390/crypto/paes_s390.c | 3 +- + arch/s390/crypto/phmac_s390.c | 3 +- + arch/s390/crypto/prng.c | 3 +- + arch/s390/hypfs/hypfs_diag.c | 3 +- + arch/s390/hypfs/hypfs_diag_fs.c | 3 +- + arch/s390/hypfs/hypfs_sprp.c | 6 +- + arch/s390/hypfs/inode.c | 3 +- + arch/s390/include/asm/ap.h | 30 +- + arch/s390/include/asm/arch-stackprotector.h | 25 + + arch/s390/include/asm/cio.h | 2 + + arch/s390/include/asm/compat.h | 140 --- + arch/s390/include/asm/cpufeature.h | 1 - + arch/s390/include/asm/elf.h | 47 +- + arch/s390/include/asm/fpu-insn.h | 3 + + arch/s390/include/asm/ftrace.h | 19 +- + arch/s390/include/asm/idals.h | 76 ++ + arch/s390/include/asm/lowcore.h | 3 +- + arch/s390/include/asm/pai.h | 1 + + arch/s390/include/asm/percpu.h | 8 - + arch/s390/include/asm/pgtable.h | 19 +- + arch/s390/include/asm/processor.h | 22 +- + arch/s390/include/asm/ptrace.h | 5 +- + arch/s390/include/asm/seccomp.h | 5 - + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/stackprotector.h | 16 + + arch/s390/include/asm/syscall.h | 19 +- + arch/s390/include/asm/syscall_wrapper.h | 95 +- + arch/s390/include/asm/thread_info.h | 2 - + arch/s390/include/asm/tlbflush.h | 13 +- + arch/s390/include/asm/trace/ap.h | 87 ++ + arch/s390/include/asm/trace/zcrypt.h | 44 +- + arch/s390/include/asm/unistd.h | 8 +- + arch/s390/include/asm/vdso-symbols.h | 12 +- + arch/s390/include/uapi/asm/bitsperlong.h | 4 - + arch/s390/include/uapi/asm/ipcbuf.h | 3 - + arch/s390/include/uapi/asm/posix_types.h | 13 - + arch/s390/include/uapi/asm/ptrace.h | 124 -- + arch/s390/include/uapi/asm/sigcontext.h | 15 - + arch/s390/include/uapi/asm/stat.h | 70 -- + arch/s390/include/uapi/asm/unistd.h | 4 - + arch/s390/kernel/Makefile | 12 +- + arch/s390/kernel/asm-offsets.c | 4 + + arch/s390/kernel/audit.c | 16 - + arch/s390/kernel/audit.h | 16 - + arch/s390/kernel/compat_audit.c | 48 - + arch/s390/kernel/compat_linux.c | 289 ----- + arch/s390/kernel/compat_linux.h | 101 -- + arch/s390/kernel/compat_ptrace.h | 64 - + arch/s390/kernel/compat_signal.c | 420 ------- + arch/s390/kernel/cpacf.c | 3 +- + arch/s390/kernel/cpcmd.c | 3 +- + arch/s390/kernel/debug.c | 3 +- + arch/s390/kernel/dis.c | 17 +- + arch/s390/kernel/dumpstack.c | 8 +- + arch/s390/kernel/early.c | 21 +- + arch/s390/kernel/entry.S | 25 +- + arch/s390/kernel/{head64.S => head.S} | 0 + arch/s390/kernel/hiperdispatch.c | 5 +- + arch/s390/kernel/module.c | 21 +- + arch/s390/kernel/nmi.c | 3 +- + arch/s390/kernel/os_info.c | 3 +- + arch/s390/kernel/perf_cpum_cf.c | 6 +- + arch/s390/kernel/perf_cpum_sf.c | 7 +- + arch/s390/kernel/perf_event.c | 4 +- + arch/s390/kernel/perf_pai.c | 1230 ++++++++++++++++++++ + arch/s390/kernel/perf_pai_crypto.c | 843 -------------- + arch/s390/kernel/perf_pai_ext.c | 756 ------------ + arch/s390/kernel/perf_regs.c | 3 - + arch/s390/kernel/process.c | 9 +- + arch/s390/kernel/processor.c | 3 +- + arch/s390/kernel/ptrace.c | 524 --------- + arch/s390/kernel/setup.c | 6 +- + arch/s390/kernel/signal.c | 27 +- + arch/s390/kernel/smp.c | 15 +- + arch/s390/kernel/stackprotector.c | 156 +++ + arch/s390/kernel/stacktrace.c | 3 - + arch/s390/kernel/sthyi.c | 2 +- + arch/s390/kernel/syscall.c | 12 +- + arch/s390/kernel/syscalls/Makefile | 58 +- + arch/s390/kernel/syscalls/syscall.tbl | 856 +++++++------- + arch/s390/kernel/syscalls/syscalltbl | 232 ---- + arch/s390/kernel/sysinfo.c | 2 +- + arch/s390/kernel/time.c | 3 +- + arch/s390/kernel/topology.c | 3 +- + arch/s390/kernel/uprobes.c | 13 +- + arch/s390/kernel/uv.c | 3 +- + arch/s390/kernel/vdso.c | 36 +- + arch/s390/kernel/{vdso32 => vdso}/.gitignore | 2 +- + arch/s390/kernel/vdso/Makefile | 76 ++ + .../kernel/{vdso64 => vdso}/gen_vdso_offsets.sh | 2 +- + arch/s390/kernel/{vdso64 => vdso}/getcpu.c | 0 + arch/s390/kernel/{vdso32 => vdso}/note.S | 0 + arch/s390/kernel/{vdso64 => vdso}/vdso.h | 6 +- + .../{vdso64/vdso64.lds.S => vdso/vdso.lds.S} | 43 +- + .../vdso64_generic.c => vdso/vdso_generic.c} | 0 + .../kernel/{vdso64 => vdso}/vdso_user_wrapper.S | 0 + .../vdso32_wrapper.S => vdso/vdso_wrapper.S} | 8 +- + .../kernel/{vdso64 => vdso}/vgetrandom-chacha.S | 0 + arch/s390/kernel/{vdso64 => vdso}/vgetrandom.c | 0 + arch/s390/kernel/vdso32/Makefile | 64 - + arch/s390/kernel/vdso32/gen_vdso_offsets.sh | 15 - + arch/s390/kernel/vdso32/vdso32.lds.S | 140 --- + arch/s390/kernel/vdso32/vdso_user_wrapper.S | 22 - + arch/s390/kernel/vdso64/.gitignore | 2 - + arch/s390/kernel/vdso64/Makefile | 79 -- + arch/s390/kernel/vdso64/note.S | 13 - + arch/s390/kernel/vdso64/vdso64_wrapper.S | 15 - + arch/s390/kernel/vmlinux.lds.S | 13 + + arch/s390/kvm/interrupt.c | 3 +- + arch/s390/kvm/kvm-s390.c | 3 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/mm/cmm.c | 4 +- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/extmem.c | 17 +- + arch/s390/mm/fault.c | 29 +- + arch/s390/mm/gmap.c | 28 +- + arch/s390/mm/hugetlbpage.c | 3 +- + arch/s390/mm/mmap.c | 1 - + arch/s390/mm/pageattr.c | 4 +- + arch/s390/mm/pgalloc.c | 2 + + arch/s390/mm/pgtable.c | 14 +- + arch/s390/mm/vmem.c | 21 +- + arch/s390/net/bpf_jit_comp.c | 3 +- + arch/s390/pci/pci.c | 3 +- + arch/s390/pci/pci_bus.c | 7 +- + arch/s390/pci/pci_clp.c | 7 +- + arch/s390/pci/pci_debug.c | 3 +- + arch/s390/pci/pci_event.c | 3 +- + arch/s390/pci/pci_iov.c | 3 +- + arch/s390/pci/pci_irq.c | 3 +- + arch/s390/pci/pci_report.c | 3 +- + arch/s390/pci/pci_sysfs.c | 3 +- + arch/s390/tools/gen_facilities.c | 1 + + drivers/base/memory.c | 23 +- + drivers/char/hw_random/s390-trng.c | 3 +- + drivers/pci/hotplug/s390_pci_hpc.c | 3 +- + drivers/s390/block/dasd.c | 1 - + drivers/s390/block/dasd_eckd.c | 11 - + drivers/s390/block/dasd_fba.c | 1 - + drivers/s390/block/dasd_ioctl.c | 6 +- + drivers/s390/block/dcssblk.c | 7 +- + drivers/s390/block/scm_blk.c | 3 +- + drivers/s390/block/scm_drv.c | 3 +- + drivers/s390/char/con3270.c | 21 +- + drivers/s390/char/diag_ftp.c | 3 +- + drivers/s390/char/fs3270.c | 7 +- + drivers/s390/char/hmcdrv_cache.c | 3 +- + drivers/s390/char/hmcdrv_dev.c | 3 +- + drivers/s390/char/hmcdrv_ftp.c | 3 +- + drivers/s390/char/hmcdrv_mod.c | 3 +- + drivers/s390/char/monreader.c | 3 +- + drivers/s390/char/monwriter.c | 3 +- + drivers/s390/char/sclp_ap.c | 3 +- + drivers/s390/char/sclp_cmd.c | 3 +- + drivers/s390/char/sclp_config.c | 3 +- + drivers/s390/char/sclp_cpi_sys.c | 3 +- + drivers/s390/char/sclp_ctl.c | 12 +- + drivers/s390/char/sclp_early.c | 3 +- + drivers/s390/char/sclp_ftp.c | 3 +- + drivers/s390/char/sclp_mem.c | 292 +++-- + drivers/s390/char/sclp_ocf.c | 3 +- + drivers/s390/char/sclp_pci.c | 3 +- + drivers/s390/char/sclp_sd.c | 3 +- + drivers/s390/char/sclp_sdias.c | 3 +- + drivers/s390/char/tape.h | 21 +- + drivers/s390/char/tape_34xx.c | 31 +- + drivers/s390/char/tape_3590.c | 92 +- + drivers/s390/char/tape_char.c | 142 +-- + drivers/s390/char/tape_class.c | 3 +- + drivers/s390/char/tape_core.c | 38 +- + drivers/s390/char/tape_proc.c | 3 +- + drivers/s390/char/tape_std.c | 83 +- + drivers/s390/char/tape_std.h | 9 +- + drivers/s390/char/vmcp.c | 7 +- + drivers/s390/char/vmlogrdr.c | 3 +- + drivers/s390/char/vmur.c | 3 +- + drivers/s390/char/zcore.c | 3 +- + drivers/s390/cio/blacklist.c | 3 +- + drivers/s390/cio/ccwgroup.c | 6 +- + drivers/s390/cio/ccwreq.c | 3 +- + drivers/s390/cio/chp.c | 5 +- + drivers/s390/cio/chsc.c | 13 +- + drivers/s390/cio/chsc_sch.c | 7 +- + drivers/s390/cio/cio.c | 5 +- + drivers/s390/cio/cio_inject.c | 3 +- + drivers/s390/cio/cmf.c | 3 +- + drivers/s390/cio/css.c | 3 +- + drivers/s390/cio/device.c | 3 +- + drivers/s390/cio/device_status.c | 2 +- + drivers/s390/crypto/ap_bus.c | 196 +++- + drivers/s390/crypto/ap_bus.h | 5 +- + drivers/s390/crypto/ap_card.c | 3 +- + drivers/s390/crypto/ap_queue.c | 75 +- + drivers/s390/crypto/pkey_api.c | 3 +- + drivers/s390/crypto/pkey_base.c | 3 +- + drivers/s390/crypto/pkey_cca.c | 3 +- + drivers/s390/crypto/pkey_ep11.c | 3 +- + drivers/s390/crypto/pkey_pckmo.c | 3 +- + drivers/s390/crypto/pkey_sysfs.c | 3 +- + drivers/s390/crypto/pkey_uv.c | 3 +- + drivers/s390/crypto/vfio_ap_ops.c | 14 +- + drivers/s390/crypto/zcrypt_api.c | 257 +--- + drivers/s390/crypto/zcrypt_card.c | 1 - + drivers/s390/crypto/zcrypt_ccamisc.c | 3 +- + drivers/s390/crypto/zcrypt_ep11misc.c | 3 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 3 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 3 +- + drivers/s390/crypto/zcrypt_queue.c | 1 - + drivers/s390/net/ctcm_fsms.c | 3 +- + drivers/s390/net/ctcm_main.c | 3 +- + drivers/s390/net/ctcm_mpc.c | 3 +- + drivers/s390/net/ctcm_sysfs.c | 3 +- + drivers/s390/net/ism_drv.c | 3 +- + drivers/s390/net/qeth_core_main.c | 7 +- + drivers/s390/net/qeth_core_sys.c | 3 +- + drivers/s390/net/qeth_ethtool.c | 3 +- + drivers/s390/net/qeth_l2_main.c | 3 +- + drivers/s390/net/qeth_l3_main.c | 3 +- + drivers/s390/net/smsgiucv_app.c | 5 +- + drivers/s390/scsi/zfcp_aux.c | 3 +- + drivers/s390/scsi/zfcp_ccw.c | 3 +- + drivers/s390/scsi/zfcp_dbf.c | 3 +- + drivers/s390/scsi/zfcp_erp.c | 3 +- + drivers/s390/scsi/zfcp_fc.c | 3 +- + drivers/s390/scsi/zfcp_fsf.c | 3 +- + drivers/s390/scsi/zfcp_qdio.c | 3 +- + drivers/s390/scsi/zfcp_scsi.c | 3 +- + drivers/s390/scsi/zfcp_sysfs.c | 3 +- + drivers/watchdog/diag288_wdt.c | 3 +- + include/linux/memory.h | 9 - + include/linux/memory_hotplug.h | 18 +- + include/linux/memremap.h | 1 - + include/linux/percpu-defs.h | 2 +- + mm/memory_hotplug.c | 17 +- + mm/sparse.c | 3 +- + tools/arch/s390/include/uapi/asm/bitsperlong.h | 4 - + tools/include/nolibc/arch-s390.h | 5 - + tools/include/nolibc/arch.h | 2 +- + tools/lib/bpf/libbpf.c | 4 - + tools/lib/bpf/usdt.c | 2 - + tools/testing/selftests/nolibc/Makefile.nolibc | 5 - + tools/testing/selftests/nolibc/run-tests.sh | 6 +- + tools/testing/selftests/rseq/rseq-s390.h | 39 - + tools/testing/selftests/vDSO/vdso_config.h | 4 - + 258 files changed, 3135 insertions(+), 6188 deletions(-) + create mode 100644 arch/s390/boot/stackprotector.c + delete mode 100644 arch/s390/configs/compat.config + create mode 100644 arch/s390/include/asm/arch-stackprotector.h + delete mode 100644 arch/s390/include/asm/compat.h + create mode 100644 arch/s390/include/asm/stackprotector.h + create mode 100644 arch/s390/include/asm/trace/ap.h + delete mode 100644 arch/s390/kernel/audit.h + delete mode 100644 arch/s390/kernel/compat_audit.c + delete mode 100644 arch/s390/kernel/compat_linux.c + delete mode 100644 arch/s390/kernel/compat_linux.h + delete mode 100644 arch/s390/kernel/compat_ptrace.h + delete mode 100644 arch/s390/kernel/compat_signal.c + rename arch/s390/kernel/{head64.S => head.S} (100%) + create mode 100644 arch/s390/kernel/perf_pai.c + delete mode 100644 arch/s390/kernel/perf_pai_crypto.c + delete mode 100644 arch/s390/kernel/perf_pai_ext.c + create mode 100644 arch/s390/kernel/stackprotector.c + delete mode 100755 arch/s390/kernel/syscalls/syscalltbl + rename arch/s390/kernel/{vdso32 => vdso}/.gitignore (78%) + create mode 100644 arch/s390/kernel/vdso/Makefile + rename arch/s390/kernel/{vdso64 => vdso}/gen_vdso_offsets.sh (82%) + rename arch/s390/kernel/{vdso64 => vdso}/getcpu.c (100%) + rename arch/s390/kernel/{vdso32 => vdso}/note.S (100%) + rename arch/s390/kernel/{vdso64 => vdso}/vdso.h (80%) + rename arch/s390/kernel/{vdso64/vdso64.lds.S => vdso/vdso.lds.S} (64%) + rename arch/s390/kernel/{vdso64/vdso64_generic.c => vdso/vdso_generic.c} (100%) + rename arch/s390/kernel/{vdso64 => vdso}/vdso_user_wrapper.S (100%) + rename arch/s390/kernel/{vdso32/vdso32_wrapper.S => vdso/vdso_wrapper.S} (64%) + rename arch/s390/kernel/{vdso64 => vdso}/vgetrandom-chacha.S (100%) + rename arch/s390/kernel/{vdso64 => vdso}/vgetrandom.c (100%) + delete mode 100644 arch/s390/kernel/vdso32/Makefile + delete mode 100755 arch/s390/kernel/vdso32/gen_vdso_offsets.sh + delete mode 100644 arch/s390/kernel/vdso32/vdso32.lds.S + delete mode 100644 arch/s390/kernel/vdso32/vdso_user_wrapper.S + delete mode 100644 arch/s390/kernel/vdso64/.gitignore + delete mode 100644 arch/s390/kernel/vdso64/Makefile + delete mode 100644 arch/s390/kernel/vdso64/note.S + delete mode 100644 arch/s390/kernel/vdso64/vdso64_wrapper.S +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 (54618003a145 um: drivers: virtio: use string choices helper) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'ort' strategy. + .../core/generic-idle-thread/arch-support.txt | 2 +- + arch/um/Kconfig | 52 ++++- + arch/um/drivers/Makefile | 1 - + arch/um/drivers/mmapper_kern.c | 135 ------------ + arch/um/drivers/virtio_uml.c | 4 +- + arch/um/include/asm/current.h | 5 +- + arch/um/include/asm/hardirq.h | 24 +- + arch/um/include/asm/irqflags.h | 4 +- + arch/um/include/asm/mmu.h | 10 + + arch/um/include/asm/page.h | 4 - + arch/um/include/asm/pgtable.h | 8 +- + arch/um/include/asm/smp.h | 15 +- + arch/um/include/asm/uaccess.h | 9 +- + arch/um/include/linux/smp-internal.h | 17 ++ + arch/um/include/linux/time-internal.h | 3 + + arch/um/include/shared/as-layout.h | 1 - + arch/um/include/shared/common-offsets.h | 20 -- + arch/um/include/shared/kern_util.h | 5 +- + arch/um/include/shared/longjmp.h | 3 +- + arch/um/include/shared/mem_user.h | 13 -- + arch/um/include/shared/os.h | 24 +- + arch/um/include/shared/skas/mm_id.h | 5 + + arch/um/include/shared/skas/skas.h | 2 + + arch/um/include/shared/smp.h | 20 ++ + arch/um/kernel/Makefile | 1 + + arch/um/kernel/asm-offsets.c | 44 +++- + arch/um/kernel/irq.c | 27 ++- + arch/um/kernel/ksyms.c | 2 +- + arch/um/kernel/mem.c | 111 +--------- + arch/um/kernel/physmem.c | 71 ------ + arch/um/kernel/process.c | 18 +- + arch/um/kernel/skas/mmu.c | 33 ++- + arch/um/kernel/skas/process.c | 19 +- + arch/um/kernel/smp.c | 242 +++++++++++++++++++++ + arch/um/kernel/time.c | 58 +++-- + arch/um/kernel/tlb.c | 5 +- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 49 +++-- + arch/um/os-Linux/Makefile | 6 +- + arch/um/os-Linux/elf_aux.c | 37 +--- + arch/um/os-Linux/internal.h | 13 ++ + arch/um/os-Linux/main.c | 6 +- + arch/um/os-Linux/process.c | 20 ++ + arch/um/os-Linux/signal.c | 46 +++- + arch/um/os-Linux/skas/process.c | 46 ++-- + arch/um/os-Linux/smp.c | 148 +++++++++++++ + arch/um/os-Linux/start_up.c | 54 +---- + arch/um/os-Linux/time.c | 78 +++++-- + arch/um/os-Linux/user_syms.c | 6 - + arch/x86/um/Kconfig | 7 +- + arch/x86/um/Makefile | 5 +- + arch/x86/um/asm/elf.h | 39 +--- + arch/x86/um/asm/spinlock.h | 8 + + arch/x86/um/elfcore.c | 78 ------- + arch/x86/um/mem_32.c | 50 ----- + arch/x86/um/shared/sysdep/kernel-offsets.h | 17 -- + arch/x86/um/vdso/Makefile | 7 +- + arch/x86/um/vdso/um_vdso.c | 30 +-- + arch/x86/um/vdso/vdso.lds.S | 2 - + arch/x86/um/vdso/vma.c | 12 +- + fs/hostfs/hostfs.h | 34 +-- + include/asm-generic/percpu.h | 3 + + 62 files changed, 966 insertions(+), 854 deletions(-) + delete mode 100644 arch/um/drivers/mmapper_kern.c + create mode 100644 arch/um/include/linux/smp-internal.h + delete mode 100644 arch/um/include/shared/common-offsets.h + create mode 100644 arch/um/include/shared/smp.h + create mode 100644 arch/um/kernel/smp.c + create mode 100644 arch/um/os-Linux/smp.c + create mode 100644 arch/x86/um/asm/spinlock.h + delete mode 100644 arch/x86/um/elfcore.c + delete mode 100644 arch/x86/um/mem_32.c + delete mode 100644 arch/x86/um/shared/sysdep/kernel-offsets.h +Merging xtensa/xtensa-for-next (4c8bad3ed035 xtensa: use HZ_PER_MHZ in platform_calibrate_ccount) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging fs-next (14ebe81f7d10 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/filesystems/porting.rst +Auto-merging MAINTAINERS +Auto-merging arch/s390/hypfs/hypfs_diag_fs.c +Auto-merging arch/s390/hypfs/inode.c +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging drivers/base/firmware_loader/main.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/ceph/crypto.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/dax.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/shmem_fs.h +Auto-merging ipc/namespace.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging mm/filemap.c +Auto-merging mm/page-writeback.c +Auto-merging mm/secretmem.c +CONFLICT (content): Merge conflict in mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/vmscan.c +Auto-merging mm/workingset.c +Auto-merging tools/testing/selftests/coredump/stackdump_test.c +Auto-merging tools/testing/selftests/filesystems/utils.c +Auto-merging tools/testing/selftests/namespaces/nsid_test.c +Auto-merging tools/testing/selftests/pidfd/pidfd.h +Auto-merging tools/testing/selftests/pidfd/pidfd_info_test.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'mm/secretmem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5c654850d6d1] Merge branch 'fs-next' of linux-next +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 6 + + Documentation/filesystems/ext4/inodes.rst | 2 + + Documentation/filesystems/ext4/super.rst | 4 +- + Documentation/filesystems/f2fs.rst | 129 +- + .../{gfs2-glocks.rst => gfs2/glocks.rst} | 0 + .../filesystems/{gfs2.rst => gfs2/index.rst} | 12 + + .../{gfs2-uevents.rst => gfs2/uevents.rst} | 0 + Documentation/filesystems/index.rst | 4 +- + Documentation/filesystems/iomap/operations.rst | 50 +- + .../nfs/nfsd-maintainer-entry-profile.rst | 547 ++++ + Documentation/filesystems/porting.rst | 22 +- + .../filesystems/xfs/xfs-online-fsck-design.rst | 236 +- + .../maintainer/maintainer-entry-profile.rst | 1 + + MAINTAINERS | 8 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/tools/syscall_32.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 59 +- + arch/powerpc/platforms/pseries/papr-hvpipe.c | 39 +- + .../powerpc/platforms/pseries/papr-platform-dump.c | 30 +- + arch/powerpc/platforms/pseries/papr-rtas-common.c | 27 +- + arch/s390/hypfs/hypfs.h | 6 +- + arch/s390/hypfs/hypfs_diag_fs.c | 60 +- + arch/s390/hypfs/hypfs_vm_fs.c | 21 +- + arch/s390/hypfs/inode.c | 82 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/bdev.c | 23 +- + block/fops.c | 5 +- + drivers/android/binder/rust_binderfs.c | 121 +- + drivers/android/binderfs.c | 82 +- + drivers/base/devtmpfs.c | 8 +- + drivers/base/firmware_loader/main.c | 59 +- + drivers/block/nbd.c | 50 +- + drivers/crypto/ccp/sev-dev.c | 17 +- + drivers/dax/super.c | 2 +- + drivers/dma-buf/dma-buf.c | 10 +- + drivers/dma-buf/sw_sync.c | 39 +- + drivers/dma-buf/sync_file.c | 55 +- + drivers/gpio/gpiolib-cdev.c | 66 +- + drivers/hv/mshv_root_main.c | 30 +- + drivers/media/mc/mc-request.c | 34 +- + drivers/misc/ibmasm/ibmasmfs.c | 24 +- + drivers/misc/ntsync.c | 21 +- + drivers/target/target_core_configfs.c | 14 +- + drivers/tty/pty.c | 51 +- + drivers/usb/gadget/function/f_fs.c | 144 +- + drivers/usb/gadget/legacy/inode.c | 49 +- + drivers/vfio/group.c | 28 +- + drivers/xen/xenfs/super.c | 2 +- + fs/9p/acl.c | 1 + + fs/9p/v9fs.c | 568 +++-- + fs/9p/v9fs.h | 7 +- + fs/9p/vfs_dentry.c | 1 - + fs/9p/vfs_file.c | 28 +- + fs/9p/vfs_inode.c | 5 +- + fs/9p/vfs_inode_dotl.c | 4 +- + fs/9p/vfs_super.c | 130 +- + fs/Makefile | 2 +- + fs/affs/inode.c | 2 +- + fs/afs/dir.c | 4 +- + fs/afs/dynroot.c | 6 +- + fs/afs/inode.c | 8 +- + fs/aio.c | 6 +- + fs/anon_inodes.c | 23 +- + fs/attr.c | 2 +- + fs/autofs/autofs_i.h | 5 + + fs/autofs/dev-ioctl.c | 31 +- + fs/autofs/inode.c | 3 +- + fs/autofs/root.c | 19 +- + fs/backing-file.c | 155 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/binfmt_misc.c | 76 +- + fs/btrfs/accessors.h | 1 + + fs/btrfs/acl.c | 25 +- + fs/btrfs/backref.c | 37 +- + fs/btrfs/backref.h | 7 +- + fs/btrfs/bio.c | 290 ++- + fs/btrfs/bio.h | 39 +- + fs/btrfs/block-group.c | 93 +- + fs/btrfs/block-group.h | 2 +- + fs/btrfs/block-rsv.c | 14 +- + fs/btrfs/btrfs_inode.h | 20 +- + fs/btrfs/compression.c | 47 +- + fs/btrfs/compression.h | 19 +- + fs/btrfs/ctree.c | 238 +- + fs/btrfs/ctree.h | 18 +- + fs/btrfs/defrag.c | 19 +- + fs/btrfs/delalloc-space.c | 4 +- + fs/btrfs/delayed-inode.c | 26 +- + fs/btrfs/delayed-ref.c | 45 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/dir-item.c | 4 +- + fs/btrfs/direct-io.c | 10 +- + fs/btrfs/disk-io.c | 64 +- + fs/btrfs/disk-io.h | 3 +- + fs/btrfs/extent-tree.c | 172 +- + fs/btrfs/extent-tree.h | 27 +- + fs/btrfs/extent_io.c | 78 +- + fs/btrfs/extent_io.h | 1 - + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file-item.c | 89 +- + fs/btrfs/file-item.h | 4 +- + fs/btrfs/file.c | 38 +- + fs/btrfs/free-space-cache.c | 24 +- + fs/btrfs/free-space-tree.c | 55 +- + fs/btrfs/fs.h | 36 +- + fs/btrfs/inode-item.c | 5 +- + fs/btrfs/inode.c | 278 +- + fs/btrfs/ioctl.c | 210 +- + fs/btrfs/messages.c | 1 + + fs/btrfs/messages.h | 3 +- + fs/btrfs/misc.h | 12 +- + fs/btrfs/ordered-data.c | 76 +- + fs/btrfs/print-tree.c | 16 +- + fs/btrfs/qgroup.c | 182 +- + fs/btrfs/raid-stripe-tree.c | 18 +- + fs/btrfs/raid56.c | 859 ++++--- + fs/btrfs/raid56.h | 103 +- + fs/btrfs/reflink.c | 15 +- + fs/btrfs/relocation.c | 85 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/scrub.c | 270 +- + fs/btrfs/send.c | 113 +- + fs/btrfs/space-info.c | 464 ++-- + fs/btrfs/space-info.h | 43 +- + fs/btrfs/subpage.c | 72 +- + fs/btrfs/subpage.h | 1 - + fs/btrfs/super.c | 77 +- + fs/btrfs/sysfs.c | 58 +- + fs/btrfs/sysfs.h | 3 +- + fs/btrfs/tests/extent-io-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 6 +- + fs/btrfs/tests/qgroup-tests.c | 16 +- + fs/btrfs/transaction.c | 48 +- + fs/btrfs/transaction.h | 4 - + fs/btrfs/tree-checker.c | 23 +- + fs/btrfs/tree-log.c | 183 +- + fs/btrfs/tree-log.h | 8 +- + fs/btrfs/uuid-tree.c | 120 +- + fs/btrfs/verity.c | 32 +- + fs/btrfs/volumes.c | 219 +- + fs/btrfs/volumes.h | 10 +- + fs/btrfs/xattr.c | 41 +- + fs/btrfs/zoned.c | 53 +- + fs/btrfs/zoned.h | 7 +- + fs/buffer.c | 6 +- + fs/cachefiles/interface.c | 11 +- + fs/cachefiles/namei.c | 98 +- + fs/cachefiles/volume.c | 9 +- + fs/ceph/addr.c | 6 +- + fs/ceph/cache.c | 2 +- + fs/ceph/crypto.c | 4 +- + fs/ceph/file.c | 4 +- + fs/ceph/inode.c | 28 +- + fs/coda/cnode.c | 4 +- + fs/configfs/dir.c | 12 +- + fs/configfs/file.c | 2 +- + fs/configfs/inode.c | 3 +- + fs/configfs/mount.c | 2 +- + fs/coredump.c | 146 +- + fs/cramfs/inode.c | 2 +- + fs/crypto/keyring.c | 2 +- + fs/crypto/keysetup.c | 2 +- + fs/dax.c | 30 +- + fs/dcache.c | 149 +- + fs/debugfs/inode.c | 102 +- + fs/devpts/inode.c | 57 +- + fs/drop_caches.c | 2 +- + fs/ecryptfs/Kconfig | 2 +- + fs/ecryptfs/crypto.c | 92 +- + fs/ecryptfs/ecryptfs_kernel.h | 14 +- + fs/ecryptfs/inode.c | 169 +- + fs/ecryptfs/keystore.c | 69 +- + fs/ecryptfs/main.c | 7 + + fs/ecryptfs/super.c | 5 +- + fs/efivarfs/inode.c | 7 +- + fs/efivarfs/super.c | 5 +- + fs/efs/inode.c | 2 +- + fs/erofs/data.c | 5 +- + fs/erofs/decompressor.c | 85 +- + fs/erofs/fileio.c | 6 +- + fs/erofs/inode.c | 2 +- + fs/erofs/super.c | 38 +- + fs/eventfd.c | 29 +- + fs/eventpoll.c | 32 +- + fs/exec.c | 3 +- + fs/exfat/balloc.c | 30 +- + fs/exfat/dir.c | 5 + + fs/exfat/exfat_fs.h | 5 +- + fs/exfat/fatent.c | 6 +- + fs/exfat/file.c | 5 + + fs/exfat/namei.c | 20 +- + fs/exfat/super.c | 11 + + fs/ext2/inode.c | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 48 +- + fs/ext4/ext4_jbd2.c | 3 +- + fs/ext4/extents.c | 118 +- + fs/ext4/extents_status.c | 31 +- + fs/ext4/extents_status.h | 2 +- + fs/ext4/hash.c | 2 +- + fs/ext4/ialloc.c | 1 - + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 197 +- + fs/ext4/ioctl.c | 14 +- + fs/ext4/mballoc.c | 188 +- + fs/ext4/mmp.c | 8 +- + fs/ext4/move_extent.c | 814 +++--- + fs/ext4/namei.c | 18 +- + fs/ext4/orphan.c | 8 +- + fs/ext4/readpage.c | 7 +- + fs/ext4/super.c | 72 +- + fs/ext4/sysfs.c | 6 + + fs/ext4/verity.c | 2 +- + fs/ext4/xattr.c | 6 +- + fs/f2fs/acl.c | 1 + + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/compress.c | 19 +- + fs/f2fs/data.c | 70 +- + fs/f2fs/extent_cache.c | 5 +- + fs/f2fs/f2fs.h | 166 +- + fs/f2fs/file.c | 26 +- + fs/f2fs/gc.c | 163 +- + fs/f2fs/gc.h | 2 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 8 +- + fs/f2fs/namei.c | 43 +- + fs/f2fs/node.c | 47 +- + fs/f2fs/node.h | 8 - + fs/f2fs/recovery.c | 31 +- + fs/f2fs/segment.c | 53 +- + fs/f2fs/segment.h | 37 +- + fs/f2fs/super.c | 210 +- + fs/f2fs/sysfs.c | 9 + + fs/f2fs/verity.c | 2 +- + fs/f2fs/xattr.c | 32 +- + fs/f2fs/xattr.h | 10 +- + fs/fat/inode.c | 1 + + fs/fcntl.c | 13 + + fs/fhandle.c | 30 +- + fs/file.c | 54 +- + fs/file_attr.c | 4 - + fs/freevxfs/vxfs_inode.c | 2 +- + fs/fs-writeback.c | 187 +- + fs/{fs_types.c => fs_dirent.c} | 2 +- + fs/fs_struct.c | 6 - + fs/fuse/control.c | 36 +- + fs/fuse/dev.c | 9 +- + fs/fuse/dev_uring.c | 12 +- + fs/fuse/dir.c | 278 +- + fs/fuse/file.c | 323 ++- + fs/fuse/fuse_dev_i.h | 1 + + fs/fuse/fuse_i.h | 36 +- + fs/fuse/inode.c | 59 +- + fs/gfs2/aops.c | 16 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/glock.c | 229 +- + fs/gfs2/glock.h | 12 +- + fs/gfs2/glops.c | 100 +- + fs/gfs2/incore.h | 22 +- + fs/gfs2/inode.c | 19 +- + fs/gfs2/inode.h | 1 + + fs/gfs2/lock_dlm.c | 57 +- + fs/gfs2/log.c | 59 +- + fs/gfs2/lops.c | 10 +- + fs/gfs2/meta_io.c | 13 +- + fs/gfs2/ops_fstype.c | 39 +- + fs/gfs2/quota.c | 66 +- + fs/gfs2/recovery.c | 8 +- + fs/gfs2/super.c | 35 +- + fs/gfs2/super.h | 1 - + fs/gfs2/sys.c | 64 +- + fs/gfs2/trace_gfs2.h | 1 - + fs/gfs2/trans.c | 32 +- + fs/gfs2/util.c | 328 +-- + fs/gfs2/util.h | 56 +- + fs/hfs/btree.c | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/options.c | 1 + + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/dir.c | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hpfs/super.c | 1 + + fs/hugetlbfs/inode.c | 12 +- + fs/init.c | 6 +- + fs/inode.c | 311 +-- + fs/internal.h | 4 +- + fs/iomap/Makefile | 3 +- + fs/iomap/bio.c | 88 + + fs/iomap/buffered-io.c | 650 +++-- + fs/iomap/direct-io.c | 272 +- + fs/iomap/internal.h | 12 + + fs/iomap/ioend.c | 2 - + fs/iomap/iter.c | 20 +- + fs/iomap/seek.c | 8 +- + fs/iomap/trace.h | 7 +- + fs/isofs/inode.c | 2 +- + fs/jbd2/checkpoint.c | 2 +- + fs/jbd2/journal.c | 35 +- + fs/jbd2/transaction.c | 26 +- + fs/jffs2/fs.c | 4 +- + fs/jfs/file.c | 4 +- + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_txnmgr.c | 2 +- + fs/kernfs/inode.c | 2 +- + fs/libfs.c | 95 +- + fs/lockd/svclock.c | 12 + + fs/lockd/svcshare.c | 6 + + fs/locks.c | 100 +- + fs/minix/inode.c | 18 +- + fs/minix/minix.h | 9 + + fs/minix/namei.c | 39 +- + fs/mount.h | 3 +- + fs/namei.c | 1061 ++++++-- + fs/namespace.c | 152 +- + fs/netfs/buffered_write.c | 2 +- + fs/netfs/misc.c | 10 +- + fs/netfs/read_single.c | 6 +- + fs/nfs/inode.c | 2 +- + fs/nfs/localio.c | 86 +- + fs/nfs/nfs4file.c | 2 + + fs/nfs/nfs4idmap.c | 7 +- + fs/nfs/pnfs.c | 2 +- + fs/nfsd/Kconfig | 6 +- + fs/nfsd/blocklayout.c | 162 +- + fs/nfsd/blocklayoutxdr.c | 36 +- + fs/nfsd/blocklayoutxdr.h | 14 + + fs/nfsd/debugfs.c | 2 + + fs/nfsd/filecache.c | 57 +- + fs/nfsd/filecache.h | 2 + + fs/nfsd/nfs3proc.c | 16 +- + fs/nfsd/nfs4proc.c | 36 +- + fs/nfsd/nfs4recover.c | 233 +- + fs/nfsd/nfs4state.c | 188 +- + fs/nfsd/nfs4xdr.c | 28 +- + fs/nfsd/nfsctl.c | 18 +- + fs/nfsd/nfsd.h | 4 +- + fs/nfsd/nfsproc.c | 14 +- + fs/nfsd/nfssvc.c | 28 +- + fs/nfsd/state.h | 5 + + fs/nfsd/trace.h | 39 + + fs/nfsd/vfs.c | 275 +- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 21 - + fs/nilfs2/cpfile.c | 2 +- + fs/nilfs2/dat.c | 2 +- + fs/nilfs2/ifile.c | 2 +- + fs/nilfs2/inode.c | 10 +- + fs/nilfs2/nilfs.h | 1 + + fs/nilfs2/sufile.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 60 +- + fs/notify/fsnotify.c | 2 +- + fs/nsfs.c | 148 +- + fs/ntfs3/attrib.c | 88 +- + fs/ntfs3/dir.c | 3 +- + fs/ntfs3/file.c | 109 +- + fs/ntfs3/frecord.c | 219 +- + fs/ntfs3/fsntfs.c | 136 +- + fs/ntfs3/index.c | 3 +- + fs/ntfs3/inode.c | 29 +- + fs/ntfs3/namei.c | 6 +- + fs/ntfs3/ntfs_fs.h | 40 +- + fs/ntfs3/record.c | 2 +- + fs/ntfs3/run.c | 17 +- + fs/ntfs3/super.c | 89 +- + fs/ntfs3/xattr.c | 18 +- + fs/ocfs2/acl.c | 1 + + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 8 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/inode.c | 27 +- + fs/ocfs2/inode.h | 1 - + fs/ocfs2/journal.c | 11 +- + fs/ocfs2/ocfs2_trace.h | 2 - + fs/ocfs2/super.c | 2 +- + fs/omfs/inode.c | 3 +- + fs/open.c | 44 +- + fs/openpromfs/inode.c | 2 +- + fs/orangefs/inode.c | 6 +- + fs/orangefs/orangefs-utils.c | 6 +- + fs/overlayfs/copy_up.c | 143 +- + fs/overlayfs/dir.c | 587 ++--- + fs/overlayfs/file.c | 91 +- + fs/overlayfs/inode.c | 124 +- + fs/overlayfs/namei.c | 400 ++- + fs/overlayfs/overlayfs.h | 63 +- + fs/overlayfs/readdir.c | 110 +- + fs/overlayfs/super.c | 152 +- + fs/overlayfs/util.c | 39 +- + fs/overlayfs/xattrs.c | 35 +- + fs/pidfs.c | 189 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 8 +- + fs/proc/base.c | 6 +- + fs/proc/internal.h | 1 + + fs/proc/root.c | 14 +- + fs/proc/self.c | 10 +- + fs/proc/thread_self.c | 11 +- + fs/pstore/inode.c | 7 +- + fs/qnx4/inode.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/quota/dquot.c | 2 +- + fs/ramfs/inode.c | 8 +- + fs/romfs/super.c | 2 +- + fs/signalfd.c | 29 +- + fs/smb/client/cifs_debug.c | 23 +- + fs/smb/client/cifs_spnego.c | 6 +- + fs/smb/client/cifsfs.c | 5 +- + fs/smb/client/cifsglob.h | 31 +- + fs/smb/client/cifspdu.h | 601 ++--- + fs/smb/client/cifssmb.c | 18 +- + fs/smb/client/cifstransport.c | 8 +- + fs/smb/client/connect.c | 6 +- + fs/smb/client/file.c | 1 + + fs/smb/client/inode.c | 19 +- + fs/smb/client/misc.c | 2 +- + fs/smb/client/ntlmssp.h | 8 +- + fs/smb/client/readdir.c | 12 +- + fs/smb/client/reparse.h | 8 +- + fs/smb/client/rfc1002pdu.h | 8 +- + fs/smb/client/smb1ops.c | 3 +- + fs/smb/client/smb2inode.c | 2 +- + fs/smb/client/smb2ops.c | 91 +- + fs/smb/client/smb2pdu.c | 45 +- + fs/smb/client/smb2pdu.h | 112 - + fs/smb/common/cifsglob.h | 30 - + fs/smb/common/fscc.h | 174 ++ + fs/smb/common/smb2pdu.h | 279 +- + fs/smb/common/smbacl.h | 8 +- + fs/smb/common/smbglob.h | 72 + + fs/smb/server/Kconfig | 6 +- + fs/smb/server/auth.c | 390 +-- + fs/smb/server/auth.h | 10 +- + fs/smb/server/crypto_ctx.c | 24 - + fs/smb/server/crypto_ctx.h | 15 +- + fs/smb/server/mgmt/tree_connect.c | 18 +- + fs/smb/server/mgmt/tree_connect.h | 1 - + fs/smb/server/misc.c | 15 +- + fs/smb/server/oplock.c | 8 +- + fs/smb/server/server.c | 4 - + fs/smb/server/smb2misc.c | 2 +- + fs/smb/server/smb2ops.c | 38 +- + fs/smb/server/smb2pdu.c | 223 +- + fs/smb/server/smb2pdu.h | 107 - + fs/smb/server/smb_common.h | 276 +- + fs/smb/server/transport_tcp.c | 41 +- + fs/smb/server/vfs.c | 130 +- + fs/smb/server/vfs.h | 8 +- + fs/splice.c | 2 +- + fs/squashfs/inode.c | 2 +- + fs/super.c | 9 +- + fs/sync.c | 19 +- + fs/timerfd.c | 29 +- + fs/tracefs/event_inode.c | 7 +- + fs/tracefs/inode.c | 13 +- + fs/ubifs/file.c | 2 +- + fs/ubifs/super.c | 2 +- + fs/udf/inode.c | 2 +- + fs/ufs/inode.c | 2 +- + fs/userfaultfd.c | 30 +- + fs/utimes.c | 5 +- + fs/xattr.c | 12 +- + fs/xfs/libxfs/xfs_errortag.h | 6 +- + fs/xfs/libxfs/xfs_group.h | 9 + + fs/xfs/libxfs/xfs_log_format.h | 45 +- + fs/xfs/libxfs/xfs_ondisk.h | 6 +- + fs/xfs/libxfs/xfs_quota_defs.h | 4 +- + fs/xfs/libxfs/xfs_rtgroup.h | 14 +- + fs/xfs/scrub/common.c | 2 +- + fs/xfs/scrub/inode_repair.c | 2 +- + fs/xfs/scrub/orphanage.c | 13 +- + fs/xfs/scrub/parent.c | 2 +- + fs/xfs/scrub/quota.c | 8 +- + fs/xfs/scrub/quota_repair.c | 18 +- + fs/xfs/scrub/quotacheck.c | 11 +- + fs/xfs/scrub/quotacheck_repair.c | 21 +- + fs/xfs/scrub/xfarray.c | 2 +- + fs/xfs/xfs_aops.c | 7 +- + fs/xfs/xfs_attr_item.c | 27 +- + fs/xfs/xfs_bmap_item.c | 10 +- + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_buf_item.c | 19 +- + fs/xfs/xfs_dquot.c | 145 +- + fs/xfs/xfs_dquot.h | 22 +- + fs/xfs/xfs_dquot_item.c | 15 +- + fs/xfs/xfs_exchmaps_item.c | 11 +- + fs/xfs/xfs_extfree_item.c | 10 +- + fs/xfs/xfs_file.c | 50 +- + fs/xfs/xfs_handle.c | 56 +- + fs/xfs/xfs_health.c | 4 +- + fs/xfs/xfs_icache.c | 37 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_inode.c | 6 +- + fs/xfs/xfs_inode_item.c | 53 +- + fs/xfs/xfs_ioctl.c | 6 +- + fs/xfs/xfs_iomap.c | 38 +- + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_log.c | 498 ++-- + fs/xfs/xfs_log.h | 65 +- + fs/xfs/xfs_log_cil.c | 117 +- + fs/xfs/xfs_log_priv.h | 53 +- + fs/xfs/xfs_log_recover.c | 45 +- + fs/xfs/xfs_qm.c | 154 +- + fs/xfs/xfs_qm.h | 2 +- + fs/xfs/xfs_qm_bhv.c | 4 +- + fs/xfs/xfs_qm_syscalls.c | 10 +- + fs/xfs/xfs_quotaops.c | 2 +- + fs/xfs/xfs_refcount_item.c | 10 +- + fs/xfs/xfs_reflink.h | 2 +- + fs/xfs/xfs_rmap_item.c | 10 +- + fs/xfs/xfs_trace.h | 8 +- + fs/xfs/xfs_trans.h | 4 +- + fs/xfs/xfs_trans_dquot.c | 18 +- + fs/xfs/xfs_zone_alloc.c | 54 +- + fs/xfs/xfs_zone_gc.c | 14 +- + fs/xfs/xfs_zone_priv.h | 1 + + fs/xfs/xfs_zone_space_resv.c | 10 +- + fs/zonefs/file.c | 5 +- + fs/zonefs/super.c | 4 +- + include/asm-generic/vmlinux.lds.h | 3 +- + include/linux/backing-dev-defs.h | 2 + + include/linux/backing-dev.h | 5 +- + include/linux/cleanup.h | 22 +- + include/linux/configfs.h | 4 +- + include/linux/cred.h | 22 + + include/linux/dcache.h | 6 +- + include/linux/f2fs_fs.h | 5 +- + include/linux/file.h | 123 + + include/linux/filelock.h | 98 +- + include/linux/fs.h | 729 +----- + include/linux/fs/super.h | 238 ++ + include/linux/fs/super_types.h | 336 +++ + include/linux/{fs_types.h => fs_dirent.h} | 11 +- + include/linux/fs_parser.h | 2 + + include/linux/fs_struct.h | 6 + + include/linux/init_task.h | 1 - + include/linux/iomap.h | 86 +- + include/linux/jbd2.h | 6 + + include/linux/lockd/lockd.h | 9 +- + include/linux/mm.h | 8 +- + include/linux/namei.h | 83 + + include/linux/ns/ns_common_types.h | 196 ++ + include/linux/ns/nstree_types.h | 55 + + include/linux/ns_common.h | 229 +- + include/linux/nsfs.h | 3 + + include/linux/nsproxy.h | 9 +- + include/linux/nstree.h | 52 +- + include/linux/pagemap.h | 18 +- + include/linux/pid_namespace.h | 3 +- + include/linux/pipe_fs_i.h | 23 +- + include/linux/proc_fs.h | 2 - + include/linux/pseudo_fs.h | 1 + + include/linux/sched/coredump.h | 2 +- + include/linux/security.h | 2 - + include/linux/shmem_fs.h | 2 +- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svcsock.h | 3 + + include/linux/syscalls.h | 4 + + include/linux/types.h | 1 + + include/linux/user_namespace.h | 4 +- + include/linux/writeback.h | 15 +- + include/linux/xattr.h | 4 +- + include/net/9p/client.h | 98 +- + include/net/9p/transport.h | 15 +- + include/trace/events/ext4.h | 99 +- + include/trace/events/f2fs.h | 40 +- + include/trace/events/writeback.h | 8 +- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/btrfs.h | 9 + + include/uapi/linux/fcntl.h | 16 + + include/uapi/linux/nsfs.h | 58 + + include/uapi/linux/pidfd.h | 11 +- + init/do_mounts.c | 5 +- + init/do_mounts_rd.c | 3 +- + init/init_task.c | 27 + + init/version-timestamp.c | 7 +- + io_uring/mock_file.c | 43 +- + io_uring/rw.c | 16 +- + ipc/mqueue.c | 97 +- + ipc/msgutil.c | 7 +- + ipc/namespace.c | 3 +- + kernel/acct.c | 29 +- + kernel/bpf/bpf_iter.c | 27 +- + kernel/bpf/inode.c | 15 +- + kernel/bpf/token.c | 47 +- + kernel/cgroup/cgroup.c | 21 +- + kernel/cgroup/namespace.c | 2 +- + kernel/cred.c | 33 +- + kernel/exit.c | 3 +- + kernel/fork.c | 3 +- + kernel/nscommon.c | 246 +- + kernel/nsproxy.c | 57 +- + kernel/nstree.c | 784 +++++- + kernel/pid.c | 12 +- + kernel/pid_namespace.c | 2 +- + kernel/time/namespace.c | 5 +- + kernel/trace/trace_events_user.c | 22 +- + kernel/user.c | 7 +- + kernel/watch_queue.c | 4 +- + mm/backing-dev.c | 2 +- + mm/fadvise.c | 3 +- + mm/filemap.c | 177 +- + mm/memfd.c | 29 +- + mm/page-writeback.c | 6 - + mm/secretmem.c | 20 +- + mm/shmem.c | 46 +- + mm/truncate.c | 10 +- + mm/vmscan.c | 2 +- + mm/workingset.c | 2 +- + net/9p/client.c | 165 +- + net/9p/mod.c | 2 +- + net/9p/trans_fd.c | 136 +- + net/9p/trans_rdma.c | 134 +- + net/9p/trans_usbg.c | 5 +- + net/9p/trans_virtio.c | 11 +- + net/9p/trans_xen.c | 7 +- + net/core/net_namespace.c | 2 +- + net/dns_resolver/dns_query.c | 6 +- + net/handshake/netlink.c | 36 +- + net/kcm/kcmsock.c | 22 +- + net/sctp/socket.c | 92 +- + net/socket.c | 34 +- + net/sunrpc/rpc_pipe.c | 27 +- + net/sunrpc/svcsock.c | 62 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 +- + net/unix/af_unix.c | 35 +- + scripts/syscall.tbl | 1 + + security/apparmor/apparmorfs.c | 21 +- + security/inode.c | 35 +- + security/keys/process_keys.c | 2 +- + security/landlock/fs.c | 2 +- + security/selinux/selinuxfs.c | 200 +- + security/smack/smackfs.c | 2 +- + tools/include/uapi/linux/nsfs.h | 70 + + tools/net/sunrpc/xdrgen/generators/__init__.py | 11 +- + tools/net/sunrpc/xdrgen/generators/union.py | 34 +- + .../xdrgen/templates/C/pointer/decoder/close.j2 | 2 +- + .../xdrgen/templates/C/pointer/encoder/close.j2 | 2 +- + .../xdrgen/templates/C/struct/decoder/close.j2 | 2 +- + .../C/struct/decoder/variable_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/struct/encoder/close.j2 | 2 +- + .../xdrgen/templates/C/typedef/decoder/basic.j2 | 2 +- + .../C/typedef/decoder/fixed_length_array.j2 | 2 +- + .../C/typedef/decoder/fixed_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/typedef/decoder/string.j2 | 2 +- + .../C/typedef/decoder/variable_length_array.j2 | 2 +- + .../C/typedef/decoder/variable_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/typedef/encoder/basic.j2 | 2 +- + .../C/typedef/encoder/fixed_length_array.j2 | 2 +- + .../C/typedef/encoder/fixed_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/typedef/encoder/string.j2 | 2 +- + .../C/typedef/encoder/variable_length_array.j2 | 2 +- + .../C/typedef/encoder/variable_length_opaque.j2 | 2 +- + .../xdrgen/templates/C/union/declaration/close.j2 | 4 + + .../xdrgen/templates/C/union/decoder/close.j2 | 2 +- + .../xdrgen/templates/C/union/encoder/close.j2 | 2 +- + .../xdrgen/templates/C/union/encoder/string.j2 | 6 + + tools/net/sunrpc/xdrgen/xdrgen | 5 + + tools/testing/selftests/coredump/.gitignore | 4 + + tools/testing/selftests/coredump/Makefile | 8 +- + .../coredump/coredump_socket_protocol_test.c | 1568 ++++++++++++ + .../selftests/coredump/coredump_socket_test.c | 742 ++++++ + tools/testing/selftests/coredump/coredump_test.h | 59 + + .../selftests/coredump/coredump_test_helpers.c | 383 +++ + tools/testing/selftests/coredump/stackdump_test.c | 1662 +----------- + tools/testing/selftests/filesystems/utils.c | 2 +- + tools/testing/selftests/namespaces/.gitignore | 9 + + tools/testing/selftests/namespaces/Makefile | 24 +- + .../selftests/namespaces/cred_change_test.c | 814 ++++++ + .../selftests/namespaces/listns_efault_test.c | 530 ++++ + .../selftests/namespaces/listns_pagination_bug.c | 138 + + .../selftests/namespaces/listns_permissions_test.c | 759 ++++++ + tools/testing/selftests/namespaces/listns_test.c | 679 +++++ + .../selftests/namespaces/ns_active_ref_test.c | 2672 ++++++++++++++++++++ + tools/testing/selftests/namespaces/nsid_test.c | 107 +- + .../namespaces/regression_pidfd_setns_test.c | 113 + + .../testing/selftests/namespaces/siocgskns_test.c | 1824 +++++++++++++ + tools/testing/selftests/namespaces/stress_test.c | 626 +++++ + tools/testing/selftests/namespaces/wrappers.h | 35 + + tools/testing/selftests/pidfd/pidfd.h | 15 +- + tools/testing/selftests/pidfd/pidfd_info_test.c | 73 + + virt/kvm/guest_memfd.c | 36 +- + virt/kvm/kvm_main.c | 19 +- + 699 files changed, 28827 insertions(+), 16916 deletions(-) + rename Documentation/filesystems/{gfs2-glocks.rst => gfs2/glocks.rst} (100%) + rename Documentation/filesystems/{gfs2.rst => gfs2/index.rst} (94%) + rename Documentation/filesystems/{gfs2-uevents.rst => gfs2/uevents.rst} (100%) + create mode 100644 Documentation/filesystems/nfs/nfsd-maintainer-entry-profile.rst + rename fs/{fs_types.c => fs_dirent.c} (98%) + create mode 100644 fs/iomap/bio.c + delete mode 100644 fs/smb/common/cifsglob.h + create mode 100644 fs/smb/common/fscc.h + create mode 100644 fs/smb/common/smbglob.h + create mode 100644 include/linux/fs/super.h + create mode 100644 include/linux/fs/super_types.h + rename include/linux/{fs_types.h => fs_dirent.h} (92%) + create mode 100644 include/linux/ns/ns_common_types.h + create mode 100644 include/linux/ns/nstree_types.h + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 + create mode 100644 tools/testing/selftests/coredump/.gitignore + create mode 100644 tools/testing/selftests/coredump/coredump_socket_protocol_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_socket_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_test.h + create mode 100644 tools/testing/selftests/coredump/coredump_test_helpers.c + create mode 100644 tools/testing/selftests/namespaces/cred_change_test.c + create mode 100644 tools/testing/selftests/namespaces/listns_efault_test.c + create mode 100644 tools/testing/selftests/namespaces/listns_pagination_bug.c + create mode 100644 tools/testing/selftests/namespaces/listns_permissions_test.c + create mode 100644 tools/testing/selftests/namespaces/listns_test.c + create mode 100644 tools/testing/selftests/namespaces/ns_active_ref_test.c + create mode 100644 tools/testing/selftests/namespaces/regression_pidfd_setns_test.c + create mode 100644 tools/testing/selftests/namespaces/siocgskns_test.c + create mode 100644 tools/testing/selftests/namespaces/stress_test.c + create mode 100644 tools/testing/selftests/namespaces/wrappers.h +Merging printk/for-next (322530a9c2ab Merge branch 'rework/nbcon-in-kdb' 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 +Auto-merging MAINTAINERS +Auto-merging drivers/pci/endpoint/functions/pci-epf-test.c +Auto-merging drivers/pps/kapi.c +Auto-merging drivers/ptp/ptp_ocp.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/inode.c +Auto-merging include/linux/console.h +Auto-merging kernel/printk/printk.c +Auto-merging net/ceph/messenger_v2.c +Merge made by the 'ort' strategy. + Documentation/core-api/printk-formats.rst | 11 +- + MAINTAINERS | 1 + + arch/um/kernel/kmsg_dump.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 3 +- + drivers/char/ipmi/ipmi_ssif.c | 6 +- + drivers/dma-buf/sync_debug.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 3 +- + drivers/gpu/drm/drm_vblank.c | 6 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 3 +- + drivers/gpu/drm/msm/msm_gpu.c | 3 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 4 +- + drivers/mmc/core/mmc_test.c | 20 +- + drivers/net/dsa/sja1105/sja1105_tas.c | 8 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 7 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 7 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 5 +- + drivers/pps/generators/pps_gen_parport.c | 3 +- + drivers/pps/kapi.c | 3 +- + drivers/ptp/ptp_ocp.c | 13 +- + drivers/s390/block/dasd.c | 3 +- + drivers/scsi/fnic/fnic_trace.c | 55 ++-- + drivers/scsi/snic/snic_debugfs.c | 10 +- + drivers/scsi/snic/snic_trc.c | 5 +- + drivers/staging/media/av7110/av7110.c | 2 +- + drivers/tty/serial/kgdboc.c | 1 - + fs/ceph/dir.c | 5 +- + fs/ceph/inode.c | 49 ++-- + fs/ceph/xattr.c | 6 +- + include/linux/console.h | 68 +++++ + include/linux/kdb.h | 16 ++ + kernel/debug/kdb/kdb_io.c | 47 ++-- + kernel/printk/internal.h | 53 +--- + kernel/printk/nbcon.c | 174 ++++++++++-- + kernel/printk/printk.c | 306 ++++++++++++++-------- + kernel/printk/printk_ringbuffer.c | 67 ++++- + kernel/trace/trace_output.c | 6 +- + lib/tests/printf_kunit.c | 4 + + lib/vsprintf.c | 80 +++--- + net/ceph/messenger_v2.c | 6 +- + 39 files changed, 682 insertions(+), 391 deletions(-) +Merging pci/next (e8c5d2fd8597 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/xe/xe_vram.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vram.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/pci/controller/dwc/pcie-designware-host.c +CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/pcie-designware-host.c +Auto-merging drivers/pci/controller/dwc/pcie-qcom.c +Auto-merging drivers/pci/controller/vmd.c +Auto-merging drivers/pci/endpoint/functions/pci-epf-test.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/setup-bus.c +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging include/linux/pci.h +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_vram.c' using previous resolution. +Resolved 'drivers/pci/controller/dwc/pcie-designware-host.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2c7695fa8c58] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/pci-error-recovery.rst | 15 + + .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 23 +- + .../bindings/pci/cix,sky1-pcie-host.yaml | 83 + + .../bindings/pci/mediatek-pcie-mt7623.yaml | 164 ++ + .../devicetree/bindings/pci/mediatek-pcie.txt | 289 ---- + .../devicetree/bindings/pci/mediatek-pcie.yaml | 438 +++++ + .../devicetree/bindings/pci/nxp,s32g-pcie.yaml | 130 ++ + Documentation/devicetree/bindings/pci/pci-ep.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie-sa8255p.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie-sa8775p.yaml | 5 +- + .../devicetree/bindings/pci/qcom,pcie-sc7280.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie-sc8180x.yaml | 2 +- + .../bindings/pci/qcom,pcie-sc8280xp.yaml | 5 +- + .../devicetree/bindings/pci/qcom,pcie-sm8150.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie-sm8250.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie-sm8350.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie-sm8450.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie-sm8550.yaml | 8 +- + .../bindings/pci/qcom,pcie-x1e80100.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 2 +- + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 249 +++ + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 3 + + .../bindings/pci/snps,dw-pcie-common.yaml | 6 +- + .../bindings/pci/spacemit,k1-pcie-host.yaml | 157 ++ + .../devicetree/bindings/pci/toshiba,tc9563.yaml | 179 ++ + Documentation/driver-api/pci/pci.rst | 3 + + MAINTAINERS | 25 + + drivers/crypto/intel/qat/qat_common/adf_aer.c | 2 - + drivers/dma/ioat/init.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 24 +- + drivers/gpu/drm/xe/xe_vram.c | 58 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 - + drivers/net/ethernet/broadcom/tg3.c | 1 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 - + drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 6 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 1 - + drivers/net/ethernet/intel/ice/ice_main.c | 2 - + drivers/net/ethernet/intel/igb/igb_main.c | 2 - + drivers/net/ethernet/intel/igc/igc_main.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 - + drivers/net/ethernet/mellanox/mlx4/main.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 - + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 1 - + drivers/net/ethernet/microchip/lan743x_main.c | 1 - + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 - + drivers/net/ethernet/neterion/s2io.c | 1 - + drivers/pci/Makefile | 2 +- + drivers/pci/bus.c | 3 + + drivers/pci/controller/Kconfig | 18 +- + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/cadence/Kconfig | 21 +- + drivers/pci/controller/cadence/Makefile | 11 +- + drivers/pci/controller/cadence/pci-j721e.c | 33 +- + drivers/pci/controller/cadence/pci-sky1.c | 238 +++ + .../controller/cadence/pcie-cadence-host-common.c | 288 ++++ + .../controller/cadence/pcie-cadence-host-common.h | 46 + + .../pci/controller/cadence/pcie-cadence-host-hpa.c | 368 ++++ + drivers/pci/controller/cadence/pcie-cadence-host.c | 278 +-- + .../pci/controller/cadence/pcie-cadence-hpa-regs.h | 193 +++ + drivers/pci/controller/cadence/pcie-cadence-hpa.c | 167 ++ + .../pci/controller/cadence/pcie-cadence-lga-regs.h | 230 +++ + drivers/pci/controller/cadence/pcie-cadence-plat.c | 9 +- + drivers/pci/controller/cadence/pcie-cadence.c | 12 + + drivers/pci/controller/cadence/pcie-cadence.h | 410 ++--- + drivers/pci/controller/cadence/pcie-sg2042.c | 3 - + drivers/pci/controller/dwc/Kconfig | 38 +- + drivers/pci/controller/dwc/Makefile | 5 + + drivers/pci/controller/dwc/pci-keystone.c | 80 +- + drivers/pci/controller/dwc/pci-meson.c | 18 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 1 + + drivers/pci/controller/dwc/pcie-designware-host.c | 12 + + drivers/pci/controller/dwc/pcie-designware.c | 36 +- + drivers/pci/controller/dwc/pcie-designware.h | 21 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 63 +- + drivers/pci/controller/dwc/pcie-nxp-s32g.c | 404 +++++ + drivers/pci/controller/dwc/pcie-qcom.c | 32 +- + drivers/pci/controller/dwc/pcie-spacemit-k1.c | 357 ++++ + drivers/pci/controller/dwc/pcie-stm32-ep.c | 43 +- + drivers/pci/controller/dwc/pcie-stm32.c | 14 +- + drivers/pci/controller/dwc/pcie-stm32.h | 3 + + drivers/pci/controller/dwc/pcie-tegra194.c | 48 +- + drivers/pci/controller/pci-host-common.c | 13 +- + drivers/pci/controller/pci-host-common.h | 1 + + drivers/pci/controller/pci-hyperv.c | 62 +- + drivers/pci/controller/pci-ixp4xx.c | 6 + + drivers/pci/controller/pcie-apple.c | 43 +- + drivers/pci/controller/pcie-brcmstb.c | 209 ++- + drivers/pci/controller/pcie-mediatek.c | 113 +- + drivers/pci/controller/pcie-rzg3s-host.c | 1761 ++++++++++++++++++++ + drivers/pci/controller/vmd.c | 40 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 5 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 153 +- + drivers/pci/endpoint/pci-epf-core.c | 159 +- + drivers/pci/host-bridge.c | 1 + + drivers/pci/iov.c | 25 +- + drivers/pci/pci-driver.c | 6 +- + drivers/pci/pci-sysfs.c | 19 +- + drivers/pci/pci.c | 172 +- + drivers/pci/pci.h | 14 +- + drivers/pci/pcie/portdrv.c | 1 - + drivers/pci/pcie/ptm.c | 23 + + drivers/pci/probe.c | 13 +- + drivers/pci/pwrctrl/Kconfig | 15 + + drivers/pci/pwrctrl/Makefile | 2 + + drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 648 +++++++ + drivers/pci/rebar.c | 328 ++++ + drivers/pci/setup-bus.c | 126 +- + drivers/pci/setup-res.c | 78 - + drivers/scsi/bfa/bfad.c | 1 - + drivers/scsi/csiostor/csio_init.c | 1 - + drivers/scsi/ipr.c | 1 - + drivers/scsi/lpfc/lpfc_init.c | 6 - + drivers/scsi/qla2xxx/qla_os.c | 5 - + drivers/scsi/qla4xxx/ql4_os.c | 5 - + drivers/tty/serial/8250/8250_pci.c | 1 - + drivers/tty/serial/jsm/jsm_driver.c | 1 - + include/linux/pci-epf.h | 12 +- + include/linux/pci.h | 27 +- + include/linux/sizes.h | 1 + + 126 files changed, 7904 insertions(+), 1672 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/cix,sky1-pcie-host.yaml + create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-mt7623.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/nxp,s32g-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/renesas,r9a08g045-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/spacemit,k1-pcie-host.yaml + create mode 100644 Documentation/devicetree/bindings/pci/toshiba,tc9563.yaml + create mode 100644 drivers/pci/controller/cadence/pci-sky1.c + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-host-common.c + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-host-common.h + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-host-hpa.c + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-hpa-regs.h + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-hpa.c + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-lga-regs.h + create mode 100644 drivers/pci/controller/dwc/pcie-nxp-s32g.c + create mode 100644 drivers/pci/controller/dwc/pcie-spacemit-k1.c + create mode 100644 drivers/pci/controller/pcie-rzg3s-host.c + create mode 100644 drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c + create mode 100644 drivers/pci/rebar.c +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 +Merge made by the 'ort' strategy. + fs/pstore/ram.c | 2 ++ + 1 file changed, 2 insertions(+) +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. + Documentation/hid/hid-alps.rst | 8 +- + drivers/hid/Kconfig | 3 + + drivers/hid/bpf/progs/Huion__Inspiroy-2-M.bpf.c | 563 ++++++++ + drivers/hid/bpf/progs/Huion__Inspiroy-2-S.bpf.c | 29 +- + drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 6 +- + drivers/hid/bpf/progs/Huion__Kamvas13Gen3.bpf.c | 1395 ++++++++++++++++++++ + drivers/hid/bpf/progs/Huion__Kamvas16Gen3.bpf.c | 724 ++++++++++ + .../hid/bpf/progs/Logitech__SpaceNavigator.bpf.c | 86 ++ + .../hid/bpf/progs/WALTOP__Batteryless-Tablet.bpf.c | 321 +++++ + drivers/hid/bpf/progs/XPPen__Deco01V3.bpf.c | 305 +++++ + drivers/hid/bpf/progs/XPPen__Deco02.bpf.c | 359 +++++ + drivers/hid/bpf/progs/hid_report_helpers.h | 10 +- + drivers/hid/hid-evision.c | 21 + + drivers/hid/hid-generic.c | 9 + + drivers/hid/hid-ids.h | 5 + + drivers/hid/hid-input.c | 25 +- + drivers/hid/hid-lg-g15.c | 481 ++++++- + drivers/hid/hid-logitech-dj.c | 192 ++- + drivers/hid/hid-logitech-hidpp.c | 12 +- + drivers/hid/hid-nintendo.c | 5 +- + drivers/hid/hid-uclogic-core.c | 19 + + drivers/hid/hid-uclogic-params.c | 47 +- + drivers/hid/hid-uclogic-params.h | 5 + + drivers/hid/hid-uclogic-rdesc.c | 125 ++ + drivers/hid/hid-uclogic-rdesc.h | 8 + + drivers/hid/hid-winwing.c | 171 ++- + drivers/hid/intel-ish-hid/ipc/ipc.c | 101 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 31 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 18 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 6 + + drivers/hid/intel-ish-hid/ishtp/hbm.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 3 + + .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 2 - + .../intel-thc-hid/intel-quicki2c/quicki2c-hid.c | 1 - + .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 2 - + .../intel-thc-hid/intel-quickspi/quickspi-hid.c | 1 - + include/linux/hid.h | 1 + + include/linux/intel-ish-client-if.h | 3 + + tools/testing/selftests/hid/tests/test_tablet.py | 71 + + 40 files changed, 4980 insertions(+), 213 deletions(-) + create mode 100644 drivers/hid/bpf/progs/Huion__Inspiroy-2-M.bpf.c + create mode 100644 drivers/hid/bpf/progs/Huion__Kamvas13Gen3.bpf.c + create mode 100644 drivers/hid/bpf/progs/Huion__Kamvas16Gen3.bpf.c + create mode 100644 drivers/hid/bpf/progs/Logitech__SpaceNavigator.bpf.c + create mode 100644 drivers/hid/bpf/progs/WALTOP__Batteryless-Tablet.bpf.c + create mode 100644 drivers/hid/bpf/progs/XPPen__Deco01V3.bpf.c + create mode 100644 drivers/hid/bpf/progs/XPPen__Deco02.bpf.c +Merging i2c/i2c/for-next (e9a6fb0bcdd7 Linux 6.18-rc5) +$ 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 (eeaaf5bc1c5b dt-bindings: i2c: qcom-cci: Document Kaanapali 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/i2c-rk3x.yaml | 1 + + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 4 + + Documentation/i2c/busses/i2c-i801.rst | 1 + + drivers/i2c/algos/i2c-algo-pcf.c | 105 +++++---------------- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-bcm2835.c | 12 ++- + drivers/i2c/busses/i2c-designware-core.h | 2 +- + drivers/i2c/busses/i2c-designware-master.c | 7 ++ + drivers/i2c/busses/i2c-designware-platdrv.c | 13 +-- + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-stm32.c | 7 +- + 11 files changed, 54 insertions(+), 102 deletions(-) +Merging i3c/i3c/next (ddb37d5b130e i3c: mipi-i3c-hci-pci: Add support for Intel Nova Lake-S I3C) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + .../bindings/i3c/snps,dw-i3c-master.yaml | 6 ++++- + drivers/i3c/master.c | 8 +++--- + drivers/i3c/master/dw-i3c-master.c | 31 +++++++++++++++++++++- + drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 3 +++ + drivers/i3c/master/svc-i3c-master.c | 22 +++++++++------ + 5 files changed, 56 insertions(+), 14 deletions(-) +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of 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 (fe5dbe3110c5 hwmon: (asus-ec-sensors) correct Pro WS TRX50-SAGE WIFI entry) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/gpd-fan.c +Auto-merging drivers/hwmon/pmbus/isl68137.c +Auto-merging drivers/hwmon/pmbus/max34440.c +Merge made by the 'ort' strategy. + .../bindings/hwmon/apm,xgene-slimpro-hwmon.yaml | 30 + + .../devicetree/bindings/hwmon/apm-xgene-hwmon.txt | 14 - + .../bindings/hwmon/aspeed,g6-pwm-tach.yaml | 7 +- + .../devicetree/bindings/hwmon/max31785.txt | 22 - + .../devicetree/bindings/hwmon/maxim,max31790.yaml | 22 +- + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 1 + + .../bindings/hwmon/pmbus/adi,max17616.yaml | 52 ++ + .../devicetree/bindings/hwmon/st,tsc1641.yaml | 63 ++ + .../devicetree/bindings/trivial-devices.yaml | 12 + + Documentation/hwmon/aht10.rst | 10 +- + Documentation/hwmon/asus_ec_sensors.rst | 4 + + Documentation/hwmon/ds1621.rst | 10 +- + Documentation/hwmon/index.rst | 5 + + Documentation/hwmon/isl68137.rst | 10 + + Documentation/hwmon/jc42.rst | 2 +- + Documentation/hwmon/lm75.rst | 13 +- + Documentation/hwmon/lm90.rst | 127 +-- + Documentation/hwmon/macsmc-hwmon.rst | 71 ++ + Documentation/hwmon/max127.rst | 2 +- + Documentation/hwmon/max15301.rst | 2 +- + Documentation/hwmon/max16064.rst | 2 +- + Documentation/hwmon/max16065.rst | 8 +- + Documentation/hwmon/max1619.rst | 4 +- + Documentation/hwmon/max16601.rst | 2 +- + Documentation/hwmon/max1668.rst | 2 +- + Documentation/hwmon/max17616.rst | 62 ++ + Documentation/hwmon/max197.rst | 4 +- + Documentation/hwmon/max20730.rst | 8 +- + Documentation/hwmon/max31722.rst | 4 +- + Documentation/hwmon/max31730.rst | 2 +- + Documentation/hwmon/max31785.rst | 2 +- + Documentation/hwmon/max31790.rst | 2 +- + Documentation/hwmon/max31827.rst | 6 +- + Documentation/hwmon/max34440.rst | 37 +- + Documentation/hwmon/max6639.rst | 2 +- + Documentation/hwmon/max6650.rst | 4 +- + Documentation/hwmon/max6697.rst | 20 +- + Documentation/hwmon/max77705.rst | 4 +- + Documentation/hwmon/max8688.rst | 2 +- + Documentation/hwmon/mp2925.rst | 151 ++++ + Documentation/hwmon/mp9945.rst | 117 +++ + Documentation/hwmon/pmbus.rst | 2 +- + Documentation/hwmon/sy7636a-hwmon.rst | 4 +- + Documentation/hwmon/tsc1641.rst | 87 +++ + Documentation/hwmon/zl6100.rst | 16 +- + MAINTAINERS | 33 + + drivers/hwmon/Kconfig | 36 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm9240.c | 17 +- + drivers/hwmon/adt7410.c | 11 + + drivers/hwmon/adt7411.c | 59 +- + drivers/hwmon/adt7x10.c | 27 +- + drivers/hwmon/aht10.c | 43 +- + drivers/hwmon/aquacomputer_d5next.c | 37 +- + drivers/hwmon/aspeed-g6-pwm-tach.c | 3 + + drivers/hwmon/asus-ec-sensors.c | 67 +- + drivers/hwmon/asus_rog_ryujin.c | 48 +- + drivers/hwmon/chipcap2.c | 7 - + drivers/hwmon/corsair-cpro.c | 8 +- + drivers/hwmon/corsair-psu.c | 13 +- + drivers/hwmon/drivetemp.c | 5 - + drivers/hwmon/emc1403.c | 46 +- + drivers/hwmon/emc2103.c | 4 + + drivers/hwmon/ftsteutates.c | 84 +- + drivers/hwmon/gpd-fan.c | 56 +- + drivers/hwmon/hs3001.c | 10 +- + drivers/hwmon/i5500_temp.c | 3 - + drivers/hwmon/ina238.c | 26 +- + drivers/hwmon/ina2xx.c | 28 +- + drivers/hwmon/ina3221.c | 19 - + drivers/hwmon/jc42.c | 11 - + drivers/hwmon/k10temp.c | 12 +- + drivers/hwmon/lm90.c | 25 +- + drivers/hwmon/lm92.c | 11 +- + drivers/hwmon/lm95234.c | 12 +- + drivers/hwmon/lm95241.c | 16 - + drivers/hwmon/lm95245.c | 16 +- + drivers/hwmon/lochnagar-hwmon.c | 18 +- + drivers/hwmon/ltc2947-core.c | 92 +-- + drivers/hwmon/ltc4245.c | 8 - + drivers/hwmon/ltc4282.c | 68 +- + drivers/hwmon/macsmc-hwmon.c | 851 +++++++++++++++++++++ + drivers/hwmon/max127.c | 23 +- + drivers/hwmon/max31790.c | 48 +- + drivers/hwmon/max31827.c | 60 +- + drivers/hwmon/max6620.c | 43 +- + drivers/hwmon/max6639.c | 23 +- + drivers/hwmon/max6697.c | 9 +- + drivers/hwmon/mr75203.c | 1 - + drivers/hwmon/nct6775-platform.c | 1 + + drivers/hwmon/nct7363.c | 2 - + drivers/hwmon/nct7904.c | 63 +- + drivers/hwmon/npcm750-pwm-fan.c | 11 +- + drivers/hwmon/ntc_thermistor.c | 43 ++ + drivers/hwmon/peci/common.h | 3 - + drivers/hwmon/peci/cputemp.c | 90 +-- + drivers/hwmon/peci/dimmtemp.c | 36 +- + drivers/hwmon/pmbus/Kconfig | 28 + + drivers/hwmon/pmbus/Makefile | 3 + + drivers/hwmon/pmbus/isl68137.c | 14 + + drivers/hwmon/pmbus/max17616.c | 73 ++ + drivers/hwmon/pmbus/max34440.c | 44 +- + drivers/hwmon/pmbus/mp2925.c | 316 ++++++++ + drivers/hwmon/pmbus/mp9945.c | 243 ++++++ + drivers/hwmon/powr1220.c | 17 +- + drivers/hwmon/sbtsi_temp.c | 17 +- + drivers/hwmon/scmi-hwmon.c | 9 + + drivers/hwmon/sfctemp.c | 36 +- + drivers/hwmon/sht4x.c | 40 +- + drivers/hwmon/tmp102.c | 2 - + drivers/hwmon/tmp103.c | 3 - + drivers/hwmon/tmp108.c | 1 - + drivers/hwmon/tmp401.c | 8 - + drivers/hwmon/tmp421.c | 28 +- + drivers/hwmon/tmp464.c | 13 +- + drivers/hwmon/tsc1641.c | 748 ++++++++++++++++++ + drivers/hwmon/vt1211.c | 53 +- + drivers/hwmon/vt8231.c | 18 +- + drivers/peci/cpu.c | 4 + + include/linux/mfd/macsmc.h | 1 + + 120 files changed, 3787 insertions(+), 1253 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/apm,xgene-slimpro-hwmon.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/max31785.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,max17616.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/st,tsc1641.yaml + create mode 100644 Documentation/hwmon/macsmc-hwmon.rst + create mode 100644 Documentation/hwmon/max17616.rst + create mode 100644 Documentation/hwmon/mp2925.rst + create mode 100644 Documentation/hwmon/mp9945.rst + create mode 100644 Documentation/hwmon/tsc1641.rst + create mode 100644 drivers/hwmon/macsmc-hwmon.c + create mode 100644 drivers/hwmon/pmbus/max17616.c + create mode 100644 drivers/hwmon/pmbus/mp2925.c + create mode 100644 drivers/hwmon/pmbus/mp9945.c + create mode 100644 drivers/hwmon/tsc1641.c +Merging jc_docs/docs-next (d879c2e0195b Merge branch 'mauro' into docs-mw) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/dev-tools/checkpatch.rst +Auto-merging Documentation/filesystems/xfs/xfs-online-fsck-design.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Merge made by the 'ort' strategy. + .pylintrc | 2 +- + Documentation/ABI/testing/sysfs-module | 2 + + Documentation/Kconfig | 2 +- + Documentation/Makefile | 166 +- + Documentation/accounting/taskstats.rst | 52 +- + Documentation/admin-guide/efi-stub.rst | 3 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 2 +- + Documentation/admin-guide/hw-vuln/spectre.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 97 +- + Documentation/admin-guide/kernel-parameters.txt | 102 +- + Documentation/admin-guide/tainted-kernels.rst | 2 +- + Documentation/admin-guide/workload-tracing.rst | 10 +- + Documentation/arch/x86/boot.rst | 38 +- + Documentation/conf.py | 15 +- + Documentation/core-api/assoc_array.rst | 196 +- + Documentation/dev-tools/checkpatch.rst | 13 +- + Documentation/doc-guide/checktransupdate.rst | 6 +- + Documentation/doc-guide/contributing.rst | 2 +- + Documentation/doc-guide/kernel-doc.rst | 33 +- + Documentation/doc-guide/parse-headers.rst | 209 +- + Documentation/doc-guide/sphinx.rst | 6 +- + Documentation/driver-api/parport-lowlevel.rst | 5 + + Documentation/driver-api/pldmfw/index.rst | 1 - + .../driver-api/usb/writing_musb_glue_layer.rst | 2 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 12 +- + .../filesystems/xfs/xfs-online-fsck-design.rst | 2 +- + Documentation/misc-devices/amd-sbi.rst | 6 +- + Documentation/misc-devices/mrvl_cn10k_dpi.rst | 4 +- + Documentation/misc-devices/tps6594-pfsm.rst | 12 +- + Documentation/misc-devices/uacce.rst | 7 +- + Documentation/mm/active_mm.rst | 2 +- + Documentation/process/2.Process.rst | 45 +- + Documentation/process/coding-style.rst | 2 +- + Documentation/sphinx/kernel_abi.py | 6 +- + Documentation/sphinx/kernel_feat.py | 26 +- + Documentation/sphinx/kernel_include.py | 114 +- + Documentation/sphinx/kerneldoc-preamble.sty | 2 +- + Documentation/sphinx/kerneldoc.py | 6 +- + Documentation/sphinx/load_config.py | 60 - + Documentation/sphinx/parallel-wrapper.sh | 33 - + .../{common_appendix.rst => common_appendix.txt} | 0 + ...on_hist_options.rst => common_hist_options.txt} | 0 + .../{common_options.rst => common_options.txt} | 16 +- + ...cription.rst => common_osnoise_description.txt} | 0 + ...oise_options.rst => common_osnoise_options.txt} | 0 + ...mmon_timerlat_aa.rst => common_timerlat_aa.txt} | 0 + ...ription.rst => common_timerlat_description.txt} | 0 + ...lat_options.rst => common_timerlat_options.txt} | 4 +- + ...mmon_top_options.rst => common_top_options.txt} | 0 + Documentation/tools/rtla/rtla-hwnoise.rst | 8 +- + Documentation/tools/rtla/rtla-osnoise-hist.rst | 10 +- + Documentation/tools/rtla/rtla-osnoise-top.rst | 10 +- + Documentation/tools/rtla/rtla-osnoise.rst | 4 +- + Documentation/tools/rtla/rtla-timerlat-hist.rst | 12 +- + Documentation/tools/rtla/rtla-timerlat-top.rst | 14 +- + Documentation/tools/rtla/rtla-timerlat.rst | 4 +- + Documentation/tools/rtla/rtla.rst | 2 +- + Documentation/trace/timerlat-tracer.rst | 12 +- + .../translations/it_IT/doc-guide/parse-headers.rst | 8 +- + .../translations/it_IT/doc-guide/sphinx.rst | 4 +- + Documentation/translations/ja_JP/SubmittingPatches | 28 +- + .../translations/zh_CN/admin-guide/README.rst | 2 +- + .../zh_CN/dev-tools/gdb-kernel-debugging.rst | 2 +- + .../zh_CN/doc-guide/checktransupdate.rst | 6 +- + .../translations/zh_CN/doc-guide/contributing.rst | 2 +- + .../translations/zh_CN/doc-guide/parse-headers.rst | 8 +- + .../translations/zh_CN/doc-guide/sphinx.rst | 4 +- + .../translations/zh_CN/filesystems/dnotify.rst | 67 + + .../translations/zh_CN/filesystems/gfs2-glocks.rst | 211 ++ + .../zh_CN/filesystems/gfs2-uevents.rst | 97 + + .../translations/zh_CN/filesystems/gfs2.rst | 57 + + .../translations/zh_CN/filesystems/index.rst | 17 +- + .../translations/zh_CN/filesystems/inotify.rst | 80 + + .../zh_CN/filesystems/ubifs-authentication.rst | 354 +++ + .../translations/zh_CN/filesystems/ubifs.rst | 114 + + Documentation/translations/zh_CN/how-to.rst | 4 +- + Documentation/translations/zh_CN/mm/active_mm.rst | 2 +- + .../translations/zh_CN/networking/generic-hdlc.rst | 176 ++ + .../translations/zh_CN/networking/index.rst | 7 +- + .../translations/zh_CN/networking/mptcp-sysctl.rst | 139 ++ + .../translations/zh_CN/networking/timestamping.rst | 674 ++++++ + .../zh_CN/rust/general-information.rst | 1 + + Documentation/translations/zh_CN/rust/index.rst | 33 +- + Documentation/translations/zh_CN/rust/testing.rst | 215 ++ + Documentation/translations/zh_CN/scsi/index.rst | 92 + + .../zh_CN/scsi/link_power_management_policy.rst | 32 + + .../translations/zh_CN/scsi/scsi-parameters.rst | 118 + + Documentation/translations/zh_CN/scsi/scsi.rst | 48 + + Documentation/translations/zh_CN/scsi/scsi_eh.rst | 482 ++++ + .../translations/zh_CN/scsi/scsi_mid_low_api.rst | 1174 ++++++++++ + .../translations/zh_CN/scsi/sd-parameters.rst | 38 + + Documentation/translations/zh_CN/security/SCTP.rst | 317 +++ + .../translations/zh_CN/security/index.rst | 4 +- + Documentation/translations/zh_CN/security/ipe.rst | 398 ++++ + .../zh_CN/security/lsm-development.rst | 19 + + .../translations/zh_CN/security/secrets/coco.rst | 96 + + .../translations/zh_CN/security/secrets/index.rst | 9 +- + .../translations/zh_CN/subsystem-apis.rst | 2 +- + .../translations/zh_TW/admin-guide/README.rst | 2 +- + .../zh_TW/dev-tools/gdb-kernel-debugging.rst | 2 +- + .../userspace-api/media/cec/cec-header.rst | 8 +- + .../userspace-api/media/cec/cec.h.rst.exceptions | 3 + + .../userspace-api/media/dvb/dmx.h.rst.exceptions | 82 +- + .../userspace-api/media/dvb/dmx_types.rst | 1 + + .../media/dvb/frontend.h.rst.exceptions | 5 +- + Documentation/userspace-api/media/dvb/headers.rst | 31 +- + .../userspace-api/media/mediactl/media-header.rst | 8 +- + .../media/mediactl/media.h.rst.exceptions | 3 + + .../userspace-api/media/rc/lirc-header.rst | 14 +- + Documentation/userspace-api/media/v4l/app-pri.rst | 1 + + Documentation/userspace-api/media/v4l/audio.rst | 1 + + Documentation/userspace-api/media/v4l/biblio.rst | 1 + + Documentation/userspace-api/media/v4l/buffer.rst | 2 + + .../userspace-api/media/v4l/capture-example.rst | 1 + + .../userspace-api/media/v4l/capture.c.rst | 1 + + .../userspace-api/media/v4l/colorspaces-defs.rst | 1 + + .../media/v4l/colorspaces-details.rst | 1 + + .../userspace-api/media/v4l/colorspaces.rst | 1 + + .../userspace-api/media/v4l/common-defs.rst | 1 + + Documentation/userspace-api/media/v4l/common.rst | 1 + + Documentation/userspace-api/media/v4l/compat.rst | 1 + + Documentation/userspace-api/media/v4l/control.rst | 1 + + Documentation/userspace-api/media/v4l/crop.rst | 1 + + .../userspace-api/media/v4l/depth-formats.rst | 1 + + .../userspace-api/media/v4l/dev-decoder.rst | 1 + + .../userspace-api/media/v4l/dev-encoder.rst | 1 + + .../userspace-api/media/v4l/dev-event.rst | 1 + + .../userspace-api/media/v4l/dev-mem2mem.rst | 1 + + Documentation/userspace-api/media/v4l/dev-meta.rst | 1 + + Documentation/userspace-api/media/v4l/dev-osd.rst | 1 + + .../userspace-api/media/v4l/dev-overlay.rst | 1 + + .../userspace-api/media/v4l/dev-radio.rst | 1 + + Documentation/userspace-api/media/v4l/dev-sdr.rst | 1 + + .../media/v4l/dev-stateless-decoder.rst | 1 + + .../userspace-api/media/v4l/dev-subdev.rst | 1 + + .../userspace-api/media/v4l/dev-touch.rst | 1 + + Documentation/userspace-api/media/v4l/devices.rst | 1 + + .../userspace-api/media/v4l/dv-timings.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 1 + + .../media/v4l/ext-ctrls-codec-stateless.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 1 + + .../media/v4l/ext-ctrls-colorimetry.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-detect.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-fm-rx.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-fm-tx.rst | 1 + + .../media/v4l/ext-ctrls-image-process.rst | 1 + + .../media/v4l/ext-ctrls-image-source.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 1 + + .../userspace-api/media/v4l/ext-ctrls-rf-tuner.rst | 1 + + .../userspace-api/media/v4l/extended-controls.rst | 1 + + .../userspace-api/media/v4l/field-order.rst | 1 + + Documentation/userspace-api/media/v4l/fourcc.rst | 1 + + .../userspace-api/media/v4l/hsv-formats.rst | 1 + + Documentation/userspace-api/media/v4l/libv4l.rst | 1 + + .../userspace-api/media/v4l/meta-formats.rst | 1 + + .../userspace-api/media/v4l/metafmt-c3-isp.rst | 1 + + .../userspace-api/media/v4l/metafmt-d4xx.rst | 1 + + .../userspace-api/media/v4l/metafmt-generic.rst | 1 + + .../userspace-api/media/v4l/metafmt-intel-ipu3.rst | 1 + + .../userspace-api/media/v4l/metafmt-pisp-be.rst | 1 + + .../userspace-api/media/v4l/metafmt-pisp-fe.rst | 1 + + .../userspace-api/media/v4l/metafmt-rkisp1.rst | 1 + + .../userspace-api/media/v4l/metafmt-uvc.rst | 1 + + .../userspace-api/media/v4l/metafmt-vivid.rst | 1 + + .../userspace-api/media/v4l/metafmt-vsp1-hgo.rst | 1 + + .../userspace-api/media/v4l/metafmt-vsp1-hgt.rst | 1 + + .../userspace-api/media/v4l/pixfmt-bayer.rst | 1 + + .../userspace-api/media/v4l/pixfmt-cnf4.rst | 1 + + .../userspace-api/media/v4l/pixfmt-compressed.rst | 1 + + .../userspace-api/media/v4l/pixfmt-indexed.rst | 1 + + .../userspace-api/media/v4l/pixfmt-intro.rst | 1 + + .../userspace-api/media/v4l/pixfmt-inzi.rst | 1 + + .../userspace-api/media/v4l/pixfmt-m420.rst | 1 + + .../userspace-api/media/v4l/pixfmt-packed-hsv.rst | 1 + + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 1 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 1 + + .../userspace-api/media/v4l/pixfmt-rgb.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-cs08.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-cs14le.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-cu08.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-cu16le.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-pcu16be.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-pcu18be.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-pcu20be.rst | 1 + + .../userspace-api/media/v4l/pixfmt-sdr-ru12le.rst | 1 + + .../media/v4l/pixfmt-srggb10-ipu3.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb10.rst | 1 + + .../media/v4l/pixfmt-srggb10alaw8.rst | 1 + + .../media/v4l/pixfmt-srggb10dpcm8.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb12.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 1 + + .../media/v4l/pixfmt-srggb8-pisp-comp.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 1 + + .../userspace-api/media/v4l/pixfmt-tch-td08.rst | 1 + + .../userspace-api/media/v4l/pixfmt-tch-td16.rst | 1 + + .../userspace-api/media/v4l/pixfmt-tch-tu08.rst | 1 + + .../userspace-api/media/v4l/pixfmt-tch-tu16.rst | 1 + + .../userspace-api/media/v4l/pixfmt-uv8.rst | 1 + + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 1 + + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 1 + + .../userspace-api/media/v4l/pixfmt-y12i.rst | 1 + + .../userspace-api/media/v4l/pixfmt-y16i.rst | 1 + + .../userspace-api/media/v4l/pixfmt-y8i.rst | 1 + + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 1 + + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 1 + + .../userspace-api/media/v4l/pixfmt-z16.rst | 1 + + Documentation/userspace-api/media/v4l/pixfmt.rst | 1 + + .../userspace-api/media/v4l/planar-apis.rst | 1 + + Documentation/userspace-api/media/v4l/querycap.rst | 1 + + .../userspace-api/media/v4l/sdr-formats.rst | 1 + + .../media/v4l/selection-api-configuration.rst | 1 + + .../media/v4l/selection-api-examples.rst | 1 + + .../media/v4l/selection-api-intro.rst | 1 + + .../media/v4l/selection-api-targets.rst | 1 + + .../media/v4l/selection-api-vs-crop-api.rst | 1 + + .../userspace-api/media/v4l/selection-api.rst | 1 + + .../userspace-api/media/v4l/selections-common.rst | 1 + + Documentation/userspace-api/media/v4l/standard.rst | 1 + + .../userspace-api/media/v4l/subdev-formats.rst | 1 + + .../userspace-api/media/v4l/tch-formats.rst | 1 + + Documentation/userspace-api/media/v4l/tuner.rst | 1 + + .../userspace-api/media/v4l/user-func.rst | 1 + + .../media/v4l/v4l2-selection-flags.rst | 1 + + .../media/v4l/v4l2-selection-targets.rst | 1 + + Documentation/userspace-api/media/v4l/v4l2.rst | 1 + + .../userspace-api/media/v4l/v4l2grab-example.rst | 1 + + .../userspace-api/media/v4l/v4l2grab.c.rst | 1 + + Documentation/userspace-api/media/v4l/video.rst | 1 + + Documentation/userspace-api/media/v4l/videodev.rst | 9 +- + .../media/v4l/videodev2.h.rst.exceptions | 288 +-- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 8 + + .../userspace-api/media/v4l/yuv-formats.rst | 1 + + Documentation/userspace-api/spec_ctrl.rst | 6 +- + Documentation/w1/w1-netlink.rst | 2 +- + MAINTAINERS | 15 +- + Makefile | 7 +- + scripts/check-variable-fonts.sh | 115 - + scripts/get_feat.pl | 641 ----- + scripts/jobserver-exec | 88 +- + scripts/kernel-doc.pl | 2439 -------------------- + scripts/kernel-doc.py | 6 +- + scripts/split-man.pl | 28 - + tools/docs/check-variable-fonts.py | 37 + + {scripts => tools/docs}/checktransupdate.py | 8 +- + .../docs}/documentation-file-ref-check | 2 +- + .../scripts => tools/docs}/features-refresh.sh | 0 + {scripts => tools/docs}/find-unused-docs.sh | 6 +- + {scripts => tools/docs}/get_abi.py | 10 +- + tools/docs/get_feat.py | 225 ++ + .../features => tools/docs}/list-arch.sh | 2 +- + tools/docs/parse-headers.py | 14 +- + {scripts => tools/docs}/sphinx-build-wrapper | 686 +++--- + {scripts => tools/docs}/sphinx-pre-install | 140 +- + {scripts => tools/docs}/test_doc_build.py | 0 + tools/{docs/lib => lib/python}/__init__.py | 0 + tools/lib/python/abi/__init__.py | 0 + .../lib => tools/lib/python}/abi/abi_parser.py | 2 +- + {scripts/lib => tools/lib/python}/abi/abi_regex.py | 4 +- + {scripts/lib => tools/lib/python}/abi/helpers.py | 0 + .../lib => tools/lib/python}/abi/system_symbols.py | 2 +- + tools/lib/python/feat/parse_features.py | 494 ++++ + tools/lib/python/jobserver.py | 149 ++ + tools/lib/python/kdoc/__init__.py | 0 + .../lib => lib/python/kdoc}/enrich_formatter.py | 0 + .../lib => tools/lib/python}/kdoc/kdoc_files.py | 11 +- + .../lib => tools/lib/python}/kdoc/kdoc_item.py | 3 +- + .../lib => tools/lib/python}/kdoc/kdoc_output.py | 89 +- + .../lib => tools/lib/python}/kdoc/kdoc_parser.py | 42 +- + {scripts/lib => tools/lib/python}/kdoc/kdoc_re.py | 0 + tools/lib/python/kdoc/latex_fonts.py | 167 ++ + .../lib => lib/python/kdoc}/parse_data_structs.py | 230 +- + tools/lib/python/kdoc/python_version.py | 178 ++ + 278 files changed, 8167 insertions(+), 4816 deletions(-) + delete mode 100644 Documentation/sphinx/load_config.py + delete mode 100644 Documentation/sphinx/parallel-wrapper.sh + rename Documentation/tools/rtla/{common_appendix.rst => common_appendix.txt} (100%) + rename Documentation/tools/rtla/{common_hist_options.rst => common_hist_options.txt} (100%) + rename Documentation/tools/rtla/{common_options.rst => common_options.txt} (82%) + rename Documentation/tools/rtla/{common_osnoise_description.rst => common_osnoise_description.txt} (100%) + rename Documentation/tools/rtla/{common_osnoise_options.rst => common_osnoise_options.txt} (100%) + rename Documentation/tools/rtla/{common_timerlat_aa.rst => common_timerlat_aa.txt} (100%) + rename Documentation/tools/rtla/{common_timerlat_description.rst => common_timerlat_description.txt} (100%) + rename Documentation/tools/rtla/{common_timerlat_options.rst => common_timerlat_options.txt} (95%) + rename Documentation/tools/rtla/{common_top_options.rst => common_top_options.txt} (100%) + create mode 100644 Documentation/translations/zh_CN/filesystems/dnotify.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/gfs2-glocks.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/gfs2-uevents.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/gfs2.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/inotify.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/ubifs-authentication.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/ubifs.rst + create mode 100644 Documentation/translations/zh_CN/networking/generic-hdlc.rst + create mode 100644 Documentation/translations/zh_CN/networking/mptcp-sysctl.rst + create mode 100644 Documentation/translations/zh_CN/networking/timestamping.rst + create mode 100644 Documentation/translations/zh_CN/rust/testing.rst + create mode 100644 Documentation/translations/zh_CN/scsi/index.rst + create mode 100644 Documentation/translations/zh_CN/scsi/link_power_management_policy.rst + create mode 100644 Documentation/translations/zh_CN/scsi/scsi-parameters.rst + create mode 100644 Documentation/translations/zh_CN/scsi/scsi.rst + create mode 100644 Documentation/translations/zh_CN/scsi/scsi_eh.rst + create mode 100644 Documentation/translations/zh_CN/scsi/scsi_mid_low_api.rst + create mode 100644 Documentation/translations/zh_CN/scsi/sd-parameters.rst + create mode 100644 Documentation/translations/zh_CN/security/SCTP.rst + create mode 100644 Documentation/translations/zh_CN/security/ipe.rst + create mode 100644 Documentation/translations/zh_CN/security/lsm-development.rst + create mode 100644 Documentation/translations/zh_CN/security/secrets/coco.rst + delete mode 100755 scripts/check-variable-fonts.sh + delete mode 100755 scripts/get_feat.pl + delete mode 100755 scripts/kernel-doc.pl + delete mode 100755 scripts/split-man.pl + create mode 100755 tools/docs/check-variable-fonts.py + rename {scripts => tools/docs}/checktransupdate.py (97%) + rename {scripts => tools/docs}/documentation-file-ref-check (99%) + rename {Documentation/features/scripts => tools/docs}/features-refresh.sh (100%) + rename {scripts => tools/docs}/find-unused-docs.sh (85%) + rename {scripts => tools/docs}/get_abi.py (95%) + create mode 100755 tools/docs/get_feat.py + rename {Documentation/features => tools/docs}/list-arch.sh (83%) + rename {scripts => tools/docs}/sphinx-build-wrapper (50%) + rename {scripts => tools/docs}/sphinx-pre-install (93%) + rename {scripts => tools/docs}/test_doc_build.py (100%) + rename tools/{docs/lib => lib/python}/__init__.py (100%) + create mode 100644 tools/lib/python/abi/__init__.py + rename {scripts/lib => tools/lib/python}/abi/abi_parser.py (99%) + rename {scripts/lib => tools/lib/python}/abi/abi_regex.py (99%) + rename {scripts/lib => tools/lib/python}/abi/helpers.py (100%) + rename {scripts/lib => tools/lib/python}/abi/system_symbols.py (99%) + create mode 100755 tools/lib/python/feat/parse_features.py + create mode 100755 tools/lib/python/jobserver.py + create mode 100644 tools/lib/python/kdoc/__init__.py + rename tools/{docs/lib => lib/python/kdoc}/enrich_formatter.py (100%) + rename {scripts/lib => tools/lib/python}/kdoc/kdoc_files.py (97%) + rename {scripts/lib => tools/lib/python}/kdoc/kdoc_item.py (93%) + rename {scripts/lib => tools/lib/python}/kdoc/kdoc_output.py (89%) + rename {scripts/lib => tools/lib/python}/kdoc/kdoc_parser.py (98%) + rename {scripts/lib => tools/lib/python}/kdoc/kdoc_re.py (100%) + create mode 100755 tools/lib/python/kdoc/latex_fonts.py + rename tools/{docs/lib => lib/python/kdoc}/parse_data_structs.py (75%) + create mode 100644 tools/lib/python/kdoc/python_version.py +Merging v4l-dvb/next (1f2353f5a1af media: rockchip: rkcif: add support for rk3568 vicap mipi capture) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/mali-c55-graph.dot | 19 + + Documentation/admin-guide/media/mali-c55.rst | 413 +++++ + .../admin-guide/media/platform-cardlist.rst | 2 - + .../admin-guide/media/rkcif-rk3568-vicap.dot | 8 + + Documentation/admin-guide/media/rkcif.rst | 79 + + Documentation/admin-guide/media/v4l-drivers.rst | 2 + + .../devicetree/bindings/media/arm,mali-c55.yaml | 86 + + .../bindings/media/i2c/dongwoon,dw9719.yaml | 89 + + .../bindings/media/i2c/nxp,tda19971.yaml | 162 ++ + .../devicetree/bindings/media/i2c/nxp,tda1997x.txt | 178 -- + .../devicetree/bindings/media/i2c/sony,imx111.yaml | 105 ++ + .../devicetree/bindings/media/i2c/st,vd55g1.yaml | 6 +- + .../devicetree/bindings/media/i2c/ti,tvp5150.txt | 157 -- + .../devicetree/bindings/media/i2c/ti,tvp5150.yaml | 133 ++ + .../devicetree/bindings/media/nxp,imx8-isi.yaml | 13 +- + .../bindings/media/qcom,msm8939-camss.yaml | 254 +++ + .../bindings/media/qcom,sm8650-camss.yaml | 375 ++++ + .../bindings/media/qcom,x1e80100-camss.yaml | 2 +- + .../bindings/media/renesas,r9a09g057-ivc.yaml | 103 ++ + .../bindings/media/rockchip,px30-vip.yaml | 124 ++ + .../bindings/media/rockchip,rk3568-vicap.yaml | 172 ++ + .../devicetree/bindings/media/rockchip,vdec.yaml | 1 + + .../devicetree/bindings/media/snps,dw-hdmi-rx.yaml | 2 +- + .../bindings/media/stih407-c8sectpfe.txt | 88 - + .../bindings/media/video-interfaces.yaml | 4 +- + Documentation/driver-api/media/v4l2-core.rst | 1 + + Documentation/driver-api/media/v4l2-isp.rst | 49 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/drivers/mali-c55.rst | 55 + + .../userspace-api/media/v4l/meta-formats.rst | 2 + + .../media/v4l/metafmt-arm-mali-c55.rst | 84 + + .../userspace-api/media/v4l/subdev-formats.rst | 420 ++++- + Documentation/userspace-api/media/v4l/v4l2-isp.rst | 67 + + .../userspace-api/media/v4l/vidioc-remove-bufs.rst | 2 +- + MAINTAINERS | 59 +- + drivers/media/cec/core/cec-core.c | 1 + + drivers/media/common/saa7146/saa7146_fops.c | 4 +- + drivers/media/common/siano/smsir.c | 2 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 1 + + drivers/media/dvb-core/dmxdev.c | 4 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 2 +- + drivers/media/dvb-core/dvb_demux.c | 28 +- + drivers/media/dvb-core/dvb_ringbuffer.c | 36 +- + drivers/media/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb-frontends/cxd2841er.c | 3 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 3 +- + drivers/media/dvb-frontends/lgdt330x.c | 4 +- + drivers/media/dvb-frontends/mn88443x.c | 7 +- + drivers/media/i2c/Kconfig | 12 +- + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adv7604.c | 4 +- + drivers/media/i2c/adv7842.c | 15 +- + drivers/media/i2c/ar0521.c | 4 +- + drivers/media/i2c/ccs/ccs-core.c | 8 +- + drivers/media/i2c/ds90ub913.c | 2 +- + drivers/media/i2c/ds90ub953.c | 14 +- + drivers/media/i2c/dw9719.c | 128 +- + drivers/media/i2c/imx111.c | 1610 +++++++++++++++++ + drivers/media/i2c/imx214.c | 15 +- + drivers/media/i2c/imx219.c | 99 +- + drivers/media/i2c/imx274.c | 3 +- + drivers/media/i2c/imx335.c | 513 ++++-- + drivers/media/i2c/imx412.c | 4 +- + drivers/media/i2c/max9286.c | 4 +- + drivers/media/i2c/max96717.c | 18 +- + drivers/media/i2c/msp3400-kthreads.c | 2 + + drivers/media/i2c/mt9m111.c | 4 +- + drivers/media/i2c/mt9v111.c | 12 +- + drivers/media/i2c/ov02c10.c | 27 +- + drivers/media/i2c/ov13b10.c | 1 + + drivers/media/i2c/ov5675.c | 4 +- + drivers/media/i2c/ov5693.c | 4 +- + drivers/media/i2c/ov9282.c | 4 +- + drivers/media/i2c/rj54n1cb0c.c | 8 +- + drivers/media/i2c/st-mipid02.c | 4 +- + drivers/media/i2c/tc358746.c | 12 +- + drivers/media/i2c/tda1997x.c | 1 - + drivers/media/i2c/vd55g1.c | 236 ++- + drivers/media/pci/intel/ipu-bridge.c | 8 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 4 +- + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 8 +- + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c | 34 +- + drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 14 + + drivers/media/pci/intel/ivsc/mei_ace.c | 4 +- + drivers/media/pci/mgb4/mgb4_trigger.c | 5 +- + drivers/media/pci/mgb4/mgb4_vin.c | 4 +- + drivers/media/pci/mgb4/mgb4_vout.c | 4 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/allegro-core.c | 118 +- + drivers/media/platform/amlogic/c3/isp/Kconfig | 1 + + .../media/platform/amlogic/c3/isp/c3-isp-params.c | 166 +- + drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 5 - + drivers/media/platform/amphion/vdec.c | 4 +- + drivers/media/platform/amphion/venc.c | 4 +- + drivers/media/platform/amphion/vpu_core.c | 40 +- + drivers/media/platform/amphion/vpu_drv.c | 26 - + drivers/media/platform/amphion/vpu_malone.c | 23 +- + drivers/media/platform/amphion/vpu_v4l2.c | 16 +- + drivers/media/platform/amphion/vpu_v4l2.h | 10 - + drivers/media/platform/arm/Kconfig | 5 + + drivers/media/platform/arm/Makefile | 2 + + drivers/media/platform/arm/mali-c55/Kconfig | 18 + + drivers/media/platform/arm/mali-c55/Makefile | 11 + + .../media/platform/arm/mali-c55/mali-c55-capture.c | 959 ++++++++++ + .../media/platform/arm/mali-c55/mali-c55-common.h | 310 ++++ + .../media/platform/arm/mali-c55/mali-c55-core.c | 917 ++++++++++ + drivers/media/platform/arm/mali-c55/mali-c55-isp.c | 665 +++++++ + .../media/platform/arm/mali-c55/mali-c55-params.c | 819 +++++++++ + .../platform/arm/mali-c55/mali-c55-registers.h | 449 +++++ + .../media/platform/arm/mali-c55/mali-c55-resizer.c | 1156 ++++++++++++ + .../media/platform/arm/mali-c55/mali-c55-stats.c | 323 ++++ + drivers/media/platform/arm/mali-c55/mali-c55-tpg.c | 437 +++++ + drivers/media/platform/chips-media/coda/coda-bit.c | 2 +- + .../media/platform/chips-media/coda/coda-common.c | 4 - + .../media/platform/chips-media/coda/coda-jpeg.c | 4 +- + .../media/platform/imagination/e5010-jpeg-enc.c | 6 +- + drivers/media/platform/m2m-deinterlace.c | 7 - + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 11 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 4 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 4 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 14 + + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 2 +- + .../mediatek/vcodec/common/mtk_vcodec_dbgfs.c | 4 +- + .../mediatek/vcodec/common/mtk_vcodec_fw_vpu.c | 14 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 7 - + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c | 12 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 2 +- + .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 6 +- + .../vcodec/decoder/vdec/vdec_h264_req_if.c | 2 +- + .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c | 14 +- + .../vcodec/decoder/vdec/vdec_hevc_req_multi_if.c | 5 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 2 +- + .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 8 +- + .../platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 5 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 14 - + .../mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c | 12 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h | 2 +- + .../platform/mediatek/vcodec/encoder/venc_vpu_if.c | 5 +- + drivers/media/platform/nvidia/tegra-vde/h264.c | 2 +- + drivers/media/platform/nxp/dw100/dw100.c | 9 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 6 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 22 +- + drivers/media/platform/nxp/imx-pxp.c | 7 - + drivers/media/platform/nxp/imx7-media-csi.c | 1 - + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 58 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 1 + + .../media/platform/nxp/imx8-isi/imx8-isi-gasket.c | 22 +- + drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c | 4 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 5 +- + drivers/media/platform/nxp/mx2_emmaprp.c | 7 - + drivers/media/platform/qcom/camss/Makefile | 1 + + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 102 ++ + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + + drivers/media/platform/qcom/camss/camss-ispif.c | 8 +- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 12 + + drivers/media/platform/qcom/camss/camss-vfe-vbif.c | 31 + + drivers/media/platform/qcom/camss/camss-vfe-vbif.h | 19 + + drivers/media/platform/qcom/camss/camss-vfe.c | 17 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 3 + + drivers/media/platform/qcom/camss/camss.c | 483 ++++- + drivers/media/platform/qcom/camss/camss.h | 3 + + drivers/media/platform/qcom/iris/Makefile | 2 +- + drivers/media/platform/qcom/iris/iris_buffer.c | 17 +- + drivers/media/platform/qcom/iris/iris_common.c | 7 +- + drivers/media/platform/qcom/iris/iris_ctrls.c | 18 +- + drivers/media/platform/qcom/iris/iris_firmware.c | 18 +- + .../platform/qcom/iris/iris_hfi_gen1_command.c | 15 +- + .../platform/qcom/iris/iris_hfi_gen2_command.c | 21 +- + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 1 + + drivers/media/platform/qcom/iris/iris_instance.h | 7 +- + .../platform/qcom/iris/iris_platform_common.h | 18 +- + ...iris_platform_sm8250.c => iris_platform_gen1.c} | 63 +- + .../media/platform/qcom/iris/iris_platform_gen2.c | 26 +- + .../platform/qcom/iris/iris_platform_qcs8300.h | 535 +----- + .../platform/qcom/iris/iris_platform_sc7280.h | 26 + + drivers/media/platform/qcom/iris/iris_probe.c | 4 + + drivers/media/platform/qcom/iris/iris_resources.c | 2 +- + drivers/media/platform/qcom/iris/iris_utils.c | 3 +- + drivers/media/platform/qcom/iris/iris_vb2.c | 8 +- + drivers/media/platform/qcom/iris/iris_vdec.c | 63 +- + drivers/media/platform/qcom/iris/iris_venc.c | 61 +- + drivers/media/platform/qcom/iris/iris_vidc.c | 2 +- + drivers/media/platform/qcom/iris/iris_vpu2.c | 6 + + drivers/media/platform/qcom/iris/iris_vpu_common.c | 34 +- + drivers/media/platform/qcom/venus/core.c | 1 - + drivers/media/platform/qcom/venus/firmware.c | 19 +- + drivers/media/platform/qcom/venus/vdec.c | 8 +- + drivers/media/platform/qcom/venus/venc.c | 8 +- + drivers/media/platform/renesas/Kconfig | 1 + + drivers/media/platform/renesas/Makefile | 1 + + drivers/media/platform/renesas/rcar_drif.c | 1 + + drivers/media/platform/renesas/rcar_fdp1.c | 6 +- + drivers/media/platform/renesas/rcar_jpu.c | 16 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 8 +- + drivers/media/platform/renesas/rzv2h-ivc/Kconfig | 18 + + drivers/media/platform/renesas/rzv2h-ivc/Makefile | 5 + + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c | 251 +++ + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-subdev.c | 376 ++++ + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-video.c | 531 ++++++ + .../media/platform/renesas/rzv2h-ivc/rzv2h-ivc.h | 130 ++ + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 3 +- + drivers/media/platform/rockchip/Kconfig | 1 + + drivers/media/platform/rockchip/Makefile | 1 + + drivers/media/platform/rockchip/rga/rga.c | 6 +- + drivers/media/platform/rockchip/rkcif/Kconfig | 18 + + drivers/media/platform/rockchip/rkcif/Makefile | 8 + + .../platform/rockchip/rkcif/rkcif-capture-dvp.c | 865 +++++++++ + .../platform/rockchip/rkcif/rkcif-capture-dvp.h | 25 + + .../platform/rockchip/rkcif/rkcif-capture-mipi.c | 777 ++++++++ + .../platform/rockchip/rkcif/rkcif-capture-mipi.h | 23 + + .../media/platform/rockchip/rkcif/rkcif-common.h | 250 +++ + drivers/media/platform/rockchip/rkcif/rkcif-dev.c | 303 ++++ + .../platform/rockchip/rkcif/rkcif-interface.c | 442 +++++ + .../platform/rockchip/rkcif/rkcif-interface.h | 31 + + drivers/media/platform/rockchip/rkcif/rkcif-regs.h | 153 ++ + .../media/platform/rockchip/rkcif/rkcif-stream.c | 636 +++++++ + .../media/platform/rockchip/rkcif/rkcif-stream.h | 32 + + drivers/media/platform/rockchip/rkisp1/Kconfig | 1 + + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 1 + + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 31 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 151 +- + drivers/media/platform/rockchip/rkvdec/Makefile | 2 +- + .../platform/rockchip/rkvdec/rkvdec-hevc-data.c | 1848 ++++++++++++++++++++ + .../media/platform/rockchip/rkvdec/rkvdec-hevc.c | 820 +++++++++ + .../media/platform/rockchip/rkvdec/rkvdec-regs.h | 4 + + .../media/platform/rockchip/rkvdec/rkvdec-vp9.c | 4 + + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 200 ++- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 17 + + .../media/platform/samsung/exynos4-is/fimc-is.c | 1 - + .../media/platform/samsung/exynos4-is/fimc-lite.c | 1 - + .../media/platform/samsung/exynos4-is/media-dev.c | 14 +- + drivers/media/platform/samsung/s5p-g2d/g2d.c | 4 - + .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 7 - + drivers/media/platform/st/Makefile | 1 - + drivers/media/platform/st/sti/Kconfig | 1 - + drivers/media/platform/st/sti/Makefile | 1 - + drivers/media/platform/st/sti/c8sectpfe/Kconfig | 28 - + drivers/media/platform/st/sti/c8sectpfe/Makefile | 11 - + .../platform/st/sti/c8sectpfe/c8sectpfe-common.c | 262 --- + .../platform/st/sti/c8sectpfe/c8sectpfe-common.h | 60 - + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 1158 ------------ + .../platform/st/sti/c8sectpfe/c8sectpfe-core.h | 287 --- + .../platform/st/sti/c8sectpfe/c8sectpfe-debugfs.c | 244 --- + .../platform/st/sti/c8sectpfe/c8sectpfe-debugfs.h | 23 - + .../platform/st/sti/c8sectpfe/c8sectpfe-dvb.c | 235 --- + .../platform/st/sti/c8sectpfe/c8sectpfe-dvb.h | 17 - + drivers/media/platform/st/stm32/dma2d/dma2d.c | 7 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 2 +- + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +- + .../media/platform/synopsys/hdmirx/snps_hdmirx.c | 2 +- + drivers/media/platform/ti/cal/cal.c | 3 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 4 +- + drivers/media/platform/ti/davinci/vpif_display.c | 4 +- + drivers/media/platform/ti/omap3isp/isp.c | 10 +- + drivers/media/platform/ti/vpe/vpe.c | 7 - + drivers/media/platform/verisilicon/hantro_drv.c | 2 +- + drivers/media/platform/verisilicon/hantro_g2.c | 84 +- + .../platform/verisilicon/hantro_g2_hevc_dec.c | 17 +- + .../media/platform/verisilicon/hantro_g2_regs.h | 13 + + .../media/platform/verisilicon/hantro_g2_vp9_dec.c | 2 - + drivers/media/platform/verisilicon/hantro_hw.h | 1 + + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 2 + + drivers/media/rc/ir-hix5hd2.c | 1 - + drivers/media/rc/st_rc.c | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 11 +- + drivers/media/test-drivers/vidtv/vidtv_channel.c | 3 + + drivers/media/test-drivers/vim2m.c | 14 +- + drivers/media/test-drivers/visl/visl-dec.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.c | 6 +- + drivers/media/tuners/xc2028.c | 9 +- + drivers/media/usb/dvb-usb/dtv5100.c | 5 + + drivers/media/usb/dvb-usb/pctv452e.c | 7 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/v4l2-core/Kconfig | 4 + + drivers/media/v4l2-core/Makefile | 1 + + drivers/media/v4l2-core/v4l2-common.c | 29 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 131 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 + + drivers/media/v4l2-core/v4l2-isp.c | 132 ++ + drivers/media/v4l2-core/v4l2-mem2mem.c | 21 +- + drivers/staging/media/av7110/av7110_ca.c | 2 +- + drivers/staging/media/av7110/av7110_v4l.c | 4 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/ipu3/ipu3.c | 3 +- + drivers/staging/media/ipu3/ipu3.h | 1 - + drivers/staging/media/ipu7/ipu7-isys-csi-phy.c | 4 +- + drivers/staging/media/ipu7/ipu7-isys-csi2.c | 4 +- + drivers/staging/media/ipu7/ipu7-isys-video.c | 7 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +- + drivers/staging/media/tegra-video/tegra20.c | 2 +- + include/dt-bindings/media/c8sectpfe.h | 13 - + include/dt-bindings/media/video-interfaces.h | 4 + + include/media/drv-intf/saa7146_vv.h | 3 +- + include/media/media-entity.h | 10 +- + include/media/v4l2-common.h | 20 + + include/media/v4l2-dev.h | 6 +- + include/media/v4l2-isp.h | 91 + + include/media/v4l2-mem2mem.h | 18 +- + include/media/v4l2-subdev.h | 2 +- + include/uapi/linux/media-bus-format.h | 9 +- + include/uapi/linux/media/amlogic/c3-isp-config.h | 90 +- + include/uapi/linux/media/arm/mali-c55-config.h | 794 +++++++++ + include/uapi/linux/media/v4l2-isp.h | 102 ++ + include/uapi/linux/rkisp1-config.h | 107 +- + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 4 + + 310 files changed, 22135 insertions(+), 4828 deletions(-) + create mode 100644 Documentation/admin-guide/media/mali-c55-graph.dot + create mode 100644 Documentation/admin-guide/media/mali-c55.rst + create mode 100644 Documentation/admin-guide/media/rkcif-rk3568-vicap.dot + create mode 100644 Documentation/admin-guide/media/rkcif.rst + create mode 100644 Documentation/devicetree/bindings/media/arm,mali-c55.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9719.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/nxp,tda19971.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/nxp,tda1997x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx111.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ti,tvp5150.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ti,tvp5150.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8939-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8650-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/renesas,r9a09g057-ivc.yaml + create mode 100644 Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml + create mode 100644 Documentation/devicetree/bindings/media/rockchip,rk3568-vicap.yaml + delete mode 100644 Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt + create mode 100644 Documentation/driver-api/media/v4l2-isp.rst + create mode 100644 Documentation/userspace-api/media/drivers/mali-c55.rst + create mode 100644 Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst + create mode 100644 Documentation/userspace-api/media/v4l/v4l2-isp.rst + create mode 100644 drivers/media/i2c/imx111.c + create mode 100644 drivers/media/platform/arm/Kconfig + create mode 100644 drivers/media/platform/arm/Makefile + create mode 100644 drivers/media/platform/arm/mali-c55/Kconfig + create mode 100644 drivers/media/platform/arm/mali-c55/Makefile + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-capture.c + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-common.h + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-core.c + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-isp.c + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-params.c + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-registers.h + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-resizer.c + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-stats.c + create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-tpg.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-vbif.c + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-vbif.h + rename drivers/media/platform/qcom/iris/{iris_platform_sm8250.c => iris_platform_gen1.c} (82%) + create mode 100644 drivers/media/platform/qcom/iris/iris_platform_sc7280.h + create mode 100644 drivers/media/platform/renesas/rzv2h-ivc/Kconfig + create mode 100644 drivers/media/platform/renesas/rzv2h-ivc/Makefile + create mode 100644 drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c + create mode 100644 drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-subdev.c + create mode 100644 drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-video.c + create mode 100644 drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc.h + create mode 100644 drivers/media/platform/rockchip/rkcif/Kconfig + create mode 100644 drivers/media/platform/rockchip/rkcif/Makefile + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.c + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.h + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.h + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-common.h + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-dev.c + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-interface.c + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-interface.h + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-regs.h + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-stream.c + create mode 100644 drivers/media/platform/rockchip/rkcif/rkcif-stream.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/Kconfig + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/Makefile + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-common.c + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-common.h + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.h + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-debugfs.c + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-debugfs.h + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-dvb.c + delete mode 100644 drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-dvb.h + create mode 100644 drivers/media/v4l2-core/v4l2-isp.c + delete mode 100644 include/dt-bindings/media/c8sectpfe.h + create mode 100644 include/media/v4l2-isp.h + create mode 100644 include/uapi/linux/media/arm/mali-c55-config.h + create mode 100644 include/uapi/linux/media/v4l2-isp.h +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 (cb9e7e5a49cb Merge branch 'pm-devfreq' 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-power | 16 ++ + Documentation/admin-guide/kernel-parameters.txt | 10 + + Documentation/admin-guide/pm/cpuidle.rst | 9 + + Documentation/admin-guide/pm/intel_pstate.rst | 133 +++++---- + Documentation/admin-guide/thermal/index.rst | 1 + + .../admin-guide/thermal/intel_thermal_throttle.rst | 91 ++++++ + Documentation/driver-api/thermal/intel_dptf.rst | 23 ++ + Documentation/netlink/specs/em.yaml | 113 ++++++++ + Documentation/power/index.rst | 1 + + Documentation/power/pm_qos_interface.rst | 9 +- + Documentation/power/runtime_pm.rst | 10 - + Documentation/power/shutdown-debugging.rst | 53 ++++ + MAINTAINERS | 3 + + drivers/acpi/acpi_tad.c | 73 ++--- + drivers/acpi/acpica/nswalk.c | 9 +- + drivers/acpi/battery.c | 12 - + drivers/acpi/dptf/Makefile | 1 - + drivers/acpi/dptf/dptf_pch_fivr.c | 2 +- + drivers/acpi/dptf/dptf_power.c | 2 + + drivers/acpi/dptf/int340x_thermal.c | 94 ------- + drivers/acpi/ec.c | 3 +- + drivers/acpi/fan.h | 41 +++ + drivers/acpi/fan_core.c | 223 ++++++++++++++- + drivers/acpi/fan_hwmon.c | 25 +- + drivers/acpi/internal.h | 1 - + drivers/acpi/osl.c | 6 +- + drivers/acpi/processor_core.c | 2 +- + drivers/acpi/processor_idle.c | 42 ++- + drivers/acpi/property.c | 29 +- + drivers/acpi/scan.c | 3 +- + drivers/acpi/sleep.c | 2 +- + drivers/acpi/sleep.h | 3 - + drivers/acpi/thermal.c | 3 +- + drivers/acpi/x86/lpss.c | 2 +- + drivers/acpi/x86/s2idle.c | 65 ++--- + drivers/base/power/generic_ops.c | 85 ++---- + drivers/base/power/main.c | 15 + + drivers/base/power/runtime.c | 23 +- + drivers/base/power/trace.c | 4 +- + drivers/base/power/wakeup.c | 24 +- + drivers/cpufreq/acpi-cpufreq.c | 2 +- + drivers/cpufreq/amd-pstate.c | 35 +-- + drivers/cpufreq/cppc_cpufreq.c | 17 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/cpufreq-nforce2.c | 3 + + drivers/cpufreq/cpufreq.c | 11 +- + drivers/cpufreq/intel_pstate.c | 229 +++++++-------- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 35 ++- + drivers/cpufreq/s5pv210-cpufreq.c | 6 +- + drivers/cpufreq/tegra186-cpufreq.c | 150 +++++++++- + drivers/cpufreq/tegra194-cpufreq.c | 3 +- + drivers/cpuidle/cpuidle.c | 12 +- + drivers/cpuidle/driver.c | 10 + + drivers/cpuidle/governor.c | 4 + + drivers/cpuidle/governors/menu.c | 9 +- + drivers/cpuidle/governors/teo.c | 159 +++++------ + drivers/cpuidle/poll_state.c | 4 + + drivers/devfreq/devfreq.c | 2 +- + drivers/devfreq/governor_passive.c | 27 +- + drivers/devfreq/governor_performance.c | 2 +- + drivers/devfreq/governor_powersave.c | 2 +- + drivers/devfreq/governor_simpleondemand.c | 6 +- + drivers/devfreq/governor_userspace.c | 2 +- + drivers/devfreq/hisi_uncore_freq.c | 6 +- + drivers/devfreq/tegra30-devfreq.c | 15 +- + drivers/opp/core.c | 69 ++--- + drivers/opp/cpu.c | 16 +- + drivers/opp/of.c | 125 +++++---- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pmdomain/core.c | 10 +- + drivers/pmdomain/governor.c | 33 ++- + drivers/pnp/driver.c | 19 ++ + drivers/powercap/intel_rapl_common.c | 39 +-- + drivers/powercap/intel_rapl_msr.c | 43 ++- + drivers/powercap/intel_rapl_tpmi.c | 2 +- + drivers/scsi/mesh.c | 1 + + drivers/scsi/stex.c | 1 + + drivers/thermal/intel/Kconfig | 3 +- + .../intel/int340x_thermal/int3400_thermal.c | 13 +- + .../intel/int340x_thermal/int3403_thermal.c | 1 + + .../int340x_thermal/processor_thermal_device.h | 2 + + .../int340x_thermal/processor_thermal_device_pci.c | 10 + + .../intel/int340x_thermal/processor_thermal_rapl.c | 2 +- + .../intel/int340x_thermal/processor_thermal_rfim.c | 15 + + drivers/usb/host/sl811-hcd.c | 1 + + include/linux/acpi.h | 15 - + include/linux/cpuidle.h | 6 +- + .../governor.h => include/linux/devfreq-governor.h | 33 +-- + include/linux/energy_model.h | 4 + + include/linux/freezer.h | 12 +- + include/linux/intel_rapl.h | 2 +- + include/linux/pm.h | 8 +- + include/linux/pm_domain.h | 1 + + include/linux/pm_qos.h | 9 + + include/linux/pm_runtime.h | 24 ++ + include/trace/events/power.h | 3 +- + include/uapi/linux/energy_model.h | 62 +++++ + kernel/cgroup/legacy_freezer.c | 2 +- + kernel/freezer.c | 2 +- + kernel/power/Kconfig | 11 + + kernel/power/Makefile | 4 +- + kernel/power/console.c | 8 +- + kernel/power/em_netlink.c | 308 +++++++++++++++++++++ + kernel/power/em_netlink.h | 39 +++ + kernel/power/em_netlink_autogen.c | 48 ++++ + kernel/power/em_netlink_autogen.h | 23 ++ + kernel/power/energy_model.c | 90 +++++- + kernel/power/hibernate.c | 6 +- + kernel/power/main.c | 81 +++++- + kernel/power/power.h | 1 + + kernel/power/qos.c | 106 +++++++ + kernel/power/snapshot.c | 13 +- + kernel/power/suspend.c | 12 +- + kernel/power/swap.c | 256 +++++++++-------- + kernel/power/user.c | 4 +- + kernel/sched/idle.c | 12 +- + rust/kernel/acpi.rs | 4 +- + rust/kernel/opp.rs | 120 ++++---- + tools/power/acpi/tools/pfrut/pfrut.c | 7 +- + tools/power/cpupower/Makefile | 32 ++- + 120 files changed, 2707 insertions(+), 1088 deletions(-) + create mode 100644 Documentation/admin-guide/thermal/intel_thermal_throttle.rst + create mode 100644 Documentation/netlink/specs/em.yaml + create mode 100644 Documentation/power/shutdown-debugging.rst + delete mode 100644 drivers/acpi/dptf/int340x_thermal.c + rename drivers/devfreq/governor.h => include/linux/devfreq-governor.h (80%) + create mode 100644 include/uapi/linux/energy_model.h + create mode 100644 kernel/power/em_netlink.c + create mode 100644 kernel/power/em_netlink.h + create mode 100644 kernel/power/em_netlink_autogen.c + create mode 100644 kernel/power/em_netlink_autogen.h +Merging cpufreq-arm/cpufreq/arm/linux-next (c3852d2ca465 cpufreq: qcom-nvmem: fix compilation warning for qcom_cpufreq_ipq806x_match_list) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (059835bbfa28 tools/power/cpupower: Support building libcpupower statically) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (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 +Auto-merging drivers/base/power/main.c +Auto-merging drivers/cpuidle/cpuidle-psci.c +Auto-merging drivers/pmdomain/core.c +Auto-merging drivers/pmdomain/governor.c +Auto-merging include/linux/pm.h +Merge made by the 'ort' strategy. + .../bindings/power/mediatek,mt8196-gpufreq.yaml | 117 +++ + .../bindings/power/mediatek,power-controller.yaml | 4 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/power/rockchip,power-controller.yaml | 2 + + .../bindings/soc/bcm/brcm,bcm2835-pm.yaml | 38 +- + drivers/amba/bus.c | 9 +- + drivers/base/power/main.c | 1 + + drivers/cpuidle/cpuidle-psci.c | 4 +- + drivers/pmdomain/bcm/bcm2835-power.c | 17 +- + drivers/pmdomain/core.c | 6 +- + drivers/pmdomain/governor.c | 20 +- + drivers/pmdomain/mediatek/Kconfig | 17 + + drivers/pmdomain/mediatek/Makefile | 1 + + drivers/pmdomain/mediatek/mt8196-pm-domains.h | 625 ++++++++++++ + drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c | 1044 ++++++++++++++++++++ + drivers/pmdomain/mediatek/mtk-pm-domains.c | 306 +++++- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 49 +- + drivers/pmdomain/qcom/rpmhpd.c | 28 +- + drivers/pmdomain/rockchip/pm-domains.c | 41 + + drivers/usb/chipidea/ci_hdrc_imx.c | 11 +- + drivers/usb/chipidea/core.c | 3 + + drivers/usb/dwc3/dwc3-imx8mp.c | 9 +- + include/dt-bindings/power/mediatek,mt8196-power.h | 58 ++ + include/dt-bindings/power/qcom,rpmhpd.h | 3 + + .../power/rockchip,rv1126b-power-controller.h | 17 + + include/linux/pm.h | 1 + + include/linux/pm_wakeup.h | 17 + + include/linux/smp.h | 5 + + include/linux/usb/chipidea.h | 1 + + kernel/smp.c | 22 + + 30 files changed, 2417 insertions(+), 60 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/mediatek,mt8196-gpufreq.yaml + create mode 100644 drivers/pmdomain/mediatek/mt8196-pm-domains.h + create mode 100644 drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c + create mode 100644 include/dt-bindings/power/mediatek,mt8196-power.h + create mode 100644 include/dt-bindings/power/rockchip,rv1126b-power-controller.h +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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/fsl,imx91-tmu.yaml | 87 +++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 9 +- + .../bindings/thermal/renesas,r9a09g047-tsu.yaml | 6 +- + drivers/thermal/Kconfig | 10 + + drivers/thermal/Makefile | 1 + + drivers/thermal/imx91_thermal.c | 384 +++++++++++++++++++++ + drivers/thermal/renesas/rcar_gen3_thermal.c | 10 +- + drivers/thermal/renesas/rcar_thermal.c | 8 +- + tools/thermal/thermal-engine/thermal-engine.c | 2 +- + 9 files changed, 504 insertions(+), 13 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/fsl,imx91-tmu.yaml + create mode 100644 drivers/thermal/imx91_thermal.c +Merging rdma/for-next (4022c7b6342a RDMA/mlx5: Add support for 1600_8x lane speed) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_device.h +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_qp.c +Auto-merging drivers/infiniband/hw/irdma/type.h +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + MAINTAINERS | 7 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/cm.c | 9 +- + drivers/infiniband/core/cma.c | 2 + + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/restrack.c | 4 +- + drivers/infiniband/core/ucma.c | 2 +- + drivers/infiniband/core/umem.c | 4 +- + drivers/infiniband/core/verbs.c | 3 + + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/bng_re/Kconfig | 10 + + drivers/infiniband/hw/bng_re/Makefile | 8 + + drivers/infiniband/hw/bng_re/bng_debugfs.c | 39 + + drivers/infiniband/hw/bng_re/bng_debugfs.h | 12 + + drivers/infiniband/hw/bng_re/bng_dev.c | 534 +++++++++++ + drivers/infiniband/hw/bng_re/bng_fw.c | 767 +++++++++++++++ + drivers/infiniband/hw/bng_re/bng_fw.h | 211 ++++ + drivers/infiniband/hw/bng_re/bng_re.h | 85 ++ + drivers/infiniband/hw/bng_re/bng_res.c | 279 ++++++ + drivers/infiniband/hw/bng_re/bng_res.h | 215 +++++ + drivers/infiniband/hw/bng_re/bng_sp.c | 131 +++ + drivers/infiniband/hw/bng_re/bng_sp.h | 47 + + drivers/infiniband/hw/bng_re/bng_tlv.h | 128 +++ + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 + + drivers/infiniband/hw/bnxt_re/debugfs.c | 128 +++ + drivers/infiniband/hw/bnxt_re/debugfs.h | 19 + + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +- + drivers/infiniband/hw/bnxt_re/main.c | 1 + + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 8 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/hfi1/init.c | 4 +- + drivers/infiniband/hw/hfi1/opfn.c | 4 +- + drivers/infiniband/hw/hns/Makefile | 4 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 1 - + drivers/infiniband/hw/hns/hns_roce_bond.c | 1012 ++++++++++++++++++++ + drivers/infiniband/hw/hns/hns_roce_bond.h | 95 ++ + drivers/infiniband/hw/hns/hns_roce_device.h | 16 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 141 ++- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 20 + + drivers/infiniband/hw/hns/hns_roce_main.c | 187 +++- + drivers/infiniband/hw/hns/hns_roce_pd.c | 1 - + drivers/infiniband/hw/hns/hns_roce_qp.c | 5 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 1 - + drivers/infiniband/hw/irdma/ctrl.c | 101 +- + drivers/infiniband/hw/irdma/hw.c | 3 - + drivers/infiniband/hw/irdma/main.h | 1 - + drivers/infiniband/hw/irdma/puda.c | 19 +- + drivers/infiniband/hw/irdma/type.h | 5 - + drivers/infiniband/hw/irdma/uk.c | 36 +- + drivers/infiniband/hw/irdma/user.h | 5 +- + drivers/infiniband/hw/irdma/utils.c | 58 +- + drivers/infiniband/hw/irdma/verbs.c | 25 +- + drivers/infiniband/hw/mlx4/cm.c | 2 +- + drivers/infiniband/hw/mlx5/devx.c | 14 + + drivers/infiniband/hw/mlx5/fs.c | 65 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 74 +- + drivers/infiniband/hw/mlx5/main.c | 6 +- + drivers/infiniband/hw/mlx5/odp.c | 95 +- + drivers/infiniband/hw/mlx5/qp.c | 5 +- + drivers/infiniband/sw/rdmavt/cq.c | 3 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 1 - + drivers/infiniband/sw/rxe/rxe_odp.c | 1 - + drivers/infiniband/sw/rxe/rxe_srq.c | 7 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- + drivers/net/ethernet/broadcom/bnge/Makefile | 3 +- + drivers/net/ethernet/broadcom/bnge/bnge.h | 10 + + drivers/net/ethernet/broadcom/bnge/bnge_auxr.c | 258 +++++ + drivers/net/ethernet/broadcom/bnge/bnge_auxr.h | 84 ++ + drivers/net/ethernet/broadcom/bnge/bnge_core.c | 18 +- + drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c | 40 + + drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h | 2 + + drivers/net/ethernet/broadcom/bnge/bnge_resc.c | 12 + + drivers/net/ethernet/broadcom/bnge/bnge_resc.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 20 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 31 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/st.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 24 +- + drivers/pci/tph.c | 16 +- + include/linux/mlx5/fs.h | 24 + + include/linux/mlx5/mlx5_ifc.h | 47 +- + include/linux/mlx5/port.h | 1 + + include/linux/mlx5/vport.h | 3 +- + include/linux/pci-tph.h | 1 + + include/rdma/ib_cm.h | 4 +- + include/rdma/ib_verbs.h | 100 +- + include/rdma/rdmavt_qp.h | 70 +- + 94 files changed, 5091 insertions(+), 503 deletions(-) + create mode 100644 drivers/infiniband/hw/bng_re/Kconfig + create mode 100644 drivers/infiniband/hw/bng_re/Makefile + create mode 100644 drivers/infiniband/hw/bng_re/bng_debugfs.c + create mode 100644 drivers/infiniband/hw/bng_re/bng_debugfs.h + create mode 100644 drivers/infiniband/hw/bng_re/bng_dev.c + create mode 100644 drivers/infiniband/hw/bng_re/bng_fw.c + create mode 100644 drivers/infiniband/hw/bng_re/bng_fw.h + create mode 100644 drivers/infiniband/hw/bng_re/bng_re.h + create mode 100644 drivers/infiniband/hw/bng_re/bng_res.c + create mode 100644 drivers/infiniband/hw/bng_re/bng_res.h + create mode 100644 drivers/infiniband/hw/bng_re/bng_sp.c + create mode 100644 drivers/infiniband/hw/bng_re/bng_sp.h + create mode 100644 drivers/infiniband/hw/bng_re/bng_tlv.h + create mode 100644 drivers/infiniband/hw/hns/hns_roce_bond.c + create mode 100644 drivers/infiniband/hw/hns/hns_roce_bond.h + create mode 100644 drivers/net/ethernet/broadcom/bnge/bnge_auxr.c + create mode 100644 drivers/net/ethernet/broadcom/bnge/bnge_auxr.h +Merging net-next/main (db4029859d6f Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/meta/fbnic/fbnic_pci.c +Auto-merging drivers/ptp/ptp_ocp.c +Auto-merging drivers/s390/net/ctcm_fsms.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/net/smsgiucv_app.c +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Auto-merging fs/coredump.c +Auto-merging fs/smb/client/connect.c +Auto-merging fs/smb/server/transport_tcp.c +Auto-merging include/net/sock.h +Auto-merging kernel/bpf/syscall.c +Auto-merging net/9p/trans_fd.c +Auto-merging net/core/net_namespace.c +Auto-merging net/sctp/socket.c +Auto-merging net/socket.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/unix/af_unix.c +Auto-merging tools/testing/selftests/drivers/net/gro.c +CONFLICT (content): Merge conflict in tools/testing/selftests/drivers/net/gro.c +Auto-merging tools/testing/selftests/drivers/net/hw/toeplitz.c +CONFLICT (content): Merge conflict in tools/testing/selftests/drivers/net/hw/toeplitz.c +Auto-merging tools/testing/selftests/net/netlink-dumps.c +Auto-merging tools/testing/selftests/net/tls.c +Resolved 'tools/testing/selftests/drivers/net/gro.c' using previous resolution. +Resolved 'tools/testing/selftests/drivers/net/hw/toeplitz.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c55f01045ca9] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/net.rst | 29 +- + .../devicetree/bindings/net/airoha,en7581-eth.yaml | 35 +- + .../devicetree/bindings/net/airoha,en7581-npu.yaml | 1 + + .../bindings/net/amd,xgbe-seattle-v1a.yaml | 147 + + Documentation/devicetree/bindings/net/amd-xgbe.txt | 76 - + .../bindings/net/aspeed,ast2600-mdio.yaml | 7 +- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 25 + + .../bindings/net/can/microchip,mcp251xfd.yaml | 5 + + .../bindings/net/can/microchip,mpfs-can.yaml | 5 + + .../devicetree/bindings/net/cdns,macb.yaml | 27 +- + .../devicetree/bindings/net/dsa/lantiq,gswip.yaml | 164 +- + .../bindings/net/dsa/motorcomm,yt921x.yaml | 167 + + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 3 + + .../devicetree/bindings/net/eswin,eic7700-eth.yaml | 129 + + .../devicetree/bindings/net/ethernet-phy.yaml | 10 +- + .../devicetree/bindings/net/fsl,enetc.yaml | 1 + + .../devicetree/bindings/net/mediatek,net.yaml | 26 +- + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 73 - + .../devicetree/bindings/net/mscc-phy-vsc8531.yaml | 131 + + .../devicetree/bindings/net/nxp,netc-blk-ctrl.yaml | 1 + + .../bindings/net/pse-pd/ti,tps23881.yaml | 1 + + .../devicetree/bindings/net/qcom,ethqos.yaml | 8 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 3 + + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- + .../bindings/net/sophgo,sg2044-dwmac.yaml | 19 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 +- + Documentation/driver-api/dpll.rst | 36 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink.yaml | 2 +- + Documentation/netlink/netlink-raw.yaml | 2 +- + Documentation/netlink/specs/devlink.yaml | 11 + + Documentation/netlink/specs/dpll.yaml | 7 + + Documentation/netlink/specs/ethtool.yaml | 86 + + Documentation/netlink/specs/netdev.yaml | 28 +- + Documentation/netlink/specs/psp.yaml | 95 + + Documentation/netlink/specs/rt-addr.yaml | 7 +- + Documentation/netlink/specs/rt-link.yaml | 50 +- + Documentation/netlink/specs/rt-neigh.yaml | 2 +- + Documentation/netlink/specs/rt-route.yaml | 8 +- + Documentation/netlink/specs/rt-rule.yaml | 6 +- + Documentation/networking/6pack.rst | 2 +- + Documentation/networking/arcnet-hardware.rst | 22 +- + Documentation/networking/arcnet.rst | 48 +- + .../device_drivers/cellular/qualcomm/rmnet.rst | 10 +- + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/mucse/rnpgbe.rst | 17 + + .../networking/devlink/devlink-eswitch-attr.rst | 13 + + .../networking/devlink/devlink-params.rst | 14 + + Documentation/networking/devlink/i40e.rst | 34 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/mlx5.rst | 14 + + Documentation/networking/devlink/stmmac.rst | 40 + + Documentation/networking/ethtool-netlink.rst | 64 + + Documentation/networking/index.rst | 5 +- + Documentation/networking/ip-sysctl.rst | 60 +- + Documentation/networking/napi.rst | 50 +- + .../net_cachelines/inet_connection_sock.rst | 2 +- + .../networking/net_cachelines/inet_sock.rst | 79 +- + .../net_cachelines/netns_ipv4_sysctl.rst | 3 +- + Documentation/networking/netconsole.rst | 2 +- + Documentation/networking/nfc.rst | 6 +- + Documentation/networking/smc-sysctl.rst | 40 + + Documentation/networking/statistics.rst | 4 +- + Documentation/networking/tls.rst | 20 + + Documentation/networking/xfrm/index.rst | 13 + + .../networking/{ => xfrm}/xfrm_device.rst | 20 +- + Documentation/networking/{ => xfrm}/xfrm_proc.rst | 0 + Documentation/networking/{ => xfrm}/xfrm_sync.rst | 97 +- + .../networking/{ => xfrm}/xfrm_sysctl.rst | 4 +- + MAINTAINERS | 30 +- + arch/m68k/coldfire/m5272.c | 15 - + arch/mips/bcm47xx/setup.c | 7 - + crypto/af_alg.c | 2 +- + drivers/android/binder_netlink.c | 1 + + drivers/android/binder_netlink.h | 1 + + drivers/block/drbd/drbd_receiver.c | 6 +- + .../crypto/marvell/octeontx2/otx2_cpt_devlink.c | 6 +- + drivers/dibs/dibs_main.c | 5 +- + drivers/dpll/dpll_netlink.c | 12 +- + drivers/dpll/dpll_nl.c | 1 + + drivers/dpll/dpll_nl.h | 1 + + drivers/dpll/zl3073x/Makefile | 3 +- + drivers/dpll/zl3073x/core.c | 243 +- + drivers/dpll/zl3073x/core.h | 188 +- + drivers/dpll/zl3073x/dpll.c | 820 ++--- + drivers/dpll/zl3073x/fw.c | 6 +- + drivers/dpll/zl3073x/out.c | 157 + + drivers/dpll/zl3073x/out.h | 93 + + drivers/dpll/zl3073x/prop.c | 19 +- + drivers/dpll/zl3073x/ref.c | 204 ++ + drivers/dpll/zl3073x/ref.h | 134 + + drivers/dpll/zl3073x/synth.c | 87 + + drivers/dpll/zl3073x/synth.h | 72 + + drivers/infiniband/hw/erdma/erdma_cm.c | 6 +- + drivers/infiniband/sw/siw/siw_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 29 + + drivers/isdn/capi/kcapi.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/isdn/mISDN/socket.c | 4 +- + drivers/net/bonding/bond_3ad.c | 9 + + drivers/net/bonding/bond_main.c | 99 +- + drivers/net/can/Kconfig | 17 + + drivers/net/can/Makefile | 1 + + drivers/net/can/at91_can.c | 1 - + drivers/net/can/bxcan.c | 3 +- + drivers/net/can/c_can/c_can_main.c | 1 - + drivers/net/can/can327.c | 1 - + drivers/net/can/cc770/cc770.c | 1 - + drivers/net/can/ctucanfd/ctucanfd_base.c | 1 - + drivers/net/can/dev/bittiming.c | 63 + + drivers/net/can/dev/calc_bittiming.c | 114 +- + drivers/net/can/dev/dev.c | 125 +- + drivers/net/can/dev/netlink.c | 319 +- + drivers/net/can/dummy_can.c | 285 ++ + drivers/net/can/esd/esd_402_pci-core.c | 4 +- + drivers/net/can/flexcan/flexcan-core.c | 1 - + drivers/net/can/grcan.c | 1 - + drivers/net/can/ifi_canfd/ifi_canfd.c | 1 - + drivers/net/can/janz-ican3.c | 1 - + drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c | 4 +- + drivers/net/can/m_can/m_can.c | 256 +- + drivers/net/can/m_can/m_can.h | 5 +- + drivers/net/can/m_can/m_can_pci.c | 4 +- + drivers/net/can/m_can/m_can_platform.c | 4 +- + drivers/net/can/m_can/tcan4x5x-core.c | 4 +- + drivers/net/can/mscan/mscan.c | 1 - + drivers/net/can/peak_canfd/peak_canfd.c | 36 +- + drivers/net/can/rcar/rcar_can.c | 1 - + drivers/net/can/rcar/rcar_canfd.c | 247 +- + drivers/net/can/rockchip/rockchip_canfd-core.c | 1 - + drivers/net/can/sja1000/sja1000.c | 1 - + drivers/net/can/slcan/slcan-core.c | 1 - + drivers/net/can/softing/softing_main.c | 1 - + drivers/net/can/spi/hi311x.c | 1 - + drivers/net/can/spi/mcp251x.c | 32 +- + drivers/net/can/spi/mcp251xfd/Kconfig | 1 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 285 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 114 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 8 + + drivers/net/can/sun4i_can.c | 1 - + drivers/net/can/ti_hecc.c | 1 - + drivers/net/can/usb/ems_usb.c | 1 - + drivers/net/can/usb/esd_usb.c | 1 - + drivers/net/can/usb/etas_es58x/es58x_core.c | 4 +- + drivers/net/can/usb/f81604.c | 1 - + drivers/net/can/usb/gs_usb.c | 21 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 +- + drivers/net/can/usb/mcba_usb.c | 1 - + drivers/net/can/usb/nct6694_canfd.c | 1 - + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 36 +- + drivers/net/can/usb/ucan.c | 1 - + drivers/net/can/usb/usb_8dev.c | 1 - + drivers/net/can/xilinx_can.c | 1 - + drivers/net/dsa/Kconfig | 7 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/b53/b53_common.c | 357 ++- + drivers/net/dsa/b53/b53_priv.h | 71 + + drivers/net/dsa/b53/b53_regs.h | 26 + + drivers/net/dsa/dsa_loop.c | 7 +- + drivers/net/dsa/ks8995.c | 6 +- + drivers/net/dsa/lantiq/Kconfig | 17 + + drivers/net/dsa/lantiq/Makefile | 2 + + drivers/net/dsa/lantiq/lantiq_gswip.c | 1686 +--------- + drivers/net/dsa/lantiq/lantiq_gswip.h | 33 +- + drivers/net/dsa/lantiq/lantiq_gswip_common.c | 1737 ++++++++++ + drivers/net/dsa/lantiq/mxl-gsw1xx.c | 733 +++++ + drivers/net/dsa/lantiq/mxl-gsw1xx.h | 126 + + drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h | 154 + + drivers/net/dsa/microchip/ksz9477.c | 2 +- + drivers/net/dsa/yt921x.c | 2891 +++++++++++++++++ + drivers/net/dsa/yt921x.h | 504 +++ + drivers/net/ethernet/3com/3c515.c | 4 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/airoha/airoha_eth.c | 438 ++- + drivers/net/ethernet/airoha/airoha_eth.h | 72 +- + drivers/net/ethernet/airoha/airoha_npu.c | 95 +- + drivers/net/ethernet/airoha/airoha_ppe.c | 259 +- + drivers/net/ethernet/airoha/airoha_ppe_debugfs.c | 3 +- + drivers/net/ethernet/airoha/airoha_regs.h | 115 +- + drivers/net/ethernet/altera/altera_tse.h | 3 - + drivers/net/ethernet/altera/altera_tse_main.c | 47 +- + drivers/net/ethernet/amd/Kconfig | 1 + + drivers/net/ethernet/amd/pds_core/core.h | 3 +- + drivers/net/ethernet/amd/pds_core/devlink.c | 3 +- + drivers/net/ethernet/amd/xgbe/Makefile | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 19 + + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 38 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 7 + + drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c | 28 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-selftest.c | 346 ++ + drivers/net/ethernet/amd/xgbe/xgbe.h | 22 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 68 +- + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 6 +- + drivers/net/ethernet/aquantia/atlantic/aq_ptp.h | 8 +- + drivers/net/ethernet/broadcom/Kconfig | 1 + + .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 34 +- + drivers/net/ethernet/broadcom/b44.c | 37 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 16 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 70 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 3 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 20 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 75 +- + drivers/net/ethernet/broadcom/tg3.c | 24 +- + drivers/net/ethernet/cadence/macb.h | 77 +- + drivers/net/ethernet/cadence/macb_main.c | 355 +-- + drivers/net/ethernet/cadence/macb_ptp.c | 16 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 50 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 48 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 62 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 45 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 156 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 40 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 4 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sched.c | 44 +- + drivers/net/ethernet/chelsio/cxgb4/sched.h | 12 +- + .../chelsio/inline_crypto/chtls/chtls_cm.c | 4 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 8 +- + drivers/net/ethernet/engleder/tsnep.h | 8 +- + drivers/net/ethernet/engleder/tsnep_main.c | 14 +- + drivers/net/ethernet/engleder/tsnep_ptp.c | 82 +- + drivers/net/ethernet/fealnx.c | 4 +- + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 45 + + drivers/net/ethernet/freescale/enetc/enetc.c | 28 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 8 + + drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 36 + + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 15 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 64 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 1 + + .../net/ethernet/freescale/enetc/enetc_pf_common.c | 19 +- + .../net/ethernet/freescale/enetc/netc_blk_ctrl.c | 400 +++ + drivers/net/ethernet/freescale/fec.h | 30 +- + drivers/net/ethernet/freescale/fec_main.c | 138 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 91 + + drivers/net/ethernet/freescale/fman/mac.h | 14 + + drivers/net/ethernet/fungible/funeth/funeth.h | 4 +- + drivers/net/ethernet/fungible/funeth/funeth_main.c | 40 +- + drivers/net/ethernet/google/gve/gve.h | 22 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 4 + + drivers/net/ethernet/google/gve/gve_dqo.h | 1 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 103 +- + drivers/net/ethernet/google/gve/gve_main.c | 97 +- + drivers/net/ethernet/google/gve/gve_ptp.c | 12 + + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 71 +- + drivers/net/ethernet/hisilicon/Kconfig | 1 + + drivers/net/ethernet/hisilicon/hibmcge/Makefile | 1 + + .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 8 + + drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 17 + + drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 4 + + drivers/net/ethernet/hisilicon/hibmcge/hbg_trace.h | 84 + + drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 219 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 5 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 31 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 32 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 9 +- + .../net/ethernet/huawei/hinic3/hinic3_netdev_ops.c | 2 +- + drivers/net/ethernet/intel/Kconfig | 1 + + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 45 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 41 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 3 + + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 17 +- + drivers/net/ethernet/intel/i40e/i40e.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_devlink.c | 55 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 19 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 43 +- + drivers/net/ethernet/intel/iavf/iavf_adv_rss.c | 119 +- + drivers/net/ethernet/intel/iavf/iavf_adv_rss.h | 31 + + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 107 +- + drivers/net/ethernet/intel/ice/devlink/devlink.c | 35 +- + drivers/net/ethernet/intel/ice/ice.h | 8 +- + drivers/net/ethernet/intel/ice/ice_base.c | 168 +- + drivers/net/ethernet/intel/ice/ice_common.c | 4 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 200 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 99 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 1 + + drivers/net/ethernet/intel/ice/ice_flow.c | 269 +- + drivers/net/ethernet/intel/ice/ice_flow.h | 94 +- + drivers/net/ethernet/intel/ice/ice_lag.c | 3 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 3 + + drivers/net/ethernet/intel/ice/ice_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_main.c | 203 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 20 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 15 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 2 + + drivers/net/ethernet/intel/ice/ice_sriov.c | 3 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 710 +---- + drivers/net/ethernet/intel/ice/ice_txrx.h | 132 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 69 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 9 - + drivers/net/ethernet/intel/ice/ice_type.h | 1 + + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 48 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 146 +- + drivers/net/ethernet/intel/ice/ice_xsk.h | 6 +- + drivers/net/ethernet/intel/ice/virt/queues.c | 6 +- + drivers/net/ethernet/intel/ice/virt/rss.c | 1313 +++++++- + drivers/net/ethernet/intel/idpf/idpf.h | 2 - + drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 23 +- + drivers/net/ethernet/intel/idpf/idpf_main.c | 105 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 11 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 15 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 14 +- + drivers/net/ethernet/marvell/mvneta.c | 14 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 +- + drivers/net/ethernet/marvell/octeontx2/af/Makefile | 3 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + .../ethernet/marvell/octeontx2/af/cn20k/debugfs.c | 218 ++ + .../ethernet/marvell/octeontx2/af/cn20k/debugfs.h | 28 + + .../net/ethernet/marvell/octeontx2/af/cn20k/nix.c | 20 + + .../net/ethernet/marvell/octeontx2/af/cn20k/npa.c | 21 + + .../ethernet/marvell/octeontx2/af/cn20k/struct.h | 340 ++ + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 73 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 15 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 42 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 15 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 76 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 29 +- + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 31 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 10 + + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c | 220 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 19 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 6 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 56 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 62 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 55 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 3 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/mapping.c | 13 +- + .../net/ethernet/mellanox/mlx5/core/en/mapping.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 3 +- + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 1 + + .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 7 + + .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 1 + + .../ethernet/mellanox/mlx5/core/en/tc/int_port.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tir.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tir.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/psp.c | 235 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/psp.h | 16 + + .../mellanox/mlx5/core/en_accel/psp_rxtx.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en_common.c | 52 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 44 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 100 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/adj_vport.c | 15 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 7 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 13 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 218 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 41 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 6 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 19 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 1 - + .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 116 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 9 + + .../net/ethernet/mellanox/mlx5/core/lib/nv_param.c | 238 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 93 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 36 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 48 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 11 + + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 90 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 61 +- + drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h | 20 +- + .../ethernet/mellanox/mlx5/core/sf/vhca_event.c | 69 +- + .../ethernet/mellanox/mlx5/core/sf/vhca_event.h | 5 + + .../mellanox/mlx5/core/steering/sws/dr_domain.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 19 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 3 +- + drivers/net/ethernet/meta/Kconfig | 3 +- + drivers/net/ethernet/meta/fbnic/Makefile | 1 + + drivers/net/ethernet/meta/fbnic/fbnic.h | 15 +- + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 2 + + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 9 + + drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 6 +- + drivers/net/ethernet/meta/fbnic/fbnic_irq.c | 34 +- + drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 81 +- + drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 41 +- + drivers/net/ethernet/meta/fbnic/fbnic_mdio.c | 195 ++ + drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 11 +- + drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 8 +- + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 15 +- + drivers/net/ethernet/meta/fbnic/fbnic_phylink.c | 201 +- + drivers/net/ethernet/meta/fbnic/fbnic_time.c | 2 +- + drivers/net/ethernet/meta/fbnic/fbnic_tlv.h | 2 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 32 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 1 + + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 7 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 12 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 204 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 123 +- + drivers/net/ethernet/mucse/Kconfig | 33 + + drivers/net/ethernet/mucse/Makefile | 7 + + drivers/net/ethernet/mucse/rnpgbe/Makefile | 11 + + drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h | 71 + + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c | 143 + + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h | 17 + + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c | 320 ++ + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.c | 406 +++ + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.h | 20 + + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c | 191 ++ + drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h | 88 + + drivers/net/ethernet/netronome/nfp/devlink_param.c | 3 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 38 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 17 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 18 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 61 +- + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 3 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 22 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 80 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.h | 6 +- + drivers/net/ethernet/realtek/r8169_main.c | 92 +- + drivers/net/ethernet/renesas/ravb.h | 16 +- + drivers/net/ethernet/renesas/ravb_main.c | 141 +- + drivers/net/ethernet/renesas/rcar_gen4_ptp.h | 13 - + drivers/net/ethernet/renesas/rswitch.h | 3 + + drivers/net/ethernet/renesas/rswitch_main.c | 88 +- + drivers/net/ethernet/renesas/rtsn.c | 47 +- + drivers/net/ethernet/spacemit/k1_emac.h | 8 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 21 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 4 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 42 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 4 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 34 +- + .../net/ethernet/stmicro/stmmac/dwmac-eic7700.c | 235 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 130 +- + .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 165 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 53 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 73 +- + .../net/ethernet/stmicro/stmmac/dwmac-loongson1.c | 30 +- + .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 44 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 77 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 30 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 269 +- + .../ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 363 ++- + drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 26 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 168 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c | 21 +- + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 54 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 44 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 21 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 96 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 35 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 - + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 100 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 11 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 5 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 16 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 41 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 33 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 273 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 19 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 27 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 4 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 112 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 3 + + .../net/ethernet/stmicro/stmmac/stmmac_libpci.c | 48 + + .../net/ethernet/stmicro/stmmac/stmmac_libpci.h | 12 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 583 +++- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 88 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 85 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c | 67 + + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 25 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 112 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 47 +- + drivers/net/ethernet/ti/cpsw_new.c | 6 +- + drivers/net/ethernet/ti/davinci_mdio.c | 21 +- + drivers/net/ethernet/ti/icssg/icssg_common.c | 514 ++- + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 401 ++- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 31 +- + drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 7 +- + drivers/net/ethernet/ti/netcp.h | 5 + + drivers/net/ethernet/ti/netcp_core.c | 58 + + drivers/net/ethernet/ti/netcp_ethss.c | 72 +- + drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 73 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 69 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 143 +- + drivers/net/ethernet/wangxun/libwx/wx_sriov.c | 4 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 51 +- + drivers/net/ethernet/wangxun/libwx/wx_vf.h | 4 + + drivers/net/ethernet/wangxun/libwx/wx_vf_lib.c | 12 + + drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c | 302 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_aml.h | 5 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 38 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 10 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 28 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 2 - + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 39 +- + .../net/ethernet/wangxun/txgbevf/txgbevf_main.c | 12 + + drivers/net/gtp.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 15 +- + drivers/net/ipa/ipa_interrupt.c | 1 - + drivers/net/ipa/ipa_main.c | 1 - + drivers/net/ipa/ipa_modem.c | 4 - + drivers/net/ipa/ipa_smp2p.c | 2 - + drivers/net/ipa/ipa_uc.c | 2 - + drivers/net/ipvlan/ipvlan_core.c | 4 +- + drivers/net/mdio/fwnode_mdio.c | 5 - + drivers/net/mdio/of_mdio.c | 5 +- + drivers/net/netconsole.c | 390 +-- + drivers/net/netdevsim/dev.c | 56 + + drivers/net/netdevsim/ipsec.c | 1 + + drivers/net/netdevsim/netdev.c | 26 +- + drivers/net/netdevsim/netdevsim.h | 6 + + drivers/net/netdevsim/psp.c | 27 + + drivers/net/netkit.c | 6 +- + drivers/net/ovpn/netlink-gen.c | 1 + + drivers/net/ovpn/netlink-gen.h | 1 + + drivers/net/pcs/pcs-xpcs-plat.c | 5 +- + drivers/net/pcs/pcs-xpcs.c | 136 +- + drivers/net/phy/Kconfig | 2 +- + drivers/net/phy/adin1100.c | 7 +- + drivers/net/phy/bcm-phy-ptp.c | 21 +- + drivers/net/phy/dp83640.c | 29 +- + drivers/net/phy/dp83867.c | 36 +- + drivers/net/phy/dp83td510.c | 62 + + drivers/net/phy/fixed_phy.c | 51 +- + drivers/net/phy/mdio-open-alliance.h | 36 + + drivers/net/phy/mdio-private.h | 11 + + drivers/net/phy/mdio_bus.c | 96 +- + drivers/net/phy/mdio_bus_provider.c | 13 +- + drivers/net/phy/mdio_device.c | 60 + + drivers/net/phy/micrel.c | 200 +- + drivers/net/phy/microchip_rds_ptp.c | 8 +- + drivers/net/phy/microchip_t1s.c | 98 +- + drivers/net/phy/motorcomm.c | 3 + + drivers/net/phy/mscc/mscc.h | 12 +- + drivers/net/phy/mscc/mscc_main.c | 510 ++- + drivers/net/phy/mscc/mscc_ptp.c | 21 +- + drivers/net/phy/mxl-gpy.c | 115 +- + drivers/net/phy/nxp-c45-tja11xx.c | 22 +- + drivers/net/phy/phy-c45.c | 150 +- + drivers/net/phy/phy-caps.h | 1 + + drivers/net/phy/phy-core.c | 47 +- + drivers/net/phy/phy.c | 14 +- + drivers/net/phy/phy_caps.c | 2 + + drivers/net/phy/phy_device.c | 46 +- + drivers/net/phy/phylink.c | 92 +- + drivers/net/phy/qt2025.rs | 10 +- + drivers/net/phy/realtek/realtek_main.c | 404 ++- + drivers/net/ppp/pppoe.c | 4 +- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/pse-pd/pd692x0.c | 155 +- + drivers/net/pse-pd/tps23881.c | 69 +- + drivers/net/sungem_phy.c | 2 +- + drivers/net/team/team_core.c | 83 +- + drivers/net/team/team_nl.c | 1 + + drivers/net/team/team_nl.h | 1 + + drivers/net/usb/r8152.c | 1 + + drivers/net/usb/usbnet.c | 293 +- + drivers/net/veth.c | 2 +- + drivers/net/virtio_net.c | 46 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 18 +- + drivers/net/vxlan/vxlan_private.h | 2 - + drivers/net/wan/hdlc_ppp.c | 4 +- + drivers/net/wireless/ath/ath10k/core.c | 28 +- + drivers/net/wireless/ath/ath10k/core.h | 6 +- + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 2 +- + drivers/net/wireless/ath/ath10k/testmode.c | 275 +- + drivers/net/wireless/ath/ath10k/testmode_i.h | 15 + + drivers/net/wireless/ath/ath10k/wmi.h | 19 +- + drivers/net/wireless/ath/ath11k/hal.h | 38 +- + drivers/net/wireless/ath/ath11k/mac.c | 455 ++- + drivers/net/wireless/ath/ath11k/pci.c | 20 +- + drivers/net/wireless/ath/ath11k/pci.h | 18 +- + drivers/net/wireless/ath/ath11k/qmi.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 20 +- + drivers/net/wireless/ath/ath11k/wmi.h | 18 +- + drivers/net/wireless/ath/ath12k/core.c | 24 +- + drivers/net/wireless/ath/ath12k/core.h | 4 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 14 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 19 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 74 +- + drivers/net/wireless/ath/ath12k/hal_rx.c | 10 +- + drivers/net/wireless/ath/ath12k/mac.c | 766 ++++- + drivers/net/wireless/ath/ath12k/mac.h | 14 +- + drivers/net/wireless/ath/ath12k/pci.c | 24 +- + drivers/net/wireless/ath/ath12k/qmi.c | 13 +- + drivers/net/wireless/ath/ath12k/qmi.h | 5 +- + drivers/net/wireless/ath/ath12k/wmi.c | 98 +- + drivers/net/wireless/ath/ath12k/wmi.h | 55 +- + drivers/net/wireless/ath/ath12k/wow.c | 1 + + drivers/net/wireless/ath/wcn36xx/hal.h | 74 - + drivers/net/wireless/ath/wcn36xx/smd.c | 60 - + drivers/net/wireless/ath/wcn36xx/smd.h | 1 - + drivers/net/wireless/ath/wil6210/pm.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/ax210.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c | 24 + + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 5 + + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 8 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 134 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 286 ++ + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 78 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 39 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 74 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 12 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 26 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 22 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 11 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 29 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 17 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mld/constants.h | 2 + + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 4 + + drivers/net/wireless/intel/iwlwifi/mld/fw.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 13 + + drivers/net/wireless/intel/iwlwifi/mld/link.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 103 +- + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 1 + + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 25 +- + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 100 +- + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/roc.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 1709 +++++----- + drivers/net/wireless/intel/iwlwifi/mld/rx.h | 5 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 15 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 3 - + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 164 - + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 3 - + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 164 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 +- + .../net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c | 9 + + drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 29 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 35 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 2 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 3 + + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 10 +- + drivers/net/wireless/st/cw1200/bh.c | 6 +- + drivers/net/wireless/ti/wl18xx/debugfs.c | 3 - + drivers/net/wireless/ti/wlcore/cmd.c | 1 - + drivers/net/wireless/ti/wlcore/debugfs.c | 11 - + drivers/net/wireless/ti/wlcore/main.c | 36 - + drivers/net/wireless/ti/wlcore/scan.c | 1 - + drivers/net/wireless/ti/wlcore/sysfs.c | 1 - + drivers/net/wireless/ti/wlcore/testmode.c | 2 - + drivers/net/wireless/ti/wlcore/tx.c | 1 - + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 3 - + drivers/net/wireless/virtual/mac80211_hwsim.c | 1 + + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 3 +- + drivers/net/wwan/qcom_bam_dmux.c | 2 - + drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 5 +- + drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 2 - + drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c | 2 - + drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c | 2 - + drivers/net/xen-netfront.c | 5 +- + drivers/nfc/mei_phy.h | 4 +- + drivers/nvme/host/tcp.c | 4 +- + drivers/nvme/target/tcp.c | 2 +- + drivers/ptp/ptp_clock.c | 4 +- + drivers/ptp/ptp_ines.c | 31 +- + drivers/ptp/ptp_ocp.c | 52 +- + drivers/s390/net/ctcm_fsms.c | 14 + + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/net/qeth_core_mpc.c | 247 +- + drivers/s390/net/qeth_core_mpc.h | 20 +- + drivers/s390/net/smsgiucv_app.c | 7 +- + drivers/slimbus/qcom-ngd-ctrl.c | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/xen/pvcalls-back.c | 4 +- + fs/afs/rxrpc.c | 6 +- + fs/coredump.c | 2 +- + fs/dlm/lowcomms.c | 8 +- + fs/lockd/netlink.c | 1 + + fs/lockd/netlink.h | 1 + + fs/nfsd/netlink.c | 1 + + fs/nfsd/netlink.h | 1 + + fs/ocfs2/cluster/tcp.c | 6 +- + fs/smb/client/connect.c | 4 +- + fs/smb/server/transport_tcp.c | 4 +- + include/linux/avf/virtchnl.h | 50 + + include/linux/bpf-cgroup.h | 17 +- + include/linux/can/bittiming.h | 81 +- + include/linux/can/dev.h | 75 +- + include/linux/dpll.h | 1 + + include/linux/filter.h | 11 +- + include/linux/icmp.h | 32 + + include/linux/ieee80211-eht.h | 1182 +++++++ + include/linux/ieee80211-he.h | 824 +++++ + include/linux/ieee80211-ht.h | 292 ++ + include/linux/ieee80211-mesh.h | 230 ++ + include/linux/ieee80211-nan.h | 35 + + include/linux/ieee80211-p2p.h | 71 + + include/linux/ieee80211-s1g.h | 575 ++++ + include/linux/ieee80211-vht.h | 236 ++ + include/linux/ieee80211.h | 3308 +------------------- + include/linux/if_vlan.h | 13 +- + include/linux/ipv6.h | 1 - + include/linux/mdio.h | 13 +- + include/linux/mii_timestamper.h | 13 +- + include/linux/mlx5/driver.h | 14 +- + include/linux/mlx5/fs.h | 1 + + include/linux/net.h | 9 +- + include/linux/netdev_features.h | 18 + + include/linux/netdevice.h | 16 +- + include/linux/netdevice_xmit.h | 9 +- + include/linux/pcs/pcs-xpcs.h | 4 +- + include/linux/phy.h | 252 +- + include/linux/phy_fixed.h | 14 +- + include/linux/phylink.h | 28 + + include/linux/platform_data/bcmgenet.h | 19 - + include/linux/rculist_nulls.h | 59 + + include/linux/skbuff.h | 75 + + include/linux/socket.h | 23 +- + include/linux/stmmac.h | 23 +- + include/linux/usb/usbnet.h | 2 + + include/net/addrconf.h | 5 + + include/net/cfg80211.h | 52 +- + include/net/devlink.h | 49 +- + include/net/dsa.h | 12 +- + include/net/gro.h | 27 + + include/net/ieee80211_radiotap.h | 20 +- + include/net/inet_common.h | 13 +- + include/net/inet_connection_sock.h | 31 +- + include/net/inet_sock.h | 9 +- + include/net/ip.h | 4 +- + include/net/ipv6.h | 10 +- + include/net/ipv6_stubs.h | 2 +- + include/net/mac80211.h | 4 +- + include/net/mana/gdma.h | 14 +- + include/net/mana/hw_channel.h | 2 + + include/net/mana/mana.h | 24 +- + include/net/neighbour.h | 17 +- + include/net/netfilter/nf_conntrack_l4proto.h | 2 +- + include/net/netmem.h | 72 +- + include/net/netns/core.h | 2 + + include/net/netns/ipv4.h | 5 +- + include/net/netns/ipv6.h | 1 + + include/net/netns/mpls.h | 1 + + include/net/netns/smc.h | 5 + + include/net/nl802154.h | 5 +- + include/net/ping.h | 2 +- + include/net/pkt_sched.h | 11 +- + include/net/proto_memory.h | 3 + + include/net/psp/types.h | 32 + + include/net/request_sock.h | 1 - + include/net/sch_generic.h | 120 +- + include/net/sctp/auth.h | 1 - + include/net/sctp/sctp.h | 5 +- + include/net/sctp/stream_sched.h | 4 +- + include/net/sctp/structs.h | 9 +- + include/net/selftests.h | 45 + + include/net/smc.h | 53 + + include/net/sock.h | 99 +- + include/net/tcp.h | 42 +- + include/net/tls.h | 3 + + include/net/udp.h | 2 +- + include/net/vsock_addr.h | 2 +- + include/net/xdp_sock.h | 7 + + include/net/xdp_sock_drv.h | 4 + + include/net/xsk_buff_pool.h | 13 +- + include/trace/events/net.h | 37 +- + include/uapi/linux/android/binder_netlink.h | 1 + + include/uapi/linux/bpf.h | 2 + + include/uapi/linux/can/netlink.h | 34 + + include/uapi/linux/devlink.h | 4 + + include/uapi/linux/dpll.h | 2 + + include/uapi/linux/ethtool.h | 5 + + include/uapi/linux/ethtool_netlink_generated.h | 36 + + include/uapi/linux/fou.h | 1 + + include/uapi/linux/handshake.h | 1 + + include/uapi/linux/if_ether.h | 2 + + include/uapi/linux/if_team.h | 1 + + include/uapi/linux/lockd_netlink.h | 1 + + include/uapi/linux/mdio.h | 23 +- + include/uapi/linux/mptcp.h | 3 +- + include/uapi/linux/mptcp_pm.h | 1 + + include/uapi/linux/net_shaper.h | 1 + + include/uapi/linux/netdev.h | 2 + + include/uapi/linux/nfsd_netlink.h | 1 + + include/uapi/linux/ovpn.h | 1 + + include/uapi/linux/psp.h | 19 + + include/uapi/linux/tls.h | 2 + + kernel/bpf/bpf_struct_ops.c | 2 + + kernel/bpf/cgroup.c | 8 +- + kernel/bpf/helpers.c | 6 +- + kernel/bpf/syscall.c | 1 + + net/9p/trans_fd.c | 8 +- + net/Kconfig | 8 +- + net/appletalk/ddp.c | 4 +- + net/atm/clip.c | 4 +- + net/atm/common.c | 2 +- + net/atm/pvc.c | 4 +- + net/atm/svc.c | 4 +- + net/ax25/af_ax25.c | 4 +- + net/batman-adv/Kconfig | 1 + + net/batman-adv/bridge_loop_avoidance.c | 51 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/types.h | 2 +- + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/iso.c | 6 +- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/rfcomm/core.c | 6 +- + net/bluetooth/rfcomm/sock.c | 5 +- + net/bluetooth/sco.c | 4 +- + net/bridge/br_if.c | 22 +- + net/bridge/br_multicast.c | 9 + + net/bridge/br_netlink.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/can/bcm.c | 2 +- + net/can/isotp.c | 2 +- + net/can/j1939/socket.c | 4 +- + net/can/raw.c | 56 +- + net/ceph/messenger.c | 2 +- + net/core/dev.c | 379 ++- + net/core/dev.h | 3 + + net/core/dev_ioctl.c | 11 +- + net/core/devmem.h | 1 - + net/core/filter.c | 124 +- + net/core/hotdata.c | 2 +- + net/core/neighbour.c | 131 +- + net/core/net_namespace.c | 12 +- + net/core/netdev-genl-gen.c | 3 +- + net/core/netdev-genl-gen.h | 1 + + net/core/netmem_priv.h | 16 +- + net/core/rtnetlink.c | 15 +- + net/core/selftests.c | 48 +- + net/core/skbuff.c | 117 +- + net/core/sock.c | 120 +- + net/core/sysctl_net_core.c | 16 + + net/devlink/netlink_gen.c | 8 +- + net/devlink/netlink_gen.h | 1 + + net/devlink/param.c | 189 +- + net/devlink/region.c | 2 +- + net/dsa/Kconfig | 14 + + net/dsa/Makefile | 2 + + net/dsa/conduit.c | 145 +- + net/dsa/devlink.c | 3 +- + net/dsa/tag_mxl-gsw1xx.c | 116 + + net/dsa/tag_yt921x.c | 141 + + net/ethernet/eth.c | 16 +- + net/ethtool/Makefile | 2 +- + net/ethtool/common.c | 8 + + net/ethtool/mse.c | 329 ++ + net/ethtool/netlink.c | 10 + + net/ethtool/netlink.h | 2 + + net/handshake/genl.c | 1 + + net/handshake/genl.h | 1 + + net/hsr/hsr_netlink.c | 8 + + net/ieee802154/socket.c | 12 +- + net/ipv4/Kconfig | 4 +- + net/ipv4/af_inet.c | 22 +- + net/ipv4/arp.c | 6 +- + net/ipv4/datagram.c | 4 +- + net/ipv4/fou_nl.c | 1 + + net/ipv4/fou_nl.h | 1 + + net/ipv4/icmp.c | 191 +- + net/ipv4/inet_connection_sock.c | 56 +- + net/ipv4/inet_diag.c | 8 +- + net/ipv4/inet_hashtables.c | 8 +- + net/ipv4/inet_timewait_sock.c | 35 +- + net/ipv4/ip_input.c | 4 +- + net/ipv4/ping.c | 8 +- + net/ipv4/raw.c | 3 +- + net/ipv4/sysctl_net_ipv4.c | 29 + + net/ipv4/tcp.c | 123 +- + net/ipv4/tcp_input.c | 72 +- + net/ipv4/tcp_ipv4.c | 156 +- + net/ipv4/tcp_lp.c | 7 +- + net/ipv4/tcp_minisocks.c | 8 +- + net/ipv4/tcp_offload.c | 27 - + net/ipv4/tcp_output.c | 38 +- + net/ipv4/tcp_timer.c | 26 +- + net/ipv4/udp.c | 6 +- + net/ipv4/udp_tunnel_core.c | 4 +- + net/ipv6/addrconf.c | 2 +- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/datagram.c | 8 +- + net/ipv6/icmp.c | 214 +- + net/ipv6/ip6_fib.c | 4 + + net/ipv6/ip6_flowlabel.c | 44 +- + net/ipv6/ip6_udp_tunnel.c | 4 +- + net/ipv6/ndisc.c | 8 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 3 +- + net/ipv6/tcp_ipv6.c | 145 +- + net/ipv6/udp.c | 5 +- + net/iucv/af_iucv.c | 13 +- + net/iucv/iucv.c | 2 +- + net/kcm/Kconfig | 4 +- + net/key/af_key.c | 2 + + net/l2tp/l2tp_core.c | 8 +- + net/l2tp/l2tp_ip.c | 6 +- + net/l2tp/l2tp_ip6.c | 5 +- + net/l2tp/l2tp_ppp.c | 2 +- + net/llc/af_llc.c | 4 +- + net/mac80211/agg-rx.c | 7 +- + net/mac80211/cfg.c | 47 +- + net/mac80211/chan.c | 397 ++- + net/mac80211/driver-ops.c | 8 +- + net/mac80211/he.c | 6 +- + net/mac80211/ibss.c | 14 +- + net/mac80211/ieee80211_i.h | 50 +- + net/mac80211/iface.c | 46 +- + net/mac80211/link.c | 5 - + net/mac80211/main.c | 3 +- + net/mac80211/mesh.c | 26 +- + net/mac80211/mesh_hwmp.c | 7 +- + net/mac80211/mesh_plink.c | 7 +- + net/mac80211/mlme.c | 85 +- + net/mac80211/parse.c | 30 +- + net/mac80211/rx.c | 172 +- + net/mac80211/scan.c | 6 +- + net/mac80211/tdls.c | 12 +- + net/mac80211/tests/elems.c | 4 +- + net/mac80211/util.c | 37 +- + net/mctp/af_mctp.c | 4 +- + net/mctp/test/route-test.c | 2 +- + net/mctp/test/utils.c | 5 +- + net/mpls/af_mpls.c | 321 +- + net/mpls/internal.h | 19 +- + net/mpls/mpls_iptunnel.c | 6 +- + net/mptcp/fastopen.c | 4 +- + net/mptcp/mib.c | 1 - + net/mptcp/mib.h | 1 - + net/mptcp/mptcp_diag.c | 3 +- + net/mptcp/mptcp_pm_gen.c | 1 + + net/mptcp/mptcp_pm_gen.h | 1 + + net/mptcp/pm.c | 4 +- + net/mptcp/pm_kernel.c | 42 +- + net/mptcp/protocol.c | 467 ++- + net/mptcp/protocol.h | 54 +- + net/mptcp/sockopt.c | 2 + + net/mptcp/subflow.c | 46 +- + net/netfilter/ipvs/ip_vs_sync.c | 6 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 4 +- + net/netfilter/nf_tables_api.c | 34 +- + net/netfilter/nft_lookup.c | 13 +- + net/netlink/af_netlink.c | 8 +- + net/netrom/af_netrom.c | 6 +- + net/nfc/llcp_sock.c | 6 +- + net/nfc/rawsock.c | 2 +- + net/packet/af_packet.c | 15 +- + net/phonet/pep.c | 3 +- + net/phonet/socket.c | 10 +- + net/psp/psp-nl-gen.c | 20 + + net/psp/psp-nl-gen.h | 3 + + net/psp/psp_main.c | 3 +- + net/psp/psp_nl.c | 93 + + net/psp/psp_sock.c | 4 +- + net/qrtr/af_qrtr.c | 4 +- + net/qrtr/ns.c | 2 +- + net/rds/af_rds.c | 2 +- + net/rds/bind.c | 2 +- + net/rds/rds.h | 2 +- + net/rds/tcp_connect.c | 4 +- + net/rds/tcp_listen.c | 2 +- + net/rose/af_rose.c | 5 +- + net/rxrpc/af_rxrpc.c | 4 +- + net/rxrpc/rxperf.c | 2 +- + net/sched/act_ct.c | 8 +- + net/sched/act_ife.c | 6 +- + net/sched/act_mirred.c | 62 +- + net/sched/cls_api.c | 8 +- + net/sched/cls_flower.c | 2 +- + net/sched/sch_cake.c | 19 +- + net/sched/sch_codel.c | 4 +- + net/sched/sch_dualpi2.c | 1 + + net/sched/sch_fq.c | 9 +- + net/sched/sch_fq_codel.c | 5 +- + net/sched/sch_generic.c | 7 - + net/sched/sch_netem.c | 1 + + net/sched/sch_qfq.c | 2 +- + net/sched/sch_taprio.c | 1 + + net/sched/sch_tbf.c | 1 + + net/sctp/ipv6.c | 49 - + net/sctp/protocol.c | 33 - + net/sctp/socket.c | 223 +- + net/sctp/stream.c | 8 +- + net/sctp/stream_sched.c | 16 +- + net/sctp/stream_sched_fc.c | 4 +- + net/sctp/stream_sched_prio.c | 2 +- + net/sctp/stream_sched_rr.c | 2 +- + net/shaper/shaper_nl_gen.c | 1 + + net/shaper/shaper_nl_gen.h | 1 + + net/smc/Kconfig | 10 + + net/smc/Makefile | 1 + + net/smc/af_smc.c | 31 +- + net/smc/smc.h | 4 +- + net/smc/smc_core.c | 34 +- + net/smc/smc_core.h | 8 + + net/smc/smc_hs_bpf.c | 140 + + net/smc/smc_hs_bpf.h | 31 + + net/smc/smc_ib.c | 10 +- + net/smc/smc_llc.c | 2 + + net/smc/smc_sysctl.c | 113 + + net/smc/smc_sysctl.h | 2 + + net/smc/smc_wr.c | 31 +- + net/smc/smc_wr.h | 2 - + net/socket.c | 14 +- + net/strparser/strparser.c | 2 +- + net/sunrpc/clnt.c | 6 +- + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtsock.c | 9 +- + net/tipc/socket.c | 10 +- + net/tls/tls_device.c | 5 +- + net/tls/tls_main.c | 64 + + net/tls/tls_sw.c | 2 +- + net/unix/af_unix.c | 30 +- + net/unix/af_unix.h | 4 +- + net/unix/garbage.c | 94 +- + net/vmw_vsock/af_vsock.c | 6 +- + net/vmw_vsock/vsock_addr.c | 2 +- + net/wireless/core.c | 27 +- + net/wireless/core.h | 3 +- + net/wireless/debugfs.c | 33 + + net/wireless/nl80211.c | 7 +- + net/wireless/scan.c | 20 +- + net/wireless/util.c | 6 +- + net/x25/af_x25.c | 4 +- + net/xdp/xsk.c | 20 +- + net/xdp/xsk_buff_pool.c | 21 +- + net/xfrm/Kconfig | 11 +- + net/xfrm/xfrm_input.c | 30 +- + samples/qmi/qmi_sample_client.c | 2 +- + tools/include/uapi/linux/bpf.h | 1 + + tools/include/uapi/linux/netdev.h | 2 + + tools/net/ynl/Makefile | 9 +- + tools/net/ynl/pyynl/cli.py | 79 + + tools/net/ynl/pyynl/lib/ynl.py | 44 +- + tools/net/ynl/pyynl/ynl_gen_c.py | 26 +- + tools/net/ynl/samples/.gitignore | 1 + + tools/net/ynl/samples/Makefile | 1 + + tools/net/ynl/samples/page-pool.c | 149 - + tools/net/ynl/samples/tc-filter-add.c | 335 ++ + tools/net/ynl/tests/Makefile | 32 + + tools/net/ynl/tests/config | 6 + + tools/net/ynl/tests/test_ynl_cli.sh | 327 ++ + tools/net/ynl/tests/test_ynl_ethtool.sh | 222 ++ + tools/net/ynl/ynltool/.gitignore | 2 + + tools/net/ynl/ynltool/Makefile | 55 + + tools/net/ynl/ynltool/json_writer.c | 288 ++ + tools/net/ynl/ynltool/json_writer.h | 75 + + tools/net/ynl/ynltool/main.c | 242 ++ + tools/net/ynl/ynltool/main.h | 66 + + tools/net/ynl/ynltool/page-pool.c | 461 +++ + tools/net/ynl/ynltool/qstats.c | 621 ++++ + tools/perf/trace/beauty/include/linux/socket.h | 5 +- + tools/testing/selftests/bpf/config | 5 + + .../selftests/bpf/prog_tests/sk_bypass_prot_mem.c | 292 ++ + .../selftests/bpf/prog_tests/test_bpf_smc.c | 390 +++ + .../bpf/prog_tests/xdp_context_test_run.c | 129 +- + tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 8 +- + tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 8 +- + tools/testing/selftests/bpf/progs/bpf_smc.c | 117 + + .../selftests/bpf/progs/sk_bypass_prot_mem.c | 104 + + tools/testing/selftests/bpf/progs/test_xdp_meta.c | 386 ++- + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 4 +- + tools/testing/selftests/drivers/net/.gitignore | 1 + + tools/testing/selftests/drivers/net/Makefile | 3 + + tools/testing/selftests/{ => drivers}/net/gro.c | 3 + + tools/testing/selftests/drivers/net/gro.py | 164 + + tools/testing/selftests/drivers/net/hw/.gitignore | 1 + + tools/testing/selftests/drivers/net/hw/Makefile | 25 +- + .../selftests/drivers/net/hw/lib/py/__init__.py | 4 +- + .../selftests/{net => drivers/net/hw}/toeplitz.c | 70 +- + tools/testing/selftests/drivers/net/hw/toeplitz.py | 211 ++ + .../selftests/drivers/net/lib/py/__init__.py | 4 +- + tools/testing/selftests/drivers/net/lib/py/env.py | 2 + + .../testing/selftests/drivers/net/netcons_basic.sh | 5 +- + .../selftests/drivers/net/netcons_overflow.sh | 2 +- + .../selftests/drivers/net/netdevsim/Makefile | 1 - + .../selftests/drivers/net/netdevsim/devlink.sh | 116 +- + .../drivers/net/netdevsim/ethtool-ring.sh | 85 - + tools/testing/selftests/drivers/net/psp.py | 13 + + .../testing/selftests/drivers/net/ring_reconfig.py | 167 + + tools/testing/selftests/drivers/net/stats.py | 5 +- + tools/testing/selftests/drivers/net/xdp.py | 57 +- + tools/testing/selftests/net/.gitignore | 9 - + tools/testing/selftests/net/Makefile | 7 - + tools/testing/selftests/net/af_unix/.gitignore | 8 + + tools/testing/selftests/net/af_unix/Makefile | 1 + + tools/testing/selftests/net/af_unix/so_peek_off.c | 4 +- + .../testing/selftests/net/af_unix/unix_connreset.c | 180 ++ + tools/testing/selftests/net/busy_poll_test.sh | 24 +- + tools/testing/selftests/net/busy_poller.c | 16 +- + tools/testing/selftests/net/fib_tests.sh | 66 +- + .../testing/selftests/net/forwarding/bridge_mdb.sh | 100 +- + tools/testing/selftests/net/gro.sh | 105 - + tools/testing/selftests/net/io_uring_zerocopy_tx.c | 24 +- + tools/testing/selftests/net/lib/Makefile | 1 + + .../selftests/net/lib/ksft_setup_loopback.sh | 111 + + tools/testing/selftests/net/lib/py/__init__.py | 5 +- + tools/testing/selftests/net/lib/py/ksft.py | 91 +- + tools/testing/selftests/net/lib/py/nsim.py | 2 +- + tools/testing/selftests/net/lib/py/utils.py | 20 +- + tools/testing/selftests/net/lib/xdp_native.bpf.c | 5 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 10 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 140 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 244 +- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 58 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 43 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 44 +- + tools/testing/selftests/net/mptcp/userspace_pm.sh | 3 +- + .../selftests/net/netfilter/sctp_collision.c | 3 +- + tools/testing/selftests/net/netlink-dumps.c | 1 + + .../net/packetdrill/tcp_rto_synack_rto_max.pkt | 54 + + .../tcp_syscall_bad_arg_sendmsg-empty-iov.pkt | 4 + + .../tcp_user_timeout_user-timeout-probe.pkt | 6 +- + .../net/packetdrill/tcp_zerocopy_basic.pkt | 2 + + .../net/packetdrill/tcp_zerocopy_batch.pkt | 2 + + .../net/packetdrill/tcp_zerocopy_client.pkt | 2 + + .../net/packetdrill/tcp_zerocopy_closed.pkt | 2 + + .../net/packetdrill/tcp_zerocopy_epoll_edge.pkt | 3 + + .../packetdrill/tcp_zerocopy_epoll_exclusive.pkt | 3 + + .../net/packetdrill/tcp_zerocopy_epoll_oneshot.pkt | 3 + + .../packetdrill/tcp_zerocopy_fastopen-client.pkt | 2 + + .../packetdrill/tcp_zerocopy_fastopen-server.pkt | 2 + + .../net/packetdrill/tcp_zerocopy_maxfrags.pkt | 2 + + .../net/packetdrill/tcp_zerocopy_small.pkt | 2 + + tools/testing/selftests/net/rtnetlink.sh | 20 + + tools/testing/selftests/net/setup_loopback.sh | 120 - + tools/testing/selftests/net/setup_veth.sh | 45 - + tools/testing/selftests/net/so_txtime.c | 2 +- + tools/testing/selftests/net/tls.c | 141 + + tools/testing/selftests/net/toeplitz.sh | 199 -- + tools/testing/selftests/net/toeplitz_client.sh | 28 - + tools/testing/selftests/net/traceroute.sh | 313 ++ + tools/testing/selftests/net/txtimestamp.c | 2 +- + tools/testing/selftests/vsock/vmtest.sh | 350 ++- + tools/testing/vsock/vsock_test.c | 7 +- + 1210 files changed, 48678 insertions(+), 20449 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/amd,xgbe-seattle-v1a.yaml + delete mode 100644 Documentation/devicetree/bindings/net/amd-xgbe.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/motorcomm,yt921x.yaml + create mode 100644 Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt + create mode 100644 Documentation/devicetree/bindings/net/mscc-phy-vsc8531.yaml + create mode 100644 Documentation/networking/device_drivers/ethernet/mucse/rnpgbe.rst + create mode 100644 Documentation/networking/devlink/stmmac.rst + create mode 100644 Documentation/networking/xfrm/index.rst + rename Documentation/networking/{ => xfrm}/xfrm_device.rst (95%) + rename Documentation/networking/{ => xfrm}/xfrm_proc.rst (100%) + rename Documentation/networking/{ => xfrm}/xfrm_sync.rst (64%) + rename Documentation/networking/{ => xfrm}/xfrm_sysctl.rst (68%) + create mode 100644 drivers/dpll/zl3073x/out.c + create mode 100644 drivers/dpll/zl3073x/out.h + create mode 100644 drivers/dpll/zl3073x/ref.c + create mode 100644 drivers/dpll/zl3073x/ref.h + create mode 100644 drivers/dpll/zl3073x/synth.c + create mode 100644 drivers/dpll/zl3073x/synth.h + create mode 100644 drivers/net/can/dummy_can.c + create mode 100644 drivers/net/dsa/lantiq/lantiq_gswip_common.c + create mode 100644 drivers/net/dsa/lantiq/mxl-gsw1xx.c + create mode 100644 drivers/net/dsa/lantiq/mxl-gsw1xx.h + create mode 100644 drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h + create mode 100644 drivers/net/dsa/yt921x.c + create mode 100644 drivers/net/dsa/yt921x.h + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-selftest.c + create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_trace.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/nix.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/npa.c + create mode 100644 drivers/net/ethernet/meta/fbnic/fbnic_mdio.c + create mode 100644 drivers/net/ethernet/mucse/Kconfig + create mode 100644 drivers/net/ethernet/mucse/Makefile + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/Makefile + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.c + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.h + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c + create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c + create mode 100644 drivers/net/phy/mdio-private.h + create mode 100644 include/linux/ieee80211-eht.h + create mode 100644 include/linux/ieee80211-he.h + create mode 100644 include/linux/ieee80211-ht.h + create mode 100644 include/linux/ieee80211-mesh.h + create mode 100644 include/linux/ieee80211-nan.h + create mode 100644 include/linux/ieee80211-p2p.h + create mode 100644 include/linux/ieee80211-s1g.h + create mode 100644 include/linux/ieee80211-vht.h + delete mode 100644 include/linux/platform_data/bcmgenet.h + create mode 100644 net/dsa/tag_mxl-gsw1xx.c + create mode 100644 net/dsa/tag_yt921x.c + create mode 100644 net/ethtool/mse.c + create mode 100644 net/smc/smc_hs_bpf.c + create mode 100644 net/smc/smc_hs_bpf.h + delete mode 100644 tools/net/ynl/samples/page-pool.c + create mode 100644 tools/net/ynl/samples/tc-filter-add.c + create mode 100644 tools/net/ynl/tests/Makefile + create mode 100644 tools/net/ynl/tests/config + create mode 100755 tools/net/ynl/tests/test_ynl_cli.sh + create mode 100755 tools/net/ynl/tests/test_ynl_ethtool.sh + create mode 100644 tools/net/ynl/ynltool/.gitignore + create mode 100644 tools/net/ynl/ynltool/Makefile + create mode 100644 tools/net/ynl/ynltool/json_writer.c + create mode 100644 tools/net/ynl/ynltool/json_writer.h + create mode 100644 tools/net/ynl/ynltool/main.c + create mode 100644 tools/net/ynl/ynltool/main.h + create mode 100644 tools/net/ynl/ynltool/page-pool.c + create mode 100644 tools/net/ynl/ynltool/qstats.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_smc.c + create mode 100644 tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c + rename tools/testing/selftests/{ => drivers}/net/gro.c (99%) + create mode 100755 tools/testing/selftests/drivers/net/gro.py + rename tools/testing/selftests/{net => drivers/net/hw}/toeplitz.c (88%) + create mode 100755 tools/testing/selftests/drivers/net/hw/toeplitz.py + delete mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh + create mode 100755 tools/testing/selftests/drivers/net/ring_reconfig.py + create mode 100644 tools/testing/selftests/net/af_unix/.gitignore + create mode 100644 tools/testing/selftests/net/af_unix/unix_connreset.c + delete mode 100755 tools/testing/selftests/net/gro.sh + create mode 100755 tools/testing/selftests/net/lib/ksft_setup_loopback.sh + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rto_synack_rto_max.pkt + delete mode 100644 tools/testing/selftests/net/setup_loopback.sh + delete mode 100644 tools/testing/selftests/net/setup_veth.sh + delete mode 100755 tools/testing/selftests/net/toeplitz.sh + delete mode 100755 tools/testing/selftests/net/toeplitz_client.sh +Merging bpf-next/for-next (017822b63c72 Merge branch 'bpf-next/master' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/loongarch/net/bpf_jit.c +Auto-merging arch/s390/net/bpf_jit_comp.c +Auto-merging arch/x86/Kconfig +Auto-merging kernel/bpf/syscall.c +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/testing/selftests/bpf/xskxceiver.c +Merge made by the 'ort' strategy. + Documentation/bpf/libbpf/program_types.rst | 18 + + Documentation/bpf/map_array.rst | 5 +- + MAINTAINERS | 1 + + arch/arm64/net/bpf_jit_comp.c | 25 +- + arch/loongarch/net/bpf_jit.c | 9 +- + arch/powerpc/net/bpf_jit_comp.c | 10 +- + arch/riscv/net/bpf_jit_comp64.c | 11 +- + arch/s390/net/bpf_jit_comp.c | 7 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/ftrace.c | 7 +- + arch/x86/kernel/ftrace_64.S | 12 +- + arch/x86/net/bpf_jit_comp.c | 97 +- + include/linux/bpf.h | 102 +- + include/linux/bpf_local_storage.h | 13 +- + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 30 +- + include/linux/buildid.h | 25 + + include/linux/filter.h | 12 +- + include/linux/ftrace.h | 33 + + include/uapi/linux/bpf.h | 33 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 38 +- + kernel/bpf/bpf_insn_array.c | 301 +++ + kernel/bpf/bpf_local_storage.c | 245 +- + kernel/bpf/core.c | 26 +- + kernel/bpf/disasm.c | 3 + + kernel/bpf/hashtab.c | 67 +- + kernel/bpf/helpers.c | 296 ++- + kernel/bpf/liveness.c | 42 +- + kernel/bpf/log.c | 3 + + kernel/bpf/range_tree.c | 21 +- + kernel/bpf/ringbuf.c | 114 +- + kernel/bpf/rqspinlock.c | 29 +- + kernel/bpf/stackmap.c | 62 +- + kernel/bpf/stream.c | 159 +- + kernel/bpf/syscall.c | 84 +- + kernel/bpf/trampoline.c | 83 +- + kernel/bpf/verifier.c | 986 ++++++-- + kernel/trace/Kconfig | 12 + + kernel/trace/bpf_trace.c | 46 +- + kernel/trace/ftrace.c | 17 +- + lib/buildid.c | 52 +- + net/bpf/test_run.c | 148 +- + net/core/bpf_sk_storage.c | 16 +- + net/core/filter.c | 16 +- + samples/bpf/do_hbm_test.sh | 2 +- + samples/bpf/hbm.c | 4 +- + samples/bpf/tcp_cong_kern.c | 2 +- + samples/bpf/tracex1.bpf.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 +- + tools/bpf/bpftool/btf_dumper.c | 2 +- + tools/bpf/bpftool/map.c | 3 +- + tools/bpf/bpftool/sign.c | 6 + + tools/include/uapi/linux/bpf.h | 33 +- + tools/lib/bpf/bpf.c | 2 +- + tools/lib/bpf/btf.c | 75 +- + tools/lib/bpf/btf.h | 8 + + tools/lib/bpf/libbpf.c | 296 ++- + tools/lib/bpf/libbpf.h | 27 +- + tools/lib/bpf/libbpf_internal.h | 2 + + tools/lib/bpf/libbpf_probes.c | 4 + + tools/lib/bpf/linker.c | 3 + + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 26 +- + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 65 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 4 +- + .../selftests/bpf/benchs/run_bench_ringbufs.sh | 4 + + tools/testing/selftests/bpf/bpf_arena_list.h | 6 +- + tools/testing/selftests/bpf/bpf_arena_strsearch.h | 128 + + tools/testing/selftests/bpf/bpf_kfuncs.h | 12 +- + tools/testing/selftests/bpf/network_helpers.c | 52 +- + tools/testing/selftests/bpf/network_helpers.h | 16 + + .../selftests/bpf/prog_tests/arena_strsearch.c | 30 + + tools/testing/selftests/bpf/prog_tests/bpf_gotox.c | 292 +++ + .../selftests/bpf/prog_tests/bpf_insn_array.c | 504 ++++ + tools/testing/selftests/bpf/prog_tests/btf.c | 65 + + tools/testing/selftests/bpf/prog_tests/btf_split.c | 87 +- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 23 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 122 +- + .../testing/selftests/bpf/prog_tests/file_reader.c | 117 + + .../testing/selftests/bpf/prog_tests/htab_update.c | 37 +- + .../selftests/bpf/prog_tests/kmem_cache_iter.c | 3 +- + .../selftests/bpf/prog_tests/perf_branches.c | 22 +- + .../selftests/bpf/prog_tests/rcu_read_lock.c | 4 +- + .../selftests/bpf/prog_tests/refcounted_kptr.c | 56 + + .../selftests/bpf/prog_tests/res_spin_lock.c | 8 +- + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 65 + + .../selftests/bpf/prog_tests/select_reuseport.c | 71 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 5 + + .../selftests/bpf/prog_tests/string_kfuncs.c | 2 + + .../selftests/bpf/prog_tests/test_tc_tunnel.c | 714 ++++++ + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 107 +- + tools/testing/selftests/bpf/prog_tests/test_xsk.c | 2596 ++++++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/test_xsk.h | 298 +++ + tools/testing/selftests/bpf/prog_tests/verifier.c | 4 + + tools/testing/selftests/bpf/prog_tests/wq.c | 56 + + tools/testing/selftests/bpf/prog_tests/xsk.c | 151 ++ + .../testing/selftests/bpf/progs/arena_strsearch.c | 146 ++ + tools/testing/selftests/bpf/progs/bpf_cc_cubic.c | 9 - + tools/testing/selftests/bpf/progs/bpf_cubic.c | 7 - + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 6 - + tools/testing/selftests/bpf/progs/bpf_gotox.c | 448 ++++ + .../selftests/bpf/progs/bpf_iter_setsockopt.c | 17 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 4 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 14 + + tools/testing/selftests/bpf/progs/connect4_prog.c | 21 +- + tools/testing/selftests/bpf/progs/dynptr_success.c | 12 +- + tools/testing/selftests/bpf/progs/file_reader.c | 145 ++ + .../testing/selftests/bpf/progs/file_reader_fail.c | 52 + + tools/testing/selftests/bpf/progs/htab_update.c | 19 +- + .../testing/selftests/bpf/progs/ip_check_defrag.c | 5 - + tools/testing/selftests/bpf/progs/lsm.c | 8 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 40 + + .../testing/selftests/bpf/progs/refcounted_kptr.c | 60 + + tools/testing/selftests/bpf/progs/ringbuf_bench.c | 11 + + .../selftests/bpf/progs/string_kfuncs_failure1.c | 12 + + .../selftests/bpf/progs/string_kfuncs_failure2.c | 2 + + .../selftests/bpf/progs/string_kfuncs_success.c | 10 + + tools/testing/selftests/bpf/progs/strobemeta.h | 6 +- + .../selftests/bpf/progs/tcp_ca_write_sk_pacing.c | 2 - + tools/testing/selftests/bpf/progs/test_check_mtu.c | 12 + + .../selftests/bpf/progs/test_perf_branches.c | 3 + + .../selftests/bpf/progs/test_ringbuf_overwrite.c | 98 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 95 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 6 +- + .../bpf/progs/verifier_async_cb_context.c | 181 ++ + .../testing/selftests/bpf/progs/verifier_bounds.c | 154 ++ + .../bpf/progs/verifier_direct_packet_access.c | 59 + + tools/testing/selftests/bpf/progs/verifier_gotox.c | 389 +++ + .../selftests/bpf/progs/verifier_live_stack.c | 50 + + .../selftests/bpf/progs/verifier_netfilter_ctx.c | 5 - + tools/testing/selftests/bpf/progs/verifier_sock.c | 39 +- + .../bpf/progs/verifier_subprog_precision.c | 53 + + tools/testing/selftests/bpf/progs/wq.c | 17 + + tools/testing/selftests/bpf/progs/wq_failures.c | 23 + + .../selftests/bpf/test_kmods/bpf_test_rqspinlock.c | 205 +- + tools/testing/selftests/bpf/test_loader.c | 29 +- + tools/testing/selftests/bpf/test_maps.c | 3 +- + tools/testing/selftests/bpf/test_tag.c | 2 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 320 --- + tools/testing/selftests/bpf/xskxceiver.c | 2512 +------------------ + tools/testing/selftests/bpf/xskxceiver.h | 156 -- + 142 files changed, 10599 insertions(+), 4415 deletions(-) + create mode 100644 kernel/bpf/bpf_insn_array.c + create mode 100644 tools/testing/selftests/bpf/bpf_arena_strsearch.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_strsearch.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_gotox.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/file_reader.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_xsk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_xsk.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/xsk.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_strsearch.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_gotox.c + create mode 100644 tools/testing/selftests/bpf/progs/file_reader.c + create mode 100644 tools/testing/selftests/bpf/progs/file_reader_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_async_cb_context.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_gotox.c + delete mode 100755 tools/testing/selftests/bpf/test_tc_tunnel.sh +Merging ipsec-next/master (939ba8c5b81c MAINTAINERS: Add entry for XFRM documentation) +$ 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 (61e628023d79 Merge branch 'net_sched-speedup-qdisc-dequeue') +$ 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 (74d9900f3087 Bluetooth: SMP: Fix not generating mackey and ltk when repairing) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging MAINTAINERS +Auto-merging drivers/bluetooth/btintel_pcie.c +Auto-merging drivers/bluetooth/btmtksdio.c +Auto-merging drivers/bluetooth/btrtl.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/bluetooth/hci_bcm.c +Auto-merging drivers/bluetooth/hci_intel.c +Auto-merging include/net/bluetooth/hci.h +CONFLICT (content): Merge conflict in include/net/bluetooth/hci.h +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging include/net/bluetooth/mgmt.h +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sock.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +CONFLICT (content): Merge conflict in net/bluetooth/iso.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/sco.c +Resolved 'include/net/bluetooth/hci.h' using previous resolution. +Resolved 'net/bluetooth/iso.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 05b09021e3f5] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/bluetooth/marvell,sd8897-bt.yaml | 79 +++++++ + Documentation/devicetree/bindings/net/btusb.txt | 2 +- + .../devicetree/bindings/net/marvell-bt-8xxx.txt | 83 ------- + MAINTAINERS | 1 + + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/btbcm.c | 4 +- + drivers/bluetooth/btintel_pcie.c | 179 +++++++++++++-- + drivers/bluetooth/btintel_pcie.h | 4 + + drivers/bluetooth/btmtksdio.c | 1 - + drivers/bluetooth/btrtl.c | 16 +- + drivers/bluetooth/btusb.c | 45 ++++ + drivers/bluetooth/hci_bcm.c | 6 +- + drivers/bluetooth/hci_h5.c | 53 ++++- + drivers/bluetooth/hci_intel.c | 3 - + include/net/bluetooth/hci.h | 79 ++++++- + include/net/bluetooth/hci_core.h | 23 +- + include/net/bluetooth/hci_sync.h | 3 + + include/net/bluetooth/mgmt.h | 2 + + net/bluetooth/hci_conn.c | 55 +++-- + net/bluetooth/hci_event.c | 222 ++++++++++++++---- + net/bluetooth/hci_sync.c | 254 ++++++++++++++++++++- + net/bluetooth/iso.c | 207 ++++++++++++++--- + net/bluetooth/mgmt.c | 160 +++++++------ + 23 files changed, 1173 insertions(+), 309 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml + delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt +Merging wireless-next/for-next (f9e788c5fd3a wifi: mac80211: allow sharing identical chanctx for S1G interfaces) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/realtek/rtw89/fw.c +Merge made by the 'ort' strategy. + .../bindings/net/wireless/mediatek,mt76.yaml | 66 +++ + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 14 + + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/mediatek/mt76/Kconfig | 6 +- + drivers/net/wireless/mediatek/mt76/Makefile | 3 +- + drivers/net/wireless/mediatek/mt76/agg-rx.c | 2 +- + drivers/net/wireless/mediatek/mt76/channel.c | 2 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/dma.c | 75 ++- + drivers/net/wireless/mediatek/mt76/dma.h | 69 ++- + drivers/net/wireless/mediatek/mt76/eeprom.c | 77 +++- + drivers/net/wireless/mediatek/mt76/mac80211.c | 10 +- + drivers/net/wireless/mediatek/mt76/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mmio.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 159 ++++++- + drivers/net/wireless/mediatek/mt76/mt7603/Kconfig | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/Makefile | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/core.c | 2 +- + .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 2 +- + .../wireless/mediatek/mt76/mt7615/mt7615_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/testmode.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/trace.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac3_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac3_mac.h | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 21 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 10 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x0/pci_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x0/usb_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_beacon.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dma.h | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_eeprom.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_trace.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_usb.h | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/Makefile | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/mt76x2u.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_phy.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_init.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_phy.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/Kconfig | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7915/coredump.c | 2 +- + .../net/wireless/mediatek/mt76/mt7915/coredump.h | 2 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 76 +++- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 184 ++++++-- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 8 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 11 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 23 +- + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 4 +- + .../net/wireless/mediatek/mt76/mt7915/testmode.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/Kconfig | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/testmode.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/Kconfig | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/Makefile | 4 +- + .../net/wireless/mediatek/mt76/mt7925/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/init.c | 152 +------ + drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7925/mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 40 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 99 +++- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.h | 10 +- + drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 11 +- + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 5 +- + .../net/wireless/mediatek/mt76/mt7925/pci_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7925/pci_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/regd.c | 265 +++++++++++ + drivers/net/wireless/mediatek/mt76/mt7925/regd.h | 19 + + drivers/net/wireless/mediatek/mt76/mt7925/regs.h | 2 +- + .../net/wireless/mediatek/mt76/mt7925/testmode.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x.h | 4 +- + .../net/wireless/mediatek/mt76/mt792x_acpi_sar.c | 2 +- + .../net/wireless/mediatek/mt76/mt792x_acpi_sar.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 3 +- + .../net/wireless/mediatek/mt76/mt792x_debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_trace.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/Kconfig | 9 +- + drivers/net/wireless/mediatek/mt76/mt7996/Makefile | 3 +- + .../net/wireless/mediatek/mt76/mt7996/coredump.c | 2 +- + .../net/wireless/mediatek/mt76/mt7996/coredump.h | 2 +- + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 74 +-- + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 33 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 62 ++- + drivers/net/wireless/mediatek/mt76/mt7996/mac.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 153 ++++--- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 78 ++-- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 16 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 38 +- + drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 352 +++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/npu.c | 501 +++++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/scan.c | 2 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/sdio.h | 2 +- + drivers/net/wireless/mediatek/mt76/sdio_txrx.c | 2 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 2 +- + drivers/net/wireless/mediatek/mt76/testmode.h | 2 +- + drivers/net/wireless/mediatek/mt76/trace.c | 2 +- + drivers/net/wireless/mediatek/mt76/trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/tx.c | 8 +- + drivers/net/wireless/mediatek/mt76/usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/usb_trace.c | 2 +- + drivers/net/wireless/mediatek/mt76/usb_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/util.c | 2 +- + drivers/net/wireless/mediatek/mt76/util.h | 3 +- + drivers/net/wireless/mediatek/mt76/wed.c | 12 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 3 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 9 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 27 +- + drivers/net/wireless/realtek/rtl8xxxu/8192c.c | 80 +++- + drivers/net/wireless/realtek/rtl8xxxu/8723a.c | 115 ++++- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 188 ++------ + drivers/net/wireless/realtek/rtl8xxxu/regs.h | 1 + + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 - + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 +- + drivers/net/wireless/realtek/rtw88/bf.c | 8 +- + drivers/net/wireless/realtek/rtw88/bf.h | 7 + + drivers/net/wireless/realtek/rtw88/rtw8822bu.c | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822cu.c | 2 + + drivers/net/wireless/realtek/rtw88/usb.c | 3 +- + drivers/net/wireless/realtek/rtw89/Kconfig | 22 + + drivers/net/wireless/realtek/rtw89/Makefile | 6 + + drivers/net/wireless/realtek/rtw89/cam.c | 165 ++++--- + drivers/net/wireless/realtek/rtw89/cam.h | 450 +++++------------- + drivers/net/wireless/realtek/rtw89/core.c | 231 +++++++--- + drivers/net/wireless/realtek/rtw89/core.h | 104 ++++- + drivers/net/wireless/realtek/rtw89/debug.c | 299 ++++++++++++ + drivers/net/wireless/realtek/rtw89/fw.c | 169 ++++--- + drivers/net/wireless/realtek/rtw89/fw.h | 67 ++- + drivers/net/wireless/realtek/rtw89/mac.c | 200 +++++++- + drivers/net/wireless/realtek/rtw89/mac.h | 114 ++++- + drivers/net/wireless/realtek/rtw89/mac80211.c | 89 +++- + drivers/net/wireless/realtek/rtw89/mac_be.c | 9 +- + drivers/net/wireless/realtek/rtw89/pci.c | 18 +- + drivers/net/wireless/realtek/rtw89/pci.h | 4 - + drivers/net/wireless/realtek/rtw89/phy.c | 65 ++- + drivers/net/wireless/realtek/rtw89/phy_be.c | 4 + + drivers/net/wireless/realtek/rtw89/ps.c | 23 +- + drivers/net/wireless/realtek/rtw89/reg.h | 24 +- + drivers/net/wireless/realtek/rtw89/regd.c | 22 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 5 +- + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 8 +- + drivers/net/wireless/realtek/rtw89/rtw8851bu.c | 24 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 85 +++- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 16 +- + drivers/net/wireless/realtek/rtw89/rtw8852au.c | 79 ++++ + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 5 +- + .../net/wireless/realtek/rtw89/rtw8852b_common.c | 6 +- + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 6 +- + drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 5 +- + drivers/net/wireless/realtek/rtw89/rtw8852bu.c | 24 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 170 +++++-- + drivers/net/wireless/realtek/rtw89/rtw8852c.h | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 69 ++- + drivers/net/wireless/realtek/rtw89/rtw8852cu.c | 69 +++ + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 17 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 7 +- + drivers/net/wireless/realtek/rtw89/usb.c | 115 +++-- + drivers/net/wireless/realtek/rtw89/usb.h | 12 + + drivers/net/wireless/realtek/rtw89/wow.c | 8 +- + drivers/net/wireless/silabs/wfx/main.c | 2 +- + drivers/net/wireless/st/cw1200/bh.c | 5 +- + include/linux/ieee80211-he.h | 1 + + include/linux/ieee80211.h | 18 +- + include/linux/soc/airoha/airoha_offload.h | 1 + + include/linux/soc/mediatek/mtk_wed.h | 1 + + include/net/cfg80211.h | 4 +- + include/uapi/linux/nl80211-vnd-intel.h | 1 - + net/mac80211/aes_cmac.c | 60 ++- + net/mac80211/aes_cmac.h | 7 +- + net/mac80211/aes_gmac.c | 22 +- + net/mac80211/aes_gmac.h | 1 - + net/mac80211/chan.c | 15 +- + net/mac80211/mlme.c | 5 +- + net/mac80211/rx.c | 6 +- + net/mac80211/tx.c | 6 +- + net/mac80211/wpa.c | 150 ++---- + net/mac80211/wpa.h | 10 +- + net/wireless/core.c | 5 +- + net/wireless/core.h | 1 + + net/wireless/mlme.c | 19 + + net/wireless/nl80211.c | 3 + + net/wireless/sysfs.c | 2 +- + net/wireless/util.c | 23 +- + 298 files changed, 5050 insertions(+), 1792 deletions(-) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/regd.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/regd.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/npu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/npu.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852au.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852cu.c +Merging ath-next/for-next (c99ebb613259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (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 (64ef5f454e16 mtd: mtdpart: ignore error -ENOENT from parsers on subpartitions) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/mtd-physmap.yaml | 10 +++ + drivers/mtd/devices/mtd_intel_dg.c | 74 ++++++++++++++++++---- + drivers/mtd/maps/pcmciamtd.c | 1 + + drivers/mtd/mtdpart.c | 7 +- + include/linux/mtd/spear_smi.h | 19 +++--- + 5 files changed, 88 insertions(+), 23 deletions(-) +Merging nand/nand/next (b98994cb9bc2 mtd: spinand: esmt: add support for F50L1G41LC) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/raw/cadence-nand-controller.c +Merge made by the 'ort' strategy. + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 41 ++- + drivers/mtd/nand/raw/cadence-nand-controller.c | 275 +++++++++++++- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 - + drivers/mtd/nand/raw/lpc32xx_slc.c | 2 +- + drivers/mtd/nand/raw/marvell_nand.c | 13 +- + drivers/mtd/nand/raw/nand_base.c | 13 +- + drivers/mtd/nand/raw/sunxi_nand.c | 407 +++++++++++++++++---- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/esmt.c | 24 ++ + include/linux/mtd/spinand.h | 1 + + 10 files changed, 682 insertions(+), 98 deletions(-) +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 +Auto-merging .mailmap +Merge made by the 'ort' strategy. + .mailmap | 1 + + drivers/mtd/spi-nor/core.c | 10 ++++ + drivers/mtd/spi-nor/core.h | 6 +++ + drivers/mtd/spi-nor/micron-st.c | 101 +++++++++++++++++++++++----------------- + drivers/mtd/spi-nor/sfdp.c | 30 +++++++++++- + drivers/mtd/spi-nor/spansion.c | 38 +++++++++++++++ + drivers/mtd/spi-nor/winbond.c | 24 ++++++++++ + 7 files changed, 164 insertions(+), 46 deletions(-) +Merging crypto/master (ebbdf6466b30 crypto: ahash - Zero positive err value in ahash_update_finish) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/axm55xx_defconfig +Auto-merging arch/arm/configs/dove_defconfig +Auto-merging arch/arm/configs/ep93xx_defconfig +Auto-merging arch/arm/configs/mmp2_defconfig +Auto-merging arch/arm/configs/mv78xx0_defconfig +Auto-merging arch/arm/configs/omap1_defconfig +Auto-merging arch/arm/configs/orion5x_defconfig +Auto-merging arch/arm/configs/spitz_defconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/hexagon/configs/comet_defconfig +Auto-merging arch/m68k/configs/amiga_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/stmark2_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/mips/configs/decstation_64_defconfig +Auto-merging arch/mips/configs/decstation_defconfig +Auto-merging arch/mips/configs/decstation_r4k_defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/sh/configs/ap325rxa_defconfig +Auto-merging arch/sh/configs/apsh4a3a_defconfig +Auto-merging arch/sh/configs/apsh4ad0a_defconfig +Auto-merging arch/sh/configs/ecovec24_defconfig +Auto-merging arch/sh/configs/edosk7760_defconfig +Auto-merging arch/sh/configs/espt_defconfig +Auto-merging arch/sh/configs/landisk_defconfig +Auto-merging arch/sh/configs/lboxre2_defconfig +Auto-merging arch/sh/configs/r7780mp_defconfig +Auto-merging arch/sh/configs/r7785rp_defconfig +Auto-merging arch/sh/configs/sdk7780_defconfig +Auto-merging arch/sh/configs/sdk7786_defconfig +Auto-merging arch/sh/configs/se7343_defconfig +Auto-merging arch/sh/configs/se7712_defconfig +Auto-merging arch/sh/configs/se7721_defconfig +Auto-merging arch/sh/configs/se7722_defconfig +Auto-merging arch/sh/configs/se7724_defconfig +Auto-merging arch/sh/configs/sh03_defconfig +Auto-merging arch/sh/configs/sh2007_defconfig +Auto-merging arch/sh/configs/sh7757lcr_defconfig +Auto-merging arch/sh/configs/sh7763rdp_defconfig +Auto-merging arch/sh/configs/sh7785lcr_32bit_defconfig +Auto-merging arch/sh/configs/sh7785lcr_defconfig +Auto-merging arch/sh/configs/shx3_defconfig +Auto-merging arch/sh/configs/titan_defconfig +Auto-merging arch/sh/configs/ul2_defconfig +Auto-merging arch/sh/configs/urquell_defconfig +Auto-merging arch/sparc/configs/sparc64_defconfig +Auto-merging arch/xtensa/configs/audio_kc705_defconfig +Auto-merging arch/xtensa/configs/generic_kc705_defconfig +Auto-merging arch/xtensa/configs/nommu_kc705_defconfig +Auto-merging arch/xtensa/configs/smp_lx200_defconfig +Auto-merging arch/xtensa/configs/virt_defconfig +Auto-merging arch/xtensa/configs/xip_kc705_defconfig +Auto-merging crypto/af_alg.c +Auto-merging crypto/zstd.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/crypto/intel/qat/qat_common/adf_aer.c +Merge made by the 'ort' strategy. + Documentation/crypto/userspace-if.rst | 7 +- + .../bindings/crypto/amd,ccp-seattle-v1a.yaml | 3 + + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + .../bindings/rng/microchip,pic32-rng.txt | 17 - + .../bindings/rng/microchip,pic32-rng.yaml | 40 ++ + Documentation/security/keys/trusted-encrypted.rst | 88 +++- + MAINTAINERS | 2 +- + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/clps711x_defconfig | 1 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/jornada720_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/mmp2_defconfig | 1 - + arch/arm/configs/mv78xx0_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/configs/orion5x_defconfig | 1 - + arch/arm/configs/pxa168_defconfig | 1 - + arch/arm/configs/pxa3xx_defconfig | 1 - + arch/arm/configs/pxa910_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm64/configs/defconfig | 1 - + arch/hexagon/configs/comet_defconfig | 1 - + arch/m68k/configs/amcore_defconfig | 1 - + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/stmark2_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/mips/configs/decstation_64_defconfig | 1 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/decstation_r4k_defconfig | 1 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/apsh4a3a_defconfig | 1 - + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/ecovec24_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/se7751_defconfig | 1 - + arch/sh/configs/se7780_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/configs/sh7785lcr_defconfig | 1 - + arch/sh/configs/shmin_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + arch/sparc/configs/sparc32_defconfig | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/x86/crypto/aesni-intel_glue.c | 3 +- + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/iss_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/virt_defconfig | 1 - + arch/xtensa/configs/xip_kc705_defconfig | 1 - + crypto/Kconfig | 21 +- + crypto/Makefile | 3 +- + crypto/aead.c | 20 + + crypto/af_alg.c | 5 +- + crypto/ahash.c | 18 +- + crypto/algif_hash.c | 3 +- + crypto/algif_rng.c | 3 +- + crypto/ansi_cprng.c | 474 --------------------- + crypto/asymmetric_keys/asymmetric_type.c | 12 +- + crypto/asymmetric_keys/restrict.c | 7 +- + crypto/asymmetric_keys/x509_cert_parser.c | 2 +- + crypto/asymmetric_keys/x509_public_key.c | 2 +- + crypto/authenc.c | 75 ++-- + crypto/deflate.c | 3 +- + crypto/df_sp80090a.c | 232 ++++++++++ + crypto/drbg.c | 266 +----------- + crypto/fips.c | 5 +- + crypto/scatterwalk.c | 343 ++++----------- + crypto/skcipher.c | 261 +++++++++++- + crypto/tcrypt.c | 8 - + crypto/tcrypt.h | 18 - + crypto/testmgr.c | 97 ----- + crypto/testmgr.h | 226 +++++----- + crypto/zstd.c | 10 +- + drivers/char/hw_random/bcm2835-rng.c | 11 +- + drivers/char/hw_random/core.c | 11 +- + drivers/crypto/Kconfig | 1 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 2 +- + drivers/crypto/atmel-i2c.c | 2 +- + drivers/crypto/axis/artpec6_crypto.c | 9 +- + drivers/crypto/caam/blob_gen.c | 86 +++- + drivers/crypto/caam/caamalg.c | 128 +++++- + drivers/crypto/caam/caamalg_desc.c | 87 +++- + drivers/crypto/caam/caamalg_desc.h | 13 +- + drivers/crypto/caam/caamrng.c | 4 +- + drivers/crypto/caam/desc.h | 9 +- + drivers/crypto/caam/desc_constr.h | 8 +- + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 2 +- + drivers/crypto/ccp/ccp-dev.c | 2 +- + drivers/crypto/ccp/sp-dev.h | 2 +- + drivers/crypto/ccp/sp-pci.c | 19 + + drivers/crypto/ccp/sp-platform.c | 17 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 6 +- + drivers/crypto/hifn_795x.c | 7 +- + drivers/crypto/hisilicon/qm.c | 55 ++- + drivers/crypto/hisilicon/sgl.c | 5 - + drivers/crypto/intel/iaa/iaa_crypto_main.c | 2 +- + drivers/crypto/intel/qat/qat_common/adf_aer.c | 4 +- + drivers/crypto/intel/qat/qat_common/adf_isr.c | 3 +- + drivers/crypto/intel/qat/qat_common/adf_sriov.c | 3 +- + drivers/crypto/intel/qat/qat_common/adf_vf_isr.c | 3 +- + drivers/crypto/intel/qat/qat_common/qat_uclo.c | 18 +- + drivers/crypto/marvell/cesa/cesa.c | 7 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 5 +- + drivers/crypto/qce/core.c | 3 +- + drivers/crypto/qce/dma.c | 6 +- + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 3 +- + drivers/crypto/starfive/jh7110-hash.c | 6 +- + drivers/crypto/ti/Kconfig | 1 + + drivers/crypto/ti/dthev2-aes.c | 139 +++++- + drivers/crypto/ti/dthev2-common.h | 10 +- + drivers/crypto/xilinx/xilinx-trng.c | 39 +- + include/crypto/aead.h | 87 ++++ + include/crypto/algapi.h | 12 + + include/crypto/df_sp80090a.h | 28 ++ + include/crypto/drbg.h | 25 +- + include/crypto/internal/drbg.h | 54 +++ + include/crypto/internal/skcipher.h | 48 ++- + include/crypto/rng.h | 11 +- + include/crypto/scatterwalk.h | 117 ++--- + include/keys/asymmetric-type.h | 2 +- + include/linux/rhashtable.h | 70 ++- + include/soc/fsl/caam-blob.h | 26 ++ + kernel/padata.c | 12 +- + lib/crypto/mpi/mpicoder.c | 2 +- + security/keys/trusted-keys/trusted_caam.c | 108 +++++ + 170 files changed, 2026 insertions(+), 1675 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/microchip,pic32-rng.yaml + delete mode 100644 crypto/ansi_cprng.c + create mode 100644 crypto/df_sp80090a.c + create mode 100644 include/crypto/df_sp80090a.h + create mode 100644 include/crypto/internal/drbg.h +Merging libcrypto/libcrypto-next (c0127f3ad65e Merge remote-tracking branches 'ebiggers/libcrypto-tests', 'ebiggers/libcrypto-aes-gcm', 'ebiggers/libcrypto-fpsimd-on-stack' and 'ebiggers/libcrypto-at-least' into libcrypto-next) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/simd.h +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging crypto/Kconfig +Auto-merging crypto/Makefile +Auto-merging crypto/tcrypt.c +Auto-merging crypto/testmgr.c +Auto-merging crypto/testmgr.h +Auto-merging include/linux/compiler_types.h +Auto-merging lib/crypto/Kconfig +Auto-merging lib/crypto/Makefile +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 29c15bf4895d] Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/crypto/index.rst | 1 + + Documentation/crypto/sha3.rst | 130 +++ + Documentation/filesystems/fscrypt.rst | 2 - + arch/arm/crypto/Kconfig | 16 - + arch/arm/crypto/Makefile | 2 - + arch/arm/crypto/blake2b-neon-glue.c | 104 -- + arch/arm/include/asm/simd.h | 7 + + arch/arm64/configs/defconfig | 2 +- + arch/arm64/crypto/Kconfig | 21 - + arch/arm64/crypto/Makefile | 6 - + arch/arm64/crypto/aes-ce-ccm-glue.c | 116 +- + arch/arm64/crypto/aes-ce-glue.c | 83 +- + arch/arm64/crypto/aes-glue.c | 139 ++- + arch/arm64/crypto/aes-neonbs-glue.c | 150 +-- + arch/arm64/crypto/ghash-ce-glue.c | 27 +- + arch/arm64/crypto/nhpoly1305-neon-glue.c | 5 +- + arch/arm64/crypto/polyval-ce-glue.c | 158 --- + arch/arm64/crypto/sha3-ce-glue.c | 151 --- + arch/arm64/crypto/sm3-ce-glue.c | 15 +- + arch/arm64/crypto/sm3-neon-glue.c | 16 +- + arch/arm64/crypto/sm4-ce-ccm-glue.c | 49 +- + arch/arm64/crypto/sm4-ce-cipher-glue.c | 10 +- + arch/arm64/crypto/sm4-ce-gcm-glue.c | 62 +- + arch/arm64/crypto/sm4-ce-glue.c | 212 ++-- + arch/arm64/crypto/sm4-neon-glue.c | 25 +- + arch/arm64/include/asm/fpu.h | 16 +- + arch/arm64/include/asm/neon.h | 4 +- + arch/arm64/include/asm/processor.h | 7 +- + arch/arm64/include/asm/simd.h | 10 + + arch/arm64/include/asm/xor.h | 22 +- + arch/arm64/kernel/fpsimd.c | 54 +- + arch/s390/configs/debug_defconfig | 3 +- + arch/s390/configs/defconfig | 3 +- + arch/s390/crypto/Kconfig | 20 - + arch/s390/crypto/Makefile | 2 - + arch/s390/crypto/sha.h | 51 - + arch/s390/crypto/sha3_256_s390.c | 157 --- + arch/s390/crypto/sha3_512_s390.c | 157 --- + arch/s390/crypto/sha_common.c | 117 -- + arch/x86/crypto/Kconfig | 10 - + arch/x86/crypto/Makefile | 8 +- + arch/x86/crypto/aes-gcm-aesni-x86_64.S | 12 +- + arch/x86/crypto/aes-gcm-vaes-avx2.S | 1146 ++++++++++++++++++++ + ...es-gcm-avx10-x86_64.S => aes-gcm-vaes-avx512.S} | 722 ++++++------ + arch/x86/crypto/aesni-intel_glue.c | 264 +++-- + arch/x86/crypto/polyval-clmulni_glue.c | 180 --- + crypto/Kconfig | 14 +- + crypto/Makefile | 6 +- + crypto/aegis128-neon.c | 33 +- + crypto/blake2b.c | 111 ++ + crypto/blake2b_generic.c | 192 ---- + crypto/hctr2.c | 222 ++-- + crypto/jitterentropy-kcapi.c | 12 +- + crypto/polyval-generic.c | 205 ---- + crypto/sha3.c | 166 +++ + crypto/sha3_generic.c | 290 ----- + crypto/tcrypt.c | 4 - + crypto/testmgr.c | 21 +- + crypto/testmgr.h | 171 --- + drivers/char/random.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/wc.c | 19 +- + drivers/net/wireguard/cookie.c | 18 +- + drivers/net/wireguard/noise.c | 32 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 8 +- + include/crypto/blake2b.h | 143 ++- + include/crypto/blake2s.h | 126 ++- + include/crypto/chacha.h | 12 +- + include/crypto/chacha20poly1305.h | 19 +- + include/crypto/curve25519.h | 24 +- + include/crypto/internal/blake2b.h | 101 -- + include/crypto/md5.h | 11 +- + include/crypto/poly1305.h | 2 +- + include/crypto/polyval.h | 182 +++- + include/crypto/sha1.h | 12 +- + include/crypto/sha2.h | 53 +- + include/crypto/sha3.h | 320 +++++- + include/linux/byteorder/generic.h | 16 + + include/linux/compiler_types.h | 15 + + lib/crc/arm/crc-t10dif.h | 19 +- + lib/crc/arm/crc32.h | 11 +- + lib/crc/arm64/crc-t10dif.h | 19 +- + lib/crc/arm64/crc32.h | 16 +- + lib/crypto/Kconfig | 36 + + lib/crypto/Makefile | 30 + + .../crypto => lib/crypto/arm}/blake2b-neon-core.S | 29 +- + lib/crypto/arm/blake2b.h | 40 + + lib/crypto/arm/blake2s-core.S | 22 +- + lib/crypto/arm/blake2s.h | 4 +- + lib/crypto/arm/chacha.h | 11 +- + lib/crypto/arm/curve25519.h | 5 +- + lib/crypto/arm/poly1305.h | 6 +- + lib/crypto/arm/sha1-armv7-neon.S | 2 +- + lib/crypto/arm/sha1-ce-core.S | 2 +- + lib/crypto/arm/sha1.h | 13 +- + lib/crypto/arm/sha256-ce.S | 2 +- + lib/crypto/arm/sha256.h | 12 +- + lib/crypto/arm/sha512.h | 5 +- + lib/crypto/arm64/chacha.h | 11 +- + lib/crypto/arm64/poly1305.h | 6 +- + .../crypto => lib/crypto/arm64}/polyval-ce-core.S | 38 +- + lib/crypto/arm64/polyval.h | 80 ++ + lib/crypto/arm64/sha1-ce-core.S | 2 +- + lib/crypto/arm64/sha1.h | 7 +- + lib/crypto/arm64/sha256-ce.S | 2 +- + lib/crypto/arm64/sha256.h | 19 +- + .../crypto => lib/crypto/arm64}/sha3-ce-core.S | 69 +- + lib/crypto/arm64/sha3.h | 59 + + lib/crypto/arm64/sha512-ce-core.S | 2 +- + lib/crypto/arm64/sha512.h | 8 +- + lib/crypto/blake2b.c | 174 +++ + lib/crypto/blake2s.c | 66 +- + lib/crypto/chacha20poly1305.c | 18 +- + lib/crypto/fips.h | 45 + + lib/crypto/polyval.c | 307 ++++++ + lib/crypto/s390/sha3.h | 151 +++ + lib/crypto/sha1.c | 19 +- + lib/crypto/sha256.c | 26 +- + lib/crypto/sha3.c | 411 +++++++ + lib/crypto/sha512.c | 19 +- + lib/crypto/tests/Kconfig | 29 + + lib/crypto/tests/Makefile | 3 + + lib/crypto/tests/blake2b-testvecs.h | 342 ++++++ + lib/crypto/tests/blake2b_kunit.c | 133 +++ + lib/crypto/tests/blake2s_kunit.c | 39 +- + lib/crypto/tests/polyval-testvecs.h | 186 ++++ + lib/crypto/tests/polyval_kunit.c | 223 ++++ + lib/crypto/tests/sha3-testvecs.h | 249 +++++ + lib/crypto/tests/sha3_kunit.c | 422 +++++++ + lib/crypto/x86/blake2s-core.S | 275 +++-- + lib/crypto/x86/blake2s.h | 22 +- + .../crypto/x86/polyval-pclmul-avx.S | 40 +- + lib/crypto/x86/polyval.h | 83 ++ + lib/raid6/neon.c | 17 +- + lib/raid6/recov_neon.c | 15 +- + scripts/crypto/gen-fips-testvecs.py | 36 + + scripts/crypto/gen-hash-testvecs.py | 101 +- + 136 files changed, 7112 insertions(+), 3966 deletions(-) + create mode 100644 Documentation/crypto/sha3.rst + delete mode 100644 arch/arm/crypto/blake2b-neon-glue.c + delete mode 100644 arch/arm64/crypto/polyval-ce-glue.c + delete mode 100644 arch/arm64/crypto/sha3-ce-glue.c + delete mode 100644 arch/s390/crypto/sha.h + delete mode 100644 arch/s390/crypto/sha3_256_s390.c + delete mode 100644 arch/s390/crypto/sha3_512_s390.c + delete mode 100644 arch/s390/crypto/sha_common.c + create mode 100644 arch/x86/crypto/aes-gcm-vaes-avx2.S + rename arch/x86/crypto/{aes-gcm-avx10-x86_64.S => aes-gcm-vaes-avx512.S} (69%) + delete mode 100644 arch/x86/crypto/polyval-clmulni_glue.c + create mode 100644 crypto/blake2b.c + delete mode 100644 crypto/blake2b_generic.c + delete mode 100644 crypto/polyval-generic.c + create mode 100644 crypto/sha3.c + delete mode 100644 crypto/sha3_generic.c + delete mode 100644 include/crypto/internal/blake2b.h + rename {arch/arm/crypto => lib/crypto/arm}/blake2b-neon-core.S (94%) + create mode 100644 lib/crypto/arm/blake2b.h + rename {arch/arm64/crypto => lib/crypto/arm64}/polyval-ce-core.S (92%) + create mode 100644 lib/crypto/arm64/polyval.h + rename {arch/arm64/crypto => lib/crypto/arm64}/sha3-ce-core.S (83%) + create mode 100644 lib/crypto/arm64/sha3.h + create mode 100644 lib/crypto/blake2b.c + create mode 100644 lib/crypto/fips.h + create mode 100644 lib/crypto/polyval.c + create mode 100644 lib/crypto/s390/sha3.h + create mode 100644 lib/crypto/sha3.c + create mode 100644 lib/crypto/tests/blake2b-testvecs.h + create mode 100644 lib/crypto/tests/blake2b_kunit.c + create mode 100644 lib/crypto/tests/polyval-testvecs.h + create mode 100644 lib/crypto/tests/polyval_kunit.c + create mode 100644 lib/crypto/tests/sha3-testvecs.h + create mode 100644 lib/crypto/tests/sha3_kunit.c + rename arch/x86/crypto/polyval-clmulni_asm.S => lib/crypto/x86/polyval-pclmul-avx.S (91%) + create mode 100644 lib/crypto/x86/polyval.h + create mode 100755 scripts/crypto/gen-fips-testvecs.py +Merging drm/drm-next (1a22e175b311 Merge tag 'drm-rust-next-2025-11-21' of https://gitlab.freedesktop.org/drm/rust/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging .clang-format +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/freescale/imx95.dtsi +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_vblank.c +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_device.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_device.h +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c +Auto-merging drivers/gpu/drm/msm/msm_gpu.c +Auto-merging drivers/gpu/drm/tegra/dc.c +Auto-merging drivers/gpu/drm/tegra/dsi.c +Auto-merging drivers/gpu/drm/xe/xe_irq.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vram.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging include/drm/intel/pciids.h +Auto-merging init/Kconfig +Resolved 'drivers/gpu/drm/i915/display/intel_dmc.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 562d2d8db2e1] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 2 +- + .mailmap | 1 + + Documentation/ABI/stable/sysfs-driver-qaic | 19 + + .../ABI/testing/sysfs-driver-intel-xe-sriov | 159 ++ + Documentation/accel/qaic/aic100.rst | 25 +- + Documentation/accel/qaic/qaic.rst | 8 +- + .../display/bridge/fsl,imx8mp-hdmi-tx.yaml | 12 + + .../display/bridge/renesas,dsi-csi2-tx.yaml | 54 +- + .../bindings/display/imx/fsl,imx8mp-hdmi-pai.yaml | 69 + + .../bindings/display/msm/dp-controller.yaml | 17 +- + .../devicetree/bindings/display/msm/gmu.yaml | 60 +- + .../bindings/display/msm/qcom,glymur-mdss.yaml | 264 ++ + .../bindings/display/msm/qcom,qcs8300-mdss.yaml | 286 ++ + .../bindings/display/msm/qcom,sm6150-mdss.yaml | 40 +- + .../bindings/display/msm/qcom,sm8650-dpu.yaml | 16 +- + .../bindings/display/panel/ilitek,il79900a.yaml | 68 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 2 + + .../bindings/display/panel/panel-simple-dsi.yaml | 3 - + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/samsung,atna33xc20.yaml | 2 + + .../bindings/display/panel/samsung,s6e3fc2x01.yaml | 81 + + .../bindings/display/panel/sharp,lq079l1sx01.yaml | 99 + + .../display/panel/synaptics,td4300-panel.yaml | 89 + + .../bindings/display/renesas,rzg2l-du.yaml | 3 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../bindings/gpu/arm,mali-valhall-csf.yaml | 42 +- + .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 91 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + .../devicetree/bindings/npu/arm,ethos.yaml | 79 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/nova/core/todo.rst | 30 - + Documentation/gpu/todo.rst | 37 + + Documentation/gpu/vkms.rst | 119 +- + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_exec_queue.rst | 20 + + Documentation/gpu/xe/xe_gt_freq.rst | 3 + + Documentation/userspace-api/dma-buf-heaps.rst | 59 +- + MAINTAINERS | 41 +- + arch/arm/boot/dts/st/stih410.dtsi | 316 ++- + arch/arm64/boot/dts/freescale/imx95.dtsi | 37 + + drivers/accel/Kconfig | 1 + + drivers/accel/Makefile | 1 + + drivers/accel/amdxdna/Makefile | 1 + + drivers/accel/amdxdna/TODO | 1 - + drivers/accel/amdxdna/aie2_ctx.c | 195 +- + drivers/accel/amdxdna/aie2_error.c | 95 +- + drivers/accel/amdxdna/aie2_message.c | 731 +++-- + drivers/accel/amdxdna/aie2_msg_priv.h | 88 +- + drivers/accel/amdxdna/aie2_pci.c | 269 +- + drivers/accel/amdxdna/aie2_pci.h | 54 +- + drivers/accel/amdxdna/aie2_smu.c | 49 +- + drivers/accel/amdxdna/amdxdna_ctx.c | 108 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 45 +- + drivers/accel/amdxdna/amdxdna_error.h | 59 + + drivers/accel/amdxdna/amdxdna_gem.c | 51 +- + drivers/accel/amdxdna/amdxdna_gem.h | 6 + + drivers/accel/amdxdna/amdxdna_mailbox.c | 14 +- + drivers/accel/amdxdna/amdxdna_mailbox_helper.h | 6 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 63 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 3 + + drivers/accel/amdxdna/amdxdna_pm.c | 94 + + drivers/accel/amdxdna/amdxdna_pm.h | 18 + + drivers/accel/amdxdna/npu1_regs.c | 8 + + drivers/accel/amdxdna/npu2_regs.c | 2 + + drivers/accel/amdxdna/npu4_regs.c | 12 + + drivers/accel/amdxdna/npu5_regs.c | 2 + + drivers/accel/amdxdna/npu6_regs.c | 2 + + drivers/accel/ethosu/Kconfig | 11 + + drivers/accel/ethosu/Makefile | 4 + + drivers/accel/ethosu/ethosu_device.h | 197 ++ + drivers/accel/ethosu/ethosu_drv.c | 403 +++ + drivers/accel/ethosu/ethosu_drv.h | 15 + + drivers/accel/ethosu/ethosu_gem.c | 704 +++++ + drivers/accel/ethosu/ethosu_gem.h | 46 + + drivers/accel/ethosu/ethosu_job.c | 497 ++++ + drivers/accel/ethosu/ethosu_job.h | 40 + + drivers/accel/ivpu/Makefile | 1 + + drivers/accel/ivpu/ivpu_debugfs.c | 38 +- + drivers/accel/ivpu/ivpu_drv.c | 18 +- + drivers/accel/ivpu/ivpu_drv.h | 5 + + drivers/accel/ivpu/ivpu_fw.c | 229 +- + drivers/accel/ivpu/ivpu_fw.h | 14 +- + drivers/accel/ivpu/ivpu_gem.c | 161 +- + drivers/accel/ivpu/ivpu_gem.h | 22 +- + drivers/accel/ivpu/ivpu_gem_userptr.c | 213 ++ + drivers/accel/ivpu/ivpu_hw.c | 59 +- + drivers/accel/ivpu/ivpu_hw.h | 10 +- + drivers/accel/ivpu/ivpu_hw_btrs.c | 20 +- + drivers/accel/ivpu/ivpu_hw_btrs.h | 2 +- + drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h | 3 + + drivers/accel/ivpu/ivpu_hw_ip.c | 10 + + drivers/accel/ivpu/ivpu_ipc.c | 2 +- + drivers/accel/ivpu/ivpu_job.c | 269 +- + drivers/accel/ivpu/ivpu_job.h | 49 +- + drivers/accel/ivpu/ivpu_mmu.c | 2 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 9 +- + drivers/accel/ivpu/ivpu_mmu_context.h | 2 +- + drivers/accel/ivpu/ivpu_ms.c | 25 +- + drivers/accel/ivpu/ivpu_pm.c | 18 +- + drivers/accel/ivpu/ivpu_sysfs.c | 3 +- + drivers/accel/ivpu/vpu_jsm_api.h | 653 +++-- + drivers/accel/qaic/Kconfig | 1 + + drivers/accel/qaic/Makefile | 2 + + drivers/accel/qaic/qaic.h | 40 +- + drivers/accel/qaic/qaic_control.c | 25 +- + drivers/accel/qaic/qaic_data.c | 164 +- + drivers/accel/qaic/qaic_drv.c | 116 +- + drivers/accel/qaic/qaic_ras.c | 6 +- + drivers/accel/qaic/qaic_ssr.c | 815 ++++++ + drivers/accel/qaic/qaic_ssr.h | 17 + + drivers/accel/qaic/qaic_sysfs.c | 109 + + drivers/accel/qaic/qaic_timesync.c | 9 + + drivers/accel/qaic/qaic_timesync.h | 3 + + drivers/accel/qaic/sahara.c | 170 +- + drivers/accel/rocket/rocket_gem.c | 1 + + drivers/dma-buf/dma-fence.c | 32 +- + drivers/dma-buf/heaps/Kconfig | 10 - + drivers/dma-buf/heaps/cma_heap.c | 47 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/adp/adp_drv.c | 1 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 24 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 402 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 244 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 19 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 201 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 145 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 374 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 422 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 114 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 141 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 640 ++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 174 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 343 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 27 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 92 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 60 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 40 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 24 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/si.c | 22 +- + drivers/gpu/drm/amd/amdgpu/sid.h | 40 - + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 14 + + drivers/gpu/drm/amd/amdgpu/vce_v1_0.c | 839 ++++++ + drivers/gpu/drm/amd/amdgpu/vce_v1_0.h | 32 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 11 - + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 309 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 5 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 18 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 17 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 95 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 286 ++ + .../gpu/drm/amd/display/dc/bios/command_table.h | 6 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 8 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 87 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.h | 1 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 38 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 561 ++-- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 2827 +++++++++++++++++++- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 53 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 56 +- + drivers/gpu/drm/amd/display/dc/dc.h | 93 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 9 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 132 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 43 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 2 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 +- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c | 2 +- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 64 +- + .../gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c | 123 + + .../gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.h | 2 + + .../drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c | 3 +- + .../drm/amd/display/dc/dccg/dcn314/dcn314_dccg.h | 3 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 24 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 13 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 85 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 16 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 14 + + .../drm/amd/display/dc/dce/dce_stream_encoder.h | 5 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 35 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 5 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 141 - + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 140 + + .../drm/amd/display/dc/{dml2 => dml2_0}/cmntypes.h | 18 +- + .../dc/{dml2 => dml2_0}/display_mode_core.c | 2 + + .../dc/{dml2 => dml2_0}/display_mode_core.h | 0 + .../{dml2 => dml2_0}/display_mode_core_structs.h | 1 - + .../dc/{dml2 => dml2_0}/display_mode_lib_defines.h | 2 +- + .../dc/{dml2 => dml2_0}/display_mode_util.c | 0 + .../dc/{dml2 => dml2_0}/display_mode_util.h | 2 - + .../dml21/dml21_translation_helper.c | 0 + .../dml21/dml21_translation_helper.h | 0 + .../dc/{dml2 => dml2_0}/dml21/dml21_utils.c | 0 + .../dc/{dml2 => dml2_0}/dml21/dml21_utils.h | 0 + .../dc/{dml2 => dml2_0}/dml21/dml21_wrapper.c | 4 - + .../dc/{dml2 => dml2_0}/dml21/dml21_wrapper.h | 0 + .../dml21/inc/bounding_boxes/dcn4_soc_bb.h | 1 - + .../dml21/inc/dml2_external_lib_deps.h | 0 + .../dc/{dml2 => dml2_0}/dml21/inc/dml_top.h | 0 + .../dml21/inc/dml_top_dchub_registers.h | 3 +- + .../dml21/inc/dml_top_display_cfg_types.h | 23 +- + .../dml21/inc/dml_top_policy_types.h | 0 + .../dml21/inc/dml_top_soc_parameter_types.h | 11 +- + .../dc/{dml2 => dml2_0}/dml21/inc/dml_top_types.h | 7 + + .../dml21/src/dml2_core/dml2_core_dcn4.c | 1 + + .../dml21/src/dml2_core/dml2_core_dcn4.h | 0 + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 123 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 0 + .../dml21/src/dml2_core/dml2_core_factory.c | 2 + + .../dml21/src/dml2_core/dml2_core_factory.h | 0 + .../dml21/src/dml2_core/dml2_core_shared_types.h | 45 +- + .../dml21/src/dml2_core/dml2_core_utils.c | 2 + + .../dml21/src/dml2_core/dml2_core_utils.h | 0 + .../dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 0 + .../dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 0 + .../dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 0 + .../dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 0 + .../dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 0 + .../dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 2 +- + .../dml21/src/dml2_mcg/dml2_mcg_factory.c | 0 + .../dml21/src/dml2_mcg/dml2_mcg_factory.h | 0 + .../dml21/src/dml2_pmo/dml2_pmo_dcn3.c | 0 + .../dml21/src/dml2_pmo/dml2_pmo_dcn3.h | 0 + .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 463 ++-- + .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 0 + .../dml21/src/dml2_pmo/dml2_pmo_factory.c | 0 + .../dml21/src/dml2_pmo/dml2_pmo_factory.h | 2 +- + .../src/dml2_standalone_libraries/lib_float_math.c | 0 + .../src/dml2_standalone_libraries/lib_float_math.h | 0 + .../dml21/src/dml2_top/dml2_top_interfaces.c | 0 + .../dml21/src/dml2_top/dml2_top_legacy.c | 0 + .../dml21/src/dml2_top/dml2_top_legacy.h | 0 + .../dml21/src/dml2_top/dml2_top_soc15.c | 0 + .../dml21/src/dml2_top/dml2_top_soc15.h | 0 + .../dc/{dml2 => dml2_0}/dml21/src/inc/dml2_debug.h | 0 + .../dml21/src/inc/dml2_internal_shared_types.h | 76 +- + .../dc/{dml2 => dml2_0}/dml2_dc_resource_mgmt.c | 0 + .../dc/{dml2 => dml2_0}/dml2_dc_resource_mgmt.h | 0 + .../display/dc/{dml2 => dml2_0}/dml2_dc_types.h | 0 + .../dc/{dml2 => dml2_0}/dml2_internal_types.h | 2 +- + .../dc/{dml2 => dml2_0}/dml2_mall_phantom.c | 1 + + .../dc/{dml2 => dml2_0}/dml2_mall_phantom.h | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml2_policy.c | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml2_policy.h | 0 + .../dc/{dml2 => dml2_0}/dml2_translation_helper.c | 3 + + .../dc/{dml2 => dml2_0}/dml2_translation_helper.h | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml2_utils.c | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml2_utils.h | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml2_wrapper.c | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml2_wrapper.h | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml_assert.h | 0 + .../display/dc/{dml2 => dml2_0}/dml_depedencies.h | 1 + + .../dc/{dml2 => dml2_0}/dml_display_rq_dlg_calc.c | 0 + .../dc/{dml2 => dml2_0}/dml_display_rq_dlg_calc.h | 0 + .../amd/display/dc/{dml2 => dml2_0}/dml_logging.h | 1 + + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.c | 19 +- + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.h | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 36 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h | 2 + + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.c | 1 + + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 1 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 1 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 43 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 10 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h | 1 + + .../gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c | 32 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 1 + + drivers/gpu/drm/amd/display/dc/dsc/dsc.h | 6 + + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 33 +- + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.h | 6 +- + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 8 +- + .../drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c | 3 +- + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 53 +- + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h | 1 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 1 + + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 136 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 63 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 8 +- + .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 2 - + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 147 +- + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h | 2 + + .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 4 +- + .../gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 74 +- + .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 4 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 28 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 2 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 86 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 5 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 5 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 68 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 1 + + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 1 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 144 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 8 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 6 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 1405 +++++++++- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 104 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 28 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 1433 +++++++++- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 36 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 12 +- + .../drm/amd/display/dc/inc/hw/cursor_reg_cache.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 121 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 50 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 17 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 23 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 27 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 13 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 130 + + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + + .../amd/display/dc/link/accessories/link_dp_cts.c | 4 +- + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 19 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 174 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 11 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 63 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 3 +- + .../display/dc/link/protocols/link_dp_capability.c | 48 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 24 +- + .../dc/link/protocols/link_dp_irq_handler.c | 4 +- + .../dc/link/protocols/link_edp_panel_control.c | 17 +- + .../dc/link/protocols/link_edp_panel_control.h | 4 +- + .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 16 + + .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.h | 5 + + .../gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.c | 1 + + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 1 + + .../gpu/drm/amd/display/dc/opp/dcn10/dcn10_opp.c | 14 +- + .../gpu/drm/amd/display/dc/opp/dcn10/dcn10_opp.h | 6 +- + .../gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.c | 13 + + .../gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.h | 6 +- + .../gpu/drm/amd/display/dc/opp/dcn35/dcn35_opp.c | 13 + + .../gpu/drm/amd/display/dc/opp/dcn35/dcn35_opp.h | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 38 +- + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 131 + + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h | 2 + + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 1 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 1 + + .../display/dc/resource/dce100/dce100_resource.c | 38 +- + .../display/dc/resource/dce110/dce110_resource.c | 7 +- + .../display/dc/resource/dce112/dce112_resource.c | 9 +- + .../display/dc/resource/dce120/dce120_resource.c | 9 +- + .../amd/display/dc/resource/dce60/dce60_resource.c | 29 +- + .../amd/display/dc/resource/dce80/dce80_resource.c | 34 +- + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 7 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 35 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 36 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 6 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 6 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 6 +- + .../display/dc/resource/dcn302/dcn302_resource.c | 6 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 6 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 6 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 6 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 7 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 6 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 13 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 6 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 8 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 8 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 8 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 10 +- + .../dcn401/dcn401_soc_and_ip_translator.h | 2 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 15 + + drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 32 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 718 ++++- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 50 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 40 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 17 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 33 +- + .../drm/amd/display/include/bios_parser_types.h | 11 +- + .../amd/display/include/grph_object_ctrl_defs.h | 1 + + .../gpu/drm/amd/display/include/grph_object_id.h | 7 + + drivers/gpu/drm/amd/display/include/signal_types.h | 12 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 6 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 3 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 13 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 87 +- + .../amd/display/modules/hdcp/hdcp2_transition.c | 61 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 122 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 6 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 148 +- + .../drm/amd/display/modules/power/power_helpers.c | 30 + + .../drm/amd/display/modules/power/power_helpers.h | 5 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h | 5 + + .../drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h | 10 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 125 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +- + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 3 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 10 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 22 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 28 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h | 557 ---- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 5 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 4 +- + .../drm/amd/pm/powerplay/smumgr/vega10_smumgr.c | 4 +- + .../drm/amd/pm/powerplay/smumgr/vega12_smumgr.c | 4 +- + .../drm/amd/pm/powerplay/smumgr/vega20_smumgr.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 86 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 21 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 9 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_ppsmc.h | 20 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 14 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 5 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 17 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 5 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 23 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 7 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 7 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 247 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 5 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 5 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 326 ++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 165 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 7 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 5 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 5 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 7 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 67 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 1 + + drivers/gpu/drm/amd/ras/Makefile | 34 + + drivers/gpu/drm/amd/ras/ras_mgr/Makefile | 33 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 285 ++ + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.h | 54 + + .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c | 182 ++ + .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.h | 27 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 648 +++++ + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 83 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c | 94 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.h | 30 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_nbio_v7_9.c | 125 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_nbio_v7_9.h | 30 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.c | 190 ++ + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.h | 41 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c | 279 ++ + drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h | 110 + + drivers/gpu/drm/amd/ras/rascore/Makefile | 44 + + drivers/gpu/drm/amd/ras/rascore/ras.h | 370 +++ + drivers/gpu/drm/amd/ras/rascore/ras_aca.c | 672 +++++ + drivers/gpu/drm/amd/ras/rascore/ras_aca.h | 164 ++ + drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.c | 379 +++ + drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.h | 71 + + drivers/gpu/drm/amd/ras/rascore/ras_cmd.c | 522 ++++ + drivers/gpu/drm/amd/ras/rascore/ras_cmd.h | 426 +++ + drivers/gpu/drm/amd/ras/rascore/ras_core.c | 603 +++++ + drivers/gpu/drm/amd/ras/rascore/ras_cper.c | 315 +++ + drivers/gpu/drm/amd/ras/rascore/ras_cper.h | 304 +++ + drivers/gpu/drm/amd/ras/rascore/ras_eeprom.c | 1339 +++++++++ + drivers/gpu/drm/amd/ras/rascore/ras_eeprom.h | 197 ++ + drivers/gpu/drm/amd/ras/rascore/ras_gfx.c | 70 + + drivers/gpu/drm/amd/ras/rascore/ras_gfx.h | 43 + + drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.c | 426 +++ + drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.h | 259 ++ + drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c | 317 +++ + drivers/gpu/drm/amd/ras/rascore/ras_log_ring.h | 93 + + drivers/gpu/drm/amd/ras/rascore/ras_mp1.c | 81 + + drivers/gpu/drm/amd/ras/rascore/ras_mp1.h | 50 + + drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.c | 105 + + drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.h | 30 + + drivers/gpu/drm/amd/ras/rascore/ras_nbio.c | 96 + + drivers/gpu/drm/amd/ras/rascore/ras_nbio.h | 46 + + drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.c | 123 + + drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.h | 31 + + drivers/gpu/drm/amd/ras/rascore/ras_process.c | 322 +++ + drivers/gpu/drm/amd/ras/rascore/ras_process.h | 53 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.c | 750 ++++++ + drivers/gpu/drm/amd/ras/rascore/ras_psp.h | 145 + + drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.c | 46 + + drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.h | 31 + + drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h | 231 ++ + drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 707 +++++ + drivers/gpu/drm/amd/ras/rascore/ras_umc.h | 166 ++ + drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.c | 511 ++++ + drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.h | 314 +++ + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 31 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 1 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 1 + + drivers/gpu/drm/arm/hdlcd_drv.c | 1 + + drivers/gpu/drm/arm/malidp_drv.c | 1 + + drivers/gpu/drm/arm/malidp_mw.c | 1 + + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 1 + + drivers/gpu/drm/armada/armada_debugfs.c | 1 + + drivers/gpu/drm/armada/armada_fb.c | 1 + + drivers/gpu/drm/armada/armada_fbdev.c | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 1 + + drivers/gpu/drm/armada/armada_overlay.c | 1 + + drivers/gpu/drm/armada/armada_plane.c | 8 +- + drivers/gpu/drm/ast/Makefile | 3 +- + drivers/gpu/drm/ast/ast_2000.c | 108 + + drivers/gpu/drm/ast/ast_2100.c | 92 + + drivers/gpu/drm/ast/ast_2200.c | 92 + + drivers/gpu/drm/ast/ast_2300.c | 135 + + drivers/gpu/drm/ast/ast_2400.c | 100 + + drivers/gpu/drm/ast/ast_2500.c | 106 + + drivers/gpu/drm/ast/ast_2600.c | 72 + + drivers/gpu/drm/ast/ast_drv.c | 69 +- + drivers/gpu/drm/ast/ast_drv.h | 100 +- + drivers/gpu/drm/ast/ast_main.c | 268 -- + drivers/gpu/drm/ast/ast_mode.c | 58 +- + drivers/gpu/drm/ast/ast_tables.h | 60 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 21 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 53 +- + drivers/gpu/drm/bridge/imx/Kconfig | 11 + + drivers/gpu/drm/bridge/imx/Makefile | 1 + + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 158 ++ + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 65 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 7 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 8 + + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 2 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c | 5 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 224 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 14 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 18 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 112 + + drivers/gpu/drm/clients/drm_fbdev_client.c | 31 +- + drivers/gpu/drm/clients/drm_log.c | 30 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 69 +- + drivers/gpu/drm/display/drm_dp_helper.c | 232 +- + drivers/gpu/drm/drm_atomic.c | 58 +- + drivers/gpu/drm/drm_atomic_helper.c | 12 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_bridge.c | 67 +- + drivers/gpu/drm/drm_buddy.c | 391 +-- + drivers/gpu/drm/drm_client.c | 199 +- + drivers/gpu/drm/drm_client_event.c | 25 +- + drivers/gpu/drm/drm_client_modeset.c | 44 + + drivers/gpu/drm/drm_crtc.c | 35 + + drivers/gpu/drm/drm_displayid.c | 58 +- + drivers/gpu/drm/drm_displayid_internal.h | 2 + + drivers/gpu/drm/drm_dumb_buffers.c | 171 +- + drivers/gpu/drm/drm_edid.c | 3 + + drivers/gpu/drm/drm_fb_helper.c | 30 +- + drivers/gpu/drm/drm_fbdev_dma.c | 13 +- + drivers/gpu/drm/drm_fbdev_shmem.c | 9 +- + drivers/gpu/drm/drm_fbdev_ttm.c | 12 +- + drivers/gpu/drm/drm_format_helper.c | 91 - + drivers/gpu/drm/drm_framebuffer.c | 2 +- + drivers/gpu/drm/drm_gem.c | 16 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 2 - + drivers/gpu/drm/drm_gem_dma_helper.c | 10 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 1 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 136 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 1 + + drivers/gpu/drm/drm_gem_vram_helper.c | 11 +- + drivers/gpu/drm/drm_gpusvm.c | 6 +- + drivers/gpu/drm/drm_gpuvm.c | 191 ++ + drivers/gpu/drm/drm_mipi_dbi.c | 3 +- + drivers/gpu/drm/drm_mm.c | 1 + + drivers/gpu/drm/drm_modeset_helper.c | 6 +- + drivers/gpu/drm/drm_prime.c | 1 + + drivers/gpu/drm/drm_vblank.c | 174 +- + drivers/gpu/drm/drm_vblank_helper.c | 176 ++ + drivers/gpu/drm/drm_vblank_work.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 + + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 32 + + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 + + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 1 + + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fb.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_gem.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_plane.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 + + drivers/gpu/drm/exynos/exynos_mixer.c | 1 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 1 + + drivers/gpu/drm/gma500/backlight.c | 2 + + drivers/gpu/drm/gma500/cdv_device.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 1 + + drivers/gpu/drm/gma500/fbdev.c | 46 - + drivers/gpu/drm/gma500/gem.c | 1 + + drivers/gpu/drm/gma500/intel_bios.c | 1 + + drivers/gpu/drm/gma500/intel_gmbus.c | 2 + + drivers/gpu/drm/gma500/mid_bios.c | 1 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 + + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 + + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 3 + + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + + drivers/gpu/drm/gma500/opregion.c | 3 + + drivers/gpu/drm/gma500/psb_drv.c | 1 + + drivers/gpu/drm/gma500/psb_intel_display.c | 1 + + drivers/gpu/drm/gma500/psb_intel_lvds.c | 1 + + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1 + + drivers/gpu/drm/gma500/psb_irq.c | 37 +- + drivers/gpu/drm/gud/gud_connector.c | 8 +- + drivers/gpu/drm/gud/gud_drv.c | 45 +- + drivers/gpu/drm/gud/gud_pipe.c | 12 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 1 + + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 + + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 12 + + drivers/gpu/drm/i915/Makefile | 13 + + drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 65 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 34 +- + drivers/gpu/drm/i915/display/i9xx_plane.h | 5 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 9 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 39 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 2 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 91 +- + drivers/gpu/drm/i915/display/intel_alpm.h | 2 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 9 +- + drivers/gpu/drm/i915/display/intel_bo.c | 40 +- + drivers/gpu/drm/i915/display/intel_bo.h | 8 +- + drivers/gpu/drm/i915/display/intel_bw.c | 363 +-- + drivers/gpu/drm/i915/display/intel_bw.h | 6 +- + drivers/gpu/drm/i915/display/intel_casf.c | 290 ++ + drivers/gpu/drm/i915/display/intel_casf.h | 21 + + drivers/gpu/drm/i915/display/intel_casf_regs.h | 33 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 524 +++- + drivers/gpu/drm/i915/display/intel_cdclk.h | 16 +- + drivers/gpu/drm/i915/display/intel_color.c | 17 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_connector.c | 3 +- + drivers/gpu/drm/i915/display/intel_crt.c | 16 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 99 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 11 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 16 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 32 +- + drivers/gpu/drm/i915/display/intel_cursor.h | 2 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 249 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 21 + + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 32 +- + drivers/gpu/drm/i915/display/intel_dbuf_bw.c | 295 ++ + drivers/gpu/drm/i915/display/intel_dbuf_bw.h | 37 + + drivers/gpu/drm/i915/display/intel_ddi.c | 77 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 83 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 9 + + drivers/gpu/drm/i915/display/intel_de.h | 143 +- + drivers/gpu/drm/i915/display/intel_display.c | 362 ++- + drivers/gpu/drm/i915/display/intel_display.h | 16 +- + .../drm/i915/display/intel_display_conversion.c | 20 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 34 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 12 +- + .../gpu/drm/i915/display/intel_display_device.c | 6 +- + .../gpu/drm/i915/display/intel_display_device.h | 9 +- + .../gpu/drm/i915/display/intel_display_driver.c | 23 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 129 +- + drivers/gpu/drm/i915/display/intel_display_irq.h | 8 +- + .../gpu/drm/i915/display/intel_display_jiffies.h | 43 + + drivers/gpu/drm/i915/display/intel_display_power.c | 21 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 26 +- + .../drm/i915/display/intel_display_power_well.c | 58 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 1 + + drivers/gpu/drm/i915/display/intel_display_rpm.c | 33 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 73 +- + drivers/gpu/drm/i915/display/intel_display_utils.c | 32 + + drivers/gpu/drm/i915/display/intel_display_utils.h | 31 + + drivers/gpu/drm/i915/display/intel_display_wa.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 1 + + drivers/gpu/drm/i915/display/intel_dmc.c | 62 +- + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 25 +- + drivers/gpu/drm/i915/display/intel_dp.c | 263 +- + drivers/gpu/drm/i915/display/intel_dp.h | 12 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 14 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 3 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 49 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 12 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 35 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 29 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 + + drivers/gpu/drm/i915/display/intel_dpt.c | 2 + + drivers/gpu/drm/i915/display/intel_dsb.c | 57 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 4 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 37 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_fb.c | 41 +- + drivers/gpu/drm/i915/display/intel_fb_bo.c | 4 +- + drivers/gpu/drm/i915/display/intel_fb_bo.h | 3 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 + + drivers/gpu/drm/i915/display/intel_fbc.c | 203 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 3 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 63 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 60 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 14 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 2 +- + drivers/gpu/drm/i915/display/intel_flipq.c | 14 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 156 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 18 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 51 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 20 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 5 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 5 +- + drivers/gpu/drm/i915/display/intel_link_bw.c | 17 +- + drivers/gpu/drm/i915/display/intel_link_bw.h | 2 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 2327 ++++++++++++++++ + drivers/gpu/drm/i915/display/intel_lt_phy.h | 47 + + drivers/gpu/drm/i915/display/intel_lt_phy_regs.h | 90 + + drivers/gpu/drm/i915/display/intel_lvds.c | 6 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 14 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 2 + + drivers/gpu/drm/i915/display/intel_overlay.c | 7 +- + drivers/gpu/drm/i915/display/intel_pch.c | 4 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 12 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 12 +- + drivers/gpu/drm/i915/display/intel_pfit.c | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 + + drivers/gpu/drm/i915/display/intel_plane.c | 65 +- + drivers/gpu/drm/i915/display/intel_plane.h | 3 - + drivers/gpu/drm/i915/display/intel_plane_initial.c | 13 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 21 +- + drivers/gpu/drm/i915/display/intel_pps.c | 3 +- + drivers/gpu/drm/i915/display/intel_psr.c | 439 ++- + drivers/gpu/drm/i915/display/intel_psr.h | 5 +- + drivers/gpu/drm/i915/display/intel_qp_tables.c | 2 +- + drivers/gpu/drm/i915/display/intel_sbi.c | 6 +- + drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 2 + + drivers/gpu/drm/i915/display/intel_snps_phy.c | 10 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 12 +- + drivers/gpu/drm/i915/display/intel_tc.c | 23 +- + drivers/gpu/drm/i915/display/intel_tc.h | 3 + + drivers/gpu/drm/i915/display/intel_vblank.c | 16 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 2 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 26 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 3 + + drivers/gpu/drm/i915/display/intel_vrr.c | 502 ++-- + drivers/gpu/drm/i915/display/intel_vrr.h | 5 +- + drivers/gpu/drm/i915/display/skl_prefill.c | 157 ++ + drivers/gpu/drm/i915/display/skl_prefill.h | 46 + + drivers/gpu/drm/i915/display/skl_scaler.c | 234 +- + drivers/gpu/drm/i915/display/skl_scaler.h | 17 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 193 +- + .../drm/i915/display/skl_universal_plane_regs.h | 24 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 383 +-- + drivers/gpu/drm/i915/display/skl_watermark.h | 3 + + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 52 +- + drivers/gpu/drm/i915/display/vlv_clock.c | 88 + + drivers/gpu/drm/i915/display/vlv_clock.h | 38 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 56 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_create.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 1 + + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.c | 103 + + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 54 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 105 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 7 + + drivers/gpu/drm/i915/gem/i915_gemfs.c | 2 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 + + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 + + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 8 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 2 + + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 3 + + drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 2 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 + + drivers/gpu/drm/i915/gt/intel_rc6.c | 5 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 + + drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 + + drivers/gpu/drm/i915/gt/intel_rps.c | 18 +- + drivers/gpu/drm/i915/gt/intel_sa_media.c | 1 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 2 + + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 2 + + drivers/gpu/drm/i915/gt/intel_timeline.c | 1 + + drivers/gpu/drm/i915/gt/intel_tlb.h | 2 +- + drivers/gpu/drm/i915/gt/intel_wopcm.c | 2 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 9 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 + + drivers/gpu/drm/i915/gt/selftest_execlists.c | 3 + + drivers/gpu/drm/i915/gt/selftest_migrate.c | 9 +- + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 2 + + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 + + drivers/gpu/drm/i915/gvt/cfg_space.c | 2 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 + + drivers/gpu/drm/i915/gvt/display.c | 1 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + + drivers/gpu/drm/i915/gvt/edid.c | 1 + + drivers/gpu/drm/i915/gvt/gtt.c | 2 + + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/interrupt.c | 2 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 36 +- + drivers/gpu/drm/i915/gvt/mmio.c | 7 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 2 + + drivers/gpu/drm/i915/gvt/vgpu.c | 2 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 1 + + drivers/gpu/drm/i915/i915_config.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 155 +- + drivers/gpu/drm/i915/i915_driver.h | 2 + + drivers/gpu/drm/i915/i915_drv.h | 23 +- + drivers/gpu/drm/i915/i915_gem.c | 3 + + drivers/gpu/drm/i915/i915_getparam.c | 2 + + drivers/gpu/drm/i915/i915_irq.c | 106 +- + drivers/gpu/drm/i915/i915_jiffies.h | 16 + + drivers/gpu/drm/i915/i915_mmio_range.c | 18 + + drivers/gpu/drm/i915/i915_mmio_range.h | 19 + + drivers/gpu/drm/i915/i915_module.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 67 +- + drivers/gpu/drm/i915/i915_pmu.c | 6 +- + drivers/gpu/drm/i915/i915_query.c | 2 + + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/i915_reg_defs.h | 10 + + drivers/gpu/drm/i915/i915_request.c | 2 + + drivers/gpu/drm/i915/i915_switcheroo.c | 2 + + drivers/gpu/drm/i915/i915_sysfs.c | 2 + + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 4 +- + drivers/gpu/drm/i915/i915_utils.c | 1 + + drivers/gpu/drm/i915/i915_utils.h | 41 +- + drivers/gpu/drm/i915/i915_vgpu.c | 2 + + drivers/gpu/drm/i915/i915_vma.c | 10 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 2 + + drivers/gpu/drm/i915/intel_gvt.c | 2 + + drivers/gpu/drm/i915/intel_memory_region.c | 1 + + drivers/gpu/drm/i915/intel_pcode.c | 2 + + drivers/gpu/drm/i915/intel_region_ttm.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 77 + + drivers/gpu/drm/i915/intel_runtime_pm.h | 3 + + drivers/gpu/drm/i915/intel_step.c | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 16 +- + drivers/gpu/drm/i915/intel_uncore.h | 8 +- + drivers/gpu/drm/i915/intel_wakeref.c | 2 + + drivers/gpu/drm/i915/pxp/intel_pxp.c | 2 + + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 + + drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 2 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 + + drivers/gpu/drm/i915/selftests/i915_active.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 + + drivers/gpu/drm/i915/selftests/i915_request.c | 2 + + drivers/gpu/drm/i915/selftests/i915_selftest.c | 1 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 15 +- + drivers/gpu/drm/i915/soc/intel_dram.h | 1 + + drivers/gpu/drm/i915/soc/intel_gmch.c | 1 + + drivers/gpu/drm/i915/soc/intel_rom.c | 7 +- + drivers/gpu/drm/i915/soc/intel_rom.h | 6 +- + drivers/gpu/drm/i915/vlv_iosf_sb.c | 2 + + drivers/gpu/drm/imagination/pvr_ccb.c | 1 + + drivers/gpu/drm/imagination/pvr_device.c | 2 +- + drivers/gpu/drm/imagination/pvr_fw.c | 1 + + drivers/gpu/drm/imagination/pvr_fw_meta.c | 2 + + drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 + + drivers/gpu/drm/imagination/pvr_power.c | 1 + + drivers/gpu/drm/imagination/pvr_vm.c | 1 + + drivers/gpu/drm/imx/dc/dc-ed.c | 8 +- + drivers/gpu/drm/imx/dc/dc-fg.c | 4 +- + drivers/gpu/drm/imx/dc/dc-fu.c | 10 +- + drivers/gpu/drm/imx/dc/dc-fu.h | 4 +- + drivers/gpu/drm/imx/dc/dc-lb.c | 28 +- + drivers/gpu/drm/imx/dc/dc-plane.c | 2 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 5 +- + drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c | 1 - + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 29 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 1 - + drivers/gpu/drm/imx/ipuv3/imx-tve.c | 18 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 4 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 5 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 13 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 4 +- + drivers/gpu/drm/kmb/kmb_drv.c | 1 + + drivers/gpu/drm/kmb/kmb_plane.c | 4 +- + drivers/gpu/drm/lima/lima_sched.c | 2 + + drivers/gpu/drm/logicvc/logicvc_layer.c | 4 +- + drivers/gpu/drm/loongson/lsdc_benchmark.c | 1 + + drivers/gpu/drm/loongson/lsdc_crtc.c | 1 + + drivers/gpu/drm/loongson/lsdc_debugfs.c | 1 + + drivers/gpu/drm/loongson/lsdc_drv.c | 1 + + drivers/gpu/drm/loongson/lsdc_gem.c | 32 +- + drivers/gpu/drm/loongson/lsdc_i2c.c | 1 + + drivers/gpu/drm/loongson/lsdc_irq.c | 1 + + drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 1 + + drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 1 + + drivers/gpu/drm/loongson/lsdc_pixpll.c | 1 + + drivers/gpu/drm/loongson/lsdc_plane.c | 3 +- + drivers/gpu/drm/loongson/lsdc_ttm.c | 4 +- + drivers/gpu/drm/mcde/mcde_clk_div.c | 13 +- + drivers/gpu/drm/mcde/mcde_display.c | 1 + + drivers/gpu/drm/mediatek/Kconfig | 23 +- + drivers/gpu/drm/mediatek/Makefile | 3 + + drivers/gpu/drm/mediatek/mtk_crtc.c | 1 + + drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 33 +- + drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 23 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 12 + + drivers/gpu/drm/mediatek/mtk_dp.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_gem.c | 1 + + drivers/gpu/drm/mediatek/mtk_hdmi.c | 539 +--- + drivers/gpu/drm/mediatek/mtk_hdmi_common.c | 456 ++++ + drivers/gpu/drm/mediatek/mtk_hdmi_common.h | 198 ++ + drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c | 396 +++ + drivers/gpu/drm/mediatek/mtk_hdmi_regs_v2.h | 263 ++ + drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 1521 +++++++++++ + drivers/gpu/drm/mediatek/mtk_plane.c | 4 +- + drivers/gpu/drm/meson/meson_overlay.c | 1 + + drivers/gpu/drm/meson/meson_plane.c | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200eh5.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200er.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200se.c | 1 + + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 1 + + drivers/gpu/drm/mgag200/mgag200_vga.c | 1 + + drivers/gpu/drm/mgag200/mgag200_vga_bmc.c | 1 + + drivers/gpu/drm/msm/Makefile | 2 + + drivers/gpu/drm/msm/adreno/a2xx_catalog.c | 7 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 52 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/a3xx_catalog.c | 13 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 52 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/a4xx_catalog.c | 7 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 54 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/a5xx_catalog.c | 17 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 61 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 385 ++- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 332 ++- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 25 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 438 +-- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 29 + + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 5 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 74 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 74 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 17 + + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 1201 +++++++++ + drivers/gpu/drm/msm/adreno/adreno_device.c | 4 +- + .../gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 420 +-- + .../gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 332 +-- + .../gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 470 ++-- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 12 + + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 56 +- + .../drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h | 541 ++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 115 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 47 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 6 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 8 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 426 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 10 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 3 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 7 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 13 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 10 +- + drivers/gpu/drm/msm/dp/dp_display.c | 9 + + drivers/gpu/drm/msm/dp/dp_link.c | 117 + + drivers/gpu/drm/msm/dp/dp_link.h | 5 + + drivers/gpu/drm/msm/dp/dp_panel.c | 78 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 3 - + drivers/gpu/drm/msm/msm_fbdev.c | 2 - + drivers/gpu/drm/msm/msm_gem.c | 30 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 28 +- + drivers/gpu/drm/msm/msm_gpu.c | 21 +- + drivers/gpu/drm/msm/msm_mdss.c | 2 + + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 2181 +++++++++++---- + .../gpu/drm/msm/registers/adreno/a6xx_enums.xml | 2 +- + drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml | 283 +- + .../gpu/drm/msm/registers/adreno/a7xx_enums.xml | 7 - + .../drm/msm/registers/adreno/a8xx_descriptors.xml | 121 + + .../gpu/drm/msm/registers/adreno/a8xx_enums.xml | 299 +++ + .../gpu/drm/msm/registers/adreno/adreno_common.xml | 12 + + .../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 351 ++- + drivers/gpu/drm/msm/registers/gen_header.py | 19 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 1 + + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 1 + + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/include/nvfw/hs.h | 4 +- + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_platform.c | 20 + + drivers/gpu/drm/nouveau/nouveau_ttm.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 102 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h | 1 + + .../drm/nouveau/nvkm/subdev/clk/gk20a_devfreq.c | 320 +++ + .../drm/nouveau/nvkm/subdev/clk/gk20a_devfreq.h | 24 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.c | 185 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.h | 18 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 67 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp10b.c | 4 +- + drivers/gpu/drm/nova/Kconfig | 2 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 1 + + drivers/gpu/drm/omapdrm/omap_debugfs.c | 1 + + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 1 + + drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 1 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 16 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 1 + + drivers/gpu/drm/omapdrm/omap_overlay.c | 1 + + drivers/gpu/drm/omapdrm/omap_plane.c | 3 +- + drivers/gpu/drm/panel/Kconfig | 39 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-edp.c | 9 + + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 1098 +++++--- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 69 + + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 580 ++-- + drivers/gpu/drm/panel/panel-samsung-s6e3fc2x01.c | 385 +++ + drivers/gpu/drm/panel/panel-sharp-lq079l1sx01.c | 225 ++ + drivers/gpu/drm/panel/panel-simple.c | 35 + + drivers/gpu/drm/panel/panel-synaptics-tddi.c | 277 ++ + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 71 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 68 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 24 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 243 +- + drivers/gpu/drm/panfrost/panfrost_dump.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 9 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 68 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 346 ++- + drivers/gpu/drm/panfrost/panfrost_job.h | 38 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 115 +- + drivers/gpu/drm/panfrost/panfrost_mmu.h | 3 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 26 +- + drivers/gpu/drm/panthor/panthor_devfreq.c | 62 +- + drivers/gpu/drm/panthor/panthor_devfreq.h | 2 + + drivers/gpu/drm/panthor/panthor_device.c | 25 +- + drivers/gpu/drm/panthor/panthor_device.h | 17 +- + drivers/gpu/drm/panthor/panthor_drv.c | 13 +- + drivers/gpu/drm/panthor/panthor_fw.c | 3 +- + drivers/gpu/drm/panthor/panthor_gem.c | 15 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 26 +- + drivers/gpu/drm/panthor/panthor_heap.c | 1 + + drivers/gpu/drm/panthor/panthor_hw.c | 2 + + drivers/gpu/drm/panthor/panthor_mmu.c | 127 +- + drivers/gpu/drm/panthor/panthor_regs.h | 4 + + drivers/gpu/drm/panthor/panthor_sched.c | 52 +- + drivers/gpu/drm/panthor/panthor_sched.h | 3 +- + drivers/gpu/drm/pl111/pl111_display.c | 14 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 1 + + drivers/gpu/drm/qxl/qxl_debugfs.c | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 30 + + drivers/gpu/drm/qxl/qxl_drv.c | 1 + + drivers/gpu/drm/qxl/qxl_gem.c | 3 +- + drivers/gpu/drm/qxl/qxl_image.c | 2 + + drivers/gpu/drm/qxl/qxl_ioctl.c | 2 + + drivers/gpu/drm/qxl/qxl_irq.c | 1 + + drivers/gpu/drm/qxl/qxl_kms.c | 1 + + drivers/gpu/drm/qxl/qxl_release.c | 2 + + drivers/gpu/drm/qxl/qxl_ttm.c | 3 +- + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_acpi.c | 1 - + drivers/gpu/drm/radeon/radeon_connectors.c | 20 +- + drivers/gpu/drm/radeon/radeon_device.c | 4 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 - + drivers/gpu/drm/radeon/radeon_drv.c | 88 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 4 - + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 4 - + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 3 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 7 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 50 +- + .../gpu/drm/renesas/rcar-du/rcar_mipi_dsi_regs.h | 387 +-- + drivers/gpu/drm/renesas/rz-du/Kconfig | 2 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 13 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 + + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 + + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 21 + + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 77 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 1 + + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 84 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 + + drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 + + drivers/gpu/drm/scheduler/sched_main.c | 20 +- + drivers/gpu/drm/scheduler/tests/sched_tests.h | 3 +- + drivers/gpu/drm/sitronix/st7571-i2c.c | 3 +- + drivers/gpu/drm/sitronix/st7586.c | 1 + + drivers/gpu/drm/sitronix/st7735r.c | 1 + + drivers/gpu/drm/solomon/ssd130x.c | 87 +- + drivers/gpu/drm/sti/sti_cursor.c | 1 + + drivers/gpu/drm/sti/sti_drv.c | 19 +- + drivers/gpu/drm/sti/sti_gdp.c | 1 + + drivers/gpu/drm/sti/sti_hda.c | 5 + + drivers/gpu/drm/sti/sti_hdmi.c | 2 + + drivers/gpu/drm/sti/sti_hqvdp.c | 1 + + drivers/gpu/drm/sti/sti_plane.c | 1 + + drivers/gpu/drm/stm/drv.c | 1 + + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 14 +- + drivers/gpu/drm/stm/ltdc.c | 1 + + drivers/gpu/drm/stm/lvds.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 1 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 + + drivers/gpu/drm/sun4i/sun4i_frontend.c | 1 + + drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c | 18 +- + drivers/gpu/drm/sun4i/sun8i_csc.c | 125 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 16 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 218 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 65 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 199 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 7 +- + drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 44 +- + drivers/gpu/drm/sun4i/sun8i_ui_scaler.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 248 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 7 +- + drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 51 +- + drivers/gpu/drm/sun4i/sun8i_vi_scaler.h | 6 +- + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 34 +- + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 153 +- + drivers/gpu/drm/sysfb/efidrm.c | 1 + + drivers/gpu/drm/sysfb/ofdrm.c | 1 + + drivers/gpu/drm/sysfb/simpledrm.c | 4 +- + drivers/gpu/drm/sysfb/vesadrm.c | 4 +- + drivers/gpu/drm/tegra/dc.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 1 + + drivers/gpu/drm/tegra/dsi.c | 1 + + drivers/gpu/drm/tegra/fb.c | 1 + + drivers/gpu/drm/tegra/fbdev.c | 2 - + drivers/gpu/drm/tegra/gem.c | 8 +- + drivers/gpu/drm/tegra/hdmi.c | 5 +- + drivers/gpu/drm/tegra/hub.c | 1 + + drivers/gpu/drm/tegra/sor.c | 5 +- + drivers/gpu/drm/tests/.kunitconfig | 2 + + drivers/gpu/drm/tests/drm_buddy_test.c | 105 + + drivers/gpu/drm/tests/drm_mm_test.c | 1 + + drivers/gpu/drm/tidss/tidss_crtc.c | 42 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 126 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 6 +- + drivers/gpu/drm/tidss/tidss_drv.c | 16 - + drivers/gpu/drm/tidss/tidss_drv.h | 2 + + drivers/gpu/drm/tidss/tidss_kms.c | 4 - + drivers/gpu/drm/tidss/tidss_oldi.c | 22 + + drivers/gpu/drm/tidss/tidss_plane.c | 8 - + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 9 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 3 +- + drivers/gpu/drm/tiny/bochs.c | 11 + + drivers/gpu/drm/tiny/cirrus-qemu.c | 12 + + drivers/gpu/drm/tiny/gm12u320.c | 1 + + drivers/gpu/drm/tiny/hx8357d.c | 1 + + drivers/gpu/drm/tiny/ili9163.c | 1 + + drivers/gpu/drm/tiny/ili9225.c | 1 + + drivers/gpu/drm/tiny/ili9341.c | 1 + + drivers/gpu/drm/tiny/ili9486.c | 1 + + drivers/gpu/drm/tiny/mi0283qt.c | 1 + + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 1 + + drivers/gpu/drm/tiny/pixpaper.c | 1 + + drivers/gpu/drm/tiny/repaper.c | 1 + + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 28 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 62 +- + drivers/gpu/drm/ttm/tests/ttm_device_test.c | 33 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 22 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 7 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 1 + + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 24 +- + drivers/gpu/drm/ttm/ttm_bo.c | 20 +- + drivers/gpu/drm/ttm/ttm_bo_internal.h | 2 + + drivers/gpu/drm/ttm/ttm_device.c | 9 +- + drivers/gpu/drm/ttm/ttm_module.c | 3 +- + drivers/gpu/drm/ttm/ttm_pool.c | 45 +- + drivers/gpu/drm/ttm/ttm_pool_internal.h | 25 + + drivers/gpu/drm/ttm/ttm_resource.c | 4 + + drivers/gpu/drm/ttm/ttm_tt.c | 11 +- + drivers/gpu/drm/tve200/tve200_display.c | 1 + + drivers/gpu/drm/udl/udl_edid.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 2 + + drivers/gpu/drm/v3d/v3d_debugfs.c | 1 + + drivers/gpu/drm/v3d/v3d_drv.c | 1 + + drivers/gpu/drm/v3d/v3d_gem.c | 1 + + drivers/gpu/drm/v3d/v3d_gemfs.c | 2 + + drivers/gpu/drm/v3d/v3d_irq.c | 2 + + drivers/gpu/drm/v3d/v3d_sched.c | 1 + + drivers/gpu/drm/v3d/v3d_submit.c | 1 + + drivers/gpu/drm/vboxvideo/vbox_irq.c | 1 + + drivers/gpu/drm/vboxvideo/vbox_main.c | 1 + + drivers/gpu/drm/vboxvideo/vbox_mode.c | 9 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 1 + + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/vc4_bo.c | 1 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 + + drivers/gpu/drm/vc4/vc4_dpi.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + drivers/gpu/drm/vc4/vc4_dsi.c | 1 + + drivers/gpu/drm/vc4/vc4_gem.c | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 138 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 1 - + drivers/gpu/drm/vc4/vc4_hvs.c | 1 + + drivers/gpu/drm/vc4/vc4_irq.c | 1 + + drivers/gpu/drm/vc4/vc4_kms.c | 1 + + drivers/gpu/drm/vc4/vc4_perfmon.c | 2 + + drivers/gpu/drm/vc4/vc4_plane.c | 7 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 2 + + drivers/gpu/drm/vc4/vc4_txp.c | 1 + + drivers/gpu/drm/vc4/vc4_v3d.c | 2 + + drivers/gpu/drm/vc4/vc4_validate.c | 2 + + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 2 + + drivers/gpu/drm/vc4/vc4_vec.c | 1 + + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_display.c | 37 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + + drivers/gpu/drm/virtio/virtgpu_object.c | 2 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 1 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 1 + + drivers/gpu/drm/vkms/Kconfig | 1 + + drivers/gpu/drm/vkms/Makefile | 3 +- + drivers/gpu/drm/vkms/tests/vkms_config_test.c | 24 + + drivers/gpu/drm/vkms/vkms_composer.c | 1 + + drivers/gpu/drm/vkms/vkms_config.c | 8 +- + drivers/gpu/drm/vkms/vkms_config.h | 26 + + drivers/gpu/drm/vkms/vkms_configfs.c | 843 ++++++ + drivers/gpu/drm/vkms/vkms_configfs.h | 8 + + drivers/gpu/drm/vkms/vkms_connector.c | 35 + + drivers/gpu/drm/vkms/vkms_connector.h | 9 + + drivers/gpu/drm/vkms/vkms_crtc.c | 88 +- + drivers/gpu/drm/vkms/vkms_drv.c | 19 +- + drivers/gpu/drm/vkms/vkms_drv.h | 22 +- + drivers/gpu/drm/vkms/vkms_output.c | 1 + + drivers/gpu/drm/vkms/vkms_plane.c | 1 + + drivers/gpu/drm/vkms/vkms_writeback.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 6 +- + drivers/gpu/drm/xe/Kconfig.debug | 22 +- + drivers/gpu/drm/xe/Makefile | 20 +- + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 8 - + .../xe/compat-i915-headers/gem/i915_gem_object.h | 4 +- + .../xe/compat-i915-headers/gem/i915_gem_stolen.h | 79 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 4 - + .../xe/compat-i915-headers/i915_scheduler_types.h | 13 - + .../gpu/drm/xe/compat-i915-headers/i915_utils.h | 9 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h | 2 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 31 +- + drivers/gpu/drm/xe/display/ext/i915_utils.c | 27 - + drivers/gpu/drm/xe/display/intel_bo.c | 60 +- + drivers/gpu/drm/xe/display/intel_fb_bo.c | 3 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 72 +- + drivers/gpu/drm/xe/display/xe_display.c | 23 +- + drivers/gpu/drm/xe/display/xe_display.h | 4 +- + drivers/gpu/drm/xe/display/xe_display_rpm.c | 61 +- + drivers/gpu/drm/xe/display/xe_display_rpm.h | 11 + + drivers/gpu/drm/xe/display/xe_display_wa.c | 3 +- + drivers/gpu/drm/xe/display/xe_panic.c | 50 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 4 +- + drivers/gpu/drm/xe/display/xe_stolen.c | 123 + + drivers/gpu/drm/xe/instructions/xe_gpu_commands.h | 6 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 4 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 30 +- + drivers/gpu/drm/xe/regs/xe_i2c_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 8 +- + drivers/gpu/drm/xe/regs/xe_pmt.h | 1 + + drivers/gpu/drm/xe/regs/xe_regs.h | 2 + + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 17 +- + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 208 ++ + drivers/gpu/drm/xe/tests/xe_pci.c | 6 +- + drivers/gpu/drm/xe/tests/xe_pci_test.c | 16 +- + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 117 +- + drivers/gpu/drm/xe/xe_bo.h | 4 +- + drivers/gpu/drm/xe/xe_bo_doc.h | 8 +- + drivers/gpu/drm/xe/xe_bo_evict.c | 9 + + drivers/gpu/drm/xe/xe_configfs.c | 283 +- + drivers/gpu/drm/xe/xe_configfs.h | 8 + + drivers/gpu/drm/xe/xe_debugfs.c | 16 +- + drivers/gpu/drm/xe/xe_device.c | 79 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 10 +- + drivers/gpu/drm/xe/xe_device_types.h | 55 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 3 + + drivers/gpu/drm/xe/xe_dma_buf.c | 41 +- + drivers/gpu/drm/xe/xe_eu_stall.c | 36 +- + drivers/gpu/drm/xe/xe_exec.c | 28 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 233 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 28 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 13 + + drivers/gpu/drm/xe/xe_execlist.c | 2 +- + drivers/gpu/drm/xe/xe_force_wake_types.h | 26 +- + drivers/gpu/drm/xe/xe_ggtt.c | 174 +- + drivers/gpu/drm/xe/xe_ggtt.h | 3 + + drivers/gpu/drm/xe/xe_ggtt_types.h | 2 + + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 27 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 29 +- + drivers/gpu/drm/xe/xe_gsc.c | 4 +- + drivers/gpu/drm/xe/xe_gt.c | 96 +- + drivers/gpu/drm/xe/xe_gt.h | 19 + + drivers/gpu/drm/xe/xe_gt_clock.c | 19 - + drivers/gpu/drm/xe/xe_gt_debugfs.c | 159 +- + drivers/gpu/drm/xe/xe_gt_debugfs.h | 1 + + drivers/gpu/drm/xe/xe_gt_freq.c | 37 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 80 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 679 ----- + drivers/gpu/drm/xe/xe_gt_pagefault.h | 19 - + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 36 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 357 ++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 16 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 750 +++++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 12 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h | 36 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 475 ++-- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 1123 ++++++-- + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h | 46 +- + .../gpu/drm/xe/xe_gt_sriov_pf_migration_types.h | 34 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 21 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_printk.h | 7 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 465 +++- + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 11 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 34 +- + drivers/gpu/drm/xe/xe_gt_throttle.c | 375 +-- + drivers/gpu/drm/xe/xe_gt_topology.c | 24 +- + drivers/gpu/drm/xe/xe_gt_topology.h | 4 +- + drivers/gpu/drm/xe/xe_gt_types.h | 79 +- + drivers/gpu/drm/xe/xe_guard.h | 119 + + drivers/gpu/drm/xe/xe_guc.c | 332 +-- + drivers/gpu/drm/xe/xe_guc.h | 1 + + drivers/gpu/drm/xe/xe_guc_ads.c | 8 +- + drivers/gpu/drm/xe/xe_guc_ads_types.h | 2 +- + drivers/gpu/drm/xe/xe_guc_buf.c | 57 +- + drivers/gpu/drm/xe/xe_guc_buf.h | 2 + + drivers/gpu/drm/xe/xe_guc_capture.c | 29 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 377 +-- + drivers/gpu/drm/xe/xe_guc_ct.h | 13 +- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 2 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 15 + + drivers/gpu/drm/xe/xe_guc_fwif.h | 1 + + drivers/gpu/drm/xe/xe_guc_log_types.h | 2 +- + drivers/gpu/drm/xe/xe_guc_pagefault.c | 95 + + drivers/gpu/drm/xe/xe_guc_pagefault.h | 15 + + drivers/gpu/drm/xe/xe_guc_pc.c | 147 +- + drivers/gpu/drm/xe/xe_guc_pc_types.h | 4 - + drivers/gpu/drm/xe/xe_guc_relay.c | 17 +- + drivers/gpu/drm/xe/xe_guc_relay_types.h | 4 + + drivers/gpu/drm/xe/xe_guc_submit.c | 606 +++-- + drivers/gpu/drm/xe/xe_guc_submit.h | 7 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 2 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 2 + + drivers/gpu/drm/xe/xe_huc.c | 10 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 62 +- + drivers/gpu/drm/xe/xe_hwmon.c | 8 - + drivers/gpu/drm/xe/xe_i2c.c | 28 +- + drivers/gpu/drm/xe/xe_i2c.h | 4 + + drivers/gpu/drm/xe/xe_irq.c | 136 +- + drivers/gpu/drm/xe/xe_lmtt.c | 11 +- + drivers/gpu/drm/xe/xe_lrc.c | 20 +- + drivers/gpu/drm/xe/xe_lrc.h | 16 +- + drivers/gpu/drm/xe/xe_map.h | 22 +- + drivers/gpu/drm/xe/xe_memirq.c | 57 +- + drivers/gpu/drm/xe/xe_memirq.h | 2 + + drivers/gpu/drm/xe/xe_migrate.c | 367 ++- + drivers/gpu/drm/xe/xe_migrate.h | 16 + + drivers/gpu/drm/xe/xe_migrate_doc.h | 2 +- + drivers/gpu/drm/xe/xe_mmio.c | 29 + + drivers/gpu/drm/xe/xe_mmio.h | 4 + + drivers/gpu/drm/xe/xe_mocs.c | 42 +- + drivers/gpu/drm/xe/xe_mocs.h | 8 +- + drivers/gpu/drm/xe/xe_oa.c | 20 +- + drivers/gpu/drm/xe/xe_oa_types.h | 3 + + drivers/gpu/drm/xe/xe_pagefault.c | 445 +++ + drivers/gpu/drm/xe/xe_pagefault.h | 19 + + drivers/gpu/drm/xe/xe_pagefault_types.h | 136 + + drivers/gpu/drm/xe/xe_pat.c | 145 +- + drivers/gpu/drm/xe/xe_pat.h | 12 +- + drivers/gpu/drm/xe/xe_pci.c | 284 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 115 +- + drivers/gpu/drm/xe/xe_pci_sriov.h | 1 + + drivers/gpu/drm/xe/xe_pci_types.h | 11 +- + drivers/gpu/drm/xe/xe_pcode.c | 40 +- + drivers/gpu/drm/xe/xe_pcode_api.h | 6 - + drivers/gpu/drm/xe/xe_platform_types.h | 3 + + drivers/gpu/drm/xe/xe_pm.c | 66 + + drivers/gpu/drm/xe/xe_pm.h | 2 + + drivers/gpu/drm/xe/xe_pmu.c | 11 +- + drivers/gpu/drm/xe/xe_preempt_fence.c | 11 + + drivers/gpu/drm/xe/xe_preempt_fence_types.h | 2 +- + drivers/gpu/drm/xe/xe_psmi.c | 4 +- + drivers/gpu/drm/xe/xe_pt.c | 110 +- + drivers/gpu/drm/xe/xe_query.c | 2 +- + drivers/gpu/drm/xe/xe_range_fence.h | 4 +- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 10 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 23 +- + drivers/gpu/drm/xe/xe_rtp.c | 31 +- + drivers/gpu/drm/xe/xe_rtp.h | 30 +- + drivers/gpu/drm/xe/xe_rtp_types.h | 4 +- + drivers/gpu/drm/xe/xe_sa.c | 21 + + drivers/gpu/drm/xe/xe_sa.h | 1 + + drivers/gpu/drm/xe/xe_sched_job.c | 25 +- + drivers/gpu/drm/xe/xe_sched_job.h | 13 +- + drivers/gpu/drm/xe/xe_sched_job_types.h | 11 +- + drivers/gpu/drm/xe/xe_sriov.c | 2 + + drivers/gpu/drm/xe/xe_sriov_packet.c | 520 ++++ + drivers/gpu/drm/xe/xe_sriov_packet.h | 30 + + drivers/gpu/drm/xe/xe_sriov_packet_types.h | 75 + + drivers/gpu/drm/xe/xe_sriov_pf.c | 177 +- + drivers/gpu/drm/xe/xe_sriov_pf.h | 22 +- + drivers/gpu/drm/xe/xe_sriov_pf_control.c | 279 ++ + drivers/gpu/drm/xe/xe_sriov_pf_control.h | 22 + + drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c | 395 +++ + drivers/gpu/drm/xe/xe_sriov_pf_debugfs.h | 18 + + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 27 + + drivers/gpu/drm/xe/xe_sriov_pf_migration.c | 340 +++ + drivers/gpu/drm/xe/xe_sriov_pf_migration.h | 29 + + drivers/gpu/drm/xe/xe_sriov_pf_migration_types.h | 37 + + drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 438 +++ + drivers/gpu/drm/xe/xe_sriov_pf_provision.h | 45 + + drivers/gpu/drm/xe/xe_sriov_pf_provision_types.h | 36 + + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 647 +++++ + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.h | 16 + + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 25 + + drivers/gpu/drm/xe/xe_sriov_printk.h | 12 +- + drivers/gpu/drm/xe/xe_sriov_vf.c | 286 +- + drivers/gpu/drm/xe/xe_sriov_vf.h | 2 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 74 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 1 + + drivers/gpu/drm/xe/xe_sriov_vf_types.h | 10 +- + drivers/gpu/drm/xe/xe_svm.c | 5 +- + drivers/gpu/drm/xe/xe_sync.c | 78 +- + drivers/gpu/drm/xe/xe_tile.c | 14 +- + drivers/gpu/drm/xe/xe_tile_debugfs.c | 19 +- + drivers/gpu/drm/xe/xe_tile_debugfs.h | 3 + + drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c | 253 ++ + drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.h | 15 + + drivers/gpu/drm/xe/xe_tile_sriov_printk.h | 33 + + drivers/gpu/drm/xe/xe_tile_sriov_vf.c | 114 +- + drivers/gpu/drm/xe/xe_tile_sriov_vf.h | 9 +- + drivers/gpu/drm/xe/xe_tile_sriov_vf_types.h | 23 + + drivers/gpu/drm/xe/xe_tlb_inval.h | 2 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.c | 31 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.h | 5 +- + drivers/gpu/drm/xe/xe_trace.h | 23 + + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 8 +- + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 6 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 6 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 4 +- + drivers/gpu/drm/xe/xe_tuning.c | 27 +- + drivers/gpu/drm/xe/xe_tuning.h | 2 +- + drivers/gpu/drm/xe/xe_uc_fw_types.h | 6 +- + drivers/gpu/drm/xe/xe_uc_types.h | 2 +- + drivers/gpu/drm/xe/xe_userptr.c | 4 +- + drivers/gpu/drm/xe/xe_validation.h | 6 +- + drivers/gpu/drm/xe/xe_vm.c | 138 +- + drivers/gpu/drm/xe/xe_vm_doc.h | 8 +- + drivers/gpu/drm/xe/xe_vm_types.h | 10 +- + drivers/gpu/drm/xe/xe_vram.c | 38 +- + drivers/gpu/drm/xe/xe_wa.c | 27 +- + drivers/gpu/drm/xe/xe_wa.h | 2 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 17 +- + drivers/gpu/drm/xen/xen_drm_front.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_kms.c | 1 + + drivers/gpu/drm/xlnx/zynqmp_kms.c | 7 +- + drivers/gpu/host1x/bus.c | 12 + + drivers/gpu/host1x/dev.c | 11 +- + drivers/gpu/host1x/hw/channel_hw.c | 112 +- + drivers/gpu/host1x/syncpt.c | 4 +- + drivers/gpu/nova-core/bitfield.rs | 330 +++ + drivers/gpu/nova-core/dma.rs | 34 +- + drivers/gpu/nova-core/driver.rs | 27 +- + drivers/gpu/nova-core/falcon.rs | 287 +- + drivers/gpu/nova-core/falcon/gsp.rs | 29 +- + drivers/gpu/nova-core/falcon/hal.rs | 14 +- + drivers/gpu/nova-core/falcon/hal/ga102.rs | 46 +- + drivers/gpu/nova-core/falcon/sec2.rs | 10 +- + drivers/gpu/nova-core/fb.rs | 100 +- + drivers/gpu/nova-core/fb/hal.rs | 6 +- + drivers/gpu/nova-core/fb/hal/ga100.rs | 16 +- + drivers/gpu/nova-core/fb/hal/ga102.rs | 8 +- + drivers/gpu/nova-core/fb/hal/tu102.rs | 25 +- + drivers/gpu/nova-core/firmware.rs | 31 +- + drivers/gpu/nova-core/firmware/booter.rs | 78 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 184 +- + drivers/gpu/nova-core/firmware/gsp.rs | 53 +- + drivers/gpu/nova-core/firmware/riscv.rs | 34 +- + drivers/gpu/nova-core/gfw.rs | 48 +- + drivers/gpu/nova-core/gpu.rs | 117 +- + drivers/gpu/nova-core/gsp.rs | 157 +- + drivers/gpu/nova-core/gsp/boot.rs | 153 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 679 +++++ + drivers/gpu/nova-core/gsp/commands.rs | 227 ++ + drivers/gpu/nova-core/gsp/fw.rs | 923 ++++++- + drivers/gpu/nova-core/gsp/fw/commands.rs | 128 + + drivers/gpu/nova-core/gsp/fw/r570_144.rs | 6 +- + drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 950 +++++++ + drivers/gpu/nova-core/gsp/sequencer.rs | 407 +++ + drivers/gpu/nova-core/nova_core.rs | 5 + + drivers/gpu/nova-core/num.rs | 217 ++ + drivers/gpu/nova-core/regs.rs | 93 +- + drivers/gpu/nova-core/regs/macros.rs | 287 +- + drivers/gpu/nova-core/sbuffer.rs | 227 ++ + drivers/gpu/nova-core/util.rs | 33 +- + drivers/gpu/nova-core/vbios.rs | 423 ++- + drivers/video/fbdev/Kconfig | 8 +- + drivers/video/fbdev/core/Kconfig | 2 +- + drivers/video/fbdev/core/bitblit.c | 122 +- + drivers/video/fbdev/core/fbcon.c | 459 ++-- + drivers/video/fbdev/core/fbcon.h | 17 +- + drivers/video/fbdev/core/fbcon_ccw.c | 151 +- + drivers/video/fbdev/core/fbcon_cw.c | 151 +- + drivers/video/fbdev/core/fbcon_rotate.c | 47 +- + drivers/video/fbdev/core/fbcon_rotate.h | 18 +- + drivers/video/fbdev/core/fbcon_ud.c | 167 +- + drivers/video/fbdev/core/softcursor.c | 18 +- + drivers/video/fbdev/core/tileblit.c | 32 +- + drivers/video/fbdev/simplefb.c | 6 +- + include/drm/bridge/dw_hdmi.h | 11 +- + include/drm/bridge/dw_hdmi_qp.h | 2 + + include/drm/display/drm_dp.h | 6 + + include/drm/display/drm_dp_helper.h | 22 + + include/drm/drm_atomic.h | 160 +- + include/drm/drm_bridge.h | 61 +- + include/drm/drm_buddy.h | 13 +- + include/drm/drm_client.h | 45 +- + include/drm/drm_client_event.h | 8 +- + include/drm/drm_crtc.h | 20 +- + include/drm/drm_dumb_buffers.h | 14 + + include/drm/drm_edid.h | 6 + + include/drm/drm_format_helper.h | 4 - + include/drm/drm_gem_shmem_helper.h | 2 + + include/drm/drm_gpusvm.h | 4 + + include/drm/drm_gpuvm.h | 16 + + include/drm/drm_mm.h | 2 +- + include/drm/drm_modeset_helper_vtables.h | 12 + + include/drm/drm_vblank.h | 32 + + include/drm/drm_vblank_helper.h | 56 + + include/drm/gpu_scheduler.h | 2 +- + include/drm/intel/display_member.h | 42 + + include/drm/intel/display_parent_interface.h | 45 + + include/drm/intel/pciids.h | 20 +- + include/drm/ttm/ttm_allocation.h | 12 + + include/drm/ttm/ttm_bo.h | 2 +- + include/drm/ttm/ttm_device.h | 8 +- + include/drm/ttm/ttm_pool.h | 8 +- + include/drm/ttm/ttm_resource.h | 3 +- + include/linux/dma-buf/heaps/cma.h | 16 + + include/sound/asoundef.h | 9 + + include/uapi/drm/amdxdna_accel.h | 61 + + include/uapi/drm/drm_mode.h | 50 +- + include/uapi/drm/ethosu_accel.h | 261 ++ + include/uapi/drm/ivpu_accel.h | 63 + + include/uapi/drm/panfrost_drm.h | 150 +- + include/uapi/drm/xe_drm.h | 6 +- + init/Kconfig | 3 + + kernel/dma/contiguous.c | 11 + + rust/kernel/drm/gem/mod.rs | 53 +- + rust/kernel/lib.rs | 4 + + rust/kernel/prelude.rs | 3 + + rust/kernel/slice.rs | 49 + + rust/kernel/transmute.rs | 63 + + 1704 files changed, 84871 insertions(+), 20900 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-qaic + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-xe-sriov + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8mp-hdmi-pai.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,glymur-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,qcs8300-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,il79900a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e3fc2x01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq079l1sx01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/synaptics,td4300-panel.yaml + create mode 100644 Documentation/devicetree/bindings/npu/arm,ethos.yaml + create mode 100644 Documentation/gpu/xe/xe_exec_queue.rst + create mode 100644 drivers/accel/amdxdna/amdxdna_error.h + create mode 100644 drivers/accel/amdxdna/amdxdna_pm.c + create mode 100644 drivers/accel/amdxdna/amdxdna_pm.h + create mode 100644 drivers/accel/ethosu/Kconfig + create mode 100644 drivers/accel/ethosu/Makefile + create mode 100644 drivers/accel/ethosu/ethosu_device.h + create mode 100644 drivers/accel/ethosu/ethosu_drv.c + create mode 100644 drivers/accel/ethosu/ethosu_drv.h + create mode 100644 drivers/accel/ethosu/ethosu_gem.c + create mode 100644 drivers/accel/ethosu/ethosu_gem.h + create mode 100644 drivers/accel/ethosu/ethosu_job.c + create mode 100644 drivers/accel/ethosu/ethosu_job.h + create mode 100644 drivers/accel/ivpu/ivpu_gem_userptr.c + create mode 100644 drivers/accel/qaic/qaic_ssr.c + create mode 100644 drivers/accel/qaic/qaic_ssr.h + create mode 100644 drivers/accel/qaic/qaic_sysfs.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v1_0.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/Makefile + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/cmntypes.h (93%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/display_mode_core.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/display_mode_core.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/display_mode_core_structs.h (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/display_mode_lib_defines.h (95%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/display_mode_util.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/display_mode_util.h (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/dml21_translation_helper.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/dml21_translation_helper.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/dml21_utils.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/dml21_utils.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/dml21_wrapper.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/dml21_wrapper.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/bounding_boxes/dcn4_soc_bb.h (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml2_external_lib_deps.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml_top.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml_top_dchub_registers.h (98%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml_top_display_cfg_types.h (95%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml_top_policy_types.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml_top_soc_parameter_types.h (94%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/inc/dml_top_types.h (98%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_dcn4.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_dcn4.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_dcn4_calcs.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_dcn4_calcs.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_factory.c (96%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_factory.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_shared_types.h (98%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_utils.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_core/dml2_core_utils.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_dpmm/dml2_dpmm_factory.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_dpmm/dml2_dpmm_factory.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_mcg/dml2_mcg_dcn4.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_mcg/dml2_mcg_dcn4.h (97%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_mcg/dml2_mcg_factory.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_mcg/dml2_mcg_factory.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_pmo/dml2_pmo_dcn3.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_pmo/dml2_pmo_dcn3.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c (82%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_pmo/dml2_pmo_factory.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_pmo/dml2_pmo_factory.h (97%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_standalone_libraries/lib_float_math.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_standalone_libraries/lib_float_math.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_top/dml2_top_interfaces.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_top/dml2_top_legacy.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_top/dml2_top_legacy.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_top/dml2_top_soc15.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/dml2_top/dml2_top_soc15.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/inc/dml2_debug.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml21/src/inc/dml2_internal_shared_types.h (93%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_dc_resource_mgmt.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_dc_resource_mgmt.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_dc_types.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_internal_types.h (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_mall_phantom.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_mall_phantom.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_policy.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_policy.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_translation_helper.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_translation_helper.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_utils.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_utils.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_wrapper.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml2_wrapper.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml_assert.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml_depedencies.h (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml_display_rq_dlg_calc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml_display_rq_dlg_calc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2 => dml2_0}/dml_logging.h (99%) + create mode 100644 drivers/gpu/drm/amd/ras/Makefile + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/Makefile + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_nbio_v7_9.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_nbio_v7_9.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_aca.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_aca.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_cmd.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_cmd.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_core.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_cper.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_cper.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_eeprom.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_eeprom.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_gfx.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_gfx.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_gfx_v9_0.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_log_ring.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_mp1.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_mp1.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_nbio.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_nbio.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_nbio_v7_9.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_process.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_process.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_psp.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_psp.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_psp_v13_0.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_umc.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_umc.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.h + create mode 100644 drivers/gpu/drm/ast/ast_2200.c + create mode 100644 drivers/gpu/drm/ast/ast_2400.c + delete mode 100644 drivers/gpu/drm/ast/ast_main.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c + create mode 100644 drivers/gpu/drm/drm_vblank_helper.c + create mode 100644 drivers/gpu/drm/i915/display/intel_casf.c + create mode 100644 drivers/gpu/drm/i915/display/intel_casf.h + create mode 100644 drivers/gpu/drm/i915/display/intel_casf_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dbuf_bw.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dbuf_bw.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_jiffies.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_utils.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_utils.h + create mode 100644 drivers/gpu/drm/i915/display/intel_lt_phy.c + create mode 100644 drivers/gpu/drm/i915/display/intel_lt_phy.h + create mode 100644 drivers/gpu/drm/i915/display/intel_lt_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/skl_prefill.c + create mode 100644 drivers/gpu/drm/i915/display/skl_prefill.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_clock.c + create mode 100644 drivers/gpu/drm/i915/display/vlv_clock.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c + create mode 100644 drivers/gpu/drm/i915/i915_jiffies.h + create mode 100644 drivers/gpu/drm/i915/i915_mmio_range.c + create mode 100644 drivers/gpu/drm/i915/i915_mmio_range.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_common.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_common.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_regs_v2.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_v2.c + create mode 100644 drivers/gpu/drm/msm/adreno/a8xx_gpu.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a8xx_descriptors.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a8xx_enums.xml + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a_devfreq.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a_devfreq.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.h + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e3fc2x01.c + create mode 100644 drivers/gpu/drm/panel/panel-sharp-lq079l1sx01.c + create mode 100644 drivers/gpu/drm/panel/panel-synaptics-tddi.c + create mode 100644 drivers/gpu/drm/ttm/ttm_pool_internal.h + create mode 100644 drivers/gpu/drm/vkms/vkms_configfs.c + create mode 100644 drivers/gpu/drm/vkms/vkms_configfs.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_scheduler_types.h + delete mode 100644 drivers/gpu/drm/xe/display/ext/i915_utils.c + create mode 100644 drivers/gpu/drm/xe/display/xe_display_rpm.h + create mode 100644 drivers/gpu/drm/xe/display/xe_stolen.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c + delete mode 100644 drivers/gpu/drm/xe/xe_gt_pagefault.c + delete mode 100644 drivers/gpu/drm/xe/xe_gt_pagefault.h + create mode 100644 drivers/gpu/drm/xe/xe_guard.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_pagefault.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_pagefault.h + create mode 100644 drivers/gpu/drm/xe/xe_pagefault.c + create mode 100644 drivers/gpu/drm/xe/xe_pagefault.h + create mode 100644 drivers/gpu/drm/xe/xe_pagefault_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_packet.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_packet.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_packet_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_control.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_control.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_migration.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_migration.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_migration_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_provision.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_provision.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_provision_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_sysfs.h + create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_printk.h + create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_vf_types.h + create mode 100644 drivers/gpu/nova-core/bitfield.rs + create mode 100644 drivers/gpu/nova-core/gsp/cmdq.rs + create mode 100644 drivers/gpu/nova-core/gsp/commands.rs + create mode 100644 drivers/gpu/nova-core/gsp/fw/commands.rs + create mode 100644 drivers/gpu/nova-core/gsp/sequencer.rs + create mode 100644 drivers/gpu/nova-core/num.rs + create mode 100644 drivers/gpu/nova-core/sbuffer.rs + create mode 100644 include/drm/drm_dumb_buffers.h + create mode 100644 include/drm/drm_vblank_helper.h + create mode 100644 include/drm/intel/display_member.h + create mode 100644 include/drm/intel/display_parent_interface.h + create mode 100644 include/drm/ttm/ttm_allocation.h + create mode 100644 include/linux/dma-buf/heaps/cma.h + create mode 100644 include/uapi/drm/ethosu_accel.h + create mode 100644 rust/kernel/slice.rs +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 (31d3354f42c0 drm/nouveau: verify that hardware supports the flush page address) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gb100.c | 3 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gb202.c | 3 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 3 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gh100.c | 3 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | 3 +++ + 6 files changed, 16 insertions(+), 1 deletion(-) +Merging amdgpu/drm-next (5427e32fa3a0 drm/amdgpu: fix cyan_skillfish2 gpu info fw handling) +$ 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/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 35 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 8 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 570 +++++++++++++++++++++ + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 104 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 76 ++- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 11 +- + drivers/gpu/drm/amd/display/dc/dc.h | 490 +++++++++++++++++- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 36 ++ + drivers/gpu/drm/amd/display/dc/dc_types.h | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 3 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 13 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 7 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 2 - + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 4 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 13 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 26 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 2 - + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 12 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 15 +- + .../display/dc/link/protocols/link_dp_capability.c | 5 + + .../dc/link/protocols/link_edp_panel_control.c | 126 ++++- + .../display/dc/resource/dcn401/dcn401_resource.h | 3 +- + .../display/dc/virtual/virtual_stream_encoder.c | 7 - + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 1 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 16 + + .../drm/amd/display/modules/power/power_helpers.c | 3 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 12 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 11 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 5 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 7 +- + 42 files changed, 1608 insertions(+), 111 deletions(-) +Merging drm-intel/for-linux-next (611d4d160616 Merge tag 'mediatek-drm-next-20251120' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Already up to date. +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 (57dc2ea0b7bd rust: slice: fix broken intra-doc links) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Already up to date. +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 (43fb9e113bf1 drm/xe/gt: Introduce runtime suspend/resume) + 28aeaed130e8 ("drm/xe/oa: Fix potential UAF in xe_oa_add_config_ioctl()") + 562b0f254d8b ("drm/xe/pf: Fix kernel-doc warning in migration_save_consume") + 78ff838a8ab7 ("drm/xe/pf: Check for fence error on VRAM save/restore") + dab751b4240f ("drm/xe/pf: Drop the VF VRAM BO reference on successful restore") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/Makefile +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_bo.c +Auto-merging drivers/gpu/drm/xe/xe_devcoredump.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_gt.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_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vram.c +Resolved 'drivers/gpu/drm/xe/tests/xe_mocs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 72167334b689] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-sriov | 2 +- + drivers/gpu/drm/drm_gpusvm.c | 3 + + drivers/gpu/drm/xe/Makefile | 1 + + 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/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_mert_regs.h | 21 ++ + 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 | 11 +- + drivers/gpu/drm/xe/xe_debugfs.c | 28 +-- + drivers/gpu/drm/xe/xe_devcoredump.c | 30 +-- + drivers/gpu/drm/xe/xe_device.c | 33 +-- + 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 | 8 + + drivers/gpu/drm/xe/xe_drm_client.c | 67 +++--- + 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_gpu_scheduler.h | 5 +- + 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 | 180 ++++++++------- + drivers/gpu/drm/xe/xe_gt.h | 2 + + drivers/gpu/drm/xe/xe_gt_clock.c | 7 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 29 +-- + drivers/gpu/drm/xe/xe_gt_freq.c | 27 +-- + drivers/gpu/drm/xe/xe_gt_idle.c | 41 +--- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 12 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 6 +- + drivers/gpu/drm/xe/xe_gt_throttle.c | 9 +- + drivers/gpu/drm/xe/xe_guc.c | 70 ++++-- + drivers/gpu/drm/xe/xe_guc.h | 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 | 242 ++++++++++++--------- + drivers/gpu/drm/xe/xe_guc_ct.h | 2 + + drivers/gpu/drm/xe/xe_guc_debugfs.c | 8 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 6 +- + drivers/gpu/drm/xe/xe_guc_log.c | 110 +--------- + drivers/gpu/drm/xe/xe_guc_log.h | 29 ++- + drivers/gpu/drm/xe/xe_guc_pc.c | 62 ++---- + drivers/gpu/drm/xe/xe_guc_submit.c | 96 +++++--- + drivers/gpu/drm/xe/xe_guc_submit.h | 6 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.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_hwmon.c | 52 ++--- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lmtt.c | 25 ++- + 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_pagefault.c | 1 - + drivers/gpu/drm/xe/xe_pat.c | 42 ++-- + drivers/gpu/drm/xe/xe_pat.h | 10 + + drivers/gpu/drm/xe/xe_pci.c | 17 ++ + drivers/gpu/drm/xe/xe_pci_sriov.c | 10 +- + drivers/gpu/drm/xe/xe_pci_types.h | 2 + + drivers/gpu/drm/xe/xe_pm.c | 31 ++- + drivers/gpu/drm/xe/xe_pm.h | 17 ++ + drivers/gpu/drm/xe/xe_pxp.c | 55 ++--- + drivers/gpu/drm/xe/xe_query.c | 16 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 17 +- + 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_sched_job_types.h | 4 +- + 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_ccs.c | 27 ++- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 1 + + drivers/gpu/drm/xe/xe_svm.c | 59 ++--- + 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_uc.c | 35 ++- + drivers/gpu/drm/xe/xe_uc.h | 2 + + drivers/gpu/drm/xe/xe_vm.c | 85 ++++++-- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_types.h | 1 + + drivers/gpu/drm/xe/xe_vram.c | 6 +- + 92 files changed, 1338 insertions(+), 993 deletions(-) + 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 +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 (7ecb5c36b136 fbdev: gxt4500fb: Use dev_err instead of printk) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/gbefb.c | 5 +++-- + drivers/video/fbdev/gxt4500.c | 2 +- + drivers/video/fbdev/vesafb.c | 29 +++++++++++++++-------------- + drivers/video/fbdev/vga16fb.c | 21 +++++++++++++++------ + 4 files changed, 34 insertions(+), 23 deletions(-) +Merging regmap/for-next (d40e1d95246b Merge remote-tracking branch 'regmap/for-6.19' 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. + drivers/base/regmap/internal.h | 2 + + drivers/base/regmap/regcache-flat.c | 113 ++++++++++++++++++++++++++++------ + drivers/base/regmap/regcache-maple.c | 47 +++++++------- + drivers/base/regmap/regcache-rbtree.c | 31 +++++----- + drivers/base/regmap/regcache.c | 17 +++++ + drivers/base/regmap/regmap-i3c.c | 5 +- + drivers/base/regmap/regmap-kunit.c | 22 +++++++ + drivers/base/regmap/regmap-sdw-mbq.c | 3 +- + include/linux/regmap.h | 17 +++-- + 9 files changed, 189 insertions(+), 68 deletions(-) +Merging sound/for-next (b72a6ddf6af2 ALSA: hda/realtek: fix mute/micmute LEDs don't work for HP 200 G2i) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/hda/codecs/realtek/alc269.c +Auto-merging tools/testing/selftests/alsa/conf.c +Merge made by the 'ort' strategy. + include/linux/pci_ids.h | 1 + + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/tas2781.h | 2 +- + sound/ac97_bus.c | 13 ++- + sound/core/pcm_drm_eld.c | 2 +- + sound/drivers/pcmtest.c | 4 +- + sound/firewire/dice/Makefile | 2 +- + sound/firewire/dice/dice-teac.c | 43 ++++++++ + sound/firewire/dice/dice.c | 13 +++ + sound/firewire/dice/dice.h | 1 + + sound/hda/codecs/hdmi/intelhdmi.c | 1 + + sound/hda/codecs/realtek/alc269.c | 99 ++++++++++++++++-- + sound/hda/codecs/senarytech.c | 9 +- + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 44 ++++---- + sound/hda/controllers/intel.c | 2 + + sound/hda/core/intel-dsp-config.c | 8 ++ + sound/isa/gus/gus_reset.c | 3 - + sound/isa/wavefront/wavefront_midi.c | 2 + + sound/isa/wavefront/wavefront_synth.c | 4 +- + sound/pci/au88x0/au88x0_eq.c | 2 +- + sound/pci/ctxfi/ctatc.c | 97 ++++++++++++----- + sound/pci/ctxfi/ctatc.h | 8 +- + sound/pci/ctxfi/ctdaio.c | 18 ++-- + sound/pci/ctxfi/ctdaio.h | 3 + + sound/pci/ctxfi/cthardware.h | 4 +- + sound/pci/ctxfi/cthw20k1.c | 3 +- + sound/pci/ctxfi/cthw20k2.c | 81 ++++++++++---- + sound/pci/ctxfi/ctmixer.c | 73 ++++++++++++- + sound/pci/maestro3.c | 6 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-nvl-match.c | 90 ++++++++++++++++ + sound/soc/sof/intel/Kconfig | 17 +++ + sound/soc/sof/intel/Makefile | 2 + + sound/soc/sof/intel/hda-dsp.c | 1 + + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/nvl.c | 55 ++++++++++ + sound/soc/sof/intel/nvl.h | 14 +++ + sound/soc/sof/intel/pci-nvl.c | 82 +++++++++++++++ + sound/soc/sof/intel/shim.h | 1 + + sound/usb/line6/podhd.c | 16 ++- + sound/usb/mixer_quirks.c | 122 ++++++++++++++++++++-- + sound/usb/stream.c | 36 ++++++- + tools/testing/selftests/alsa/conf.c | 2 +- + 43 files changed, 864 insertions(+), 126 deletions(-) + create mode 100644 sound/firewire/dice/dice-teac.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-nvl-match.c + create mode 100644 sound/soc/sof/intel/nvl.c + create mode 100644 sound/soc/sof/intel/nvl.h + create mode 100644 sound/soc/sof/intel/pci-nvl.c +Merging ieee1394/for-next (036176d9dba7 firewire: core: abort pending transactions at card removal) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Auto-merging drivers/firewire/core-card.c +Auto-merging drivers/firewire/core-transaction.c +Merge made by the 'ort' strategy. + drivers/firewire/core-card.c | 25 ++--- + drivers/firewire/core-device.c | 194 +++++++++++++++++++++++----------- + drivers/firewire/core-transaction.c | 88 ++++++++++----- + drivers/firewire/core.h | 5 + + drivers/firewire/ohci.c | 78 +++++++++++--- + include/linux/firewire.h | 17 +++ + sound/firewire/tascam/tascam-stream.c | 21 ++-- + 7 files changed, 304 insertions(+), 124 deletions(-) +Merging sound-asoc/for-next (3362786aaba1 Merge remote-tracking branch 'asoc/for-6.19' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/base/regmap/regmap-sdw-mbq.c +Auto-merging include/linux/regmap.h +Auto-merging include/sound/tas2781.h +Auto-merging sound/soc/sof/intel/Kconfig +Auto-merging sound/soc/sof/intel/shim.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,max98363.yaml | 60 - + .../devicetree/bindings/sound/adi,ssm2602.txt | 19 - + .../devicetree/bindings/sound/adi,ssm3515.yaml | 49 - + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 4 +- + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 44 +- + .../devicetree/bindings/sound/cirrus,cs4271.yaml | 10 + + .../devicetree/bindings/sound/cirrus,cs530x.yaml | 8 + + Documentation/devicetree/bindings/sound/cs4265.txt | 29 - + Documentation/devicetree/bindings/sound/cs4341.txt | 22 - + Documentation/devicetree/bindings/sound/cs4349.txt | 19 - + Documentation/devicetree/bindings/sound/da9055.txt | 22 - + .../bindings/sound/mediatek,mt8189-afe-pcm.yaml | 178 + + .../bindings/sound/mediatek,mt8189-nau8825.yaml | 101 + + .../devicetree/bindings/sound/nuvoton,nau8540.yaml | 40 - + .../devicetree/bindings/sound/nuvoton,nau8810.yaml | 45 - + .../bindings/sound/nvidia,tegra210-admaif.yaml | 102 +- + .../devicetree/bindings/sound/nxp,tfa9879.yaml | 44 - + .../devicetree/bindings/sound/nxp,uda1342.yaml | 42 - + .../devicetree/bindings/sound/pcm1789.txt | 22 - + .../devicetree/bindings/sound/pcm179x.txt | 27 - + .../devicetree/bindings/sound/pcm186x.txt | 42 - + .../devicetree/bindings/sound/pcm5102a.txt | 13 - + .../bindings/sound/qcom,lpass-rx-macro.yaml | 19 + + .../bindings/sound/qcom,lpass-tx-macro.yaml | 1 + + .../bindings/sound/qcom,lpass-va-macro.yaml | 52 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 1 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 2 + + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 2 +- + .../devicetree/bindings/sound/spacemit,k1-i2s.yaml | 87 + + .../devicetree/bindings/sound/ti,pcm1862.yaml | 76 + + .../devicetree/bindings/sound/ti,tas2781.yaml | 58 +- + .../devicetree/bindings/sound/trivial-codec.yaml | 79 + + .../devicetree/bindings/sound/wlf,wm8510.yaml | 41 - + .../devicetree/bindings/sound/wlf,wm8523.yaml | 40 - + .../devicetree/bindings/sound/wlf,wm8580.yaml | 42 - + .../devicetree/bindings/sound/wlf,wm8711.yaml | 40 - + .../devicetree/bindings/sound/wlf,wm8728.yaml | 40 - + .../devicetree/bindings/sound/wlf,wm8737.yaml | 40 - + .../devicetree/bindings/sound/wlf,wm8750.yaml | 42 - + .../devicetree/bindings/sound/wlf,wm8753.yaml | 62 - + .../devicetree/bindings/sound/wlf,wm8776.yaml | 41 - + .../devicetree/bindings/sound/wlf,wm8961.yaml | 43 - + .../devicetree/bindings/sound/wlf,wm8974.yaml | 41 - + Documentation/devicetree/bindings/sound/wm8770.txt | 16 - + MAINTAINERS | 8 +- + drivers/base/regmap/regmap-sdw-mbq.c | 23 +- + drivers/firmware/cirrus/cs_dsp.c | 169 +- + drivers/gpio/Kconfig | 17 + + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-shared-proxy.c | 333 + + drivers/gpio/gpiolib-shared.c | 558 + + drivers/gpio/gpiolib-shared.h | 71 + + drivers/gpio/gpiolib.c | 70 +- + drivers/gpio/gpiolib.h | 2 + + drivers/input/misc/arizona-haptics.c | 14 +- + drivers/regulator/arizona-micsupp.c | 8 +- + drivers/staging/greybus/audio_codec.c | 16 +- + drivers/staging/greybus/audio_helper.c | 9 +- + drivers/staging/greybus/audio_topology.c | 24 +- + include/linux/firmware/cirrus/cs_dsp.h | 6 +- + include/linux/firmware/cirrus/cs_dsp_test_utils.h | 18 +- + include/linux/gpio/consumer.h | 9 + + include/linux/regmap.h | 21 +- + include/linux/soundwire/sdw_registers.h | 2 + + include/linux/string.h | 18 + + include/sound/cs-amp-lib.h | 25 +- + include/sound/cs35l56.h | 49 + + include/sound/sdca.h | 19 + + include/sound/sdca_fdl.h | 105 + + include/sound/sdca_function.h | 122 +- + include/sound/sdca_hid.h | 21 +- + include/sound/sdca_interrupts.h | 19 +- + include/sound/sdca_regmap.h | 2 + + include/sound/sdca_ump.h | 50 + + include/sound/soc-acpi.h | 8 +- + include/sound/soc.h | 39 +- + include/sound/soc_sdw_utils.h | 2 + + include/sound/tas2781.h | 6 + + include/trace/events/asoc.h | 4 +- + include/uapi/sound/intel/avs/tokens.h | 6 + + lib/tests/string_kunit.c | 13 + + sound/hda/codecs/side-codecs/Kconfig | 15 + + sound/hda/codecs/side-codecs/cs35l56_hda.c | 116 +- + sound/hda/codecs/side-codecs/cs35l56_hda.h | 6 + + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/acp/acp-mach-common.c | 40 +- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 4 + + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 10 +- + sound/soc/amd/ps/acp63.h | 2 + + sound/soc/amd/ps/pci-ps.c | 9 + + sound/soc/amd/vangogh/acp5x-mach.c | 3 +- + sound/soc/atmel/atmel-pdmic.c | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 32 +- + sound/soc/codecs/88pm860x-codec.c | 11 +- + sound/soc/codecs/Kconfig | 49 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ab8500-codec.c | 18 +- + sound/soc/codecs/ad1836.c | 2 +- + sound/soc/codecs/ad193x.c | 4 +- + sound/soc/codecs/adau1761.c | 9 +- + sound/soc/codecs/adau1781.c | 2 +- + sound/soc/codecs/adau17x1.c | 14 +- + sound/soc/codecs/adau1977.c | 5 +- + sound/soc/codecs/adau7118.c | 7 +- + sound/soc/codecs/adav80x.c | 10 +- + sound/soc/codecs/ak4458.c | 4 +- + sound/soc/codecs/ak4619.c | 4 +- + sound/soc/codecs/ak4641.c | 7 +- + sound/soc/codecs/alc5623.c | 2 +- + sound/soc/codecs/arizona-jack.c | 8 +- + sound/soc/codecs/arizona.c | 22 +- + sound/soc/codecs/audio-iio-aux.c | 2 +- + sound/soc/codecs/aw87390.c | 14 +- + sound/soc/codecs/aw88081.c | 24 +- + sound/soc/codecs/aw88166.c | 28 +- + sound/soc/codecs/aw88261.c | 34 +- + sound/soc/codecs/aw88395/aw88395.c | 30 +- + sound/soc/codecs/aw88399.c | 34 +- + sound/soc/codecs/bd28623.c | 6 +- + sound/soc/codecs/cpcap.c | 21 +- + sound/soc/codecs/cros_ec_codec.c | 10 +- + sound/soc/codecs/cs-amp-lib-test.c | 1522 ++- + sound/soc/codecs/cs-amp-lib.c | 372 +- + sound/soc/codecs/cs35l33.c | 4 +- + sound/soc/codecs/cs35l36.c | 6 +- + sound/soc/codecs/cs35l41.c | 2 +- + sound/soc/codecs/cs35l45.c | 12 +- + sound/soc/codecs/cs35l56-shared.c | 432 +- + sound/soc/codecs/cs35l56.c | 249 +- + sound/soc/codecs/cs35l56.h | 6 + + sound/soc/codecs/cs4234.c | 7 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271.c | 36 +- + sound/soc/codecs/cs42l42.c | 2 +- + sound/soc/codecs/cs42l43-jack.c | 14 +- + sound/soc/codecs/cs42l43.c | 38 +- + sound/soc/codecs/cs42l51.c | 6 +- + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 5 +- + sound/soc/codecs/cs42l73.c | 3 +- + sound/soc/codecs/cs42l84.c | 4 +- + sound/soc/codecs/cs42xx8.c | 2 +- + sound/soc/codecs/cs43130.c | 2 +- + sound/soc/codecs/cs47l15.c | 11 +- + sound/soc/codecs/cs47l24.c | 4 +- + sound/soc/codecs/cs47l35.c | 5 +- + sound/soc/codecs/cs47l85.c | 5 +- + sound/soc/codecs/cs47l90.c | 5 +- + sound/soc/codecs/cs47l92.c | 11 +- + sound/soc/codecs/cs48l32.c | 40 +- + sound/soc/codecs/cs530x-i2c.c | 24 +- + sound/soc/codecs/cs530x-spi.c | 92 + + sound/soc/codecs/cs530x.c | 526 +- + sound/soc/codecs/cs530x.h | 90 +- + sound/soc/codecs/cs53l30.c | 9 +- + sound/soc/codecs/cx20442.c | 5 +- + sound/soc/codecs/cx2072x.c | 6 +- + sound/soc/codecs/da7210.c | 4 +- + sound/soc/codecs/da7213.c | 21 +- + sound/soc/codecs/da7218.c | 21 +- + sound/soc/codecs/da7219-aad.c | 10 +- + sound/soc/codecs/da7219.c | 29 +- + sound/soc/codecs/da732x.c | 7 +- + sound/soc/codecs/da9055.c | 6 +- + sound/soc/codecs/es7134.c | 2 +- + sound/soc/codecs/es8311.c | 3 +- + sound/soc/codecs/es8316.c | 4 +- + sound/soc/codecs/es8326.c | 16 +- + sound/soc/codecs/es8328.c | 8 +- + sound/soc/codecs/es8389.c | 4 +- + sound/soc/codecs/fs210x.c | 2 +- + sound/soc/codecs/hda.c | 2 +- + sound/soc/codecs/hdac_hda.c | 4 +- + sound/soc/codecs/hdac_hdmi.c | 35 +- + sound/soc/codecs/hdmi-codec.c | 2 +- + sound/soc/codecs/idt821034.c | 8 +- + sound/soc/codecs/jz4740.c | 3 +- + sound/soc/codecs/jz4760.c | 7 +- + sound/soc/codecs/jz4770.c | 8 +- + sound/soc/codecs/lm49453.c | 3 +- + sound/soc/codecs/lpass-rx-macro.c | 114 +- + sound/soc/codecs/lpass-tx-macro.c | 19 +- + sound/soc/codecs/lpass-va-macro.c | 102 +- + sound/soc/codecs/lpass-wsa-macro.c | 169 +- + sound/soc/codecs/madera.c | 48 +- + sound/soc/codecs/max9759.c | 8 +- + sound/soc/codecs/max9768.c | 4 +- + sound/soc/codecs/max98088.c | 18 +- + sound/soc/codecs/max98090.c | 54 +- + sound/soc/codecs/max98095.c | 27 +- + sound/soc/codecs/max98373.c | 3 +- + sound/soc/codecs/max98390.c | 22 +- + sound/soc/codecs/max98396.c | 11 +- + sound/soc/codecs/max9850.c | 3 +- + sound/soc/codecs/max9867.c | 15 +- + sound/soc/codecs/max98925.c | 2 +- + sound/soc/codecs/ml26124.c | 3 +- + sound/soc/codecs/msm8916-wcd-digital.c | 6 +- + sound/soc/codecs/mt6357.c | 2 +- + sound/soc/codecs/mt6358.c | 25 +- + sound/soc/codecs/mt6359.c | 18 +- + sound/soc/codecs/mt6660.c | 3 +- + sound/soc/codecs/nau8325.c | 3 +- + sound/soc/codecs/nau8810.c | 7 +- + sound/soc/codecs/nau8821.c | 28 +- + sound/soc/codecs/nau8822.c | 20 +- + sound/soc/codecs/nau8824.c | 10 +- + sound/soc/codecs/nau8825.c | 6 +- + sound/soc/codecs/ntp8835.c | 4 +- + sound/soc/codecs/pcm1681.c | 4 +- + sound/soc/codecs/pcm186x.c | 6 +- + sound/soc/codecs/pcm512x.c | 25 +- + sound/soc/codecs/pcm6240.c | 9 +- + sound/soc/codecs/peb2466.c | 6 +- + sound/soc/codecs/pm4125-sdw.c | 64 +- + sound/soc/codecs/pm4125.c | 104 +- + sound/soc/codecs/pm4125.h | 18 +- + sound/soc/codecs/rk3308_codec.c | 3 +- + sound/soc/codecs/rt1011.c | 36 +- + sound/soc/codecs/rt1015.c | 17 +- + sound/soc/codecs/rt1318.c | 4 +- + sound/soc/codecs/rt274.c | 5 +- + sound/soc/codecs/rt286.c | 8 +- + sound/soc/codecs/rt298.c | 9 +- + sound/soc/codecs/rt5514.c | 8 +- + sound/soc/codecs/rt5616.c | 5 +- + sound/soc/codecs/rt5631.c | 10 +- + sound/soc/codecs/rt5640.c | 19 +- + sound/soc/codecs/rt5645.c | 15 +- + sound/soc/codecs/rt5651.c | 13 +- + sound/soc/codecs/rt5659.c | 13 +- + sound/soc/codecs/rt5660.c | 5 +- + sound/soc/codecs/rt5663.c | 10 +- + sound/soc/codecs/rt5665.c | 6 +- + sound/soc/codecs/rt5668.c | 3 +- + sound/soc/codecs/rt5670.c | 43 +- + sound/soc/codecs/rt5677.c | 14 +- + sound/soc/codecs/rt5682.c | 10 +- + sound/soc/codecs/rt5682s.c | 5 +- + sound/soc/codecs/rt700.c | 28 +- + sound/soc/codecs/rt711-sdca.c | 13 +- + sound/soc/codecs/rt711.c | 28 +- + sound/soc/codecs/rt712-sdca-dmic.c | 9 +- + sound/soc/codecs/rt712-sdca.c | 20 +- + sound/soc/codecs/rt715-sdca.c | 9 +- + sound/soc/codecs/rt715.c | 35 +- + sound/soc/codecs/rt721-sdca.c | 9 +- + sound/soc/codecs/rt722-sdca-sdw.c | 4 +- + sound/soc/codecs/rt9123.c | 6 +- + sound/soc/codecs/sgtl5000.c | 8 +- + sound/soc/codecs/simple-mux.c | 7 +- + sound/soc/codecs/sma1303.c | 31 +- + sound/soc/codecs/sma1307.c | 95 +- + sound/soc/codecs/ssm2518.c | 3 +- + sound/soc/codecs/ssm2602.c | 4 +- + sound/soc/codecs/ssm4567.c | 3 +- + sound/soc/codecs/sta32x.c | 10 +- + sound/soc/codecs/sta350.c | 10 +- + sound/soc/codecs/sta529.c | 3 +- + sound/soc/codecs/tas2562.c | 4 +- + sound/soc/codecs/tas2781-i2c.c | 104 +- + sound/soc/codecs/tas2783-sdw.c | 4 +- + sound/soc/codecs/tas5086.c | 4 +- + sound/soc/codecs/tas571x.c | 7 +- + sound/soc/codecs/tas5720.c | 4 +- + sound/soc/codecs/tas5805m.c | 6 +- + sound/soc/codecs/tas6424.c | 4 +- + sound/soc/codecs/tfa989x.c | 2 +- + sound/soc/codecs/tlv320adc3xxx.c | 8 +- + sound/soc/codecs/tlv320adcx140.c | 6 +- + sound/soc/codecs/tlv320aic23.c | 4 +- + sound/soc/codecs/tlv320aic31xx.c | 14 +- + sound/soc/codecs/tlv320aic32x4.c | 3 +- + sound/soc/codecs/tlv320aic3x.c | 11 +- + sound/soc/codecs/tlv320dac33.c | 9 +- + sound/soc/codecs/tscs42xx.c | 6 +- + sound/soc/codecs/tscs454.c | 6 +- + sound/soc/codecs/twl4030.c | 14 +- + sound/soc/codecs/twl6040.c | 15 +- + sound/soc/codecs/uda1334.c | 4 +- + sound/soc/codecs/uda1380.c | 3 +- + sound/soc/codecs/wcd9335.c | 34 +- + sound/soc/codecs/wcd934x.c | 44 +- + sound/soc/codecs/wcd937x.c | 20 +- + sound/soc/codecs/wcd938x.c | 27 +- + sound/soc/codecs/wcd939x-sdw.c | 8 +- + sound/soc/codecs/wcd939x.c | 24 +- + sound/soc/codecs/wm0010.c | 5 +- + sound/soc/codecs/wm2000.c | 8 +- + sound/soc/codecs/wm5100.c | 4 +- + sound/soc/codecs/wm5102.c | 12 +- + sound/soc/codecs/wm5110.c | 16 +- + sound/soc/codecs/wm8350.c | 7 +- + sound/soc/codecs/wm8400.c | 14 +- + sound/soc/codecs/wm8510.c | 3 +- + sound/soc/codecs/wm8523.c | 3 +- + sound/soc/codecs/wm8580.c | 8 +- + sound/soc/codecs/wm8711.c | 3 +- + sound/soc/codecs/wm8728.c | 3 +- + sound/soc/codecs/wm8731.c | 9 +- + sound/soc/codecs/wm8737.c | 6 +- + sound/soc/codecs/wm8750.c | 3 +- + sound/soc/codecs/wm8753.c | 7 +- + sound/soc/codecs/wm8770.c | 3 +- + sound/soc/codecs/wm8776.c | 3 +- + sound/soc/codecs/wm8804.c | 4 +- + sound/soc/codecs/wm8900.c | 12 +- + sound/soc/codecs/wm8903.c | 10 +- + sound/soc/codecs/wm8904.c | 23 +- + sound/soc/codecs/wm8940.c | 6 +- + sound/soc/codecs/wm8955.c | 10 +- + sound/soc/codecs/wm8958-dsp2.c | 32 +- + sound/soc/codecs/wm8960.c | 16 +- + sound/soc/codecs/wm8961.c | 5 +- + sound/soc/codecs/wm8962.c | 30 +- + sound/soc/codecs/wm8971.c | 3 +- + sound/soc/codecs/wm8974.c | 3 +- + sound/soc/codecs/wm8978.c | 9 +- + sound/soc/codecs/wm8983.c | 7 +- + sound/soc/codecs/wm8985.c | 9 +- + sound/soc/codecs/wm8988.c | 3 +- + sound/soc/codecs/wm8990.c | 9 +- + sound/soc/codecs/wm8991.c | 5 +- + sound/soc/codecs/wm8993.c | 13 +- + sound/soc/codecs/wm8994.c | 46 +- + sound/soc/codecs/wm8995.c | 7 +- + sound/soc/codecs/wm8996.c | 13 +- + sound/soc/codecs/wm8997.c | 4 +- + sound/soc/codecs/wm8998.c | 8 +- + sound/soc/codecs/wm9081.c | 7 +- + sound/soc/codecs/wm9090.c | 5 +- + sound/soc/codecs/wm9712.c | 7 +- + sound/soc/codecs/wm9713.c | 7 +- + sound/soc/codecs/wm_adsp.c | 21 +- + sound/soc/codecs/wm_hubs.c | 10 +- + sound/soc/codecs/wsa881x.c | 9 +- + sound/soc/codecs/wsa883x.c | 19 +- + sound/soc/codecs/wsa884x.c | 8 +- + sound/soc/fsl/fsl-asoc-card.c | 4 +- + sound/soc/fsl/fsl_aud2htx.h | 3 +- + sound/soc/fsl/fsl_micfil.c | 4 +- + sound/soc/fsl/fsl_spdif.c | 16 +- + sound/soc/fsl/fsl_xcvr.c | 86 +- + sound/soc/fsl/imx-rpmsg.c | 2 +- + sound/soc/generic/audio-graph-card.c | 4 +- + sound/soc/intel/atom/sst-atom-controls.c | 15 +- + sound/soc/intel/atom/sst/sst_acpi.c | 3 +- + sound/soc/intel/avs/boards/da7219.c | 3 +- + sound/soc/intel/avs/boards/es8336.c | 5 +- + sound/soc/intel/avs/boards/nau8825.c | 3 +- + sound/soc/intel/avs/boards/rt274.c | 6 +- + sound/soc/intel/avs/boards/rt5514.c | 3 +- + sound/soc/intel/avs/boards/rt5640.c | 3 +- + sound/soc/intel/avs/control.c | 7 +- + sound/soc/intel/avs/debugfs.c | 9 +- + sound/soc/intel/avs/path.c | 13 +- + sound/soc/intel/avs/pcm.c | 2 +- + sound/soc/intel/avs/topology.c | 113 +- + sound/soc/intel/avs/topology.h | 8 + + sound/soc/intel/boards/bdw-rt5677.c | 9 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 3 +- + sound/soc/intel/boards/bytcht_es8316.c | 9 +- + sound/soc/intel/boards/bytcr_rt5640.c | 25 +- + sound/soc/intel/boards/bytcr_rt5651.c | 18 +- + sound/soc/intel/boards/bytcr_wm5102.c | 14 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 5 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 12 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 8 +- + sound/soc/intel/boards/hda_dsp_common.c | 15 +- + sound/soc/intel/boards/sof_board_helpers.c | 10 +- + sound/soc/intel/boards/sof_cirrus_common.c | 5 +- + sound/soc/intel/boards/sof_da7219.c | 5 +- + sound/soc/intel/boards/sof_es8336.c | 14 +- + sound/soc/intel/boards/sof_maxim_common.c | 22 +- + sound/soc/intel/boards/sof_nau8825.c | 2 +- + sound/soc/intel/boards/sof_nuvoton_common.c | 5 +- + sound/soc/intel/boards/sof_pcm512x.c | 5 +- + sound/soc/intel/boards/sof_realtek_common.c | 34 +- + sound/soc/intel/boards/sof_rt5682.c | 17 +- + sound/soc/intel/boards/sof_sdw.c | 59 +- + sound/soc/intel/catpt/pcm.c | 15 +- + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 79 + + sound/soc/intel/common/sof-function-topology-lib.c | 8 +- + sound/soc/mediatek/Kconfig | 31 + + sound/soc/mediatek/Makefile | 1 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 7 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 24 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 5 +- + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 4 +- + sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 4 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 12 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 4 +- + sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 4 +- + sound/soc/mediatek/mt8186/mt8186-dai-tdm.c | 4 +- + sound/soc/mediatek/mt8186/mt8186-misc-control.c | 12 +- + sound/soc/mediatek/mt8186/mt8186-mt6366-common.c | 2 +- + sound/soc/mediatek/mt8186/mt8186-mt6366.c | 19 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 10 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 4 +- + sound/soc/mediatek/mt8188/mt8188-dai-dmic.c | 2 +- + sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 3 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 17 +- + sound/soc/mediatek/mt8189/Makefile | 18 + + sound/soc/mediatek/mt8189/mt8189-afe-clk.c | 750 ++ + sound/soc/mediatek/mt8189/mt8189-afe-clk.h | 76 + + sound/soc/mediatek/mt8189/mt8189-afe-common.h | 240 + + sound/soc/mediatek/mt8189/mt8189-afe-pcm.c | 2615 +++++ + sound/soc/mediatek/mt8189/mt8189-dai-adda.c | 1228 +++ + sound/soc/mediatek/mt8189/mt8189-dai-i2s.c | 1463 +++ + sound/soc/mediatek/mt8189/mt8189-dai-pcm.c | 332 + + sound/soc/mediatek/mt8189/mt8189-dai-tdm.c | 672 ++ + sound/soc/mediatek/mt8189/mt8189-interconnection.h | 97 + + sound/soc/mediatek/mt8189/mt8189-nau8825.c | 1178 ++ + sound/soc/mediatek/mt8189/mt8189-reg.h | 10773 +++++++++++++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 12 +- + sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 4 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 3 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 21 +- + sound/soc/mediatek/mt8365/mt8365-afe-pcm.c | 3 +- + sound/soc/meson/aiu-acodec-ctrl.c | 6 +- + sound/soc/meson/aiu-codec-ctrl.c | 6 +- + sound/soc/meson/axg-spdifout.c | 4 +- + sound/soc/meson/axg-tdm-interface.c | 4 +- + sound/soc/meson/g12a-toacodec.c | 6 +- + sound/soc/meson/g12a-tohdmitx.c | 12 +- + sound/soc/meson/t9015.c | 4 +- + sound/soc/mxs/mxs-saif.c | 123 +- + sound/soc/pxa/spitz.c | 9 +- + sound/soc/qcom/qdsp6/audioreach.c | 234 +- + sound/soc/qcom/qdsp6/q6adm.c | 179 +- + sound/soc/qcom/qdsp6/q6afe.c | 49 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 25 +- + sound/soc/qcom/qdsp6/q6apm.c | 57 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 87 +- + sound/soc/qcom/qdsp6/q6asm.c | 203 +- + sound/soc/qcom/qdsp6/q6asm.h | 1 + + sound/soc/qcom/qdsp6/q6prm.c | 27 +- + sound/soc/qcom/qdsp6/q6routing.c | 6 +- + sound/soc/qcom/qdsp6/q6usb.c | 3 +- + sound/soc/qcom/qdsp6/topology.c | 12 +- + sound/soc/qcom/sc7180.c | 10 +- + sound/soc/qcom/sc7280.c | 67 +- + sound/soc/qcom/sc8280xp.c | 34 +- + sound/soc/qcom/sdm845.c | 53 +- + sound/soc/qcom/sdw.c | 132 +- + sound/soc/qcom/sdw.h | 7 +- + sound/soc/qcom/sm8250.c | 34 +- + sound/soc/qcom/x1e80100.c | 33 +- + sound/soc/renesas/fsi.c | 8 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 3 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 3 +- + sound/soc/rockchip/rockchip_max98090.c | 2 +- + sound/soc/rockchip/rockchip_sai.c | 8 +- + sound/soc/samsung/aries_wm8994.c | 6 +- + sound/soc/samsung/bells.c | 6 +- + sound/soc/samsung/littlemill.c | 8 +- + sound/soc/samsung/lowland.c | 3 +- + sound/soc/samsung/midas_wm1811.c | 8 +- + sound/soc/samsung/smdk_wm8994.c | 30 +- + sound/soc/samsung/speyside.c | 24 +- + sound/soc/samsung/tm2_wm5110.c | 7 +- + sound/soc/samsung/tobermory.c | 6 +- + sound/soc/sdca/Kconfig | 26 + + sound/soc/sdca/Makefile | 10 +- + sound/soc/sdca/sdca_asoc.c | 38 +- + sound/soc/sdca/sdca_class.c | 304 + + sound/soc/sdca/sdca_class.h | 37 + + sound/soc/sdca/sdca_class_function.c | 460 + + sound/soc/sdca/sdca_device.c | 20 + + sound/soc/sdca/sdca_fdl.c | 504 + + sound/soc/sdca/sdca_function_device.c | 117 + + sound/soc/sdca/sdca_function_device.h | 15 + + sound/soc/sdca/sdca_functions.c | 254 +- + sound/soc/sdca/sdca_hid.c | 59 +- + sound/soc/sdca/sdca_interrupts.c | 280 +- + sound/soc/sdca/sdca_regmap.c | 100 +- + sound/soc/sdca/sdca_ump.c | 262 + + sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c | 5 +- + sound/soc/sdw_utils/soc_sdw_cs42l42.c | 3 +- + sound/soc/sdw_utils/soc_sdw_cs42l43.c | 9 +- + sound/soc/sdw_utils/soc_sdw_cs_amp.c | 3 +- + sound/soc/sdw_utils/soc_sdw_dmic.c | 5 +- + sound/soc/sdw_utils/soc_sdw_maxim.c | 8 +- + sound/soc/sdw_utils/soc_sdw_rt5682.c | 3 +- + sound/soc/sdw_utils/soc_sdw_rt700.c | 3 +- + sound/soc/sdw_utils/soc_sdw_rt711.c | 3 +- + sound/soc/sdw_utils/soc_sdw_rt_amp.c | 5 +- + sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c | 3 +- + sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c | 11 +- + sound/soc/sdw_utils/soc_sdw_ti_amp.c | 3 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 63 +- + sound/soc/soc-core.c | 42 +- + sound/soc/soc-dai.c | 5 +- + sound/soc/soc-dapm.c | 196 +- + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-ops.c | 62 +- + sound/soc/soc-pcm.c | 36 +- + sound/soc/soc-topology.c | 10 +- + sound/soc/sof/fw-file-profile.c | 13 +- + sound/soc/sof/imx/Kconfig | 1 + + sound/soc/sof/imx/imx9.c | 36 +- + sound/soc/sof/intel/Kconfig | 1 + + sound/soc/sof/intel/apl.c | 1 + + sound/soc/sof/intel/cnl.c | 4 +- + sound/soc/sof/intel/hda-ipc.c | 2 +- + sound/soc/sof/intel/hda.c | 213 +- + sound/soc/sof/intel/icl.c | 1 + + sound/soc/sof/intel/lnl.c | 1 + + sound/soc/sof/intel/mtl.c | 2 + + sound/soc/sof/intel/ptl.c | 2 + + sound/soc/sof/intel/shim.h | 1 + + sound/soc/sof/intel/skl.c | 1 + + sound/soc/sof/intel/tgl.c | 4 + + sound/soc/sof/pcm.c | 18 + + sound/soc/sof/sof-client-probes-ipc4.c | 2 +- + sound/soc/sof/sof-client-probes.c | 11 +- + sound/soc/sof/topology.c | 7 +- + sound/soc/spacemit/Kconfig | 15 + + sound/soc/spacemit/Makefile | 5 + + sound/soc/spacemit/k1_i2s.c | 461 + + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_sai.c | 14 +- + sound/soc/stm/stm32_sai_sub.c | 57 +- + sound/soc/sunxi/sun4i-codec.c | 3 +- + sound/soc/sunxi/sun4i-spdif.c | 26 +- + sound/soc/sunxi/sun50i-codec-analog.c | 2 +- + sound/soc/sunxi/sun8i-codec-analog.c | 14 +- + sound/soc/sunxi/sun8i-codec.c | 4 +- + sound/soc/tegra/Kconfig | 2 +- + sound/soc/tegra/tegra186_asrc.c | 24 +- + sound/soc/tegra/tegra186_dspk.c | 24 +- + sound/soc/tegra/tegra210_admaif.c | 16 +- + sound/soc/tegra/tegra210_adx.c | 4 +- + sound/soc/tegra/tegra210_ahub.c | 6 +- + sound/soc/tegra/tegra210_amx.c | 4 +- + sound/soc/tegra/tegra210_dmic.c | 24 +- + sound/soc/tegra/tegra210_i2s.c | 32 +- + sound/soc/tegra/tegra210_mbdrc.c | 24 +- + sound/soc/tegra/tegra210_mixer.c | 4 +- + sound/soc/tegra/tegra210_mvc.c | 12 +- + sound/soc/tegra/tegra210_ope.c | 4 +- + sound/soc/tegra/tegra210_peq.c | 8 +- + sound/soc/tegra/tegra210_sfc.c | 16 +- + sound/soc/tegra/tegra_asoc_machine.c | 11 +- + sound/soc/tegra/tegra_wm8903.c | 3 +- + sound/soc/ti/ams-delta.c | 8 +- + sound/soc/ti/davinci-evm.c | 11 +- + sound/soc/ti/j721e-evm.c | 2 +- + sound/soc/ti/n810.c | 12 +- + sound/soc/ti/omap-abe-twl6040.c | 2 +- + sound/soc/ti/omap-twl4030.c | 2 +- + sound/soc/ti/omap3pandora.c | 36 +- + sound/soc/ti/rx51.c | 17 +- + sound/soc/uniphier/aio-cpu.c | 4 +- + sound/soc/uniphier/evea.c | 12 +- + sound/soc/ux500/mop500_ab8500.c | 2 +- + 560 files changed, 31689 insertions(+), 5034 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,max98363.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2602.txt + delete mode 100644 Documentation/devicetree/bindings/sound/adi,ssm3515.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs4265.txt + delete mode 100644 Documentation/devicetree/bindings/sound/cs4341.txt + delete mode 100644 Documentation/devicetree/bindings/sound/cs4349.txt + delete mode 100644 Documentation/devicetree/bindings/sound/da9055.txt + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8189-afe-pcm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8189-nau8825.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8540.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8810.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nxp,uda1342.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/pcm1789.txt + delete mode 100644 Documentation/devicetree/bindings/sound/pcm179x.txt + delete mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt + delete mode 100644 Documentation/devicetree/bindings/sound/pcm5102a.txt + create mode 100644 Documentation/devicetree/bindings/sound/spacemit,k1-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1862.yaml + create mode 100644 Documentation/devicetree/bindings/sound/trivial-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8510.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8523.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8580.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8711.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8728.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8737.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8750.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8753.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8776.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8961.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt + create mode 100644 drivers/gpio/gpio-shared-proxy.c + create mode 100644 drivers/gpio/gpiolib-shared.c + create mode 100644 drivers/gpio/gpiolib-shared.h + create mode 100644 include/sound/sdca_fdl.h + create mode 100644 include/sound/sdca_ump.h + create mode 100644 sound/soc/codecs/cs530x-spi.c + create mode 100644 sound/soc/mediatek/mt8189/Makefile + create mode 100644 sound/soc/mediatek/mt8189/mt8189-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8189/mt8189-afe-common.h + create mode 100644 sound/soc/mediatek/mt8189/mt8189-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-interconnection.h + create mode 100644 sound/soc/mediatek/mt8189/mt8189-nau8825.c + create mode 100644 sound/soc/mediatek/mt8189/mt8189-reg.h + create mode 100644 sound/soc/sdca/sdca_class.c + create mode 100644 sound/soc/sdca/sdca_class.h + create mode 100644 sound/soc/sdca/sdca_class_function.c + create mode 100644 sound/soc/sdca/sdca_fdl.c + create mode 100644 sound/soc/sdca/sdca_function_device.c + create mode 100644 sound/soc/sdca/sdca_function_device.h + create mode 100644 sound/soc/sdca/sdca_ump.c + create mode 100644 sound/soc/spacemit/Kconfig + create mode 100644 sound/soc/spacemit/Makefile + create mode 100644 sound/soc/spacemit/k1_i2s.c +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 +Auto-merging MAINTAINERS +Auto-merging rust/kernel/lib.rs +Merge made by the 'ort' strategy. + MAINTAINERS | 3 + + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 12 +- + include/linux/moduleparam.h | 3 + + rust/kernel/lib.rs | 1 + + rust/kernel/module_param.rs | 181 ++++++++++++++++++++++++ + rust/kernel/str.rs | 2 + + rust/kernel/str/parse_int.rs | 148 ++++++++++++++++++++ + rust/kernel/sync.rs | 2 + + rust/kernel/sync/set_once.rs | 125 +++++++++++++++++ + rust/macros/helpers.rs | 25 ++++ + rust/macros/lib.rs | 31 ++++ + rust/macros/module.rs | 194 +++++++++++++++++++++++--- + samples/rust/rust_minimal.rs | 10 ++ + 14 files changed, 714 insertions(+), 25 deletions(-) + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/str/parse_int.rs + create mode 100644 rust/kernel/sync/set_once.rs +Merging input/next (a311c777f298 dt-bindings: touchscreen: consolidate simple touch controller to trivial-touch.yaml) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../bindings/input/ti,twl4030-keypad.yaml | 59 +++++++++++++++ + .../bindings/input/touchscreen/ar1021.txt | 15 ---- + .../bindings/input/touchscreen/azoteq,iqs5xx.yaml | 75 ------------------- + .../bindings/input/touchscreen/himax,hx83112b.yaml | 64 ----------------- + .../input/touchscreen/hynitron,cstxxx.yaml | 65 ----------------- + .../bindings/input/touchscreen/ilitek_ts_i2c.yaml | 76 -------------------- + .../bindings/input/touchscreen/maxim,max11801.yaml | 46 ------------ + .../bindings/input/touchscreen/melfas,mip4_ts.yaml | 56 +++++++++++++++ + .../bindings/input/touchscreen/melfas_mip4.txt | 20 ------ + .../bindings/input/touchscreen/semtech,sx8654.yaml | 52 -------------- + .../bindings/input/touchscreen/trivial-touch.yaml | 84 ++++++++++++++++++++++ + .../devicetree/bindings/input/twl4030-keypad.txt | 27 ------- + drivers/input/misc/qnap-mcu-input.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 4 +- + drivers/input/touchscreen/zforce_ts.c | 3 +- + 15 files changed, 203 insertions(+), 445 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/ti,twl4030-keypad.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ar1021.txt + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/himax,hx83112b.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/hynitron,cstxxx.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ilitek_ts_i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/maxim,max11801.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas,mip4_ts.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/semtech,sx8654.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/trivial-touch.yaml + delete mode 100644 Documentation/devicetree/bindings/input/twl4030-keypad.txt +Merging block/for-next (e8a31aa2e00a Merge branch 'for-6.19/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/nbd.c +Auto-merging drivers/nvme/host/tcp.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging drivers/s390/block/dasd_eckd.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/zoned.c +Auto-merging fs/fuse/dev_uring.c +Auto-merging fs/xfs/xfs_zone_alloc.c +Auto-merging include/linux/backing-dev-defs.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/socket.h +Auto-merging io_uring/memmap.c +Auto-merging io_uring/rw.c +CONFLICT (content): Merge conflict in io_uring/rw.c +Auto-merging net/core/dev.h +Auto-merging net/socket.c +Resolved 'io_uring/rw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6c78494af952] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-bcache | 7 - + Documentation/admin-guide/bcache.rst | 13 +- + Documentation/admin-guide/blockdev/zoned_loop.rst | 61 +- + Documentation/admin-guide/md.rst | 10 + + MAINTAINERS | 13 +- + block/bio-integrity-auto.c | 26 +- + block/bio-integrity.c | 48 ++ + block/bio.c | 1 + + block/blk-core.c | 12 +- + block/blk-iocost.c | 6 +- + block/blk-lib.c | 6 +- + block/blk-map.c | 3 + + block/blk-merge.c | 44 +- + block/blk-mq-dma.c | 29 +- + block/blk-mq-sched.c | 120 ++- + block/blk-mq-sched.h | 40 +- + block/blk-mq.c | 89 +- + block/blk-settings.c | 27 +- + block/blk-sysfs.c | 26 +- + block/blk-throttle.c | 45 +- + block/blk-zoned.c | 988 ++++++++++++++++------ + block/blk.h | 23 +- + block/elevator.c | 80 +- + block/elevator.h | 27 +- + block/genhd.c | 8 +- + block/ioctl.c | 8 +- + block/kyber-iosched.c | 30 +- + block/mq-deadline.c | 129 ++- + block/partitions/efi.c | 3 +- + drivers/block/drbd/drbd_bitmap.c | 10 +- + drivers/block/drbd/drbd_receiver.c | 8 +- + drivers/block/floppy.c | 2 +- + drivers/block/loop.c | 4 + + drivers/block/nbd.c | 5 +- + drivers/block/null_blk/main.c | 82 +- + drivers/block/null_blk/null_blk.h | 3 +- + drivers/block/null_blk/zoned.c | 6 +- + drivers/block/ps3disk.c | 4 + + drivers/block/rnull/rnull.rs | 3 +- + drivers/block/ublk_drv.c | 255 +++--- + drivers/block/virtio_blk.c | 24 +- + drivers/block/zloop.c | 160 +++- + drivers/md/bcache/alloc.c | 25 +- + drivers/md/bcache/bcache.h | 6 +- + drivers/md/bcache/bset.h | 8 +- + drivers/md/bcache/btree.c | 53 +- + drivers/md/bcache/journal.c | 93 +- + drivers/md/bcache/journal.h | 13 - + drivers/md/bcache/super.c | 33 +- + drivers/md/bcache/sysfs.c | 15 - + drivers/md/bcache/writeback.c | 5 +- + drivers/md/dm-zone.c | 63 +- + drivers/md/dm.h | 3 +- + drivers/md/md-linear.c | 2 + + drivers/md/md-llbitmap.c | 2 +- + drivers/md/md.c | 247 ++++-- + drivers/md/md.h | 10 +- + drivers/md/raid0.c | 17 +- + drivers/md/raid1.c | 1 + + drivers/md/raid10.c | 1 + + drivers/md/raid5-cache.c | 2 +- + drivers/md/raid5.c | 1 + + drivers/nvme/host/apple.c | 1 + + drivers/nvme/host/core.c | 15 +- + drivers/nvme/host/fabrics.h | 6 + + drivers/nvme/host/fc.c | 1 + + drivers/nvme/host/ioctl.c | 7 +- + drivers/nvme/host/multipath.c | 4 +- + drivers/nvme/host/nvme.h | 9 +- + drivers/nvme/host/pci.c | 118 ++- + drivers/nvme/host/rdma.c | 1 + + drivers/nvme/host/tcp.c | 1 + + drivers/nvme/host/zns.c | 10 +- + drivers/nvme/target/loop.c | 1 + + drivers/s390/block/dasd.c | 64 +- + drivers/s390/block/dasd_devmap.c | 3 +- + drivers/s390/block/dasd_eckd.c | 8 + + drivers/s390/block/dasd_genhd.c | 80 +- + drivers/scsi/sd.h | 2 +- + drivers/scsi/sd_zbc.c | 20 +- + fs/btrfs/ioctl.c | 5 +- + fs/btrfs/zoned.c | 11 +- + fs/fuse/dev_uring.c | 7 +- + fs/xfs/libxfs/xfs_zones.c | 1 + + fs/xfs/xfs_zone_alloc.c | 2 +- + include/linux/backing-dev-defs.h | 4 +- + include/linux/bio-integrity.h | 7 +- + include/linux/bio.h | 2 + + include/linux/blk-integrity.h | 19 +- + include/linux/blk-mq-dma.h | 28 +- + include/linux/blk-mq.h | 16 + + include/linux/blk_types.h | 14 +- + include/linux/blkdev.h | 60 +- + include/linux/blktrace_api.h | 3 +- + include/linux/device-mapper.h | 10 +- + include/linux/io_uring/cmd.h | 22 +- + include/linux/io_uring_types.h | 12 +- + include/linux/netdevice.h | 1 + + include/linux/socket.h | 6 +- + include/uapi/linux/blktrace_api.h | 55 +- + include/uapi/linux/blkzoned.h | 46 +- + include/uapi/linux/fs.h | 3 +- + include/uapi/linux/io_uring.h | 43 + + include/uapi/linux/io_uring/query.h | 24 + + include/uapi/linux/raid/md_p.h | 3 +- + io_uring/cancel.c | 270 ++++++ + io_uring/cancel.h | 8 +- + io_uring/cmd_net.c | 22 + + io_uring/fdinfo.c | 37 +- + io_uring/futex.c | 57 +- + io_uring/io_uring.c | 551 ++++-------- + io_uring/io_uring.h | 63 +- + io_uring/kbuf.c | 6 +- + io_uring/kbuf.h | 5 +- + io_uring/memmap.c | 59 +- + io_uring/memmap.h | 24 +- + io_uring/msg_ring.c | 3 +- + io_uring/net.c | 13 +- + io_uring/notif.c | 7 +- + io_uring/opdef.c | 26 + + io_uring/opdef.h | 2 + + io_uring/poll.c | 13 +- + io_uring/poll.h | 2 +- + io_uring/query.c | 55 +- + io_uring/query.h | 2 +- + io_uring/register.c | 105 ++- + io_uring/rsrc.c | 30 +- + io_uring/rsrc.h | 6 +- + io_uring/rw.c | 12 +- + io_uring/rw.h | 2 +- + io_uring/slist.h | 18 - + io_uring/sqpoll.c | 1 + + io_uring/timeout.c | 20 +- + io_uring/uring_cmd.c | 34 +- + io_uring/waitid.c | 48 +- + io_uring/zcrx.c | 421 ++++++--- + io_uring/zcrx.h | 16 +- + kernel/trace/blktrace.c | 533 +++++++++--- + net/compat.c | 4 +- + net/core/dev.h | 1 - + net/socket.c | 83 +- + rust/kernel/block/mq.rs | 5 +- + rust/kernel/block/mq/operations.rs | 4 +- + rust/kernel/block/mq/request.rs | 8 +- + tools/testing/selftests/ublk/kublk.c | 70 +- + tools/testing/selftests/ublk/kublk.h | 9 +- + 146 files changed, 4153 insertions(+), 2345 deletions(-) +Merging device-mapper/for-next (fcdfebc35f75 MAINTAINERS: add Benjamin Marzinski as a device mapper maintainer) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/md/dm-verity-fec.c +Auto-merging drivers/md/dm-zone.c +Auto-merging drivers/md/dm.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/device-mapper/verity.rst | 6 +- + MAINTAINERS | 1 + + drivers/md/Kconfig | 2 + + drivers/md/dm-bufio.c | 10 +- + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 117 +++++------- + drivers/md/dm-ebs-target.c | 2 +- + drivers/md/dm-mpath.c | 63 +++---- + drivers/md/dm-sysfs.c | 8 +- + drivers/md/dm-table.c | 4 + + drivers/md/dm-thin.c | 7 +- + drivers/md/dm-vdo/action-manager.c | 2 +- + drivers/md/dm-vdo/admin-state.c | 75 +++++--- + drivers/md/dm-vdo/block-map.c | 51 ++++- + drivers/md/dm-vdo/completion.c | 5 + + drivers/md/dm-vdo/data-vio.c | 34 +++- + drivers/md/dm-vdo/dedupe.c | 42 ++--- + drivers/md/dm-vdo/dm-vdo-target.c | 5 +- + drivers/md/dm-vdo/encodings.c | 26 ++- + drivers/md/dm-vdo/flush.c | 6 +- + drivers/md/dm-vdo/funnel-workqueue.c | 7 + + drivers/md/dm-vdo/io-submitter.c | 26 +-- + drivers/md/dm-vdo/logical-zone.c | 20 +- + drivers/md/dm-vdo/packer.c | 15 +- + drivers/md/dm-vdo/physical-zone.c | 5 +- + drivers/md/dm-vdo/recovery-journal.c | 30 +-- + drivers/md/dm-vdo/slab-depot.c | 96 ++++++---- + drivers/md/dm-vdo/vdo.c | 9 +- + drivers/md/dm-vdo/vdo.h | 4 +- + drivers/md/dm-vdo/vio.c | 3 +- + drivers/md/dm-vdo/vio.h | 6 +- + drivers/md/dm-verity-fec.c | 41 ++-- + drivers/md/dm-verity-fec.h | 10 +- + drivers/md/dm-verity-target.c | 209 +++++++++++++++------ + drivers/md/dm-verity.h | 52 +++-- + drivers/md/dm-zone.c | 3 - + drivers/md/dm.c | 46 +++-- + 37 files changed, 629 insertions(+), 420 deletions(-) +Merging libata/for-next (1d779fa9962f ata: pata_pcmcia: Add Iomega Clik! PCMCIA ATA/ATAPI Adapter) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + .../bindings/ata/eswin,eic7700-ahci.yaml | 79 ++++++++++++++++++++++ + .../devicetree/bindings/ata/snps,dwc-ahci.yaml | 4 ++ + drivers/ata/libata-sff.c | 3 +- + drivers/ata/pata_it821x.c | 5 +- + drivers/ata/pata_pcmcia.c | 1 + + 5 files changed, 89 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/eswin,eic7700-ahci.yaml +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 (79cf71c0b177 mmc: sdhci-of-dwcmshc: reduce CIT for better performance) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging drivers/mmc/core/mmc_test.c +Merge made by the 'ort' strategy. + .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 + + .../devicetree/bindings/mmc/davinci_mmc.txt | 32 -- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 3 +- + .../devicetree/bindings/mmc/sdhci-milbeaut.txt | 30 - + .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 + + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 57 +- + .../mmc/socionext,milbeaut-m10v-sdhci-3.0.yaml | 79 +++ + .../devicetree/bindings/mmc/ti,da830-mmc.yaml | 61 +++ + MAINTAINERS | 1 + + drivers/mmc/core/block.c | 14 +- + drivers/mmc/core/bus.h | 2 +- + drivers/mmc/core/debugfs.c | 10 +- + drivers/mmc/core/mmc.c | 4 +- + drivers/mmc/core/mmc_test.c | 4 +- + drivers/mmc/core/sd.c | 9 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/atmel-mci.c | 10 +- + drivers/mmc/host/cqhci.h | 1 + + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc-rockchip.c | 6 + + drivers/mmc/host/dw_mmc.c | 15 +- + drivers/mmc/host/meson-mx-sdio.c | 337 ++++++------ + drivers/mmc/host/mtk-sd.c | 4 +- + drivers/mmc/host/omap.c | 6 +- + drivers/mmc/host/omap_hsmmc.c | 4 +- + drivers/mmc/host/renesas_sdhi.h | 3 + + drivers/mmc/host/renesas_sdhi_core.c | 39 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 15 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 +- + drivers/mmc/host/sdhci-brcmstb.c | 156 +++++- + drivers/mmc/host/sdhci-msm.c | 27 +- + drivers/mmc/host/sdhci-of-arasan.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 604 ++++++++++++++++++++- + drivers/mmc/host/tmio_mmc.h | 2 - + include/linux/mmc/card.h | 1 - + 36 files changed, 1219 insertions(+), 334 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/davinci_mmc.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-milbeaut.txt + create mode 100644 Documentation/devicetree/bindings/mmc/socionext,milbeaut-m10v-sdhci-3.0.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/ti,da830-mmc.yaml +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 +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/ls2k-bmc-core.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/media/radio-cardlist.rst | 1 - + .../devicetree/bindings/mfd/da9052-i2c.txt | 67 --- + .../devicetree/bindings/mfd/dlg,da9052.yaml | 89 +++ + .../devicetree/bindings/mfd/dlg,da9063.yaml | 2 + + .../devicetree/bindings/mfd/fsl,mc13xxx.yaml | 72 ++- + .../devicetree/bindings/mfd/maxim,max77705.yaml | 14 + + .../devicetree/bindings/mfd/nxp,pf1550.yaml | 161 ++++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 + + .../bindings/mfd/renesas,r2a11302ft.yaml | 58 ++ + .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 11 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 226 ++++---- + .../devicetree/bindings/mfd/ti,tps65910.yaml | 3 - + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 40 +- + MAINTAINERS | 11 + + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/pf1550-onkey.c | 197 +++++++ + drivers/mfd/Kconfig | 32 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/altera-sysmgr.c | 2 + + drivers/mfd/bcm2835-pm.c | 1 + + drivers/mfd/da9055-core.c | 2 +- + drivers/mfd/da9063-i2c.c | 3 + + drivers/mfd/ls2k-bmc-core.c | 2 +- + drivers/mfd/macsmc.c | 6 +- + drivers/mfd/max77620.c | 15 +- + drivers/mfd/mt6358-irq.c | 1 + + drivers/mfd/mt6397-irq.c | 1 + + drivers/mfd/pf1550.c | 367 ++++++++++++ + drivers/mfd/qnap-mcu.c | 80 ++- + drivers/mfd/rohm-bd718x7.c | 9 +- + drivers/mfd/sec-acpm.c | 23 +- + drivers/mfd/sec-irq.c | 73 ++- + drivers/mfd/simple-mfd-i2c.c | 18 +- + drivers/mfd/syscon.c | 2 +- + drivers/mfd/tqmx86.c | 8 + + drivers/mfd/wl1273-core.c | 262 --------- + drivers/power/supply/Kconfig | 11 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/pf1550-charger.c | 641 +++++++++++++++++++++ + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/pf1550-regulator.c | 429 ++++++++++++++ + include/linux/mfd/macsmc.h | 6 +- + include/linux/mfd/pf1550.h | 273 +++++++++ + include/linux/mfd/samsung/irq.h | 6 + + include/linux/mfd/wl1273-core.h | 277 --------- + 48 files changed, 2712 insertions(+), 819 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/da9052-i2c.txt + create mode 100644 Documentation/devicetree/bindings/mfd/dlg,da9052.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/nxp,pf1550.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/renesas,r2a11302ft.yaml + create mode 100644 drivers/input/misc/pf1550-onkey.c + create mode 100644 drivers/mfd/pf1550.c + delete mode 100644 drivers/mfd/wl1273-core.c + create mode 100644 drivers/power/supply/pf1550-charger.c + create mode 100644 drivers/regulator/pf1550-regulator.c + create mode 100644 include/linux/mfd/pf1550.h + delete mode 100644 include/linux/mfd/wl1273-core.h +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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/awinic,aw99706.yaml | 101 +++++ + MAINTAINERS | 6 + + drivers/video/backlight/Kconfig | 9 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aw99706.c | 471 +++++++++++++++++++++ + drivers/video/backlight/led_bl.c | 13 + + include/linux/backlight.h | 1 - + include/linux/platform_data/lp855x.h | 4 +- + 8 files changed, 603 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/awinic,aw99706.yaml + create mode 100644 drivers/video/backlight/aw99706.c +Merging battery/for-next (8e8856396b54 Revert "power: supply: qcom_battmgr: support disabling charge control") +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/power/supply/Makefile +Auto-merging drivers/power/supply/intel_dc_ti_battery.c +CONFLICT (content): Merge conflict in drivers/power/supply/intel_dc_ti_battery.c +Resolved 'drivers/power/supply/intel_dc_ti_battery.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 317473e1a627] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-power-rt9756 | 30 + + .../bindings/power/supply/richtek,rt9756.yaml | 72 ++ + Documentation/power/power_supply_class.rst | 84 +- + MAINTAINERS | 6 + + drivers/power/reset/Kconfig | 9 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/spacemit-p1-reboot.c | 88 ++ + drivers/power/supply/Kconfig | 24 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/apm_power.c | 3 +- + drivers/power/supply/bd71828-power.c | 1049 ++++++++++++++++++++ + drivers/power/supply/cw2015_battery.c | 8 +- + drivers/power/supply/max17040_battery.c | 6 +- + drivers/power/supply/max77705_charger.c | 56 +- + drivers/power/supply/qcom_battmgr.c | 14 +- + drivers/power/supply/rt5033_charger.c | 2 + + drivers/power/supply/rt9467-charger.c | 6 +- + drivers/power/supply/rt9756.c | 955 ++++++++++++++++++ + drivers/power/supply/wm831x_power.c | 10 +- + include/linux/power/max77705_charger.h | 2 + + 20 files changed, 2363 insertions(+), 64 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-rt9756 + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9756.yaml + create mode 100644 drivers/power/reset/spacemit-p1-reboot.c + create mode 100644 drivers/power/supply/bd71828-power.c + create mode 100644 drivers/power/supply/rt9756.c +Merging regulator/for-next (545fbfcbfb4b Merge remote-tracking branch 'regulator/for-6.19' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/da9211.txt | 205 --- + .../devicetree/bindings/regulator/dlg,da9211.yaml | 103 ++ + .../bindings/regulator/fitipower,fp9931.yaml | 110 ++ + .../regulator/mediatek,mt6316b-regulator.yaml | 76 ++ + .../regulator/mediatek,mt6316c-regulator.yaml | 76 ++ + .../regulator/mediatek,mt6316d-regulator.yaml | 75 ++ + .../regulator/mediatek,mt6363-regulator.yaml | 146 +++ + .../bindings/regulator/nxp,pca9450-regulator.yaml | 39 + + .../bindings/regulator/qcom,rpmh-regulator.yaml | 53 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 1 - + drivers/regulator/Kconfig | 32 + + drivers/regulator/Makefile | 3 + + drivers/regulator/bd71815-regulator.c | 8 +- + drivers/regulator/bd71828-regulator.c | 4 +- + drivers/regulator/bd718x7-regulator.c | 4 +- + drivers/regulator/bd96801-regulator.c | 10 +- + drivers/regulator/core.c | 169 ++- + drivers/regulator/fp9931.c | 551 ++++++++ + drivers/regulator/hi6421-regulator.c | 10 +- + drivers/regulator/hi6421v530-regulator.c | 4 +- + drivers/regulator/hi6421v600-regulator.c | 6 +- + drivers/regulator/irq_helpers.c | 2 +- + drivers/regulator/max77650-regulator.c | 6 +- + drivers/regulator/mt6315-regulator.c | 6 +- + drivers/regulator/mt6316-regulator.c | 345 +++++ + drivers/regulator/mt6358-regulator.c | 2 +- + drivers/regulator/mt6363-regulator.c | 938 ++++++++++++++ + drivers/regulator/of_regulator.c | 6 +- + drivers/regulator/pca9450-regulator.c | 203 ++- + drivers/regulator/pf1550-regulator.c | 24 +- + drivers/regulator/pf9453-regulator.c | 42 +- + drivers/regulator/qcom-labibb-regulator.c | 4 +- + drivers/regulator/qcom-rpmh-regulator.c | 1338 ++++++++++++-------- + drivers/regulator/renesas-usb-vbus-regulator.c | 2 - + drivers/regulator/sy7636a-regulator.c | 27 + + include/linux/regulator/driver.h | 3 + + include/linux/regulator/mt6363-regulator.h | 330 +++++ + include/linux/regulator/pca9450.h | 32 + + 39 files changed, 4126 insertions(+), 871 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/da9211.txt + create mode 100644 Documentation/devicetree/bindings/regulator/dlg,da9211.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/fitipower,fp9931.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6316b-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6316c-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6316d-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6363-regulator.yaml + create mode 100644 drivers/regulator/fp9931.c + create mode 100644 drivers/regulator/mt6316-regulator.c + create mode 100644 drivers/regulator/mt6363-regulator.c + create mode 100644 include/linux/regulator/mt6363-regulator.h +Merging security/next (9a948eefad59 lsm: use unrcu_pointer() for current->cred in security_init()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging include/linux/security.h +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/inode.c +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/smack/smackfs.c +Merge made by the 'ort' strategy. + include/linux/lsm_hooks.h | 73 ++-- + include/linux/security.h | 3 +- + security/Makefile | 2 +- + security/apparmor/apparmorfs.c | 4 +- + security/apparmor/crypto.c | 3 +- + security/apparmor/include/apparmorfs.h | 2 + + security/apparmor/include/crypto.h | 1 + + security/apparmor/lsm.c | 11 +- + security/bpf/hooks.c | 2 +- + security/commoncap.c | 2 +- + security/device_cgroup.c | 56 ++- + security/inode.c | 46 ++- + security/integrity/evm/evm_main.c | 5 +- + security/integrity/evm/evm_secfs.c | 11 +- + security/integrity/iint.c | 14 +- + security/integrity/ima/ima_fs.c | 11 +- + security/integrity/ima/ima_main.c | 6 +- + security/integrity/integrity.h | 2 + + security/ipe/fs.c | 4 +- + security/ipe/ipe.c | 3 +- + security/ipe/ipe.h | 2 + + security/landlock/setup.c | 2 +- + security/loadpin/loadpin.c | 15 +- + security/lockdown/lockdown.c | 5 +- + security/lsm.h | 58 +++ + security/lsm_init.c | 564 +++++++++++++++++++++++++++++ + security/lsm_notifier.c | 31 ++ + security/lsm_syscalls.c | 2 + + security/min_addr.c | 5 +- + security/safesetid/lsm.c | 3 +- + security/safesetid/lsm.h | 2 + + security/safesetid/securityfs.c | 3 +- + security/security.c | 623 ++------------------------------- + security/selinux/Makefile | 2 +- + security/selinux/hooks.c | 11 +- + security/selinux/ibpkey.c | 5 +- + security/selinux/include/audit.h | 9 + + security/selinux/include/initcalls.h | 19 + + security/selinux/initcalls.c | 52 +++ + security/selinux/netif.c | 5 +- + security/selinux/netlink.c | 5 +- + security/selinux/netnode.c | 5 +- + security/selinux/netport.c | 5 +- + security/selinux/selinuxfs.c | 5 +- + security/selinux/ss/services.c | 26 +- + security/smack/smack.h | 14 + + security/smack/smack_lsm.c | 11 +- + security/smack/smack_netfilter.c | 4 +- + security/smack/smackfs.c | 4 +- + security/tomoyo/common.h | 2 + + security/tomoyo/securityfs_if.c | 4 +- + security/tomoyo/tomoyo.c | 3 +- + security/yama/yama_lsm.c | 2 +- + 53 files changed, 1026 insertions(+), 743 deletions(-) + create mode 100644 security/lsm.h + create mode 100644 security/lsm_init.c + create mode 100644 security/lsm_notifier.c + create mode 100644 security/selinux/include/initcalls.h + create mode 100644 security/selinux/initcalls.c +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 +Auto-merging kernel/module/main.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/ima_policy | 3 +- + include/linux/kernel_read_file.h | 1 + + kernel/module/main.c | 17 ++++++++-- + security/integrity/ima/ima_main.c | 60 ++++++++++++++++++++++++++-------- + security/integrity/ima/ima_policy.c | 62 ++++++++++++++++++++++++++++++++---- + security/ipe/hooks.c | 1 + + security/selinux/hooks.c | 5 +-- + 7 files changed, 122 insertions(+), 27 deletions(-) +Merging selinux/next (cdcf0b369d40 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging mm/memfd.c +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + include/linux/memfd.h | 2 ++ + mm/memfd.c | 14 +++++++-- + security/selinux/Kconfig | 11 +++++++ + security/selinux/avc.c | 9 +++--- + security/selinux/hooks.c | 26 +++++++++++++---- + security/selinux/include/classmap.h | 2 ++ + security/selinux/include/hash.h | 47 ++++++++++++++++++++++++++++++ + security/selinux/include/policycap.h | 1 + + security/selinux/include/policycap_names.h | 1 + + security/selinux/include/security.h | 5 ++++ + security/selinux/ss/avtab.c | 39 ++----------------------- + 11 files changed, 110 insertions(+), 47 deletions(-) + create mode 100644 security/selinux/include/hash.h +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 +Auto-merging security/smack/smack.h +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/Smack.rst | 16 +- + security/smack/smack.h | 3 + + security/smack/smack_access.c | 96 ++++++++--- + security/smack/smack_lsm.c | 277 +++++++++++++++++++++----------- + 4 files changed, 274 insertions(+), 118 deletions(-) +Merging tomoyo/master (b24e217157fd net/can/j1939: add j1939_session debugging) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging include/linux/netdevice.h +Auto-merging net/core/dev.c +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + 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 ++++++-- + 9 files changed, 335 insertions(+), 7 deletions(-) +Merging tpmdd/next (35ef1e24392f KEYS: trusted: Use tpm_ret_to_err() in trusted_tpm2) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + Documentation/security/tpm/tpm-security.rst | 2 +- + drivers/char/tpm/tpm-chip.c | 36 ----------------------------- + drivers/char/tpm/tpm-dev-common.c | 3 ++- + drivers/char/tpm/tpm-interface.c | 20 ++++++++++++---- + drivers/char/tpm/tpm.h | 1 - + drivers/char/tpm/tpm1-cmd.c | 7 +----- + drivers/char/tpm/tpm2-cmd.c | 8 +++---- + drivers/char/tpm/tpm_crb.c | 4 +++- + drivers/char/tpm/tpm_tis_core.c | 7 +++--- + include/linux/tpm.h | 12 ++++++---- + security/keys/trusted-keys/trusted_tpm2.c | 26 ++++++--------------- + tools/testing/selftests/tpm2/tpm2.py | 4 ++-- + 12 files changed, 46 insertions(+), 84 deletions(-) +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 +Auto-merging drivers/watchdog/diag288_wdt.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/rohm,bd96801-pmic.yaml | 8 +- + .../bindings/watchdog/airoha,en7581-wdt.yaml | 6 +- + .../bindings/watchdog/aspeed,ast2400-wdt.yaml | 8 +- + .../devicetree/bindings/watchdog/lantiq,wdt.yaml | 57 +++++++ + .../devicetree/bindings/watchdog/lantiq-wdt.txt | 24 --- + .../bindings/watchdog/loongson,ls1x-wdt.yaml | 3 +- + .../devicetree/bindings/watchdog/marvel.txt | 45 ------ + .../bindings/watchdog/marvell,orion-wdt.yaml | 100 +++++++++++++ + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/omap-wdt.txt | 15 -- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../bindings/watchdog/renesas,r9a09g057-wdt.yaml | 99 +++++++++++++ + .../bindings/watchdog/renesas,rcar-gen3-wwdt.yaml | 114 ++++++++++++++ + .../bindings/watchdog/renesas,rza-wdt.yaml | 51 +++++++ + .../bindings/watchdog/renesas,rzg2l-wdt.yaml | 111 ++++++++++++++ + .../bindings/watchdog/renesas,rzn1-wdt.yaml | 50 +++++++ + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 146 +----------------- + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 + + .../devicetree/bindings/watchdog/ti,omap2-wdt.yaml | 51 +++++++ + .../devicetree/bindings/watchdog/watchdog.yaml | 3 +- + drivers/watchdog/Kconfig | 12 +- + drivers/watchdog/Makefile | 1 + + drivers/watchdog/aspeed_wdt.c | 30 +++- + drivers/watchdog/diag288_wdt.c | 6 +- + drivers/watchdog/loongson1_wdt.c | 89 ++++++++--- + drivers/watchdog/renesas_wwdt.c | 163 +++++++++++++++++++++ + drivers/watchdog/starfive-wdt.c | 4 +- + drivers/watchdog/via_wdt.c | 1 + + drivers/watchdog/wdat_wdt.c | 64 +++++--- + include/dt-bindings/watchdog/aspeed-wdt.h | 138 +++++++++++++++++ + 30 files changed, 1113 insertions(+), 290 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/lantiq,wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/lantiq-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/marvel.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/marvell,orion-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/omap-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,r9a09g057-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,rcar-gen3-wwdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,rza-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,rzg2l-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,rzn1-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/ti,omap2-wdt.yaml + create mode 100644 drivers/watchdog/renesas_wwdt.c +Merging iommu/next (138c5a509fa1 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 +Auto-merging .clang-format +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/iommu/arm,smmu.yaml +Auto-merging Documentation/driver-api/index.rst +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/kernel/iommu.c +Auto-merging drivers/iommu/amd/init.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging include/linux/iommu.h +Auto-merging tools/testing/selftests/iommu/iommufd_utils.h +Merge made by the 'ort' strategy. + .clang-format | 1 + + .mailmap | 3 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 8 + + .../devicetree/bindings/iommu/qcom,iommu.yaml | 4 + + Documentation/driver-api/generic_pt.rst | 137 +++ + Documentation/driver-api/index.rst | 1 + + MAINTAINERS | 6 +- + arch/powerpc/kernel/iommu.c | 5 +- + drivers/amba/Kconfig | 2 +- + drivers/iommu/Kconfig | 15 +- + drivers/iommu/Makefile | 2 + + drivers/iommu/amd/Kconfig | 5 +- + drivers/iommu/amd/Makefile | 2 +- + drivers/iommu/amd/amd_iommu.h | 1 - + drivers/iommu/amd/amd_iommu_types.h | 114 +- + drivers/iommu/amd/debugfs.c | 2 +- + drivers/iommu/amd/init.c | 15 +- + drivers/iommu/amd/io_pgtable.c | 577 --------- + drivers/iommu/amd/io_pgtable_v2.c | 370 ------ + drivers/iommu/amd/iommu.c | 589 ++++----- + drivers/iommu/apple-dart.c | 11 +- + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 5 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 33 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 28 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 9 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 21 +- + drivers/iommu/exynos-iommu.c | 20 +- + drivers/iommu/fsl_pamu_domain.c | 12 +- + drivers/iommu/generic_pt/.kunitconfig | 14 + + drivers/iommu/generic_pt/Kconfig | 79 ++ + drivers/iommu/generic_pt/fmt/Makefile | 28 + + drivers/iommu/generic_pt/fmt/amdv1.h | 411 +++++++ + drivers/iommu/generic_pt/fmt/defs_amdv1.h | 21 + + drivers/iommu/generic_pt/fmt/defs_vtdss.h | 21 + + drivers/iommu/generic_pt/fmt/defs_x86_64.h | 21 + + drivers/iommu/generic_pt/fmt/iommu_amdv1.c | 15 + + drivers/iommu/generic_pt/fmt/iommu_mock.c | 10 + + drivers/iommu/generic_pt/fmt/iommu_template.h | 48 + + drivers/iommu/generic_pt/fmt/iommu_vtdss.c | 10 + + drivers/iommu/generic_pt/fmt/iommu_x86_64.c | 11 + + drivers/iommu/generic_pt/fmt/vtdss.h | 292 +++++ + drivers/iommu/generic_pt/fmt/x86_64.h | 282 +++++ + drivers/iommu/generic_pt/iommu_pt.h | 1275 ++++++++++++++++++++ + drivers/iommu/generic_pt/kunit_generic_pt.h | 823 +++++++++++++ + drivers/iommu/generic_pt/kunit_iommu.h | 184 +++ + drivers/iommu/generic_pt/kunit_iommu_pt.h | 487 ++++++++ + drivers/iommu/generic_pt/pt_common.h | 389 ++++++ + drivers/iommu/generic_pt/pt_defs.h | 332 +++++ + drivers/iommu/generic_pt/pt_fmt_defaults.h | 295 +++++ + drivers/iommu/generic_pt/pt_iter.h | 636 ++++++++++ + drivers/iommu/generic_pt/pt_log2.h | 122 ++ + drivers/iommu/intel/Kconfig | 6 +- + drivers/iommu/intel/iommu.c | 925 +++----------- + drivers/iommu/intel/iommu.h | 99 +- + drivers/iommu/intel/nested.c | 7 +- + drivers/iommu/intel/pasid.c | 44 +- + drivers/iommu/intel/pasid.h | 1 + + drivers/iommu/intel/svm.c | 1 + + drivers/iommu/io-pgtable-arm-selftests.c | 214 ++++ + drivers/iommu/io-pgtable-arm.c | 203 ---- + drivers/iommu/io-pgtable.c | 4 - + drivers/iommu/iommu-pages.c | 136 ++- + drivers/iommu/iommu-pages.h | 51 +- + drivers/iommu/iommu.c | 44 +- + drivers/iommu/iommufd/Kconfig | 1 + + drivers/iommu/iommufd/iommufd_test.h | 11 +- + drivers/iommu/iommufd/selftest.c | 440 +++---- + drivers/iommu/ipmmu-vmsa.c | 12 +- + drivers/iommu/msm_iommu.c | 11 +- + drivers/iommu/mtk_iommu.c | 174 ++- + drivers/iommu/mtk_iommu_v1.c | 35 +- + drivers/iommu/omap-iommu.c | 19 +- + drivers/iommu/omap-iommu.h | 2 - + drivers/iommu/riscv/iommu.c | 9 +- + drivers/iommu/rockchip-iommu.c | 20 +- + drivers/iommu/s390-iommu.c | 13 +- + drivers/iommu/sprd-iommu.c | 3 +- + drivers/iommu/sun50i-iommu.c | 10 +- + drivers/iommu/tegra-smmu.c | 15 +- + drivers/iommu/virtio-iommu.c | 6 +- + .../memory/mediatek,mt8189-memory-port.h | 283 +++++ + include/linux/generic_pt/common.h | 191 +++ + include/linux/generic_pt/iommu.h | 289 +++++ + include/linux/io-pgtable.h | 2 - + include/linux/iommu.h | 3 +- + include/linux/irqchip/riscv-imsic.h | 3 +- + tools/testing/selftests/iommu/iommufd.c | 60 +- + tools/testing/selftests/iommu/iommufd_utils.h | 12 + + 89 files changed, 8276 insertions(+), 2889 deletions(-) + create mode 100644 Documentation/driver-api/generic_pt.rst + delete mode 100644 drivers/iommu/amd/io_pgtable.c + delete mode 100644 drivers/iommu/amd/io_pgtable_v2.c + create mode 100644 drivers/iommu/generic_pt/.kunitconfig + create mode 100644 drivers/iommu/generic_pt/Kconfig + create mode 100644 drivers/iommu/generic_pt/fmt/Makefile + create mode 100644 drivers/iommu/generic_pt/fmt/amdv1.h + create mode 100644 drivers/iommu/generic_pt/fmt/defs_amdv1.h + create mode 100644 drivers/iommu/generic_pt/fmt/defs_vtdss.h + create mode 100644 drivers/iommu/generic_pt/fmt/defs_x86_64.h + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_amdv1.c + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_mock.c + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_template.h + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_vtdss.c + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_x86_64.c + create mode 100644 drivers/iommu/generic_pt/fmt/vtdss.h + create mode 100644 drivers/iommu/generic_pt/fmt/x86_64.h + create mode 100644 drivers/iommu/generic_pt/iommu_pt.h + create mode 100644 drivers/iommu/generic_pt/kunit_generic_pt.h + create mode 100644 drivers/iommu/generic_pt/kunit_iommu.h + create mode 100644 drivers/iommu/generic_pt/kunit_iommu_pt.h + create mode 100644 drivers/iommu/generic_pt/pt_common.h + create mode 100644 drivers/iommu/generic_pt/pt_defs.h + create mode 100644 drivers/iommu/generic_pt/pt_fmt_defaults.h + create mode 100644 drivers/iommu/generic_pt/pt_iter.h + create mode 100644 drivers/iommu/generic_pt/pt_log2.h + create mode 100644 drivers/iommu/io-pgtable-arm-selftests.c + create mode 100644 include/dt-bindings/memory/mediatek,mt8189-memory-port.h + create mode 100644 include/linux/generic_pt/common.h + create mode 100644 include/linux/generic_pt/iommu.h +Merging audit/next (c8a3dfe73159 audit: merge loops in __audit_inode_child()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/audit.h | 2 +- + kernel/auditfilter.c | 3 +-- + kernel/auditsc.c | 47 +++++++++++++++++++++-------------------------- + 3 files changed, 23 insertions(+), 29 deletions(-) +Merging devicetree/for-next (546dbb022310 of: Skip devicetree kunit tests when RISCV+ACPI doesn't populate root node) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/bus/st,stm32mp25-rifsc.yaml +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Auto-merging Documentation/devicetree/bindings/iommu/arm,smmu.yaml +Auto-merging Documentation/devicetree/bindings/mfd/ti,twl.yaml +Auto-merging Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml +Auto-merging Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Auto-merging drivers/of/irq.c +Auto-merging drivers/soc/qcom/ubwc_config.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/.yamllint | 2 +- + .../bindings/arm/altera/socfpga-clk-manager.yaml | 20 +-- + .../devicetree/bindings/arm/amd,seattle.yaml | 24 +++ + Documentation/devicetree/bindings/arm/apm.yaml | 28 +++ + Documentation/devicetree/bindings/arm/lge.yaml | 28 +++ + .../arm/marvell/ap80x-system-controller.txt | 146 ---------------- + .../arm/marvell/cp110-system-controller.txt | 191 --------------------- + Documentation/devicetree/bindings/arm/psci.yaml | 1 - + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 2 +- + .../devicetree/bindings/bus/cznic,moxtet.yaml | 94 ++++++++++ + .../bus/fsl,imx8qxp-pixel-link-msi-bus.yaml | 2 +- + Documentation/devicetree/bindings/bus/moxtet.txt | 46 ----- + .../devicetree/bindings/bus/st,stm32-etzpc.yaml | 2 +- + .../bindings/bus/st,stm32mp25-rifsc.yaml | 2 +- + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 1 - + .../bindings/clock/marvell,ap80x-clock.yaml | 54 ++++++ + .../bindings/clock/marvell,cp110-clock.yaml | 70 ++++++++ + .../bindings/clock/nvidia,tegra124-car.yaml | 8 +- + .../bindings/clock/nvidia,tegra20-car.yaml | 6 +- + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 +- + .../bindings/clock/renesas,cpg-mssr.yaml | 1 - + .../bindings/clock/xlnx,clocking-wizard.yaml | 1 - + .../allwinner,sun4i-a10-display-frontend.yaml | 1 - + .../bindings/display/allwinner,sun6i-a31-drc.yaml | 1 - + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 1 - + .../bindings/display/amlogic,meson-vpu.yaml | 1 - + .../bindings/display/bridge/adi,adv7511.yaml | 1 - + .../bindings/display/bridge/lvds-codec.yaml | 1 - + .../bindings/display/bridge/parade,ps8622.yaml | 2 +- + .../bindings/display/bridge/sil,sii8620.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358767.yaml | 1 - + .../bindings/display/ilitek,ili9486.yaml | 1 - + .../devicetree/bindings/display/msm/gpu.yaml | 1 - + .../bindings/display/msm/qcom,sm8750-mdss.yaml | 2 +- + .../bindings/display/panel/panel-timing.yaml | 1 - + .../bindings/display/panel/tpo,tpg110.yaml | 1 - + .../bindings/display/rockchip/rockchip,dw-dp.yaml | 1 - + .../bindings/display/simple-framebuffer.yaml | 1 - + .../bindings/dma/apm,xgene-storm-dma.yaml | 59 +++++++ + .../devicetree/bindings/dma/apm-xgene-dma.txt | 47 ----- + .../bindings/dma/snps,dma-spear1340.yaml | 1 - + .../devicetree/bindings/dma/stericsson,dma40.yaml | 1 - + .../bindings/dma/stm32/st,stm32-dma.yaml | 1 - + .../devicetree/bindings/dts-coding-style.rst | 5 +- + .../bindings/edac/altr,socfpga-ecc-manager.yaml | 2 +- + .../devicetree/bindings/edac/apm,xgene-edac.yaml | 1 - + Documentation/devicetree/bindings/eeprom/at25.yaml | 1 + + .../bindings/firmware/qemu,fw-cfg-mmio.yaml | 1 - + .../devicetree/bindings/fpga/fpga-region.yaml | 5 - + .../bindings/fpga/lattice,ice40-fpga-mgr.yaml | 59 +++++++ + .../bindings/fpga/lattice-ice40-fpga-mgr.txt | 21 --- + .../bindings/gpio/brcm,xgs-iproc-gpio.yaml | 1 - + .../bindings/gpio/fairchild,74hc595.yaml | 1 - + .../devicetree/bindings/gpio/gpio-mxs.yaml | 13 +- + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 4 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 + + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 1 - + .../devicetree/bindings/hwmon/adi,max31827.yaml | 1 - + .../devicetree/bindings/hwmon/national,lm90.yaml | 1 - + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 1 - + .../devicetree/bindings/hwmon/ti,tps23861.yaml | 1 - + .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 1 - + .../devicetree/bindings/i2c/qcom,i2c-qup.yaml | 2 +- + .../bindings/i2c/realtek,rtl9301-i2c.yaml | 1 - + .../devicetree/bindings/i2c/tsd,mule-i2c-mux.yaml | 2 - + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,ade9000.yaml | 1 - + .../bindings/iio/adc/cosmic,10001-adc.yaml | 1 - + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 1 - + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 1 - + .../bindings/iio/afe/voltage-divider.yaml | 1 - + .../bindings/iio/frequency/adi,admv4420.yaml | 1 - + .../bindings/iio/pressure/murata,zpa2326.yaml | 1 - + .../bindings/iio/proximity/semtech,sx9324.yaml | 1 - + .../bindings/iio/temperature/adi,ltc2983.yaml | 21 ++- + .../devicetree/bindings/input/cypress,cyapa.yaml | 2 +- + .../devicetree/bindings/input/ti,drv266x.yaml | 1 - + .../bindings/input/touchscreen/st,stmfts.yaml | 2 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 +- + .../bindings/interconnect/qcom,rpmh.yaml | 1 - + .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 - + .../interrupt-controller/aspeed,ast2700-intc.yaml | 1 - + .../interrupt-controller/fsl,irqsteer.yaml | 2 + + .../interrupt-controller/fsl,vf610-mscm-ir.yaml | 1 - + .../interrupt-controller/loongson,liointc.yaml | 1 - + .../interrupt-controller/mediatek,mtk-cirq.yaml | 1 - + .../mscc,ocelot-icpu-intr.yaml | 1 - + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../interrupt-controller/ti,omap4-wugen-mpu.yaml | 2 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 4 - + .../devicetree/bindings/leds/qcom,pm8058-led.yaml | 2 +- + .../bindings/mailbox/apm,xgene-slimpro-mbox.yaml | 62 +++++++ + .../devicetree/bindings/mailbox/arm,mhu.yaml | 1 - + .../devicetree/bindings/mailbox/arm,mhuv2.yaml | 1 - + .../devicetree/bindings/mailbox/mtk,adsp-mbox.yaml | 1 - + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 16 +- + .../bindings/mailbox/xgene-slimpro-mailbox.txt | 35 ---- + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 2 +- + .../devicetree/bindings/media/amphion,vpu.yaml | 1 - + .../devicetree/bindings/media/fsl,imx6q-vdoa.yaml | 2 +- + .../devicetree/bindings/media/i2c/adi,adv7604.yaml | 2 - + .../bindings/media/i2c/samsung,s5k5baf.yaml | 2 +- + .../bindings/media/i2c/samsung,s5k6a3.yaml | 2 +- + .../bindings/media/i2c/techwell,tw9900.yaml | 1 - + .../bindings/media/mediatek,mt8173-mdp.yaml | 169 ++++++++++++++++++ + .../devicetree/bindings/media/mediatek-mdp.txt | 96 ----------- + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 1 - + .../bindings/media/qcom,sc8280xp-camss.yaml | 1 - + .../bindings/media/qcom,sm8750-iris.yaml | 2 +- + .../bindings/media/samsung,exynos4210-csis.yaml | 2 +- + .../bindings/media/samsung,exynos4210-fimc.yaml | 2 +- + .../bindings/media/samsung,exynos4212-fimc-is.yaml | 3 +- + .../media/samsung,exynos4212-fimc-lite.yaml | 2 +- + .../devicetree/bindings/media/samsung,fimc.yaml | 2 +- + .../devicetree/bindings/media/samsung,s5c73m3.yaml | 2 +- + .../bindings/media/samsung,s5pv210-jpeg.yaml | 1 - + .../devicetree/bindings/media/st,stm32-dma2d.yaml | 1 - + .../bindings/media/video-interface-devices.yaml | 4 - + .../qcom,ebi2-peripheral-props.yaml | 1 - + .../devicetree/bindings/mfd/aspeed-lpc.yaml | 16 +- + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 1 - + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 4 +- + .../bindings/mtd/amlogic,meson-nand.yaml | 1 - + .../bindings/mtd/marvell,nand-controller.yaml | 1 - + .../devicetree/bindings/mux/mux-controller.yaml | 1 - + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 - + .../devicetree/bindings/net/brcm,bcmgenet.yaml | 1 - + .../bindings/net/brcm,mdio-mux-iproc.yaml | 1 - + .../bindings/net/cortina,gemini-ethernet.yaml | 1 - + .../devicetree/bindings/net/ethernet-switch.yaml | 16 +- + .../devicetree/bindings/net/fsl,gianfar.yaml | 2 - + .../bindings/net/mdio-mux-multiplexer.yaml | 1 - + .../devicetree/bindings/net/qcom,ipa.yaml | 1 - + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 1 - + .../bindings/net/wireless/ti,wlcore.yaml | 1 - + .../devicetree/bindings/nvmem/brcm,ocotp.txt | 17 -- + .../devicetree/bindings/nvmem/brcm,ocotp.yaml | 39 +++++ + .../bindings/pci/altr,pcie-root-port.yaml | 1 - + .../devicetree/bindings/pci/loongson.yaml | 1 - + .../bindings/pci/plda,xpressrich3-axi-common.yaml | 2 +- + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 1 - + .../bindings/pci/starfive,jh7110-pcie.yaml | 1 - + .../devicetree/bindings/pci/versatile.yaml | 1 - + .../bindings/phy/motorola,cpcap-usb-phy.yaml | 4 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 1 - + .../bindings/pinctrl/brcm,bcm21664-pinctrl.yaml | 1 - + .../bindings/pinctrl/fsl,imx9-pinctrl.yaml | 1 - + .../bindings/pinctrl/marvell,ap806-pinctrl.yaml | 61 +++++++ + .../pinctrl/marvell,armada-7k-pinctrl.yaml | 72 ++++++++ + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 12 +- + .../bindings/pinctrl/qcom,ipq5018-tlmm.yaml | 2 +- + .../bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 2 +- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 2 +- + .../bindings/pinctrl/qcom,lpass-lpi-common.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 10 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 6 +- + .../bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 3 +- + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml | 1 - + .../bindings/pinctrl/qcom,sm6125-tlmm.yaml | 1 - + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8350-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 2 +- + .../bindings/pinctrl/renesas,rza1-ports.yaml | 5 +- + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 1 - + .../devicetree/bindings/power/actions,owl-sps.txt | 21 --- + .../bindings/power/actions,s500-sps.yaml | 39 +++++ + .../bindings/power/renesas,sysc-rmobile.yaml | 4 +- + .../bindings/power/supply/mt6360_charger.yaml | 1 - + .../power/supply/stericsson,ab8500-charger.yaml | 1 - + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 1 - + .../bindings/regulator/qcom,rpmh-regulator.yaml | 2 +- + .../regulator/richtek,rt6245-regulator.yaml | 1 - + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 2 - + .../devicetree/bindings/reset/ti,sci-reset.yaml | 1 - + .../bindings/rng/inside-secure,safexcel-eip76.yaml | 2 - + .../devicetree/bindings/serial/qcom,msm-uart.yaml | 2 +- + .../bindings/serial/qcom,msm-uartdm.yaml | 2 +- + .../devicetree/bindings/slimbus/qcom,slim-ngd.yaml | 2 +- + .../bindings/soc/fsl/cpm_qe/fsl,qe-muram.yaml | 1 - + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 - + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 9 +- + .../devicetree/bindings/soc/qcom/qcom,gsbi.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smp2p.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smsm.yaml | 2 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 - + .../bindings/soc/tegra/nvidia,tegra20-pmc.yaml | 12 +- + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 3 - + .../devicetree/bindings/sound/adi,adau1372.yaml | 1 - + .../devicetree/bindings/sound/adi,adau7002.yaml | 2 +- + .../devicetree/bindings/sound/adi,adau7118.yaml | 1 - + .../devicetree/bindings/sound/maxim,max98090.yaml | 2 +- + .../devicetree/bindings/sound/maxim,max98095.yaml | 2 +- + .../devicetree/bindings/sound/maxim,max98504.yaml | 2 +- + .../bindings/sound/qcom,q6adm-routing.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6adm.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6afe.yaml | 2 +- + .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6apm.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6asm.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6core.yaml | 2 +- + .../devicetree/bindings/sound/qcom,q6prm.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wsa8840.yaml | 2 +- + .../bindings/sound/rockchip,i2s-tdm.yaml | 1 - + .../bindings/sound/rockchip,rk3328-codec.yaml | 2 +- + .../devicetree/bindings/sound/samsung,tm2.yaml | 1 - + .../bindings/sound/ti,tlv320dac3100.yaml | 1 - + .../devicetree/bindings/sound/wlf,wm8903.yaml | 1 - + .../devicetree/bindings/sound/wlf,wm8994.yaml | 2 +- + .../bindings/spi/qcom,spi-geni-qcom.yaml | 2 +- + .../devicetree/bindings/spi/qcom,spi-qup.yaml | 2 +- + .../bindings/thermal/amazon,al-thermal.txt | 33 ---- + .../bindings/thermal/amazon,al-thermal.yaml | 50 ++++++ + .../bindings/thermal/brcm,sr-thermal.txt | 105 ----------- + .../bindings/thermal/brcm,sr-thermal.yaml | 121 +++++++++++++ + .../devicetree/bindings/thermal/db8500-thermal.txt | 44 ----- + .../bindings/timer/nvidia,tegra-timer.yaml | 1 - + .../bindings/timer/nvidia,tegra186-timer.yaml | 1 - + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 1 - + .../bindings/watchdog/qcom,pm8916-wdt.yaml | 2 +- + MAINTAINERS | 8 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 15 +- + drivers/cpufreq/mediatek-cpufreq.c | 12 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 11 +- + drivers/cpuidle/cpuidle-big_little.c | 11 +- + drivers/firmware/qcom/qcom_scm.c | 17 +- + drivers/irqchip/irq-atmel-aic-common.c | 15 +- + drivers/of/address.c | 4 - + drivers/of/base.c | 47 +++++ + drivers/of/fdt.c | 101 +++++++---- + drivers/of/irq.c | 4 +- + drivers/of/of_kunit_helpers.c | 5 +- + drivers/of/of_reserved_mem.c | 69 +++----- + drivers/of/overlay.c | 3 + + .../platform/surface/surface_aggregator_registry.c | 13 +- + drivers/powercap/dtpm.c | 16 +- + drivers/soc/qcom/ubwc_config.c | 14 +- + drivers/soc/tegra/common.c | 12 +- + include/linux/of.h | 13 ++ + include/linux/of_fdt.h | 9 + + scripts/Makefile.dtbs | 9 + + 260 files changed, 1406 insertions(+), 1316 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/amd,seattle.yaml + create mode 100644 Documentation/devicetree/bindings/arm/apm.yaml + create mode 100644 Documentation/devicetree/bindings/arm/lge.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/ap80x-system-controller.txt + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt + create mode 100644 Documentation/devicetree/bindings/bus/cznic,moxtet.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/moxtet.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,ap80x-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,cp110-clock.yaml + create mode 100644 Documentation/devicetree/bindings/dma/apm,xgene-storm-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/apm-xgene-dma.txt + create mode 100644 Documentation/devicetree/bindings/fpga/lattice,ice40-fpga-mgr.yaml + delete mode 100644 Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/apm,xgene-slimpro-mbox.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/xgene-slimpro-mailbox.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8173-mdp.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-mdp.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/brcm,ocotp.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,ap806-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-7k-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/power/actions,owl-sps.txt + create mode 100644 Documentation/devicetree/bindings/power/actions,s500-sps.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/amazon,al-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/brcm,sr-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,sr-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/db8500-thermal.txt +Merging dt-krzk/for-next (3a8660878839 Linux 6.18-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 (3f39f5652037 mailbox: mtk-cmdq: Remove pm_runtime APIs from cmdq_mbox_send_data()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (5f8fbb72714e Merge remote-tracking branch 'spi/for-6.19' 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 +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/spi/airoha,en7581-snand.yaml | 7 +- + .../bindings/spi/aspeed,ast2600-fmc.yaml | 4 +- + .../devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml | 21 +- + .../bindings/spi/microchip,mpfs-spi.yaml | 70 +- + .../devicetree/bindings/spi/nuvoton,npcm-pspi.txt | 36 - + .../devicetree/bindings/spi/nuvoton,npcm-pspi.yaml | 72 ++ + .../bindings/spi/qcom,spi-qpic-snand.yaml | 2 + + .../bindings/spi/renesas,rzv2h-rspi.yaml | 65 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 +- + .../devicetree/bindings/spi/spi-cadence.yaml | 1 + + .../devicetree/bindings/spi/spi-controller.yaml | 2 +- + .../devicetree/bindings/trivial-devices.yaml | 2 + + MAINTAINERS | 3 +- + drivers/spi/Kconfig | 31 +- + drivers/spi/Makefile | 3 +- + drivers/spi/spi-airoha-snfi.c | 412 ++++++----- + drivers/spi/spi-aspeed-smc.c | 753 ++++++++++++++++----- + drivers/spi/spi-bcm63xx.c | 4 +- + drivers/spi/spi-cadence.c | 106 ++- + drivers/spi/spi-davinci.c | 64 +- + drivers/spi/spi-dw-bt1.c | 4 +- + drivers/spi/spi-dw-core.c | 188 ++--- + drivers/spi/spi-dw-dma.c | 22 +- + drivers/spi/spi-dw-mmio.c | 9 +- + drivers/spi/spi-dw-pci.c | 8 +- + drivers/spi/spi-dw.h | 12 +- + drivers/spi/spi-fsl-qspi.c | 88 ++- + drivers/spi/spi-imx.c | 58 +- + drivers/spi/spi-mem.c | 5 + + drivers/spi/spi-microchip-core-spi.c | 444 ++++++++++++ + drivers/spi/{spi-microchip-core.c => spi-mpfs.c} | 207 +++--- + drivers/spi/spi-offload-trigger-pwm.c | 3 + + drivers/spi/spi-qpic-snand.c | 2 +- + drivers/spi/spi-rzv2h-rspi.c | 339 ++++++++-- + drivers/spi/spi-sg2044-nor.c | 4 +- + drivers/spi/spi-tegra210-quad.c | 172 +++-- + drivers/spi/spi-tle62x0.c | 2 +- + drivers/spi/spidev.c | 2 + + include/linux/platform_data/spi-davinci.h | 73 -- + include/linux/spi/offload/types.h | 9 + + include/trace/events/spi-mem.h | 106 +++ + 41 files changed, 2510 insertions(+), 907 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.yaml + create mode 100644 drivers/spi/spi-microchip-core-spi.c + rename drivers/spi/{spi-microchip-core.c => spi-mpfs.c} (68%) + delete mode 100644 include/linux/platform_data/spi-davinci.h + create mode 100644 include/trace/events/spi-mem.h +Merging tip/master (3fde0f05218c Merge branch into tip/master: 'x86/sgx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2700-intc.yaml +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/kernel/entry-common.c +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/parisc/include/asm/bug.h +Auto-merging arch/s390/kernel/vmlinux.lds.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/kernel/cpu/microcode/core.c +Auto-merging arch/x86/kernel/cpu/sgx/driver.c +Auto-merging arch/x86/kernel/kvm.c +Auto-merging drivers/hv/mshv_root_main.c +Auto-merging drivers/irqchip/irq-bcm7038-l1.c +Auto-merging drivers/irqchip/irq-mchp-eic.c +Auto-merging drivers/irqchip/irq-renesas-rzg2l.c +Auto-merging drivers/irqchip/irq-sifive-plic.c +Auto-merging drivers/of/irq.c +Auto-merging drivers/perf/arm_pmu.c +Auto-merging drivers/perf/arm_pmuv3.c +Auto-merging drivers/perf/arm_spe_pmu.c +Auto-merging fs/exec.c +Auto-merging fs/proc/base.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/acpi.h +Auto-merging include/linux/cleanup.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/perf/arm_pmu.h +Auto-merging include/linux/platform_device.h +Auto-merging include/linux/uaccess.h +Auto-merging include/uapi/linux/perf_event.h +Auto-merging init/Kconfig +Auto-merging init/init_task.c +Auto-merging kernel/bpf/stackmap.c +CONFLICT (content): Merge conflict in kernel/bpf/stackmap.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/panic.c +Auto-merging kernel/sched/idle.c +Auto-merging lib/Kconfig.debug +Auto-merging tools/build/Makefile.feature +Auto-merging tools/include/uapi/linux/perf_event.h +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/testing/selftests/futex/functional/futex_numa_mpol.c +Auto-merging tools/testing/selftests/futex/functional/futex_wait.c +Auto-merging tools/testing/selftests/futex/functional/futex_waitv.c +Auto-merging tools/testing/selftests/timers/nanosleep.c +Auto-merging tools/testing/selftests/timers/posix_timers.c +Auto-merging tools/testing/selftests/x86/test_vsyscall.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'kernel/bpf/stackmap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 93b699914707] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + .../amlogic,meson-gpio-intc.yaml | 3 + + .../interrupt-controller/aspeed,ast2700-intc.yaml | 13 +- + .../interrupt-controller/sifive,plic-1.0.0.yaml | 4 + + .../thead,c900-aclint-mswi.yaml | 17 +- + .../thead,c900-aclint-sswi.yaml | 4 + + .../bindings/timer/realtek,rtd1625-systimer.yaml | 47 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/filesystems/resctrl.rst | 134 +- + Documentation/locking/seqlock.rst | 9 +- + MAINTAINERS | 8 +- + arch/arm/include/asm/uaccess.h | 26 +- + arch/arm64/include/asm/bug.h | 2 +- + arch/arm64/include/asm/uaccess.h | 4 +- + arch/arm64/kernel/entry-common.c | 2 +- + arch/arm64/kernel/smp.c | 2 +- + arch/loongarch/include/asm/bug.h | 27 +- + arch/parisc/include/asm/bug.h | 6 +- + arch/powerpc/include/asm/bug.h | 12 +- + arch/powerpc/include/asm/uaccess.h | 8 +- + arch/riscv/include/asm/bug.h | 10 +- + arch/riscv/include/asm/uaccess.h | 8 +- + arch/s390/include/asm/bug.h | 96 +- + arch/s390/include/asm/nospec-insn.h | 2 +- + arch/s390/include/asm/uaccess.h | 4 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/s390/mm/pfault.c | 3 +- + arch/sh/include/asm/bug.h | 4 +- + arch/x86/Kconfig | 4 +- + arch/x86/Kconfig.cpufeatures | 4 + + arch/x86/boot/boot.h | 2 - + arch/x86/boot/compressed/misc.h | 11 - + arch/x86/boot/compressed/pgtable_64.c | 11 +- + arch/x86/boot/compressed/sev-handle-vc.c | 3 +- + arch/x86/boot/compressed/sev.c | 7 +- + arch/x86/boot/compressed/sev.h | 6 +- + arch/x86/boot/cpucheck.c | 16 +- + arch/x86/boot/msr.h | 26 - + arch/x86/boot/startup/Makefile | 2 +- + arch/x86/boot/startup/sev-shared.c | 2 +- + arch/x86/coco/sev/vc-handle.c | 1 - + arch/x86/coco/sev/vc-shared.c | 11 + + arch/x86/entry/entry.S | 15 +- + arch/x86/entry/entry_64.S | 3 +- + arch/x86/entry/entry_64_fred.S | 3 +- + arch/x86/entry/entry_fred.c | 4 +- + arch/x86/entry/syscall_32.c | 3 +- + arch/x86/events/amd/core.c | 12 +- + arch/x86/events/core.c | 73 +- + arch/x86/events/intel/core.c | 444 ++++- + arch/x86/events/intel/cstate.c | 18 +- + arch/x86/events/intel/ds.c | 603 +++++-- + arch/x86/events/intel/lbr.c | 3 +- + arch/x86/events/intel/pt.c | 7 +- + arch/x86/events/perf_event.h | 41 +- + arch/x86/include/asm/alternative.h | 4 + + arch/x86/include/asm/asm.h | 5 + + arch/x86/include/asm/bug.h | 151 +- + arch/x86/include/asm/cpufeature.h | 3 +- + arch/x86/include/asm/cpufeatures.h | 11 +- + arch/x86/include/asm/fred.h | 2 +- + arch/x86/include/asm/futex.h | 75 +- + arch/x86/include/asm/idtentry.h | 4 +- + arch/x86/include/asm/insn-eval.h | 2 + + arch/x86/include/asm/insn.h | 5 +- + arch/x86/include/asm/intel_ds.h | 10 +- + arch/x86/include/asm/jump_label.h | 1 + + arch/x86/include/asm/kvm_types.h | 5 + + arch/x86/include/asm/mce.h | 14 + + arch/x86/include/asm/msr-index.h | 30 + + arch/x86/include/asm/page_64.h | 14 +- + arch/x86/include/asm/percpu.h | 5 +- + arch/x86/include/asm/perf_event.h | 116 +- + arch/x86/include/asm/ptrace.h | 24 +- + arch/x86/include/asm/sgx.h | 97 +- + arch/x86/include/asm/shared/msr.h | 15 + + arch/x86/include/asm/smap.h | 41 +- + arch/x86/include/asm/smp.h | 2 +- + arch/x86/include/asm/string.h | 26 + + arch/x86/include/asm/svm.h | 1 + + arch/x86/include/asm/topology.h | 14 +- + arch/x86/include/asm/uaccess.h | 12 +- + arch/x86/include/asm/unwind_user.h | 41 + + arch/x86/include/asm/uprobes.h | 9 + + arch/x86/include/uapi/asm/processor-flags.h | 2 + + arch/x86/include/uapi/asm/sgx.h | 10 +- + arch/x86/kernel/acpi/apei.c | 2 + + arch/x86/kernel/acpi/boot.c | 12 +- + arch/x86/kernel/alternative.c | 98 +- + arch/x86/kernel/apic/apic.c | 18 +- + arch/x86/kernel/apic/apic_common.c | 3 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/cpu/amd.c | 4 +- + arch/x86/kernel/cpu/bugs.c | 251 ++- + arch/x86/kernel/cpu/bus_lock.c | 3 +- + arch/x86/kernel/cpu/common.c | 39 +- + arch/x86/kernel/cpu/cpu.h | 9 - + arch/x86/kernel/cpu/cpuid-deps.c | 3 + + arch/x86/kernel/cpu/mce/amd.c | 356 ++-- + arch/x86/kernel/cpu/mce/core.c | 31 +- + arch/x86/kernel/cpu/mce/internal.h | 4 + + arch/x86/kernel/cpu/mce/threshold.c | 19 +- + arch/x86/kernel/cpu/microcode/amd.c | 113 +- + arch/x86/kernel/cpu/microcode/core.c | 13 +- + arch/x86/kernel/cpu/microcode/intel.c | 362 ++++ + arch/x86/kernel/cpu/microcode/internal.h | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 1 - + arch/x86/kernel/cpu/mtrr/mtrr.h | 4 - + arch/x86/kernel/cpu/resctrl/core.c | 9 + + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 40 + + arch/x86/kernel/cpu/resctrl/internal.h | 5 + + arch/x86/kernel/cpu/resctrl/monitor.c | 1 + + arch/x86/kernel/cpu/scattered.c | 5 + + arch/x86/kernel/cpu/sgx/driver.c | 19 +- + arch/x86/kernel/cpu/sgx/encl.c | 1 + + arch/x86/kernel/cpu/sgx/encls.h | 5 + + arch/x86/kernel/cpu/sgx/main.c | 104 +- + arch/x86/kernel/cpu/sgx/sgx.h | 3 + + arch/x86/kernel/cpu/sgx/virt.c | 25 +- + arch/x86/kernel/cpu/topology.c | 19 - + arch/x86/kernel/cpu/topology_common.c | 3 + + arch/x86/kernel/cpu/tsx.c | 58 +- + arch/x86/kernel/dumpstack.c | 23 +- + arch/x86/kernel/e820.c | 3 +- + arch/x86/kernel/fpu/core.c | 21 +- + arch/x86/kernel/fpu/xstate.c | 7 +- + arch/x86/kernel/hw_breakpoint.c | 3 +- + arch/x86/kernel/irq.c | 3 +- + arch/x86/kernel/kprobes/core.c | 3 +- + arch/x86/kernel/kprobes/opt.c | 4 - + arch/x86/kernel/kvm.c | 5 +- + arch/x86/kernel/module.c | 15 +- + arch/x86/kernel/msr.c | 2 +- + arch/x86/kernel/nmi.c | 5 +- + arch/x86/kernel/process_64.c | 5 +- + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/relocate_kernel_64.S | 7 +- + arch/x86/kernel/smpboot.c | 81 +- + arch/x86/kernel/static_call.c | 13 +- + arch/x86/kernel/traps.c | 167 +- + arch/x86/kernel/tsc.c | 1 + + arch/x86/kernel/uprobes.c | 70 +- + arch/x86/kvm/reverse_cpuid.h | 1 - + arch/x86/lib/cache-smp.c | 9 +- + arch/x86/lib/insn-eval.c | 151 +- + arch/x86/lib/kaslr.c | 2 +- + arch/x86/lib/msr.c | 5 +- + arch/x86/math-emu/poly.h | 2 +- + arch/x86/mm/dump_pagetables.c | 1 - + arch/x86/mm/pat/memtype.c | 3 +- + arch/x86/mm/physaddr.c | 11 - + arch/x86/mm/tlb.c | 5 +- + arch/x86/virt/vmx/tdx/tdx.c | 69 +- + drivers/acpi/irq.c | 19 + + drivers/base/platform.c | 71 +- + drivers/bus/fsl-mc/mc-sys.c | 2 +- + drivers/clocksource/Kconfig | 11 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/arm_arch_timer_mmio.c | 2 + + drivers/clocksource/sh_cmt.c | 36 +- + drivers/clocksource/timer-nxp-pit.c | 3 +- + drivers/clocksource/timer-nxp-stm.c | 23 +- + drivers/clocksource/timer-ralink.c | 11 +- + drivers/clocksource/timer-rda.c | 9 +- + drivers/clocksource/timer-realtek.c | 150 ++ + drivers/clocksource/timer-sp804.c | 24 + + drivers/clocksource/timer-sprd.c | 24 +- + drivers/clocksource/timer-stm32-lp.c | 1 - + drivers/firmware/efi/libstub/x86-5lvl.c | 4 +- + drivers/hv/mshv_root_main.c | 3 + + drivers/hwtracing/coresight/coresight-trbe.c | 9 +- + .../infiniband/hw/usnic/usnic_uiom_interval_tree.h | 4 + + drivers/irqchip/Kconfig | 10 +- + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-aclint-sswi.c | 3 +- + drivers/irqchip/irq-apple-aic.c | 62 +- + drivers/irqchip/irq-bcm2712-mip.c | 11 +- + drivers/irqchip/irq-bcm7038-l1.c | 17 +- + drivers/irqchip/irq-bcm7120-l2.c | 31 +- + drivers/irqchip/irq-brcmstb-l2.c | 25 +- + drivers/irqchip/irq-gic-its-msi-parent.c | 91 +- + drivers/irqchip/irq-gic-v3.c | 234 +-- + drivers/irqchip/irq-imx-mu-msi.c | 28 +- + drivers/irqchip/irq-mchp-eic.c | 5 +- + drivers/irqchip/irq-meson-gpio.c | 17 +- + drivers/irqchip/irq-mvebu-pic.c | 2 - + drivers/irqchip/irq-partition-percpu.c | 241 --- + drivers/irqchip/irq-qcom-mpm.c | 6 +- + drivers/irqchip/irq-renesas-rzg2l.c | 37 +- + drivers/irqchip/irq-renesas-rzv2h.c | 32 +- + drivers/irqchip/irq-riscv-imsic-early.c | 11 +- + drivers/irqchip/irq-riscv-imsic-platform.c | 4 +- + drivers/irqchip/irq-riscv-imsic-state.c | 20 +- + drivers/irqchip/irq-riscv-imsic-state.h | 4 +- + drivers/irqchip/irq-sifive-plic.c | 149 +- + drivers/irqchip/irq-starfive-jh8100-intc.c | 6 +- + drivers/irqchip/irq-ts4800.c | 1 - + drivers/irqchip/irqchip.c | 10 +- + drivers/irqchip/qcom-irq-combiner.c | 6 +- + drivers/irqchip/qcom-pdc.c | 5 +- + drivers/md/dm-vdo/logger.c | 2 +- + drivers/of/irq.c | 20 + + drivers/pci/controller/pcie-iproc.c | 22 +- + drivers/pci/msi/irqdomain.c | 90 - + drivers/perf/arm_pmu.c | 49 +- + drivers/perf/arm_pmu_acpi.c | 2 +- + drivers/perf/arm_pmu_platform.c | 20 +- + drivers/perf/arm_pmuv3.c | 2 +- + drivers/perf/arm_spe_pmu.c | 13 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 6 +- + drivers/tty/amiserial.c | 14 +- + drivers/tty/serial/icom.c | 8 +- + drivers/tty/synclink_gt.c | 20 +- + drivers/xen/xenbus/xenbus_xs.c | 4 +- + fs/binfmt_elf.c | 2 +- + fs/exec.c | 2 +- + fs/proc/array.c | 9 +- + fs/proc/base.c | 13 +- + fs/resctrl/ctrlmondata.c | 309 +++- + fs/resctrl/internal.h | 17 + + fs/resctrl/rdtgroup.c | 82 +- + fs/select.c | 12 +- + include/asm-generic/bug.h | 86 +- + include/asm-generic/thread_info_tif.h | 3 + + include/asm-generic/vmlinux.lds.h | 76 +- + include/linux/acpi.h | 7 + + include/linux/annotate.h | 134 ++ + include/linux/atomic/atomic-instrumented.h | 26 +- + include/linux/bitmap.h | 15 + + include/linux/bug.h | 8 + + include/linux/cc_platform.h | 2 +- + include/linux/cleanup.h | 35 +- + include/linux/compiler.h | 8 +- + include/linux/cpumask.h | 28 +- + include/linux/delay.h | 8 +- + include/linux/elfnote.h | 13 +- + include/linux/entry-common.h | 38 +- + include/linux/init.h | 3 +- + include/linux/interrupt.h | 25 +- + include/linux/interval_tree.h | 4 + + include/linux/interval_tree_generic.h | 2 +- + include/linux/irq-entry-common.h | 77 +- + include/linux/irq.h | 5 - + include/linux/irq_work.h | 9 +- + include/linux/irq_work_types.h | 14 + + include/linux/irqchip.h | 8 +- + include/linux/irqchip/irq-partition-percpu.h | 53 - + include/linux/irqdesc.h | 1 - + include/linux/irqdomain.h | 33 +- + include/linux/kvm_types.h | 14 + + include/linux/livepatch.h | 25 +- + include/linux/livepatch_external.h | 76 + + include/linux/livepatch_helpers.h | 77 + + include/linux/lockdep.h | 2 +- + include/linux/mm.h | 27 +- + include/linux/mm_types.h | 128 +- + include/linux/module.h | 3 +- + include/linux/msi.h | 3 - + include/linux/mutex.h | 45 +- + include/linux/objtool.h | 96 +- + include/linux/objtool_types.h | 2 + + include/linux/of_irq.h | 7 + + include/linux/perf/arm_pmu.h | 6 +- + include/linux/perf_event.h | 2 +- + include/linux/platform_device.h | 2 + + include/linux/preempt.h | 2 - + include/linux/resctrl.h | 24 + + include/linux/restart_block.h | 4 +- + include/linux/resume_user_mode.h | 2 +- + include/linux/rseq.h | 224 +-- + include/linux/rseq_entry.h | 616 +++++++ + include/linux/rseq_types.h | 164 ++ + include/linux/sched.h | 91 +- + include/linux/sched/topology.h | 3 + + include/linux/seqlock.h | 114 ++ + include/linux/thread_info.h | 5 + + include/linux/timer.h | 9 + + include/linux/uaccess.h | 314 +++- + include/linux/unwind_deferred.h | 50 +- + include/linux/unwind_deferred_types.h | 18 +- + include/linux/unwind_user_types.h | 2 + + include/trace/events/rseq.h | 4 +- + include/trace/events/timer_migration.h | 4 +- + include/uapi/linux/perf_event.h | 21 +- + include/uapi/linux/rseq.h | 21 +- + init/Kconfig | 28 +- + init/init_task.c | 3 + + kernel/bpf/stackmap.c | 4 +- + kernel/bpf/syscall.c | 4 +- + kernel/cgroup/cpuset.c | 17 +- + kernel/cpu.c | 19 + + kernel/entry/common.c | 39 +- + kernel/entry/syscall-common.c | 8 - + kernel/events/callchain.c | 14 +- + kernel/events/core.c | 78 +- + kernel/exit.c | 8 +- + kernel/fork.c | 7 +- + kernel/futex/core.c | 4 +- + kernel/futex/futex.h | 58 +- + kernel/futex/waitwake.c | 9 +- + kernel/irq/chip.c | 33 +- + kernel/irq/handle.c | 10 +- + kernel/irq/irqdesc.c | 24 +- + kernel/irq/irqdomain.c | 32 +- + kernel/irq/manage.c | 172 +- + kernel/irq/msi.c | 2 +- + kernel/irq/proc.c | 2 + + kernel/kthread.c | 15 +- + kernel/livepatch/Kconfig | 12 + + kernel/livepatch/core.c | 8 +- + kernel/locking/mutex.c | 22 +- + kernel/locking/rtmutex_api.c | 19 +- + kernel/locking/spinlock_debug.c | 4 +- + kernel/panic.c | 16 +- + kernel/ptrace.c | 6 +- + kernel/rcu/tiny.c | 8 +- + kernel/rcu/tree.c | 14 +- + kernel/rcu/tree_exp.h | 3 +- + kernel/rcu/tree_plugin.h | 9 +- + kernel/rcu/tree_stall.h | 3 +- + kernel/rseq.c | 673 ++++---- + kernel/sched/core.c | 1337 +++++++-------- + kernel/sched/cpudeadline.c | 34 +- + kernel/sched/cpudeadline.h | 4 +- + kernel/sched/cputime.c | 20 +- + kernel/sched/deadline.c | 336 +++- + kernel/sched/debug.c | 8 +- + kernel/sched/ext.c | 132 +- + kernel/sched/fair.c | 600 +++++-- + kernel/sched/features.h | 7 +- + kernel/sched/idle.c | 29 +- + kernel/sched/isolation.c | 23 + + kernel/sched/membarrier.c | 8 +- + kernel/sched/rt.c | 13 +- + kernel/sched/sched.h | 723 ++++---- + kernel/sched/stats.h | 2 +- + kernel/sched/stop_task.c | 13 +- + kernel/sched/syscalls.c | 102 +- + kernel/sched/topology.c | 114 +- + kernel/signal.c | 2 - + kernel/task_work.c | 8 +- + kernel/time/hrtimer.c | 4 +- + kernel/time/posix-cpu-timers.c | 4 +- + kernel/time/posix-timers.c | 2 +- + kernel/time/tick-oneshot.c | 20 +- + kernel/time/tick-sched.c | 30 +- + kernel/time/timer.c | 2 +- + kernel/time/timer_migration.c | 501 ++++-- + kernel/time/timer_migration.h | 2 +- + kernel/unwind/deferred.c | 44 +- + kernel/unwind/user.c | 59 +- + lib/Kconfig.debug | 10 + + lib/bitmap.c | 6 + + lib/bug.c | 90 +- + lib/interval_tree.c | 1 + + lib/iov_iter.c | 22 +- + lib/locking-selftest.c | 4 +- + lib/strncpy_from_user.c | 2 +- + lib/strnlen_user.c | 2 +- + net/core/scm.c | 20 +- + rust/kernel/debugfs/traits.rs | 55 +- + rust/kernel/sync/atomic.rs | 12 +- + rust/kernel/sync/lock.rs | 41 +- + rust/kernel/sync/lock/global.rs | 5 +- + samples/rust/rust_debugfs.rs | 12 +- + samples/rust/rust_debugfs_scoped.rs | 6 +- + scripts/Makefile.lib | 6 +- + scripts/Makefile.vmlinux_o | 6 +- + scripts/atomic/gen-atomic-instrumented.sh | 11 +- + scripts/check-function-names.sh | 25 + + scripts/faddr2line | 19 +- + scripts/link-vmlinux.sh | 3 +- + scripts/livepatch/fix-patch-lines | 79 + + scripts/livepatch/init.c | 108 ++ + scripts/livepatch/klp-build | 831 ++++++++++ + scripts/mod/modpost.c | 5 + + scripts/module.lds.S | 22 +- + tools/arch/x86/include/asm/cpufeatures.h | 7 +- + tools/arch/x86/include/asm/insn.h | 5 +- + tools/arch/x86/tools/gen-cpu-feature-names-x86.awk | 34 + + tools/build/Build | 2 + + tools/build/Makefile | 21 +- + tools/build/Makefile.feature | 4 +- + tools/include/linux/interval_tree_generic.h | 10 +- + tools/include/linux/livepatch_external.h | 76 + + tools/include/linux/objtool_types.h | 2 + + tools/include/linux/string.h | 14 + + tools/include/uapi/linux/perf_event.h | 21 +- + tools/objtool/.gitignore | 3 + + tools/objtool/Build | 7 +- + tools/objtool/Makefile | 74 +- + tools/objtool/arch/loongarch/decode.c | 29 +- + tools/objtool/arch/loongarch/orc.c | 1 - + tools/objtool/arch/loongarch/special.c | 5 + + tools/objtool/arch/powerpc/decode.c | 31 +- + tools/objtool/arch/powerpc/special.c | 5 + + tools/objtool/arch/x86/Build | 13 +- + tools/objtool/arch/x86/decode.c | 111 +- + tools/objtool/arch/x86/orc.c | 1 - + tools/objtool/arch/x86/special.c | 12 +- + tools/objtool/builtin-check.c | 102 +- + tools/objtool/builtin-klp.c | 53 + + tools/objtool/check.c | 1562 ++++++++++-------- + tools/objtool/disas.c | 1245 ++++++++++++++ + tools/objtool/elf.c | 838 +++++++--- + tools/objtool/include/objtool/arch.h | 16 +- + tools/objtool/include/objtool/builtin.h | 14 +- + tools/objtool/include/objtool/check.h | 39 +- + tools/objtool/include/objtool/checksum.h | 43 + + tools/objtool/include/objtool/checksum_types.h | 25 + + tools/objtool/include/objtool/disas.h | 81 + + tools/objtool/include/objtool/elf.h | 198 ++- + tools/objtool/include/objtool/endianness.h | 9 +- + tools/objtool/include/objtool/klp.h | 35 + + tools/objtool/include/objtool/objtool.h | 4 +- + tools/objtool/include/objtool/special.h | 4 +- + tools/objtool/include/objtool/trace.h | 141 ++ + tools/objtool/include/objtool/util.h | 19 + + tools/objtool/include/objtool/warn.h | 66 +- + tools/objtool/klp-diff.c | 1723 ++++++++++++++++++++ + tools/objtool/klp-post-link.c | 168 ++ + tools/objtool/noreturns.h | 1 + + tools/objtool/objtool.c | 42 +- + tools/objtool/orc_dump.c | 1 - + tools/objtool/orc_gen.c | 9 +- + tools/objtool/special.c | 16 +- + tools/objtool/sync-check.sh | 2 + + tools/objtool/trace.c | 203 +++ + tools/objtool/weak.c | 7 + + tools/perf/Makefile.perf | 6 +- + .../testing/selftests/futex/functional/.gitignore | 1 + + tools/testing/selftests/futex/functional/Makefile | 3 +- + .../selftests/futex/functional/futex_numa_mpol.c | 5 - + .../selftests/futex/functional/futex_wait.c | 8 +- + .../selftests/futex/functional/futex_waitv.c | 2 + + .../selftests/futex/functional/robust_list.c | 552 +++++++ + tools/testing/selftests/timers/nanosleep.c | 55 + + tools/testing/selftests/timers/posix_timers.c | 32 +- + tools/testing/selftests/x86/test_vsyscall.c | 21 +- + virt/kvm/kvm_main.c | 7 + + 441 files changed, 18230 insertions(+), 6616 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/realtek,rtd1625-systimer.yaml + delete mode 100644 arch/x86/boot/msr.h + create mode 100644 arch/x86/include/asm/unwind_user.h + create mode 100644 drivers/clocksource/timer-realtek.c + delete mode 100644 drivers/irqchip/irq-partition-percpu.c + create mode 100644 include/linux/annotate.h + create mode 100644 include/linux/irq_work_types.h + delete mode 100644 include/linux/irqchip/irq-partition-percpu.h + create mode 100644 include/linux/livepatch_external.h + create mode 100644 include/linux/livepatch_helpers.h + create mode 100644 include/linux/rseq_entry.h + create mode 100644 include/linux/rseq_types.h + create mode 100755 scripts/check-function-names.sh + create mode 100755 scripts/livepatch/fix-patch-lines + create mode 100644 scripts/livepatch/init.c + create mode 100755 scripts/livepatch/klp-build + create mode 100644 tools/arch/x86/tools/gen-cpu-feature-names-x86.awk + create mode 100644 tools/build/Build + create mode 100644 tools/include/linux/livepatch_external.h + create mode 100644 tools/objtool/builtin-klp.c + create mode 100644 tools/objtool/disas.c + create mode 100644 tools/objtool/include/objtool/checksum.h + create mode 100644 tools/objtool/include/objtool/checksum_types.h + create mode 100644 tools/objtool/include/objtool/disas.h + create mode 100644 tools/objtool/include/objtool/klp.h + create mode 100644 tools/objtool/include/objtool/trace.h + create mode 100644 tools/objtool/include/objtool/util.h + create mode 100644 tools/objtool/klp-diff.c + create mode 100644 tools/objtool/klp-post-link.c + create mode 100644 tools/objtool/trace.c + create mode 100644 tools/testing/selftests/futex/functional/robust_list.c +$ git am -3 ../patches/0001-fix-up-for-sched-mmcid-Use-proper-data-structures.patch +Applying: fix up for "sched/mmcid: Use proper data structures" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/firmware/efi/efi.c +$ git add -A . +$ git commit -v -a --amend +[master 369b622b883d] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Fri Nov 28 11:31:07 2025 +1100 +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. + Documentation/admin-guide/RAS/main.rst | 142 +------ + arch/loongarch/configs/loongson3_defconfig | 1 - + drivers/acpi/prmt.c | 6 + + drivers/edac/Kconfig | 20 +- + drivers/edac/Makefile | 3 + + drivers/edac/amd64_edac.c | 61 +-- + drivers/edac/amd64_edac.h | 7 +- + drivers/edac/edac_mc_sysfs.c | 404 ------------------- + drivers/edac/ghes_edac.c | 7 +- + drivers/edac/i10nm_base.c | 3 +- + drivers/edac/ie31200_edac.c | 2 + + drivers/edac/igen6_edac.c | 2 + + drivers/edac/imh_base.c | 602 +++++++++++++++++++++++++++++ + drivers/edac/skx_base.c | 4 +- + drivers/edac/skx_common.c | 33 +- + drivers/edac/skx_common.h | 98 +++-- + drivers/ras/amd/atl/core.c | 7 +- + drivers/ras/amd/atl/internal.h | 6 +- + drivers/ras/amd/atl/prm.c | 4 - + drivers/ras/amd/atl/system.c | 30 +- + drivers/ras/amd/atl/umc.c | 23 +- + include/linux/prmt.h | 2 + + 22 files changed, 795 insertions(+), 672 deletions(-) + create mode 100644 drivers/edac/imh_base.c +Merging ftrace/for-next (b668bb6dfc3a 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 +Auto-merging Documentation/tools/rtla/common_options.txt +CONFLICT (content): Merge conflict in Documentation/tools/rtla/common_options.txt +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/trace/blktrace.c +Auto-merging kernel/trace/fgraph.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace_output.c +Auto-merging scripts/link-vmlinux.sh +Resolved 'Documentation/tools/rtla/common_options.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 01a1c5c48e90] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/tools/rtla/common_options.txt | 2 +- + Documentation/trace/ftrace.rst | 8 + + MAINTAINERS | 5 + + Makefile | 21 + + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/fprobe.h | 3 +- + include/linux/rv.h | 11 +- + include/linux/seq_buf.h | 17 + + include/linux/trace_seq.h | 13 + + include/linux/tracepoint.h | 13 + + include/rv/da_monitor.h | 35 +- + include/rv/ltl_monitor.h | 17 +- + include/trace/syscall.h | 8 +- + kernel/trace/Kconfig | 14 + + kernel/trace/blktrace.c | 6 +- + kernel/trace/fgraph.c | 10 +- + kernel/trace/fprobe.c | 303 +++++-- + kernel/trace/ftrace.c | 30 +- + kernel/trace/pid_list.c | 30 +- + kernel/trace/pid_list.h | 1 + + kernel/trace/rv/reactor_panic.c | 6 +- + kernel/trace/rv/reactor_printk.c | 6 +- + kernel/trace/rv/rv_reactors.c | 22 +- + kernel/trace/trace.c | 830 ++++++++++++------ + kernel/trace/trace.h | 79 +- + kernel/trace/trace_dynevent.c | 11 +- + kernel/trace/trace_eprobe.c | 108 +-- + kernel/trace/trace_events.c | 4 +- + kernel/trace/trace_events_synth.c | 2 +- + kernel/trace/trace_fprobe.c | 6 +- + kernel/trace/trace_functions.c | 10 +- + kernel/trace/trace_functions_graph.c | 151 +++- + kernel/trace/trace_irqsoff.c | 30 +- + kernel/trace/trace_kdb.c | 2 +- + kernel/trace/trace_kprobe.c | 6 +- + kernel/trace/trace_output.c | 45 +- + kernel/trace/trace_output.h | 11 + + kernel/trace/trace_probe.c | 5 +- + kernel/trace/trace_probe.h | 4 +- + kernel/trace/trace_sched_wakeup.c | 24 +- + kernel/trace/trace_syscalls.c | 939 +++++++++++++++++++-- + kernel/trace/trace_uprobe.c | 82 +- + lib/tests/test_fprobe.c | 99 ++- + scripts/.gitignore | 1 + + scripts/Makefile | 6 + + scripts/Makefile.modfinal | 5 + + scripts/elf-parse.c | 198 +++++ + scripts/elf-parse.h | 305 +++++++ + scripts/link-vmlinux.sh | 7 + + scripts/sorttable.c | 477 +---------- + scripts/tracepoint-update.c | 261 ++++++ + tools/testing/selftests/ftrace/ftracetest | 34 +- + .../ftrace/test.d/00basic/mount_options.tc | 2 +- + tools/testing/selftests/ftrace/test.d/functions | 6 +- + tools/testing/selftests/verification/.gitignore | 2 + + tools/testing/selftests/verification/Makefile | 8 + + tools/testing/selftests/verification/config | 1 + + tools/testing/selftests/verification/settings | 1 + + .../selftests/verification/test.d/functions | 39 + + .../test.d/rv_monitor_enable_disable.tc | 75 ++ + .../verification/test.d/rv_monitor_reactor.tc | 68 ++ + .../verification/test.d/rv_monitors_available.tc | 18 + + .../verification/test.d/rv_wwnr_printk.tc | 30 + + .../selftests/verification/verificationtest-ktap | 8 + + tools/tracing/rtla/Makefile.rtla | 2 +- + tools/tracing/rtla/src/common.c | 24 +- + tools/tracing/rtla/src/common.h | 4 + + tools/tracing/rtla/src/osnoise_hist.c | 136 +-- + tools/tracing/rtla/src/osnoise_top.c | 106 +-- + tools/tracing/rtla/src/timerlat.bpf.c | 3 + + tools/tracing/rtla/src/timerlat.c | 12 +- + tools/tracing/rtla/src/timerlat_hist.c | 148 ++-- + tools/tracing/rtla/src/timerlat_top.c | 116 +-- + tools/tracing/rtla/src/timerlat_u.c | 12 +- + tools/tracing/rtla/src/utils.c | 41 + + tools/tracing/rtla/src/utils.h | 2 + + tools/tracing/rtla/tests/osnoise.t | 6 +- + tools/tracing/rtla/tests/timerlat.t | 6 +- + 78 files changed, 3664 insertions(+), 1536 deletions(-) + create mode 100644 scripts/elf-parse.c + create mode 100644 scripts/elf-parse.h + create mode 100644 scripts/tracepoint-update.c + create mode 100644 tools/testing/selftests/verification/.gitignore + create mode 100644 tools/testing/selftests/verification/Makefile + create mode 100644 tools/testing/selftests/verification/config + create mode 100644 tools/testing/selftests/verification/settings + create mode 100644 tools/testing/selftests/verification/test.d/functions + create mode 100644 tools/testing/selftests/verification/test.d/rv_monitor_enable_disable.tc + create mode 100644 tools/testing/selftests/verification/test.d/rv_monitor_reactor.tc + create mode 100644 tools/testing/selftests/verification/test.d/rv_monitors_available.tc + create mode 100644 tools/testing/selftests/verification/test.d/rv_wwnr_printk.tc + create mode 100755 tools/testing/selftests/verification/verificationtest-ktap +Merging rcu/next (3fa5aca16a36 Merge branches 'rcu/misc', 'rcu/srcu' and 'rcu/refscale' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Auto-merging include/linux/rculist_nulls.h +Auto-merging kernel/rcu/tree.c +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 33 +- + Documentation/RCU/checklist.rst | 12 +- + Documentation/RCU/whatisRCU.rst | 3 + + include/linux/context_tracking_state.h | 44 ++- + include/linux/notifier.h | 2 +- + include/linux/rculist_nulls.h | 6 +- + include/linux/srcu.h | 143 ++++++-- + include/linux/srcutiny.h | 31 +- + include/linux/srcutree.h | 101 ++++-- + kernel/locking/locktorture.c | 8 +- + kernel/rcu/Kconfig.debug | 15 + + kernel/rcu/rcutorture.c | 76 ++++- + kernel/rcu/refscale.c | 379 ++++++++++++++++++++- + kernel/rcu/srcutiny.c | 13 +- + kernel/rcu/srcutree.c | 130 ++++++- + kernel/rcu/tree.c | 2 +- + kernel/rcu/update.c | 8 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 56 ++- + .../testing/selftests/rcutorture/bin/kvm-series.sh | 116 +++++++ + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 1 + + 21 files changed, 1040 insertions(+), 141 deletions(-) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-series.sh +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 +Merge made by the 'ort' strategy. + Documentation/memory-barriers.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging kvm/next (6b36119b94d0 KVM: x86: Export KVM-internal symbols for sub-modules only) +$ 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 (caca1d7c3367 Merge branch 'kvm-arm64/vgic-lr-overflow' 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 +Auto-merging arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm64/include/asm/virt.h +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/nested.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/vgic/vgic-init.c +Auto-merging arch/arm64/kvm/vgic/vgic-v3.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/vgic/vgic-v3.c +Auto-merging arch/arm64/kvm/vgic/vgic.c +Auto-merging drivers/irqchip/irq-apple-aic.c +Auto-merging tools/arch/arm64/include/asm/esr.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c +Resolved 'arch/arm64/kvm/vgic/vgic-v3.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 30a9f11c02fb] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 47 +++ + arch/arm64/include/asm/kvm_asm.h | 8 +- + arch/arm64/include/asm/kvm_host.h | 3 + + arch/arm64/include/asm/kvm_hyp.h | 3 +- + arch/arm64/include/asm/kvm_nested.h | 40 +- + arch/arm64/include/asm/kvm_pgtable.h | 45 ++- + arch/arm64/include/asm/kvm_pkvm.h | 4 +- + arch/arm64/include/asm/virt.h | 7 +- + arch/arm64/kernel/cpufeature.c | 59 +++ + arch/arm64/kernel/hyp-stub.S | 5 + + arch/arm64/kernel/image-vars.h | 1 + + arch/arm64/kvm/arm.c | 14 +- + arch/arm64/kvm/at.c | 193 ++++++++- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 7 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 + + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 5 + + arch/arm64/kvm/hyp/pgtable.c | 128 +++++- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 4 + + arch/arm64/kvm/hyp/vgic-v3-sr.c | 96 +++-- + arch/arm64/kvm/mmu.c | 132 ++++++- + arch/arm64/kvm/nested.c | 123 ++++-- + arch/arm64/kvm/pkvm.c | 11 +- + arch/arm64/kvm/ptdump.c | 35 +- + arch/arm64/kvm/sys_regs.c | 28 +- + arch/arm64/kvm/vgic/vgic-init.c | 9 +- + arch/arm64/kvm/vgic/vgic-mmio-v2.c | 24 ++ + arch/arm64/kvm/vgic/vgic-mmio.h | 1 + + arch/arm64/kvm/vgic/vgic-v2.c | 295 ++++++++++---- + arch/arm64/kvm/vgic/vgic-v3-nested.c | 106 ++--- + arch/arm64/kvm/vgic/vgic-v3.c | 430 ++++++++++++++++----- + arch/arm64/kvm/vgic/vgic-v4.c | 5 +- + arch/arm64/kvm/vgic/vgic.c | 304 +++++++++------ + arch/arm64/kvm/vgic/vgic.h | 43 ++- + arch/arm64/tools/cpucaps | 2 + + drivers/irqchip/irq-apple-aic.c | 7 +- + drivers/irqchip/irq-gic.c | 3 + + include/kvm/arm_vgic.h | 29 +- + include/linux/irqchip/arm-gic.h | 6 + + include/linux/irqchip/arm-vgic-info.h | 2 + + include/uapi/linux/kvm.h | 10 + + tools/arch/arm64/include/asm/esr.h | 2 + + tools/testing/selftests/kvm/Makefile.kvm | 2 + + tools/testing/selftests/kvm/arm64/at.c | 166 ++++++++ + tools/testing/selftests/kvm/arm64/sea_to_user.c | 331 ++++++++++++++++ + tools/testing/selftests/kvm/arm64/vgic_irq.c | 285 ++++++++++++-- + .../testing/selftests/kvm/arm64/vgic_lpi_stress.c | 4 + + tools/testing/selftests/kvm/include/arm64/gic.h | 1 + + .../selftests/kvm/include/arm64/gic_v3_its.h | 1 + + tools/testing/selftests/kvm/include/kvm_util.h | 1 + + tools/testing/selftests/kvm/lib/arm64/gic.c | 6 + + .../testing/selftests/kvm/lib/arm64/gic_private.h | 1 + + tools/testing/selftests/kvm/lib/arm64/gic_v3.c | 22 ++ + tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c | 10 + + tools/testing/selftests/kvm/lib/kvm_util.c | 11 + + 54 files changed, 2579 insertions(+), 541 deletions(-) + create mode 100644 tools/testing/selftests/kvm/arm64/at.c + create mode 100644 tools/testing/selftests/kvm/arm64/sea_to_user.c +Merging kvms390/next (98afdebb1543 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 +Auto-merging Documentation/virt/kvm/api.rst +CONFLICT (content): Merge conflict in Documentation/virt/kvm/api.rst +Auto-merging arch/s390/kernel/asm-offsets.c +Auto-merging arch/s390/kernel/entry.S +Auto-merging arch/s390/kvm/interrupt.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Resolved 'Documentation/virt/kvm/api.rst' using previous resolution. +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3218f49a022c] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 19 +- + arch/s390/include/asm/kvm_host.h | 8 +- + arch/s390/include/asm/stacktrace.h | 1 + + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/entry.S | 2 + + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/gaccess.c | 27 +-- + arch/s390/kvm/intercept.c | 3 + + arch/s390/kvm/interrupt.c | 80 ++------ + arch/s390/kvm/kvm-s390.c | 229 ++++++----------------- + arch/s390/kvm/kvm-s390.h | 9 +- + arch/s390/kvm/vsie.c | 20 +- + include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/s390/user_operexec.c | 140 ++++++++++++++ + 15 files changed, 271 insertions(+), 271 deletions(-) + create mode 100644 tools/testing/selftests/kvm/s390/user_operexec.c +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 +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 2 +- + arch/riscv/include/asm/kvm_host.h | 6 +++++ + arch/riscv/include/asm/kvm_tlb.h | 1 + + arch/riscv/include/asm/kvm_vcpu_sbi.h | 5 +++- + arch/riscv/include/asm/kvm_vmid.h | 1 - + arch/riscv/include/uapi/asm/kvm.h | 3 +++ + arch/riscv/kvm/Makefile | 1 + + arch/riscv/kvm/aia_imsic.c | 2 +- + arch/riscv/kvm/main.c | 14 ++++++++++ + arch/riscv/kvm/mmu.c | 5 +++- + arch/riscv/kvm/tlb.c | 30 +++++++++++++++++++++ + arch/riscv/kvm/vcpu.c | 2 +- + arch/riscv/kvm/vcpu_insn.c | 22 +++++++++++++++ + arch/riscv/kvm/vcpu_sbi.c | 10 ++++++- + arch/riscv/kvm/vcpu_sbi_base.c | 28 +------------------ + arch/riscv/kvm/vcpu_sbi_forward.c | 34 ++++++++++++++++++++++++ + arch/riscv/kvm/vcpu_sbi_replace.c | 32 ---------------------- + arch/riscv/kvm/vcpu_sbi_system.c | 4 +-- + arch/riscv/kvm/vcpu_sbi_v01.c | 3 +-- + arch/riscv/kvm/vmid.c | 23 ---------------- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 +++ + 21 files changed, 138 insertions(+), 94 deletions(-) + create mode 100644 arch/riscv/kvm/vcpu_sbi_forward.c +Merging kvm-x86/next (115d5de2eef3 Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/loongarch/kvm/vcpu.c +Auto-merging arch/riscv/kvm/vcpu.c +Auto-merging arch/s390/kvm/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/svm.h +Auto-merging arch/x86/kernel/cpu/bugs.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/bugs.c +Auto-merging arch/x86/kernel/cpu/scattered.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/verity.c +Auto-merging fs/f2fs/compress.c +Auto-merging include/linux/pagemap.h +Auto-merging mm/filemap.c +Auto-merging mm/mempolicy.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/kvm/arm64/vgic_irq.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging virt/kvm/guest_memfd.c +CONFLICT (content): Merge conflict in virt/kvm/guest_memfd.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Resolved 'arch/x86/kernel/cpu/bugs.c' using previous resolution. +Resolved 'virt/kvm/guest_memfd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e835f2a28252] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 2 +- + Documentation/virt/kvm/x86/errata.rst | 9 +- + arch/arm64/kvm/arm.c | 6 + + arch/loongarch/kvm/Kconfig | 1 - + arch/loongarch/kvm/vcpu.c | 4 +- + arch/mips/kvm/Kconfig | 1 - + arch/mips/kvm/mips.c | 4 +- + arch/powerpc/kvm/Kconfig | 1 - + arch/powerpc/kvm/powerpc.c | 4 +- + arch/riscv/kvm/Kconfig | 1 - + arch/riscv/kvm/vcpu.c | 4 +- + arch/s390/kvm/Kconfig | 1 - + arch/s390/kvm/kvm-s390.c | 4 +- + arch/x86/include/asm/cpufeatures.h | 7 + + arch/x86/include/asm/hardirq.h | 4 +- + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 23 +- + arch/x86/include/asm/nospec-branch.h | 30 +- + arch/x86/include/asm/svm.h | 5 +- + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/kernel/cpu/bugs.c | 22 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kvm/cpuid.c | 1 + + arch/x86/kvm/emulate.c | 319 +++++--- + arch/x86/kvm/fpu.h | 66 ++ + arch/x86/kvm/hyperv.c | 2 +- + arch/x86/kvm/kvm_emulate.h | 20 +- + arch/x86/kvm/lapic.c | 44 +- + arch/x86/kvm/mmu.h | 5 +- + arch/x86/kvm/mmu/mmu.c | 94 ++- + arch/x86/kvm/mmu/mmu_internal.h | 10 - + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/mmu/spte.c | 2 +- + arch/x86/kvm/mmu/spte.h | 10 + + arch/x86/kvm/mmu/tdp_mmu.c | 50 +- + arch/x86/kvm/svm/avic.c | 86 ++- + arch/x86/kvm/svm/nested.c | 12 +- + arch/x86/kvm/svm/sev.c | 45 +- + arch/x86/kvm/svm/svm.c | 113 +-- + arch/x86/kvm/svm/svm.h | 4 +- + arch/x86/kvm/svm/vmenter.S | 53 +- + arch/x86/kvm/vmx/main.c | 9 + + arch/x86/kvm/vmx/nested.c | 173 ++--- + arch/x86/kvm/vmx/run_flags.h | 10 +- + arch/x86/kvm/vmx/tdx.c | 801 ++++++++++----------- + arch/x86/kvm/vmx/tdx.h | 9 +- + arch/x86/kvm/vmx/vmenter.S | 49 +- + arch/x86/kvm/vmx/vmx.c | 323 +++++---- + arch/x86/kvm/vmx/vmx.h | 2 - + arch/x86/kvm/vmx/x86_ops.h | 2 +- + arch/x86/kvm/x86.c | 285 ++++---- + arch/x86/kvm/x86.h | 16 +- + drivers/crypto/ccp/sev-dev.c | 37 + + fs/btrfs/compression.c | 4 +- + fs/btrfs/verity.c | 2 +- + fs/erofs/zdata.c | 2 +- + fs/f2fs/compress.c | 2 +- + include/linux/kvm_host.h | 14 +- + include/linux/pagemap.h | 18 +- + include/linux/psp-sev.h | 37 + + include/uapi/linux/magic.h | 1 + + mm/filemap.c | 23 +- + mm/mempolicy.c | 6 + + mm/readahead.c | 2 +- + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/kvm/Makefile.kvm | 8 +- + tools/testing/selftests/kvm/arm64/vgic_irq.c | 2 +- + tools/testing/selftests/kvm/guest_memfd_test.c | 98 +++ + tools/testing/selftests/kvm/include/kvm_syscalls.h | 81 +++ + tools/testing/selftests/kvm/include/kvm_util.h | 44 +- + tools/testing/selftests/kvm/include/numaif.h | 110 +-- + .../testing/selftests/kvm/include/x86/processor.h | 2 +- + tools/testing/selftests/kvm/include/x86/vmx.h | 3 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 4 +- + tools/testing/selftests/kvm/lib/arm64/processor.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 134 ++-- + tools/testing/selftests/kvm/lib/x86/memstress.c | 2 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 80 +- + tools/testing/selftests/kvm/lib/x86/vmx.c | 9 +- + tools/testing/selftests/kvm/mmu_stress_test.c | 10 +- + .../testing/selftests/kvm/pre_fault_memory_test.c | 32 +- + tools/testing/selftests/kvm/x86/hyperv_features.c | 2 +- + tools/testing/selftests/kvm/x86/hyperv_ipi.c | 18 +- + tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c | 2 +- + ...while_nested_test.c => nested_close_kvm_test.c} | 42 +- + .../selftests/kvm/x86/nested_invalid_cr3_test.c | 116 +++ + ..._tsc_adjust_test.c => nested_tsc_adjust_test.c} | 73 +- + ...sc_scaling_test.c => nested_tsc_scaling_test.c} | 48 +- + .../kvm/x86/private_mem_conversions_test.c | 9 +- + tools/testing/selftests/kvm/x86/sev_smoke_test.c | 2 +- + tools/testing/selftests/kvm/x86/state_test.c | 2 +- + .../testing/selftests/kvm/x86/userspace_io_test.c | 2 +- + .../testing/selftests/kvm/x86/vmx_dirty_log_test.c | 12 +- + .../selftests/kvm/x86/vmx_nested_la57_state_test.c | 132 ++++ + tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 5 +- + virt/kvm/Kconfig | 3 - + virt/kvm/eventfd.c | 2 +- + virt/kvm/guest_memfd.c | 393 +++++++--- + virt/kvm/kvm_main.c | 13 +- + virt/kvm/kvm_mm.h | 9 +- + 100 files changed, 2788 insertions(+), 1621 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/kvm_syscalls.h + rename tools/testing/selftests/kvm/x86/{vmx_close_while_nested_test.c => nested_close_kvm_test.c} (64%) + create mode 100644 tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c + rename tools/testing/selftests/kvm/x86/{vmx_tsc_adjust_test.c => nested_tsc_adjust_test.c} (61%) + rename tools/testing/selftests/kvm/x86/{vmx_nested_tsc_scaling_test.c => nested_tsc_scaling_test.c} (83%) + create mode 100644 tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c +Merging xen-tip/linux-next (a73d4a055622 drivers/xen/xenbus: Replace deprecated strcpy in xenbus_transaction_end) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/xen/xenbus/xenbus_xs.c +Merge made by the 'ort' strategy. + drivers/xen/xenbus/xenbus_xs.c | 16 +++++----------- + include/xen/xenbus.h | 2 +- + 2 files changed, 6 insertions(+), 12 deletions(-) +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 (6d90215dc015 workqueue: Don't rely on wq->rescuer to stop rescuer) +$ 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 | 86 +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 50 insertions(+), 36 deletions(-) +Merging sched-ext/for-next (e090182ceee2 Merge branch 'for-6.19' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/ext.c +CONFLICT (content): Merge conflict in kernel/sched/ext.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/watchdog.c +Resolved 'kernel/sched/ext.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0da88c707446] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git +$ git diff -M --stat --summary HEAD^.. + include/linux/cgroup.h | 14 +- + include/linux/sched/ext.h | 27 +- + include/trace/events/sched_ext.h | 39 + + kernel/cgroup/cgroup.c | 39 +- + kernel/cgroup/cpuset-internal.h | 3 - + kernel/cgroup/cpuset.c | 41 +- + kernel/exit.c | 4 +- + kernel/fork.c | 3 +- + kernel/sched/autogroup.c | 4 +- + kernel/sched/core.c | 8 + + kernel/sched/ext.c | 1086 ++++++++++++++++------ + kernel/sched/ext_idle.c | 43 +- + kernel/sched/ext_internal.h | 29 +- + kernel/sched/sched.h | 4 +- + kernel/watchdog.c | 9 + + tools/sched_ext/Makefile | 4 +- + tools/sched_ext/include/scx/common.bpf.h | 15 +- + tools/sched_ext/include/scx/compat.bpf.h | 306 ++++-- + tools/sched_ext/include/scx/compat.h | 14 + + tools/sched_ext/scx_cpu0.bpf.c | 88 ++ + tools/sched_ext/scx_cpu0.c | 106 +++ + tools/sched_ext/scx_flatcg.bpf.c | 10 +- + tools/sched_ext/scx_qmap.bpf.c | 52 +- + tools/testing/selftests/sched_ext/Makefile | 1 + + tools/testing/selftests/sched_ext/peek_dsq.bpf.c | 251 +++++ + tools/testing/selftests/sched_ext/peek_dsq.c | 224 +++++ + 26 files changed, 1947 insertions(+), 477 deletions(-) + create mode 100644 tools/sched_ext/scx_cpu0.bpf.c + create mode 100644 tools/sched_ext/scx_cpu0.c + create mode 100644 tools/testing/selftests/sched_ext/peek_dsq.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/peek_dsq.c +Merging drivers-x86/for-next (5c14bff570dc platform/x86/uniwill: Add TUXEDO devices) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/platform/arm64/lenovo-thinkpad-t14s.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/platform/x86/dell/alienware-wmi-wmax.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-uniwill-laptop | 53 + + Documentation/ABI/testing/sysfs-platform-asus-wmi | 17 + + Documentation/ABI/testing/sysfs-platform-ayaneo-ec | 19 + + Documentation/admin-guide/laptops/index.rst | 1 + + .../admin-guide/laptops/uniwill-laptop.rst | 60 + + Documentation/driver-api/wmi.rst | 2 +- + Documentation/wmi/devices/uniwill-laptop.rst | 198 ++ + MAINTAINERS | 20 +- + drivers/hid/hid-asus.c | 1 + + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/arm64/lenovo-thinkpad-t14s.c | 58 +- + drivers/platform/surface/aggregator/core.c | 2 +- + drivers/platform/wmi/Kconfig | 34 + + drivers/platform/wmi/Makefile | 8 + + drivers/platform/{x86/wmi.c => wmi/core.c} | 34 +- + drivers/platform/x86/Kconfig | 72 +- + drivers/platform/x86/Makefile | 8 +- + drivers/platform/x86/acer-wmi.c | 290 ++- + drivers/platform/x86/amd/hfi/hfi.c | 11 - + drivers/platform/x86/amd/hsmp/acpi.c | 9 +- + drivers/platform/x86/amd/pmf/auto-mode.c | 14 +- + drivers/platform/x86/amd/pmf/cnqf.c | 14 +- + drivers/platform/x86/amd/pmf/core.c | 6 +- + drivers/platform/x86/amd/pmf/pmf.h | 18 +- + drivers/platform/x86/amd/pmf/spc.c | 2 +- + drivers/platform/x86/amd/pmf/sps.c | 38 +- + drivers/platform/x86/amd/pmf/tee-if.c | 20 +- + drivers/platform/x86/asus-armoury.c | 1161 ++++++++++++ + drivers/platform/x86/asus-armoury.h | 1527 ++++++++++++++++ + drivers/platform/x86/asus-wmi.c | 177 +- + drivers/platform/x86/ayaneo-ec.c | 593 ++++++ + drivers/platform/x86/dell/alienware-wmi-wmax.c | 124 +- + drivers/platform/x86/intel/pmc/arl.c | 12 +- + drivers/platform/x86/intel/pmc/core.c | 149 +- + drivers/platform/x86/intel/pmc/core.h | 16 +- + drivers/platform/x86/intel/pmc/lnl.c | 2 +- + drivers/platform/x86/intel/pmc/mtl.c | 9 +- + drivers/platform/x86/intel/pmc/ptl.c | 3 +- + drivers/platform/x86/intel/pmc/wcl.c | 18 + + drivers/platform/x86/intel/vsec.c | 2 + + drivers/platform/x86/lenovo/ideapad-laptop.c | 214 ++- + drivers/platform/x86/lg-laptop.c | 11 + + drivers/platform/x86/oxpec.c | 115 +- + drivers/platform/x86/uniwill/Kconfig | 38 + + drivers/platform/x86/uniwill/Makefile | 8 + + drivers/platform/x86/uniwill/uniwill-acpi.c | 1912 ++++++++++++++++++++ + drivers/platform/x86/uniwill/uniwill-wmi.c | 92 + + drivers/platform/x86/uniwill/uniwill-wmi.h | 129 ++ + drivers/platform/x86/x86-android-tablets/lenovo.c | 2 +- + fs/nls/nls_base.c | 16 +- + .../linux/platform_data/x86/asus-wmi-leds-ids.h | 50 + + include/linux/platform_data/x86/asus-wmi.h | 58 +- + include/linux/wmi.h | 15 +- + 54 files changed, 6896 insertions(+), 569 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-uniwill-laptop + create mode 100644 Documentation/ABI/testing/sysfs-platform-ayaneo-ec + create mode 100644 Documentation/admin-guide/laptops/uniwill-laptop.rst + create mode 100644 Documentation/wmi/devices/uniwill-laptop.rst + create mode 100644 drivers/platform/wmi/Kconfig + create mode 100644 drivers/platform/wmi/Makefile + rename drivers/platform/{x86/wmi.c => wmi/core.c} (98%) + create mode 100644 drivers/platform/x86/asus-armoury.c + create mode 100644 drivers/platform/x86/asus-armoury.h + create mode 100644 drivers/platform/x86/ayaneo-ec.c + create mode 100644 drivers/platform/x86/uniwill/Kconfig + create mode 100644 drivers/platform/x86/uniwill/Makefile + create mode 100644 drivers/platform/x86/uniwill/uniwill-acpi.c + create mode 100644 drivers/platform/x86/uniwill/uniwill-wmi.c + create mode 100644 drivers/platform/x86/uniwill/uniwill-wmi.h + create mode 100644 include/linux/platform_data/x86/asus-wmi-leds-ids.h +Merging chrome-platform/for-next (52075d2c7595 platform/chrome: sensorhub: Support devices without FIFO_INT_ENABLE) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_ishtp.c | 1 + + drivers/platform/chrome/cros_ec_lightbar.c | 16 ++++++++++++---- + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 11 +++++++++++ + drivers/platform/chrome/cros_usbpd_notify.c | 17 +++++++++++++++-- + 4 files changed, 39 insertions(+), 6 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (3a8660878839 Linux 6.18-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 (3a8660878839 Linux 6.18-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 +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/arc,arc2c0608.yaml | 108 +++++++++++++++++++++ + .../bindings/leds/backlight/arcxcnn_bl.txt | 33 ------- + Documentation/devicetree/bindings/leds/common.yaml | 6 ++ + .../devicetree/bindings/leds/leds-pwm.yaml | 7 ++ + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 5 + + .../bindings/leds/qcom,spmi-flash-led.yaml | 1 + + Documentation/leds/leds-lp5521.rst | 2 +- + Documentation/leds/leds-lp5523.rst | 2 +- + drivers/leds/Kconfig | 8 +- + drivers/leds/flash/leds-rt4505.c | 2 +- + drivers/leds/flash/leds-rt8515.c | 2 +- + drivers/leds/flash/leds-sgm3140.c | 3 +- + drivers/leds/flash/leds-tps6131x.c | 2 +- + drivers/leds/led-class.c | 6 +- + drivers/leds/leds-cros_ec.c | 5 +- + drivers/leds/leds-lp50xx.c | 67 ++++++++----- + drivers/leds/leds-max5970.c | 2 +- + drivers/leds/leds-max77705.c | 2 +- + drivers/leds/leds-netxbig.c | 36 +++++-- + drivers/leds/leds-pwm.c | 29 +++++- + drivers/leds/leds-upboard.c | 2 +- + drivers/leds/rgb/leds-ktd202x.c | 4 +- + drivers/leds/rgb/leds-ncp5623.c | 2 +- + drivers/leds/rgb/leds-qcom-lpg.c | 10 +- + drivers/leds/trigger/ledtrig-input-events.c | 2 +- + 25 files changed, 246 insertions(+), 102 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/arc,arc2c0608.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/arcxcnn_bl.txt +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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 28 ----------- + .../bindings/ipmi/aspeed,ast2400-ibt-bmc.yaml | 44 +++++++++++++++++ + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 40 ---------------- + .../bindings/ipmi/nuvoton,npcm750-kcs-bmc.yaml | 55 ++++++++++++++++++++++ + MAINTAINERS | 1 + + drivers/char/ipmi/ipmi_msghandler.c | 24 +++++++--- + 6 files changed, 117 insertions(+), 75 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt + create mode 100644 Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.yaml + delete mode 100644 Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt + create mode 100644 Documentation/devicetree/bindings/ipmi/nuvoton,npcm750-kcs-bmc.yaml +Merging driver-core/driver-core-next (ea34511aaf75 driver core: Check drivers_autoprobe for all added devices) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm64/kernel/topology.c +Auto-merging drivers/base/arch_topology.c +Auto-merging drivers/gpu/nova-core/driver.rs +CONFLICT (content): Merge conflict in drivers/gpu/nova-core/driver.rs +Auto-merging include/linux/arch_topology.h +Auto-merging include/linux/platform_device.h +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/kernel/debugfs/traits.rs +CONFLICT (content): Merge conflict in rust/kernel/debugfs/traits.rs +Auto-merging rust/kernel/devres.rs +Auto-merging rust/kernel/lib.rs +Auto-merging samples/rust/rust_debugfs.rs +CONFLICT (content): Merge conflict in samples/rust/rust_debugfs.rs +Auto-merging samples/rust/rust_debugfs_scoped.rs +CONFLICT (content): Merge conflict in samples/rust/rust_debugfs_scoped.rs +Resolved 'drivers/gpu/nova-core/driver.rs' using previous resolution. +Resolved 'rust/kernel/debugfs/traits.rs' using previous resolution. +Resolved 'samples/rust/rust_debugfs.rs' using previous resolution. +Resolved 'samples/rust/rust_debugfs_scoped.rs' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b40aad2f5cbd] Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 11 + + Documentation/driver-api/driver-model/devres.rst | 1 - + MAINTAINERS | 10 + + arch/arm64/include/asm/topology.h | 3 + + arch/arm64/kernel/topology.c | 101 ---- + drivers/base/arch_topology.c | 96 +++- + drivers/base/base.h | 16 + + drivers/base/bus.c | 3 +- + drivers/base/core.c | 2 +- + drivers/base/cpu.c | 28 +- + drivers/base/dd.c | 12 +- + drivers/base/devres.c | 25 - + drivers/base/firmware_loader/sysfs.c | 10 +- + drivers/base/firmware_loader/sysfs_upload.c | 6 +- + drivers/cpufreq/rcpufreq_dt.rs | 4 +- + drivers/gpu/drm/nova/driver.rs | 4 +- + drivers/gpu/drm/nova/file.rs | 2 +- + drivers/gpu/drm/tyr/driver.rs | 4 +- + drivers/gpu/nova-core/driver.rs | 50 +- + fs/kernfs/dir.c | 5 +- + fs/kernfs/mount.c | 1 + + fs/sysfs/group.c | 10 +- + include/linux/arch_topology.h | 5 + + include/linux/device.h | 19 - + include/linux/device/devres.h | 17 + + include/linux/mod_devicetable.h | 2 +- + include/linux/platform_device.h | 6 +- + include/linux/sysfs.h | 48 +- + rust/bindings/bindings_helper.h | 7 + + rust/helpers/time.c | 5 + + rust/kernel/auxiliary.rs | 114 ++-- + rust/kernel/cpufreq.rs | 4 +- + rust/kernel/debugfs.rs | 110 +++- + rust/kernel/debugfs/file_ops.rs | 146 ++++- + rust/kernel/debugfs/traits.rs | 238 ++++++++- + rust/kernel/device.rs | 132 ++++- + rust/kernel/devres.rs | 18 +- + rust/kernel/dma.rs | 29 +- + rust/kernel/driver.rs | 4 +- + rust/kernel/fs/file.rs | 5 + + rust/kernel/i2c.rs | 586 +++++++++++++++++++++ + rust/kernel/io.rs | 32 +- + rust/kernel/io/mem.rs | 36 +- + rust/kernel/io/poll.rs | 93 +++- + rust/kernel/io/resource.rs | 27 +- + rust/kernel/lib.rs | 2 + + rust/kernel/pci.rs | 231 ++------ + rust/kernel/pci/id.rs | 5 +- + rust/kernel/pci/io.rs | 144 +++++ + rust/kernel/pci/irq.rs | 252 +++++++++ + rust/kernel/platform.rs | 59 ++- + rust/kernel/scatterlist.rs | 2 +- + rust/kernel/time/delay.rs | 37 ++ + rust/kernel/uaccess.rs | 85 +++ + rust/kernel/usb.rs | 25 +- + rust/pin-init/src/lib.rs | 87 +++ + samples/kobject/kset-example.c | 44 +- + samples/rust/Kconfig | 25 +- + samples/rust/Makefile | 2 + + samples/rust/rust_debugfs.rs | 34 +- + samples/rust/rust_debugfs_scoped.rs | 14 +- + samples/rust/rust_dma.rs | 37 +- + samples/rust/rust_driver_auxiliary.rs | 59 ++- + samples/rust/rust_driver_i2c.rs | 74 +++ + samples/rust/rust_driver_pci.rs | 47 +- + samples/rust/rust_driver_platform.rs | 6 +- + samples/rust/rust_driver_usb.rs | 5 +- + samples/rust/rust_i2c_client.rs | 147 ++++++ + 68 files changed, 2846 insertions(+), 664 deletions(-) + create mode 100644 rust/kernel/i2c.rs + create mode 100644 rust/kernel/pci/io.rs + create mode 100644 rust/kernel/pci/irq.rs + create mode 100644 samples/rust/rust_driver_i2c.rs + create mode 100644 samples/rust/rust_i2c_client.rs +Merging usb/usb-next (c7bbc43a1769 Merge tag 'usb-serial-6.19-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging MAINTAINERS +Auto-merging drivers/thunderbolt/nhi.c +Auto-merging drivers/usb/chipidea/core.c +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/dwc3/dwc3-imx8mp.c +Auto-merging drivers/usb/dwc3/dwc3-pci.c +Auto-merging drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/renesas_usbhs/common.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/storage/uas.c +Auto-merging drivers/usb/typec/ucsi/psy.c +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/kernel/lib.rs +Auto-merging samples/rust/Kconfig +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-usb_power_delivery | 28 ++ + Documentation/admin-guide/thunderbolt.rst | 50 ++- + .../devicetree/bindings/usb/apple,dwc3.yaml | 80 ++++ + .../devicetree/bindings/usb/dwc3-xilinx.yaml | 22 + + .../devicetree/bindings/usb/eswin,eic7700-usb.yaml | 94 ++++ + .../devicetree/bindings/usb/fsl,ls1028a.yaml | 33 +- + .../devicetree/bindings/usb/fsl,usbmisc.yaml | 1 + + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/generic-xhci.yaml | 17 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +- + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 32 ++ + .../bindings/usb/renesas,rzg3e-xhci.yaml | 12 +- + .../bindings/usb/samsung,exynos-dwc3.yaml | 6 + + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 8 + + .../devicetree/bindings/usb/usb-uhci.yaml | 13 + + MAINTAINERS | 2 + + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/debugfs.c | 4 +- + drivers/thunderbolt/domain.c | 2 +- + drivers/thunderbolt/eeprom.c | 2 +- + drivers/thunderbolt/icm.c | 8 +- + drivers/thunderbolt/lc.c | 2 +- + drivers/thunderbolt/nhi.c | 2 +- + drivers/thunderbolt/retimer.c | 2 +- + drivers/thunderbolt/switch.c | 6 +- + drivers/thunderbolt/tb.c | 16 +- + drivers/thunderbolt/tb.h | 14 +- + drivers/thunderbolt/tb_regs.h | 6 +- + drivers/thunderbolt/tmu.c | 4 +- + drivers/thunderbolt/tunnel.c | 14 +- + drivers/thunderbolt/usb4.c | 26 +- + drivers/thunderbolt/xdomain.c | 4 +- + drivers/usb/cdns3/cdns3-gadget.c | 1 - + drivers/usb/cdns3/cdnsp-gadget.c | 1 - + drivers/usb/chipidea/core.c | 1 - + drivers/usb/chipidea/otg_fsm.c | 1 - + drivers/usb/chipidea/usbmisc_imx.c | 12 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/usbtmc.c | 12 +- + drivers/usb/core/Makefile | 5 +- + drivers/usb/core/hcd.c | 8 +- + drivers/usb/core/hub.c | 43 +- + drivers/usb/core/message.c | 2 +- + drivers/usb/core/trace.c | 6 + + drivers/usb/core/trace.h | 61 +++ + drivers/usb/core/usb.c | 2 + + drivers/usb/dwc2/platform.c | 17 +- + drivers/usb/dwc3/Kconfig | 11 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 34 +- + drivers/usb/dwc3/drd.c | 1 + + drivers/usb/dwc3/dwc3-am62.c | 1 - + drivers/usb/dwc3/dwc3-apple.c | 489 +++++++++++++++++++++ + drivers/usb/dwc3/dwc3-generic-plat.c | 70 +++ + drivers/usb/dwc3/dwc3-imx8mp.c | 1 - + drivers/usb/dwc3/dwc3-pci.c | 1 - + drivers/usb/dwc3/dwc3-qcom.c | 1 + + drivers/usb/dwc3/dwc3-xilinx.c | 1 - + drivers/usb/dwc3/gadget.c | 4 +- + drivers/usb/dwc3/glue.h | 157 +++++++ + drivers/usb/dwc3/host.c | 7 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_hid.c | 3 +- + drivers/usb/gadget/legacy/raw_gadget.c | 3 + + drivers/usb/gadget/legacy/zero.c | 27 +- + drivers/usb/gadget/udc/cdns2/cdns2-gadget.c | 1 - + drivers/usb/host/ehci-platform.c | 40 +- + drivers/usb/host/ohci-da8xx.c | 17 - + drivers/usb/host/ohci-platform.c | 24 +- + drivers/usb/host/uhci-hcd.h | 1 + + drivers/usb/host/uhci-platform.c | 28 +- + drivers/usb/host/xen-hcd.c | 4 +- + drivers/usb/host/xhci-caps.h | 167 ++++--- + drivers/usb/host/xhci-dbgcap.c | 8 +- + drivers/usb/host/xhci-debugfs.c | 57 ++- + drivers/usb/host/xhci-hub.c | 125 +++--- + drivers/usb/host/xhci-mem.c | 41 +- + drivers/usb/host/xhci-mtk.c | 1 - + drivers/usb/host/xhci-mtk.h | 10 +- + drivers/usb/host/xhci-pci.c | 6 +- + drivers/usb/host/xhci-port.h | 5 + + drivers/usb/host/xhci-ring.c | 240 +++++----- + drivers/usb/host/xhci-tegra.c | 13 +- + drivers/usb/host/xhci-trace.h | 25 +- + drivers/usb/host/xhci.c | 92 ++-- + drivers/usb/host/xhci.h | 118 ++--- + drivers/usb/misc/apple-mfi-fastcharge.c | 1 - + drivers/usb/misc/chaoskey.c | 16 +- + drivers/usb/misc/usb-ljca.c | 39 +- + drivers/usb/mtu3/mtu3.h | 34 +- + drivers/usb/mtu3/mtu3_core.c | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 1 - + drivers/usb/mtu3/mtu3_qmu.c | 2 +- + drivers/usb/musb/musb_core.c | 5 - + drivers/usb/musb/musb_debugfs.c | 5 - + drivers/usb/musb/musb_dsps.c | 1 - + drivers/usb/musb/musb_gadget.c | 4 - + drivers/usb/musb/omap2430.c | 1 - + drivers/usb/phy/phy.c | 4 + + drivers/usb/renesas_usbhs/common.c | 51 ++- + drivers/usb/serial/belkin_sa.c | 42 +- + drivers/usb/serial/ftdi_sio.c | 200 +++------ + drivers/usb/serial/kobil_sct.c | 208 ++++----- + drivers/usb/serial/option.c | 22 +- + drivers/usb/storage/protocol.c | 3 +- + drivers/usb/storage/uas.c | 29 +- + drivers/usb/storage/unusual_uas.h | 2 +- + drivers/usb/typec/altmodes/displayport.c | 4 +- + drivers/usb/typec/anx7411.c | 3 +- + drivers/usb/typec/class.c | 13 + + drivers/usb/typec/hd3ss3220.c | 75 +++- + drivers/usb/typec/mux/ps883x.c | 127 ++++-- + drivers/usb/typec/pd.c | 95 +++- + drivers/usb/typec/tcpm/tcpm.c | 15 +- + drivers/usb/typec/tipd/core.c | 15 +- + drivers/usb/typec/ucsi/cros_ec_ucsi.c | 5 +- + drivers/usb/typec/ucsi/debugfs.c | 37 +- + drivers/usb/typec/ucsi/displayport.c | 11 +- + drivers/usb/typec/ucsi/psy.c | 26 ++ + drivers/usb/typec/ucsi/ucsi.c | 156 +++++-- + drivers/usb/typec/ucsi/ucsi.h | 30 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 25 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 11 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 88 +++- + drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c | 2 + + drivers/usb/typec/ucsi/ucsi_yoga_c630.c | 15 +- + drivers/usb/usbip/stub_tx.c | 9 +- + drivers/usb/usbip/vhci_hcd.c | 96 ++-- + include/linux/platform_data/usb-davinci.h | 22 - + include/linux/usb/pd.h | 69 ++- + include/linux/usb/typec.h | 1 + + include/linux/usb/typec_altmode.h | 13 + + include/linux/usb/typec_tbt.h | 1 + + include/uapi/linux/usb/cdc.h | 12 +- + rust/bindings/bindings_helper.h | 1 + + rust/helpers/helpers.c | 1 + + rust/kernel/lib.rs | 2 + + samples/rust/Kconfig | 2 +- + 138 files changed, 2943 insertions(+), 1241 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/apple,dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/eswin,eic7700-usb.yaml + create mode 100644 drivers/usb/core/trace.c + create mode 100644 drivers/usb/core/trace.h + create mode 100644 drivers/usb/dwc3/dwc3-apple.c + delete mode 100644 include/linux/platform_data/usb-davinci.h +Merging thunderbolt/next (479d186fc946 thunderbolt: Fix typos in xdomain.c) +$ 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 (75a9f4c54770 serial: sh-sci: Fix deadlock during RSCI FIFO overrun error) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml +Auto-merging arch/arm/configs/aspeed_g5_defconfig +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/xtensa/configs/audio_kc705_defconfig +Auto-merging arch/xtensa/configs/generic_kc705_defconfig +Auto-merging arch/xtensa/configs/nommu_kc705_defconfig +Auto-merging arch/xtensa/configs/smp_lx200_defconfig +Auto-merging arch/xtensa/configs/xip_kc705_defconfig +Auto-merging drivers/tty/pty.c +Auto-merging drivers/tty/serial/8250/8250.h +Auto-merging drivers/tty/serial/8250/8250_pci.c +Auto-merging drivers/tty/serial/8250/8250_platform.c +Auto-merging drivers/tty/serial/8250/8250_rsa.c +CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_rsa.c +Auto-merging drivers/tty/serial/8250/Makefile +Auto-merging drivers/tty/serial/icom.c +Resolved 'drivers/tty/serial/8250/8250_rsa.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7d34f6f42ca9] Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/serial/8250.yaml | 14 + + .../devicetree/bindings/serial/renesas,rsci.yaml | 2 - + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + arch/arm/configs/aspeed_g4_defconfig | 1 - + arch/arm/configs/aspeed_g5_defconfig | 1 - + arch/arm/configs/hisi_defconfig | 1 - + arch/arm/configs/lpc18xx_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 1 - + arch/loongarch/boot/dts/loongson-2k0500.dtsi | 2 +- + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 2 +- + arch/loongarch/boot/dts/loongson-2k2000.dtsi | 2 +- + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bmips_stb_defconfig | 1 - + arch/mips/configs/gcw0_defconfig | 1 - + arch/nios2/configs/10m50_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/parisc/configs/generic-64bit_defconfig | 1 - + arch/powerpc/configs/44x/akebono_defconfig | 1 - + arch/powerpc/configs/microwatt_defconfig | 1 - + arch/riscv/configs/nommu_virt_defconfig | 1 - + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/xip_kc705_defconfig | 1 - + drivers/tty/moxa.c | 165 +++--- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/n_hdlc.c | 79 +-- + drivers/tty/n_tty.c | 107 ++-- + drivers/tty/pty.c | 103 ++-- + drivers/tty/serial/8250/8250.h | 9 - + drivers/tty/serial/8250/8250_core.c | 4 + + drivers/tty/serial/8250/8250_dw.c | 4 +- + drivers/tty/serial/8250/8250_exar.c | 4 +- + drivers/tty/serial/8250/8250_keba.c | 280 +++++++++ + drivers/tty/serial/8250/8250_loongson.c | 238 ++++++++ + drivers/tty/serial/8250/8250_of.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 47 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 10 +- + drivers/tty/serial/8250/8250_pcilib.c | 7 +- + drivers/tty/serial/8250/8250_pcilib.h | 2 +- + drivers/tty/serial/8250/8250_platform.c | 55 +- + drivers/tty/serial/8250/8250_rsa.c | 24 - + drivers/tty/serial/8250/Kconfig | 40 +- + drivers/tty/serial/8250/Makefile | 2 + + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/ar933x_uart.c | 62 ++ + drivers/tty/serial/fsl_lpuart.c | 8 + + drivers/tty/serial/icom.c | 1 + + drivers/tty/serial/imx.c | 24 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 178 +++++- + drivers/tty/serial/samsung_tty.c | 2 + + drivers/tty/serial/sc16is7xx.c | 413 ++++++------- + drivers/tty/serial/sc16is7xx.h | 1 - + drivers/tty/serial/sc16is7xx_i2c.c | 4 +- + drivers/tty/serial/sc16is7xx_spi.c | 4 +- + drivers/tty/serial/serial_core.c | 178 +++--- + drivers/tty/serial/sh-sci.c | 196 ++++++- + drivers/tty/serial/sh-sci.h | 178 ------ + drivers/tty/serial/sprd_serial.c | 6 + + drivers/tty/serial/xilinx_uartps.c | 15 +- + drivers/tty/tty_buffer.c | 8 +- + drivers/tty/vt/keyboard.c | 318 ++++------ + drivers/tty/vt/selection.c | 9 +- + drivers/tty/vt/vt.c | 4 +- + tools/testing/selftests/tty/.gitignore | 1 + + tools/testing/selftests/tty/Makefile | 6 +- + tools/testing/selftests/tty/config | 1 + + tools/testing/selftests/tty/tty_tiocsti_test.c | 650 +++++++++++++++++++++ + 71 files changed, 2338 insertions(+), 1161 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_keba.c + create mode 100644 drivers/tty/serial/8250/8250_loongson.c + delete mode 100644 drivers/tty/serial/sh-sci.h + create mode 100644 tools/testing/selftests/tty/config + create mode 100644 tools/testing/selftests/tty/tty_tiocsti_test.c +Merging char-misc/char-misc-next (cbe1d77ed84a hangcheck-timer: fix coding style spacing) +$ 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 +Auto-merging Documentation/devicetree/bindings/fpga/fpga-region.yaml +Auto-merging Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging arch/powerpc/platforms/cell/spu_base.c +Auto-merging arch/powerpc/platforms/ps3/system-bus.c +Auto-merging drivers/android/binderfs.c +Auto-merging drivers/firmware/stratix10-svc.c +CONFLICT (content): Merge conflict in drivers/firmware/stratix10-svc.c +Auto-merging drivers/hwtracing/coresight/coresight-trbe.c +Auto-merging drivers/iio/adc/ad4030.c +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +Auto-merging drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +Auto-merging drivers/iio/industrialio-buffer.c +Auto-merging include/linux/iio/buffer_impl.h +Resolved 'drivers/firmware/stratix10-svc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1a107c46d902] Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 36 + + .../ABI/testing/sysfs-driver-uio_pci_sva-pasid | 29 + + .../bindings/arm/qcom,coresight-tpdm.yaml | 23 +- + .../devicetree/bindings/fpga/fpga-region.yaml | 4 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 11 +- + .../devicetree/bindings/iio/accel/adi,adxl380.yaml | 11 +- + .../bindings/iio/accel/bosch,bma220.yaml | 9 +- + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 5 + + .../devicetree/bindings/iio/adc/adi,max14001.yaml | 89 + + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 2 + + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../bindings/iio/adc/renesas,r9a09g077-adc.yaml | 135 ++ + .../bindings/iio/adc/renesas,rzn1-adc.yaml | 111 ++ + .../bindings/iio/adc/rockchip-saradc.yaml | 3 + + .../devicetree/bindings/iio/dac/adi,ad5446.yaml | 138 ++ + .../bindings/iio/health/maxim,max30100.yaml | 8 + + .../devicetree/bindings/iio/imu/bosch,smi330.yaml | 90 + + .../bindings/iio/imu/invensense,icm45600.yaml | 90 + + .../bindings/iio/imu/invensense,mpu6050.yaml | 1 - + .../bindings/iio/pressure/aosong,adp810.yaml | 45 + + .../bindings/iio/pressure/fsl,mpl3115.yaml | 71 + + .../bindings/iio/pressure/infineon,dps310.yaml | 54 + + .../bindings/interconnect/qcom,kaanapali-rpmh.yaml | 124 ++ + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 1 + + .../bindings/interconnect/qcom,sa8775p-rpmh.yaml | 52 +- + .../bindings/interconnect/qcom,sm6350-rpmh.yaml | 65 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 4 +- + .../bindings/nvmem/layouts/u-boot,env.yaml | 7 + + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 5 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- + .../devicetree/bindings/slimbus/slimbus.yaml | 16 +- + .../devicetree/bindings/trivial-devices.yaml | 4 - + Documentation/iio/ade9000.rst | 2 +- + Documentation/iio/adis16475.rst | 4 +- + Documentation/iio/adis16480.rst | 4 +- + Documentation/iio/adis16550.rst | 4 +- + Documentation/iio/adxl345.rst | 4 +- + Documentation/iio/adxl380.rst | 4 +- + MAINTAINERS | 68 +- + arch/arm/common/sa1111.c | 2 +- + arch/arm/include/asm/hardware/sa1111.h | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 + + arch/powerpc/platforms/cell/spu_base.c | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 2 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + drivers/android/binder.c | 2 + + drivers/android/binder/node.rs | 6 +- + drivers/android/binder/process.rs | 17 +- + drivers/android/binder/rust_binder_main.rs | 22 +- + drivers/android/binder/thread.rs | 4 +- + drivers/android/binderfs.c | 3 + + drivers/android/tests/binder_alloc_kunit.c | 2 +- + drivers/base/firmware_loader/Kconfig | 2 +- + drivers/bus/mhi/ep/internal.h | 2 +- + drivers/bus/mhi/ep/main.c | 4 +- + drivers/bus/mhi/host/pci_generic.c | 26 + + drivers/cdx/cdx.c | 4 +- + drivers/char/adi.c | 6 +- + drivers/char/apm-emulation.c | 10 +- + drivers/char/hangcheck-timer.c | 24 +- + drivers/char/mwave/3780i.c | 218 +-- + drivers/char/mwave/3780i.h | 12 +- + drivers/char/mwave/Makefile | 6 - + drivers/char/mwave/README | 10 - + drivers/char/mwave/mwavedd.c | 337 +--- + drivers/char/mwave/mwavedd.h | 76 +- + drivers/char/mwave/mwavepub.h | 22 +- + drivers/char/mwave/smapi.c | 244 +-- + drivers/char/mwave/smapi.h | 6 +- + drivers/char/mwave/tp3780i.c | 209 +-- + drivers/char/mwave/tp3780i.h | 30 +- + drivers/char/xillybus/xillybus_core.c | 2 +- + drivers/char/xillybus/xillyusb.c | 4 +- + drivers/comedi/comedi_buf.c | 290 +-- + drivers/comedi/comedi_fops.c | 189 +- + drivers/comedi/comedi_internal.h | 12 + + drivers/comedi/drivers.c | 134 +- + drivers/comedi/drivers/8255.c | 20 +- + drivers/comedi/drivers/c6xdigio.c | 46 +- + drivers/comedi/drivers/comedi_bond.c | 4 +- + drivers/comedi/drivers/multiq3.c | 9 + + drivers/comedi/drivers/pcl818.c | 5 +- + drivers/comedi/kcomedilib/kcomedilib_main.c | 120 +- + drivers/eisa/eisa-bus.c | 2 +- + drivers/firmware/stratix10-rsu.c | 277 +-- + drivers/firmware/stratix10-svc.c | 761 +++++++- + drivers/fpga/altera-cvp.c | 20 +- + drivers/fpga/xilinx-spi.c | 7 + + drivers/fsi/fsi-occ.c | 16 +- + drivers/greybus/gb-beagleplay.c | 12 +- + drivers/greybus/operation.c | 2 +- + drivers/hwtracing/coresight/coresight-catu.c | 10 +- + drivers/hwtracing/coresight/coresight-core.c | 30 +- + drivers/hwtracing/coresight/coresight-ctcu-core.c | 9 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 5 +- + drivers/hwtracing/coresight/coresight-cti.h | 5 +- + drivers/hwtracing/coresight/coresight-dummy.c | 2 +- + drivers/hwtracing/coresight/coresight-etb10.c | 8 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 3 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 59 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 140 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 5 - + drivers/hwtracing/coresight/coresight-priv.h | 3 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 10 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 22 +- + drivers/hwtracing/coresight/coresight-tmc.h | 3 +- + drivers/hwtracing/coresight/coresight-tpda.c | 7 - + drivers/hwtracing/coresight/coresight-tpdm.c | 174 +- + drivers/hwtracing/coresight/coresight-tpdm.h | 12 + + drivers/hwtracing/coresight/coresight-tpiu.c | 2 +- + drivers/hwtracing/coresight/coresight-trbe.c | 4 +- + drivers/hwtracing/coresight/ultrasoc-smb.c | 9 +- + drivers/hwtracing/intel_th/core.c | 22 +- + drivers/iio/accel/Kconfig | 19 +- + drivers/iio/accel/Makefile | 4 +- + drivers/iio/accel/adxl380.c | 134 +- + drivers/iio/accel/adxl380.h | 4 + + drivers/iio/accel/adxl380_i2c.c | 4 + + drivers/iio/accel/adxl380_spi.c | 4 + + drivers/iio/accel/bma220.h | 28 + + drivers/iio/accel/bma220_core.c | 585 ++++++ + drivers/iio/accel/bma220_i2c.c | 69 + + drivers/iio/accel/bma220_spi.c | 322 +--- + drivers/iio/accel/bma400.h | 155 +- + drivers/iio/accel/bma400_core.c | 349 ++-- + drivers/iio/adc/Kconfig | 31 + + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad4030.c | 4 +- + drivers/iio/adc/ad4080.c | 126 +- + drivers/iio/adc/ad7124.c | 311 ++-- + drivers/iio/adc/ad7768-1.c | 2 +- + drivers/iio/adc/ade9000.c | 2 +- + drivers/iio/adc/aspeed_adc.c | 34 + + drivers/iio/adc/max14001.c | 391 +++++ + drivers/iio/adc/mcp3564.c | 2 +- + drivers/iio/adc/meson_saradc.c | 6 +- + drivers/iio/adc/mt6360-adc.c | 2 +- + drivers/iio/adc/pac1921.c | 8 +- + drivers/iio/adc/pac1934.c | 2 +- + drivers/iio/adc/qcom-spmi-rradc.c | 2 +- + drivers/iio/adc/rohm-bd79112.c | 13 +- + drivers/iio/adc/rohm-bd79124.c | 39 +- + drivers/iio/adc/rzn1-adc.c | 490 ++++++ + drivers/iio/adc/rzt2h_adc.c | 304 ++++ + drivers/iio/adc/ti-ads131e08.c | 2 +- + drivers/iio/adc/ti_am335x_adc.c | 2 +- + drivers/iio/buffer/industrialio-buffer-cb.c | 1 + + drivers/iio/common/scmi_sensors/scmi_iio.c | 5 +- + drivers/iio/dac/Kconfig | 31 +- + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad5446-i2c.c | 102 ++ + drivers/iio/dac/ad5446-spi.c | 252 +++ + drivers/iio/dac/ad5446.c | 506 +----- + drivers/iio/dac/ad5446.h | 77 + + drivers/iio/dac/ltc2688.c | 32 +- + drivers/iio/health/max30100.c | 38 +- + drivers/iio/imu/Kconfig | 2 + + drivers/iio/imu/Makefile | 2 + + drivers/iio/imu/bmi270/bmi270_core.c | 381 +++- + drivers/iio/imu/bmi270/bmi270_spi.c | 2 +- + drivers/iio/imu/inv_icm45600/Kconfig | 70 + + drivers/iio/imu/inv_icm45600/Makefile | 16 + + drivers/iio/imu/inv_icm45600/inv_icm45600.h | 385 ++++ + drivers/iio/imu/inv_icm45600/inv_icm45600_accel.c | 782 +++++++++ + drivers/iio/imu/inv_icm45600/inv_icm45600_buffer.c | 558 ++++++ + drivers/iio/imu/inv_icm45600/inv_icm45600_buffer.h | 101 ++ + drivers/iio/imu/inv_icm45600/inv_icm45600_core.c | 988 +++++++++++ + drivers/iio/imu/inv_icm45600/inv_icm45600_gyro.c | 791 +++++++++ + drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c | 98 ++ + drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c | 79 + + drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c | 108 ++ + drivers/iio/imu/smi330/Kconfig | 33 + + drivers/iio/imu/smi330/Makefile | 7 + + drivers/iio/imu/smi330/smi330.h | 25 + + drivers/iio/imu/smi330/smi330_core.c | 918 ++++++++++ + drivers/iio/imu/smi330/smi330_i2c.c | 133 ++ + drivers/iio/imu/smi330/smi330_spi.c | 85 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 71 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 2 + + drivers/iio/industrialio-backend.c | 8 +- + drivers/iio/industrialio-buffer.c | 12 +- + drivers/iio/industrialio-core.c | 18 +- + drivers/iio/light/apds9306.c | 2 +- + drivers/iio/light/apds9960.c | 2 +- + drivers/iio/light/ltr390.c | 8 +- + drivers/iio/light/veml3235.c | 2 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 2 +- + drivers/iio/pressure/Kconfig | 12 + + drivers/iio/pressure/Makefile | 8 +- + drivers/iio/pressure/adp810.c | 225 +++ + drivers/iio/pressure/mpl3115.c | 551 +++++- + drivers/iio/resolver/ad2s1210.c | 30 +- + drivers/interconnect/debugfs-client.c | 7 +- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/glymur.c | 225 ++- + drivers/interconnect/qcom/icc-rpmh.c | 37 +- + drivers/interconnect/qcom/icc-rpmh.h | 7 +- + drivers/interconnect/qcom/kaanapali.c | 1855 ++++++++++++++++++++ + drivers/interconnect/qcom/milos.c | 142 +- + drivers/interconnect/qcom/msm8996.c | 1 + + drivers/interconnect/qcom/qcs615.c | 511 +++--- + drivers/interconnect/qcom/qcs615.h | 128 -- + drivers/interconnect/qcom/qcs8300.c | 671 +++---- + drivers/interconnect/qcom/qcs8300.h | 177 -- + drivers/interconnect/qcom/qdu1000.c | 348 ++-- + drivers/interconnect/qcom/qdu1000.h | 95 - + drivers/interconnect/qcom/sa8775p.c | 639 +++++-- + drivers/interconnect/qcom/sar2130p.c | 630 +++---- + drivers/interconnect/qcom/sc7180.c | 678 ++++--- + drivers/interconnect/qcom/sc7180.h | 149 -- + drivers/interconnect/qcom/sc7280.c | 617 +++---- + drivers/interconnect/qcom/sc7280.h | 154 -- + drivers/interconnect/qcom/sc8180x.c | 648 +++---- + drivers/interconnect/qcom/sc8180x.h | 179 -- + drivers/interconnect/qcom/sc8280xp.c | 825 +++++---- + drivers/interconnect/qcom/sc8280xp.h | 209 --- + drivers/interconnect/qcom/sdm670.c | 522 +++--- + drivers/interconnect/qcom/sdm670.h | 128 -- + drivers/interconnect/qcom/sdm845.c | 766 ++++---- + drivers/interconnect/qcom/sdm845.h | 140 -- + drivers/interconnect/qcom/sdx55.c | 489 +++--- + drivers/interconnect/qcom/sdx55.h | 70 - + drivers/interconnect/qcom/sdx65.c | 457 +++-- + drivers/interconnect/qcom/sdx65.h | 65 - + drivers/interconnect/qcom/sdx75.c | 395 ++--- + drivers/interconnect/qcom/sdx75.h | 97 - + drivers/interconnect/qcom/sm6350.c | 927 ++++++---- + drivers/interconnect/qcom/sm6350.h | 139 -- + drivers/interconnect/qcom/sm7150.c | 653 ++++--- + drivers/interconnect/qcom/sm7150.h | 140 -- + drivers/interconnect/qcom/sm8150.c | 706 ++++---- + drivers/interconnect/qcom/sm8150.h | 152 -- + drivers/interconnect/qcom/sm8250.c | 736 ++++---- + drivers/interconnect/qcom/sm8250.h | 168 -- + drivers/interconnect/qcom/sm8350.c | 684 ++++---- + drivers/interconnect/qcom/sm8350.h | 158 -- + drivers/interconnect/qcom/sm8450.c | 601 +++---- + drivers/interconnect/qcom/sm8450.h | 169 -- + drivers/interconnect/qcom/sm8550.c | 501 +++--- + drivers/interconnect/qcom/sm8550.h | 138 -- + drivers/interconnect/qcom/sm8650.c | 527 +++--- + drivers/interconnect/qcom/sm8650.h | 144 -- + drivers/interconnect/qcom/sm8750.c | 602 +++---- + drivers/interconnect/qcom/x1e80100.c | 610 +++---- + drivers/interconnect/qcom/x1e80100.h | 192 -- + drivers/misc/amd-sbi/Kconfig | 4 +- + drivers/misc/amd-sbi/rmi-core.c | 202 ++- + drivers/misc/amd-sbi/rmi-i2c.c | 124 +- + drivers/misc/bh1770glc.c | 4 +- + drivers/misc/cb710/core.c | 8 +- + drivers/misc/eeprom/at25.c | 2 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 6 +- + drivers/misc/mei/Kconfig | 2 +- + drivers/misc/mei/client.c | 14 +- + drivers/misc/mei/interrupt.c | 2 - + drivers/misc/mei/main.c | 1 + + drivers/misc/rp1/rp1_pci.c | 3 + + drivers/misc/vmw_vmci/vmci_context.h | 2 +- + drivers/mux/mmio.c | 82 +- + drivers/nvmem/Kconfig | 9 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/imx-ocotp-ele.c | 20 + + drivers/nvmem/layouts/u-boot-env.c | 4 +- + drivers/nvmem/qnap-mcu-eeprom.c | 111 ++ + drivers/peci/controller/peci-aspeed.c | 12 +- + drivers/rapidio/rio-driver.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 102 +- + drivers/staging/iio/frequency/ad9834.c | 3 +- + drivers/staging/iio/frequency/ad9834.h | 10 - + drivers/uio/Kconfig | 12 + + drivers/uio/Makefile | 1 + + drivers/uio/uio_fsl_elbc_gpcm.c | 7 + + drivers/uio/uio_pci_generic_sva.c | 192 ++ + drivers/w1/masters/omap_hdq.c | 5 - + drivers/w1/slaves/w1_ds28e17.c | 4 +- + drivers/w1/w1.c | 20 +- + .../dt-bindings/interconnect/qcom,kaanapali-rpmh.h | 149 ++ + include/dt-bindings/interconnect/qcom,sdx75.h | 2 - + include/linux/cdx/cdx_bus.h | 2 +- + include/linux/comedi/comedidev.h | 7 + + include/linux/comedi/comedilib.h | 34 +- + include/linux/coresight.h | 42 +- + include/linux/eisa.h | 2 +- + include/linux/firmware/intel/stratix10-smc.h | 111 ++ + .../linux/firmware/intel/stratix10-svc-client.h | 104 ++ + include/linux/iio/adc/qcom-vadc-common.h | 27 +- + include/linux/iio/buffer.h | 22 +- + include/linux/iio/buffer_impl.h | 3 +- + include/linux/iio/consumer.h | 3 +- + include/linux/iio/imu/adis.h | 45 +- + include/linux/interconnect.h | 2 +- + include/linux/ipack.h | 23 +- + include/linux/rio.h | 2 +- + include/uapi/linux/acrn.h | 36 +- + rust/kernel/list.rs | 3 + + 301 files changed, 23674 insertions(+), 14097 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-uio_pci_sva-pasid + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,max14001.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/renesas,r9a09g077-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/renesas,rzn1-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5446.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,smi330.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/invensense,icm45600.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/aosong,adp810.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/fsl,mpl3115.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/infineon,dps310.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,kaanapali-rpmh.yaml + create mode 100644 drivers/iio/accel/bma220.h + create mode 100644 drivers/iio/accel/bma220_core.c + create mode 100644 drivers/iio/accel/bma220_i2c.c + create mode 100644 drivers/iio/adc/max14001.c + create mode 100644 drivers/iio/adc/rzn1-adc.c + create mode 100644 drivers/iio/adc/rzt2h_adc.c + create mode 100644 drivers/iio/dac/ad5446-i2c.c + create mode 100644 drivers/iio/dac/ad5446-spi.c + create mode 100644 drivers/iio/dac/ad5446.h + create mode 100644 drivers/iio/imu/inv_icm45600/Kconfig + create mode 100644 drivers/iio/imu/inv_icm45600/Makefile + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600.h + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_accel.c + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_buffer.c + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_buffer.h + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_core.c + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_gyro.c + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c + create mode 100644 drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c + create mode 100644 drivers/iio/imu/smi330/Kconfig + create mode 100644 drivers/iio/imu/smi330/Makefile + create mode 100644 drivers/iio/imu/smi330/smi330.h + create mode 100644 drivers/iio/imu/smi330/smi330_core.c + create mode 100644 drivers/iio/imu/smi330/smi330_i2c.c + create mode 100644 drivers/iio/imu/smi330/smi330_spi.c + create mode 100644 drivers/iio/pressure/adp810.c + create mode 100644 drivers/interconnect/qcom/kaanapali.c + delete mode 100644 drivers/interconnect/qcom/qcs615.h + delete mode 100644 drivers/interconnect/qcom/qcs8300.h + delete mode 100644 drivers/interconnect/qcom/qdu1000.h + delete mode 100644 drivers/interconnect/qcom/sc7180.h + delete mode 100644 drivers/interconnect/qcom/sc7280.h + delete mode 100644 drivers/interconnect/qcom/sc8180x.h + delete mode 100644 drivers/interconnect/qcom/sc8280xp.h + delete mode 100644 drivers/interconnect/qcom/sdm670.h + delete mode 100644 drivers/interconnect/qcom/sdm845.h + delete mode 100644 drivers/interconnect/qcom/sdx55.h + delete mode 100644 drivers/interconnect/qcom/sdx65.h + delete mode 100644 drivers/interconnect/qcom/sdx75.h + delete mode 100644 drivers/interconnect/qcom/sm6350.h + delete mode 100644 drivers/interconnect/qcom/sm7150.h + delete mode 100644 drivers/interconnect/qcom/sm8150.h + delete mode 100644 drivers/interconnect/qcom/sm8250.h + delete mode 100644 drivers/interconnect/qcom/sm8350.h + delete mode 100644 drivers/interconnect/qcom/sm8450.h + delete mode 100644 drivers/interconnect/qcom/sm8550.h + delete mode 100644 drivers/interconnect/qcom/sm8650.h + delete mode 100644 drivers/interconnect/qcom/x1e80100.h + create mode 100644 drivers/nvmem/qnap-mcu-eeprom.c + delete mode 100644 drivers/staging/iio/frequency/ad9834.h + create mode 100644 drivers/uio/uio_pci_generic_sva.c + create mode 100644 include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h +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 (3b64ea4768e7 phy: fsl-imx8mq-usb: support alternate reference clock) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml +Merge made by the 'ort' strategy. + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 7 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 11 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 69 +++++- + .../bindings/phy/renesas,rzg3e-usb3-phy.yaml | 63 +++++ + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 1 + + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 1 + + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 69 +++++- + drivers/phy/broadcom/phy-bcm63xx-usbh.c | 6 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 23 +- + drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 5 +- + drivers/phy/phy-can-transceiver.c | 160 +++++++++---- + drivers/phy/phy-core.c | 27 ++- + drivers/phy/qualcomm/phy-qcom-m31-eusb2.c | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 191 +++++++++++---- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 32 +++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v8_50.h | 13 ++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 2 + + drivers/phy/renesas/Kconfig | 7 + + drivers/phy/renesas/Makefile | 1 + + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 2 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 70 ++++-- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 2 +- + drivers/phy/renesas/phy-rzg3e-usb3.c | 259 +++++++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 91 +++++++- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 15 ++ + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 27 ++- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 2 +- + drivers/phy/samsung/phy-gs101-ufs.c | 28 +++ + drivers/phy/samsung/phy-samsung-ufs.c | 40 ++++ + drivers/phy/samsung/phy-samsung-ufs.h | 7 + + drivers/phy/sophgo/phy-cv1800-usb2.c | 1 - + drivers/phy/ti/phy-gmii-sel.c | 2 +- + include/linux/phy/phy.h | 19 ++ + 34 files changed, 1114 insertions(+), 142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/renesas,rzg3e-usb3-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v8_50.h + create mode 100644 drivers/phy/renesas/phy-rzg3e-usb3.c +Merging soundwire/next (96e539b24be5 soundwire: send multi sections in one BPT stream) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging include/linux/of.h +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 8 +- + drivers/of/property.c | 33 +++ + drivers/soundwire/bus.c | 10 +- + drivers/soundwire/bus.h | 22 +- + drivers/soundwire/cadence_master.c | 237 +++++++++++++------ + drivers/soundwire/cadence_master.h | 19 +- + drivers/soundwire/debugfs.c | 14 +- + drivers/soundwire/generic_bandwidth_allocation.c | 3 + + drivers/soundwire/intel_ace2x.c | 104 +++++++-- + drivers/soundwire/qcom.c | 257 ++++++++++++--------- + include/linux/of.h | 9 + + include/sound/hda-sdw-bpt.h | 7 + + sound/soc/sof/intel/hda-sdw-bpt.c | 13 ++ + 13 files changed, 530 insertions(+), 206 deletions(-) +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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/gnss/gnss-common.yaml | 3 +-- + Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml | 10 +++++++--- + drivers/gnss/ubx.c | 8 ++++++++ + 3 files changed, 16 insertions(+), 5 deletions(-) +Merging vfio/next (fa804aa4ac1b Merge tag 'vfio-v6.19-dma-buf-v9+' into v6.19/vfio/next) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging block/blk-mq-dma.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/vfio/pci/nvgrace-gpu/main.c +Auto-merging kernel/dma/direct.c +CONFLICT (content): Merge conflict in kernel/dma/direct.c +Auto-merging mm/hmm.c +Resolved 'drivers/gpu/drm/i915/gvt/kvmgt.c' using previous resolution. +Resolved 'kernel/dma/direct.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f7501c1c28a5] Merge branch 'next' of https://github.com/awilliam/linux-vfio.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/pci/p2pdma.rst | 95 ++++++-- + block/blk-mq-dma.c | 2 +- + drivers/crypto/hisilicon/qm.c | 27 +++ + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf-mapping.c | 248 +++++++++++++++++++ + drivers/gpu/drm/i915/gvt/kvmgt.c | 262 +++++++++----------- + drivers/iommu/dma-iommu.c | 4 +- + drivers/pci/p2pdma.c | 188 +++++++++++---- + drivers/s390/cio/vfio_ccw_ops.c | 47 +--- + drivers/vfio/cdx/main.c | 29 +-- + drivers/vfio/device_cdev.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 43 ++-- + drivers/vfio/pci/Kconfig | 3 + + drivers/vfio/pci/Makefile | 1 + + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 171 ++++++++----- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 23 +- + drivers/vfio/pci/mlx5/main.c | 1 + + drivers/vfio/pci/nvgrace-gpu/main.c | 105 ++++---- + drivers/vfio/pci/pds/vfio_dev.c | 1 + + drivers/vfio/pci/qat/main.c | 1 + + drivers/vfio/pci/vfio_pci.c | 6 + + drivers/vfio/pci/vfio_pci_config.c | 22 +- + drivers/vfio/pci/vfio_pci_core.c | 163 ++++++------- + drivers/vfio/pci/vfio_pci_dmabuf.c | 316 +++++++++++++++++++++++++ + drivers/vfio/pci/vfio_pci_priv.h | 23 ++ + drivers/vfio/pci/virtio/common.h | 5 +- + drivers/vfio/pci/virtio/legacy_io.c | 38 +-- + drivers/vfio/pci/virtio/main.c | 5 +- + drivers/vfio/platform/vfio_amba.c | 1 + + drivers/vfio/platform/vfio_platform.c | 1 + + drivers/vfio/platform/vfio_platform_common.c | 40 ++-- + drivers/vfio/platform/vfio_platform_private.h | 3 + + drivers/vfio/vfio_main.c | 51 ++++ + include/linux/dma-buf-mapping.h | 17 ++ + include/linux/dma-buf.h | 11 + + include/linux/hisi_acc_qm.h | 3 + + include/linux/pci-p2pdma.h | 120 ++++++---- + include/linux/vfio.h | 6 + + include/linux/vfio_pci_core.h | 45 ++++ + include/uapi/linux/vfio.h | 28 +++ + kernel/dma/direct.c | 4 +- + mm/hmm.c | 2 +- + samples/vfio-mdev/mbochs.c | 71 ++---- + samples/vfio-mdev/mdpy.c | 34 +-- + samples/vfio-mdev/mtty.c | 35 +-- + tools/testing/selftests/vfio/lib/libvfio.mk | 20 +- + 46 files changed, 1615 insertions(+), 710 deletions(-) + create mode 100644 drivers/dma-buf/dma-buf-mapping.c + create mode 100644 drivers/vfio/pci/vfio_pci_dmabuf.c + create mode 100644 include/linux/dma-buf-mapping.h +Merging w1/for-next (a5d908e0ec05 w1: omap-hdq: Remove redundant pm_runtime_mark_last_busy() calls) +$ 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 (502ddcc405b6 staging: rtl8723bs: fix out-of-bounds read in OnBeacon ESR IE parsing) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/platform/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/Kconfig +Auto-merging drivers/platform/Makefile +CONFLICT (content): Merge conflict in drivers/platform/Makefile +Resolved 'drivers/platform/Kconfig' using previous resolution. +Resolved 'drivers/platform/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c70828e5f62d] Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/{staging => }/gpib/Kconfig | 8 +- + drivers/{staging => }/gpib/Makefile | 2 +- + drivers/{staging => }/gpib/TODO | 14 - + drivers/{staging => }/gpib/agilent_82350b/Makefile | 0 + .../gpib/agilent_82350b/agilent_82350b.c | 0 + .../gpib/agilent_82350b/agilent_82350b.h | 0 + drivers/{staging => }/gpib/agilent_82357a/Makefile | 0 + .../gpib/agilent_82357a/agilent_82357a.c | 0 + .../gpib/agilent_82357a/agilent_82357a.h | 0 + drivers/{staging => }/gpib/cb7210/Makefile | 0 + drivers/{staging => }/gpib/cb7210/cb7210.c | 12 - + drivers/{staging => }/gpib/cb7210/cb7210.h | 0 + drivers/{staging => }/gpib/cec/Makefile | 0 + drivers/{staging => }/gpib/cec/cec.h | 0 + drivers/{staging => }/gpib/cec/cec_gpib.c | 0 + drivers/{staging => }/gpib/common/Makefile | 0 + drivers/{staging => }/gpib/common/gpib_os.c | 0 + drivers/{staging => }/gpib/common/iblib.c | 0 + drivers/{staging => }/gpib/common/ibsys.h | 0 + drivers/{staging => }/gpib/eastwood/Makefile | 0 + drivers/{staging => }/gpib/eastwood/fluke_gpib.c | 0 + drivers/{staging => }/gpib/eastwood/fluke_gpib.h | 0 + drivers/{staging => }/gpib/fmh_gpib/Makefile | 0 + drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.c | 0 + drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.h | 0 + drivers/{staging => }/gpib/gpio/Makefile | 0 + drivers/{staging => }/gpib/gpio/gpib_bitbang.c | 0 + drivers/{staging => }/gpib/hp_82335/Makefile | 0 + drivers/{staging => }/gpib/hp_82335/hp82335.c | 0 + drivers/{staging => }/gpib/hp_82335/hp82335.h | 0 + drivers/{staging => }/gpib/hp_82341/Makefile | 0 + drivers/{staging => }/gpib/hp_82341/hp_82341.c | 0 + drivers/{staging => }/gpib/hp_82341/hp_82341.h | 0 + drivers/{staging => }/gpib/include/amcc5920.h | 0 + drivers/{staging => }/gpib/include/amccs5933.h | 0 + drivers/{staging => }/gpib/include/gpibP.h | 4 +- + drivers/{staging => }/gpib/include/gpib_cmd.h | 0 + drivers/{staging => }/gpib/include/gpib_pci_ids.h | 0 + drivers/{staging => }/gpib/include/gpib_proto.h | 0 + .../gpib/include/gpib_state_machines.h | 0 + drivers/{staging => }/gpib/include/gpib_types.h | 2 +- + drivers/{staging => }/gpib/include/nec7210.h | 0 + .../{staging => }/gpib/include/nec7210_registers.h | 0 + drivers/{staging => }/gpib/include/plx9050.h | 0 + drivers/{staging => }/gpib/include/quancom_pci.h | 0 + drivers/{staging => }/gpib/include/tms9914.h | 0 + .../{staging => }/gpib/include/tnt4882_registers.h | 0 + drivers/{staging => }/gpib/ines/Makefile | 0 + drivers/{staging => }/gpib/ines/ines.h | 0 + drivers/{staging => }/gpib/ines/ines_gpib.c | 0 + drivers/{staging => }/gpib/lpvo_usb_gpib/Makefile | 0 + .../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 0 + drivers/{staging => }/gpib/nec7210/Makefile | 0 + drivers/{staging => }/gpib/nec7210/board.h | 0 + drivers/{staging => }/gpib/nec7210/nec7210.c | 0 + drivers/{staging => }/gpib/ni_usb/Makefile | 0 + drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.c | 0 + drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.h | 0 + drivers/{staging => }/gpib/pc2/Makefile | 0 + drivers/{staging => }/gpib/pc2/pc2_gpib.c | 0 + drivers/{staging => }/gpib/tms9914/Makefile | 0 + drivers/{staging => }/gpib/tms9914/tms9914.c | 2 +- + drivers/{staging => }/gpib/tnt4882/Makefile | 0 + drivers/{staging => }/gpib/tnt4882/mite.c | 0 + drivers/{staging => }/gpib/tnt4882/mite.h | 0 + drivers/{staging => }/gpib/tnt4882/tnt4882_gpib.c | 0 + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/raspberrypi/Kconfig | 52 + + drivers/platform/raspberrypi/Makefile | 15 + + .../raspberrypi/vchiq-interface}/TESTING | 0 + drivers/platform/raspberrypi/vchiq-interface/TODO | 4 + + .../raspberrypi/vchiq-interface}/vchiq_arm.c | 20 +- + .../raspberrypi/vchiq-interface}/vchiq_bus.c | 4 +- + .../raspberrypi/vchiq-interface}/vchiq_core.c | 9 +- + .../raspberrypi/vchiq-interface}/vchiq_debugfs.c | 6 +- + .../raspberrypi/vchiq-interface}/vchiq_dev.c | 7 +- + .../raspberrypi/vchiq-interface}/vchiq_ioctl.h | 3 +- + .../raspberrypi}/vchiq-mmal/Kconfig | 0 + .../raspberrypi}/vchiq-mmal/Makefile | 0 + .../raspberrypi}/vchiq-mmal/mmal-common.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-encodings.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-msg-common.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-msg-format.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-msg-port.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-msg.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-parameters.h | 0 + .../raspberrypi}/vchiq-mmal/mmal-vchiq.c | 5 +- + .../raspberrypi}/vchiq-mmal/mmal-vchiq.h | 0 + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/axis-fifo/axis-fifo.c | 214 +-- + drivers/staging/axis-fifo/axis-fifo.txt | 5 +- + drivers/staging/fbtft/fbtft-core.c | 4 +- + drivers/staging/greybus/uart.c | 8 +- + drivers/staging/most/Kconfig | 2 - + drivers/staging/most/Makefile | 1 - + drivers/staging/most/i2c/Kconfig | 13 - + drivers/staging/most/i2c/Makefile | 4 - + drivers/staging/most/i2c/i2c.c | 374 ---- + drivers/staging/nvec/nvec_ps2.c | 12 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 312 ++- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 3 - + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 38 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 48 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 76 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 80 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 235 ++- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 6 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 19 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 65 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 5 - + drivers/staging/rtl8723bs/hal/odm.c | 13 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 33 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 16 - + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 15 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 5 +- + drivers/staging/rtl8723bs/include/basic_types.h | 3 +- + drivers/staging/rtl8723bs/include/drv_types.h | 7 - + drivers/staging/rtl8723bs/include/hal_com.h | 2 - + drivers/staging/rtl8723bs/include/hal_com_reg.h | 4 - + drivers/staging/rtl8723bs/include/hal_intf.h | 2 - + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 2 - + drivers/staging/rtl8723bs/include/rtw_mlme.h | 4 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 + + drivers/staging/sm750fb/sm750.c | 13 +- + drivers/staging/sm750fb/sm750_accel.c | 10 +- + drivers/staging/vc04_services/Kconfig | 49 - + drivers/staging/vc04_services/Makefile | 14 - + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 5 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 3 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 3 +- + .../staging/vc04_services/bcm2835-camera/Kconfig | 13 - + .../staging/vc04_services/bcm2835-camera/Makefile | 6 - + drivers/staging/vc04_services/bcm2835-camera/TODO | 17 - + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2011 -------------------- + .../vc04_services/bcm2835-camera/bcm2835-camera.h | 142 -- + .../vc04_services/bcm2835-camera/controls.c | 1399 -------------- + drivers/staging/vc04_services/interface/TODO | 28 - + .../include => include}/linux/raspberrypi/vchiq.h | 0 + .../linux/raspberrypi}/vchiq_arm.h | 0 + .../linux/raspberrypi}/vchiq_bus.h | 0 + .../linux/raspberrypi}/vchiq_cfg.h | 0 + .../linux/raspberrypi}/vchiq_core.h | 58 +- + .../linux/raspberrypi}/vchiq_debugfs.h | 0 + .../gpib/uapi => include/uapi/linux}/gpib.h | 2 +- + .../gpib/uapi => include/uapi/linux}/gpib_ioctl.h | 16 +- + 153 files changed, 660 insertions(+), 4962 deletions(-) + rename drivers/{staging => }/gpib/Kconfig (97%) + rename drivers/{staging => }/gpib/Makefile (92%) + rename drivers/{staging => }/gpib/TODO (56%) + rename drivers/{staging => }/gpib/agilent_82350b/Makefile (100%) + rename drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.c (100%) + rename drivers/{staging => }/gpib/agilent_82350b/agilent_82350b.h (100%) + rename drivers/{staging => }/gpib/agilent_82357a/Makefile (100%) + rename drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.c (100%) + rename drivers/{staging => }/gpib/agilent_82357a/agilent_82357a.h (100%) + rename drivers/{staging => }/gpib/cb7210/Makefile (100%) + rename drivers/{staging => }/gpib/cb7210/cb7210.c (99%) + rename drivers/{staging => }/gpib/cb7210/cb7210.h (100%) + rename drivers/{staging => }/gpib/cec/Makefile (100%) + rename drivers/{staging => }/gpib/cec/cec.h (100%) + rename drivers/{staging => }/gpib/cec/cec_gpib.c (100%) + rename drivers/{staging => }/gpib/common/Makefile (100%) + rename drivers/{staging => }/gpib/common/gpib_os.c (100%) + rename drivers/{staging => }/gpib/common/iblib.c (100%) + rename drivers/{staging => }/gpib/common/ibsys.h (100%) + rename drivers/{staging => }/gpib/eastwood/Makefile (100%) + rename drivers/{staging => }/gpib/eastwood/fluke_gpib.c (100%) + rename drivers/{staging => }/gpib/eastwood/fluke_gpib.h (100%) + rename drivers/{staging => }/gpib/fmh_gpib/Makefile (100%) + rename drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.c (100%) + rename drivers/{staging => }/gpib/fmh_gpib/fmh_gpib.h (100%) + rename drivers/{staging => }/gpib/gpio/Makefile (100%) + rename drivers/{staging => }/gpib/gpio/gpib_bitbang.c (100%) + rename drivers/{staging => }/gpib/hp_82335/Makefile (100%) + rename drivers/{staging => }/gpib/hp_82335/hp82335.c (100%) + rename drivers/{staging => }/gpib/hp_82335/hp82335.h (100%) + rename drivers/{staging => }/gpib/hp_82341/Makefile (100%) + rename drivers/{staging => }/gpib/hp_82341/hp_82341.c (100%) + rename drivers/{staging => }/gpib/hp_82341/hp_82341.h (100%) + rename drivers/{staging => }/gpib/include/amcc5920.h (100%) + rename drivers/{staging => }/gpib/include/amccs5933.h (100%) + rename drivers/{staging => }/gpib/include/gpibP.h (96%) + rename drivers/{staging => }/gpib/include/gpib_cmd.h (100%) + rename drivers/{staging => }/gpib/include/gpib_pci_ids.h (100%) + rename drivers/{staging => }/gpib/include/gpib_proto.h (100%) + rename drivers/{staging => }/gpib/include/gpib_state_machines.h (100%) + rename drivers/{staging => }/gpib/include/gpib_types.h (99%) + rename drivers/{staging => }/gpib/include/nec7210.h (100%) + rename drivers/{staging => }/gpib/include/nec7210_registers.h (100%) + rename drivers/{staging => }/gpib/include/plx9050.h (100%) + rename drivers/{staging => }/gpib/include/quancom_pci.h (100%) + rename drivers/{staging => }/gpib/include/tms9914.h (100%) + rename drivers/{staging => }/gpib/include/tnt4882_registers.h (100%) + rename drivers/{staging => }/gpib/ines/Makefile (100%) + rename drivers/{staging => }/gpib/ines/ines.h (100%) + rename drivers/{staging => }/gpib/ines/ines_gpib.c (100%) + rename drivers/{staging => }/gpib/lpvo_usb_gpib/Makefile (100%) + rename drivers/{staging => }/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c (100%) + rename drivers/{staging => }/gpib/nec7210/Makefile (100%) + rename drivers/{staging => }/gpib/nec7210/board.h (100%) + rename drivers/{staging => }/gpib/nec7210/nec7210.c (100%) + rename drivers/{staging => }/gpib/ni_usb/Makefile (100%) + rename drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.c (100%) + rename drivers/{staging => }/gpib/ni_usb/ni_usb_gpib.h (100%) + rename drivers/{staging => }/gpib/pc2/Makefile (100%) + rename drivers/{staging => }/gpib/pc2/pc2_gpib.c (100%) + rename drivers/{staging => }/gpib/tms9914/Makefile (100%) + rename drivers/{staging => }/gpib/tms9914/tms9914.c (99%) + rename drivers/{staging => }/gpib/tnt4882/Makefile (100%) + rename drivers/{staging => }/gpib/tnt4882/mite.c (100%) + rename drivers/{staging => }/gpib/tnt4882/mite.h (100%) + rename drivers/{staging => }/gpib/tnt4882/tnt4882_gpib.c (100%) + create mode 100644 drivers/platform/raspberrypi/Kconfig + create mode 100644 drivers/platform/raspberrypi/Makefile + rename drivers/{staging/vc04_services/interface => platform/raspberrypi/vchiq-interface}/TESTING (100%) + create mode 100644 drivers/platform/raspberrypi/vchiq-interface/TODO + rename drivers/{staging/vc04_services/interface/vchiq_arm => platform/raspberrypi/vchiq-interface}/vchiq_arm.c (98%) + rename drivers/{staging/vc04_services/interface/vchiq_arm => platform/raspberrypi/vchiq-interface}/vchiq_bus.c (96%) + rename drivers/{staging/vc04_services/interface/vchiq_arm => platform/raspberrypi/vchiq-interface}/vchiq_core.c (99%) + rename drivers/{staging/vc04_services/interface/vchiq_arm => platform/raspberrypi/vchiq-interface}/vchiq_debugfs.c (96%) + rename drivers/{staging/vc04_services/interface/vchiq_arm => platform/raspberrypi/vchiq-interface}/vchiq_dev.c (99%) + rename drivers/{staging/vc04_services/interface/vchiq_arm => platform/raspberrypi/vchiq-interface}/vchiq_ioctl.h (98%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-common.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-encodings.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-common.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-format.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-port.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-parameters.h (100%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.c (99%) + rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.h (100%) + delete mode 100644 drivers/staging/most/i2c/Kconfig + delete mode 100644 drivers/staging/most/i2c/Makefile + delete mode 100644 drivers/staging/most/i2c/i2c.c + delete mode 100644 drivers/staging/vc04_services/bcm2835-camera/Kconfig + delete mode 100644 drivers/staging/vc04_services/bcm2835-camera/Makefile + delete mode 100644 drivers/staging/vc04_services/bcm2835-camera/TODO + delete mode 100644 drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c + delete mode 100644 drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h + delete mode 100644 drivers/staging/vc04_services/bcm2835-camera/controls.c + delete mode 100644 drivers/staging/vc04_services/interface/TODO + rename {drivers/staging/vc04_services/include => include}/linux/raspberrypi/vchiq.h (100%) + rename {drivers/staging/vc04_services/interface/vchiq_arm => include/linux/raspberrypi}/vchiq_arm.h (100%) + rename {drivers/staging/vc04_services/interface/vchiq_arm => include/linux/raspberrypi}/vchiq_bus.h (100%) + rename {drivers/staging/vc04_services/interface/vchiq_arm => include/linux/raspberrypi}/vchiq_cfg.h (100%) + rename {drivers/staging/vc04_services/interface/vchiq_arm => include/linux/raspberrypi}/vchiq_core.h (86%) + rename {drivers/staging/vc04_services/interface/vchiq_arm => include/linux/raspberrypi}/vchiq_debugfs.h (100%) + rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib.h (97%) + rename {drivers/staging/gpib/uapi => include/uapi/linux}/gpib_ioctl.h (90%) +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 (2b11e7403a8e dt-bindings: dma: xilinx: Simplify dma-coherent property) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Merge made by the 'ort' strategy. + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 3 +- + drivers/dma/Kconfig | 4 +- + drivers/dma/at_hdmac.c | 6 +- + drivers/dma/bcm2835-dma.c | 1 - + drivers/dma/dw/platform.c | 5 +- + drivers/dma/fsl-edma-common.c | 45 +++- + drivers/dma/fsl-edma-main.c | 1 - + drivers/dma/fsl-qdma.c | 1 - + drivers/dma/idxd/device.c | 19 +- + drivers/dma/k3dma.c | 1 - + drivers/dma/mmp_tdma.c | 4 +- + drivers/dma/nbpfaxi.c | 6 +- + drivers/dma/qcom/gpi.c | 11 +- + drivers/dma/sh/Kconfig | 2 +- + drivers/dma/sh/rcar-dmac.c | 16 +- + drivers/dma/sh/usb-dmac.c | 11 +- + drivers/dma/sprd-dma.c | 1 - + drivers/dma/st_fdma.c | 1 - + drivers/dma/tegra210-adma.c | 1 - + drivers/i2c/busses/i2c-qcom-geni.c | 248 +++++++++++++++++++-- + 20 files changed, 302 insertions(+), 85 deletions(-) +Merging cgroup/for-next (004d6fbaf4fc Merge branch 'for-6.19' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging include/linux/sched.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +CONFLICT (content): Merge conflict in kernel/cgroup/cpuset.c +Auto-merging kernel/sched/deadline.c +Auto-merging tools/testing/selftests/cgroup/test_core.c +Auto-merging tools/testing/selftests/cgroup/test_cpu.c +Auto-merging tools/testing/selftests/cgroup/test_cpuset.c +Auto-merging tools/testing/selftests/cgroup/test_freezer.c +Auto-merging tools/testing/selftests/cgroup/test_kill.c +Auto-merging tools/testing/selftests/cgroup/test_kmem.c +Auto-merging tools/testing/selftests/cgroup/test_memcontrol.c +Auto-merging tools/testing/selftests/cgroup/test_zswap.c +Resolved 'kernel/cgroup/cpuset.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9f9d0d6b6f93] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 31 ++- + include/linux/cpuset.h | 9 +- + include/linux/sched.h | 5 +- + kernel/cgroup/cgroup.c | 56 +++- + kernel/cgroup/cpuset-internal.h | 10 +- + kernel/cgroup/cpuset.c | 316 +++++++++++++++-------- + kernel/sched/deadline.c | 54 +++- + tools/testing/selftests/cgroup/test_core.c | 7 +- + tools/testing/selftests/cgroup/test_cpu.c | 7 +- + tools/testing/selftests/cgroup/test_cpuset.c | 7 +- + tools/testing/selftests/cgroup/test_freezer.c | 7 +- + tools/testing/selftests/cgroup/test_kill.c | 7 +- + tools/testing/selftests/cgroup/test_kmem.c | 7 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 7 +- + tools/testing/selftests/cgroup/test_zswap.c | 7 +- + 15 files changed, 387 insertions(+), 150 deletions(-) +Merging scsi/for-next (87ff3a759db2 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 +Auto-merging MAINTAINERS +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/stex.c +Auto-merging drivers/target/target_core_configfs.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/mediatek,ufs-phy.yaml | 3 +- + .../devicetree/bindings/ufs/amd,versal2-ufs.yaml | 61 + + .../devicetree/bindings/ufs/mediatek,ufs.yaml | 3 +- + .../devicetree/bindings/ufs/qcom,ufs.yaml | 3 - + .../bindings/ufs/samsung,exynos-ufs.yaml | 3 + + MAINTAINERS | 8 + + drivers/ata/libata-acpi.c | 67 + + drivers/ata/libata-core.c | 2 + + drivers/ata/libata-scsi.c | 1 + + drivers/ata/libata.h | 4 + + drivers/firmware/xilinx/Makefile | 2 +- + drivers/firmware/xilinx/zynqmp-ufs.c | 118 ++ + drivers/firmware/xilinx/zynqmp.c | 46 + + drivers/message/fusion/mptbase.c | 7 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/advansys.c | 3 +- + drivers/scsi/aic94xx/aic94xx_init.c | 3 + + drivers/scsi/be2iscsi/be_main.c | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fnic/fnic_res.c | 1 - + drivers/scsi/hosts.c | 19 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +- + drivers/scsi/isci/task.h | 10 +- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 36 + + drivers/scsi/lpfc/lpfc_disc.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 249 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- + drivers/scsi/lpfc/lpfc_hw.h | 25 +- + drivers/scsi/lpfc/lpfc_init.c | 14 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 21 +- + drivers/scsi/lpfc/lpfc_sli.c | 79 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 17 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 15 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/qla1280.c | 35 +- + drivers/scsi/qla2xxx/qla_dbg.c | 3 +- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 32 +- + drivers/scsi/qla2xxx/qla_mbx.c | 2 + + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 39 +- + drivers/scsi/qla2xxx/qla_target.c | 1771 +++++++++++++++++--- + drivers/scsi/qla2xxx/qla_target.h | 116 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 17 + + drivers/scsi/qla4xxx/ql4_mbx.c | 4 +- + drivers/scsi/scsi.c | 12 +- + drivers/scsi/scsi_debug.c | 118 +- + drivers/scsi/scsi_error.c | 3 + + drivers/scsi/scsi_lib.c | 104 +- + drivers/scsi/scsi_logging.c | 21 +- + drivers/scsi/scsi_pm.c | 1 - + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_scan.c | 74 +- + drivers/scsi/scsi_sysfs.c | 79 +- + drivers/scsi/scsi_transport_fc.c | 5 +- + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/sd.c | 34 +- + drivers/scsi/sim710.c | 2 + + drivers/scsi/smartpqi/smartpqi_init.c | 49 +- + drivers/scsi/st.c | 89 +- + drivers/scsi/stex.c | 1 + + drivers/target/sbp/sbp_target.c | 8 +- + drivers/target/target_core_configfs.c | 38 +- + drivers/target/target_core_device.c | 24 +- + drivers/target/target_core_fabric_configfs.c | 2 +- + drivers/target/target_core_file.c | 4 +- + drivers/target/target_core_iblock.c | 9 +- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_sbc.c | 51 + + drivers/target/target_core_spc.c | 49 +- + drivers/target/target_core_stat.c | 254 +-- + drivers/target/target_core_tpg.c | 23 +- + drivers/target/target_core_transport.c | 26 +- + drivers/target/target_core_xcopy.c | 2 +- + drivers/target/tcm_fc/tfc_conf.c | 2 +- + drivers/ufs/core/ufs-mcq.c | 62 +- + drivers/ufs/core/ufs-sysfs.c | 3 +- + drivers/ufs/core/ufs_bsg.c | 2 +- + drivers/ufs/core/ufs_trace.h | 1 - + drivers/ufs/core/ufs_trace_types.h | 1 - + drivers/ufs/core/ufshcd-crypto.h | 18 +- + drivers/ufs/core/ufshcd-priv.h | 22 +- + drivers/ufs/core/ufshcd.c | 836 ++++----- + drivers/ufs/host/Kconfig | 13 + + drivers/ufs/host/Makefile | 1 + + drivers/ufs/host/ti-j721e-ufs.c | 37 +- + drivers/ufs/host/ufs-amd-versal2.c | 564 +++++++ + drivers/ufs/host/ufs-mediatek.c | 130 +- + drivers/ufs/host/ufs-mediatek.h | 4 + + drivers/ufs/host/ufs-qcom.c | 3 - + drivers/ufs/host/ufshcd-dwc.h | 46 + + include/linux/firmware/xlnx-zynqmp-ufs.h | 38 + + include/linux/firmware/xlnx-zynqmp.h | 16 + + include/scsi/scsi_dbg.h | 4 +- + include/scsi/scsi_device.h | 30 +- + include/scsi/scsi_host.h | 33 +- + include/target/target_core_backend.h | 6 +- + include/target/target_core_base.h | 26 +- + include/ufs/ufs_quirks.h | 7 - + include/ufs/ufshcd.h | 19 +- + include/ufs/ufshci.h | 25 +- + include/ufs/unipro.h | 8 +- + 109 files changed, 4512 insertions(+), 1411 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/amd,versal2-ufs.yaml + create mode 100644 drivers/firmware/xilinx/zynqmp-ufs.c + create mode 100644 drivers/ufs/host/ufs-amd-versal2.c + create mode 100644 include/linux/firmware/xlnx-zynqmp-ufs.h +Merging scsi-mkp/for-next (38725491e766 scsi: MAINTAINERS: Add the UFS include directory) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + drivers/scsi/qla2xxx/qla_nvme.c | 2 +- + drivers/scsi/scsi_debug.c | 12 +++++++++++- + drivers/ufs/core/ufshcd-priv.h | 7 ++++++- + drivers/ufs/core/ufshcd.c | 4 ++-- + drivers/ufs/host/ufs-rockchip.c | 20 ++++++++++++++------ + 6 files changed, 36 insertions(+), 11 deletions(-) +Merging vhost/linux-next (f84451e7e54e vhost: use "checked" versions of get_user() and put_user()) +$ 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/net/virtio_net.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vhost.h +Merge made by the 'ort' strategy. + drivers/net/virtio_net.c | 29 ++++++++++++---------- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + drivers/vdpa/octeon_ep/octep_vdpa_main.c | 1 + + drivers/vdpa/pds/vdpa_dev.c | 2 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 3 ++- + drivers/vhost/net.c | 29 +++++++++++----------- + drivers/vhost/scsi.c | 9 ++++--- + drivers/vhost/test.c | 10 ++++++-- + drivers/vhost/vhost.c | 12 +++++---- + drivers/vhost/vhost.h | 42 ++++++++++++++++++++++++++------ + drivers/vhost/vsock.c | 10 +++++--- + drivers/virtio/virtio.c | 12 ++++----- + drivers/virtio/virtio_balloon.c | 3 ++- + drivers/virtio/virtio_debug.c | 10 ++++---- + drivers/virtio/virtio_pci_modern_dev.c | 6 ++--- + drivers/virtio/virtio_ring.c | 7 +++--- + drivers/virtio/virtio_vdpa.c | 2 +- + include/linux/virtio.h | 2 +- + include/linux/virtio_config.h | 24 +++++++++--------- + include/linux/virtio_features.h | 29 +++++++++++----------- + include/linux/virtio_pci_modern.h | 8 +++--- + include/uapi/linux/virtio_pci.h | 2 +- + 22 files changed, 151 insertions(+), 103 deletions(-) +Merging rpmsg/for-next (ba19afd42d91 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. + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 26 +- + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 4 + + drivers/remoteproc/imx_dsp_rproc.c | 404 +++++++++++---------- + drivers/remoteproc/imx_rproc.c | 238 +++++------- + drivers/remoteproc/imx_rproc.h | 16 +- + drivers/remoteproc/mtk_scp.c | 65 +++- + drivers/remoteproc/omap_remoteproc.c | 3 - + drivers/remoteproc/qcom_q6v5_adsp.c | 24 +- + drivers/remoteproc/qcom_q6v5_mss.c | 60 +-- + drivers/remoteproc/qcom_q6v5_pas.c | 70 ++-- + drivers/remoteproc/qcom_q6v5_wcss.c | 25 +- + drivers/remoteproc/qcom_wcnss.c | 23 +- + drivers/remoteproc/rcar_rproc.c | 36 +- + drivers/remoteproc/remoteproc_core.c | 31 +- + drivers/remoteproc/st_remoteproc.c | 42 +-- + drivers/remoteproc/stm32_rproc.c | 46 +-- + drivers/remoteproc/ti_k3_common.c | 28 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 53 +-- + drivers/rpmsg/qcom_glink_native.c | 35 +- + 19 files changed, 566 insertions(+), 663 deletions(-) +Merging gpio-brgl/gpio/for-next (7b78b26757e0 gpio: shared: handle the reset-gpios corner case) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging drivers/gpio/gpiolib-cdev.c +Merge made by the 'ort' strategy. + .../bindings/gpio/microchip,mpfs-gpio.yaml | 5 +- + .../devicetree/bindings/gpio/trivial-gpio.yaml | 2 + + Documentation/driver-api/gpio/index.rst | 1 + + Documentation/driver-api/gpio/pca953x.rst | 552 +++++++++++++++++++++ + MAINTAINERS | 7 + + arch/arm64/Kconfig.platforms | 1 + + drivers/gpio/Kconfig | 20 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/TODO | 11 - + drivers/gpio/gpio-aspeed.c | 7 +- + drivers/gpio/gpio-brcmstb.c | 12 +- + drivers/gpio/gpio-bt8xx.c | 30 +- + drivers/gpio/gpio-dwapb.c | 18 +- + drivers/gpio/gpio-elkhartlake.c | 36 +- + drivers/gpio/gpio-fxl6408.c | 13 + + drivers/gpio/gpio-grgpio.c | 24 +- + drivers/gpio/gpio-htc-egpio.c | 21 +- + drivers/gpio/gpio-latch.c | 2 - + drivers/gpio/gpio-loongson-64bit.c | 1 + + drivers/gpio/gpio-menz127.c | 26 +- + drivers/gpio/gpio-ml-ioh.c | 12 +- + drivers/gpio/gpio-mlxbf2.c | 8 +- + drivers/gpio/gpio-mm-lantiq.c | 57 ++- + drivers/gpio/gpio-mmio.c | 335 ++++++------- + drivers/gpio/gpio-mpsse.c | 229 ++++++++- + drivers/gpio/gpio-msc313.c | 8 +- + drivers/gpio/gpio-mvebu.c | 3 +- + drivers/gpio/gpio-omap.c | 15 +- + drivers/gpio/gpio-pca953x.c | 13 +- + drivers/gpio/gpio-pch.c | 12 +- + drivers/gpio/gpio-pl061.c | 17 +- + drivers/gpio/gpio-qixis-fpga.c | 111 +++++ + drivers/gpio/gpio-regmap.c | 18 +- + drivers/gpio/gpio-tegra186.c | 174 ++++--- + drivers/gpio/gpio-tqmx86.c | 9 +- + drivers/gpio/gpio-uniphier.c | 9 +- + drivers/gpio/gpio-virtuser.c | 8 +- + drivers/gpio/gpio-xgene.c | 8 +- + drivers/gpio/gpio-xilinx.c | 15 +- + drivers/gpio/gpio-zynq.c | 15 +- + drivers/gpio/gpiolib-acpi-core.c | 2 +- + drivers/gpio/gpiolib-cdev.c | 18 +- + drivers/gpio/gpiolib-legacy.c | 44 +- + drivers/gpio/gpiolib-of.c | 79 --- + drivers/gpio/gpiolib-shared.c | 90 +++- + drivers/gpio/gpiolib-sysfs.c | 16 +- + drivers/gpio/gpiolib.c | 147 +++--- + drivers/gpio/gpiolib.h | 49 +- + drivers/platform/x86/intel/Kconfig | 13 + + drivers/platform/x86/intel/Makefile | 1 + + drivers/platform/x86/intel/ehl_pse_io.c | 86 ++++ + include/linux/ehl_pse_io_aux.h | 24 + + include/linux/gpio/consumer.h | 2 + + include/linux/gpio/legacy-of-mm-gpiochip.h | 36 -- + include/linux/string.h | 7 +- + 55 files changed, 1720 insertions(+), 760 deletions(-) + create mode 100644 Documentation/driver-api/gpio/pca953x.rst + create mode 100644 drivers/gpio/gpio-qixis-fpga.c + create mode 100644 drivers/platform/x86/intel/ehl_pse_io.c + create mode 100644 include/linux/ehl_pse_io_aux.h + delete mode 100644 include/linux/gpio/legacy-of-mm-gpiochip.h +Merging gpio-intel/for-next (b2a186cced11 gpiolib: acpi: use min() instead of min_t()) +$ 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 (2d432ce3a98d Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/armada3700-xtal-clock.txt | 29 - + .../devicetree/bindings/mfd/syscon-common.yaml | 3 - + .../bindings/pinctrl/actions,s700-pinctrl.txt | 170 -- + .../bindings/pinctrl/actions,s700-pinctrl.yaml | 204 ++ + .../bindings/pinctrl/actions,s900-pinctrl.txt | 204 -- + .../bindings/pinctrl/actions,s900-pinctrl.yaml | 219 ++ + .../bindings/pinctrl/airoha,an7583-pinctrl.yaml | 402 ++++ + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 + + .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 47 - + .../bindings/pinctrl/bitmain,bm1880-pinctrl.txt | 126 -- + .../bindings/pinctrl/bitmain,bm1880-pinctrl.yaml | 132 ++ + .../bindings/pinctrl/brcm,ns2-pinmux.txt | 102 - + .../bindings/pinctrl/brcm,ns2-pinmux.yaml | 111 + + .../bindings/pinctrl/cix,sky1-pinctrl.yaml | 91 + + .../pinctrl/marvell,armada-37xx-pinctrl.txt | 195 -- + .../pinctrl/marvell,armada3710-xb-pinctrl.yaml | 124 ++ + .../pinctrl/marvell,berlin2-soc-pinctrl.yaml | 86 + + .../bindings/pinctrl/mediatek,mt6878-pinctrl.yaml | 211 ++ + .../bindings/pinctrl/mediatek,mt7988-pinctrl.yaml | 5 + + .../pinctrl/microchip,mpfs-pinctrl-iomux0.yaml | 89 + + .../pinctrl/microchip,pic64gx-pinctrl-gpio2.yaml | 74 + + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 17 + + .../bindings/pinctrl/pinctrl-single.yaml | 1 + + .../bindings/pinctrl/qcom,kaanapali-tlmm.yaml | 127 ++ + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 4 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 15 + + .../pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml | 8 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl.yaml | 6 +- + .../devicetree/bindings/pinctrl/sprd,pinctrl.txt | 83 - + .../bindings/pinctrl/sprd,sc9860-pinctrl.txt | 70 - + .../bindings/pinctrl/sprd,sc9860-pinctrl.yaml | 199 ++ + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 101 +- + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 1 - + .../microchip/microchip,mpfs-mss-top-sysreg.yaml | 13 +- + MAINTAINERS | 6 +- + drivers/pinctrl/Kconfig | 17 + + drivers/pinctrl/Makefile | 3 + + drivers/pinctrl/cix/Kconfig | 15 + + drivers/pinctrl/cix/Makefile | 4 + + drivers/pinctrl/cix/pinctrl-sky1-base.c | 587 +++++ + drivers/pinctrl/cix/pinctrl-sky1.c | 559 +++++ + drivers/pinctrl/cix/pinctrl-sky1.h | 48 + + drivers/pinctrl/core.c | 3 +- + drivers/pinctrl/intel/pinctrl-alderlake.c | 68 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 20 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 68 +- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 37 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 86 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 21 +- + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 43 +- + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 33 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 60 +- + drivers/pinctrl/intel/pinctrl-intel.c | 36 +- + drivers/pinctrl/intel/pinctrl-intel.h | 11 + + drivers/pinctrl/intel/pinctrl-jasperlake.c | 34 +- + drivers/pinctrl/intel/pinctrl-lakefield.c | 26 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 28 +- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 54 +- + drivers/pinctrl/intel/pinctrl-meteorpoint.c | 46 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 26 +- + drivers/pinctrl/intel/pinctrl-tangier.c | 3 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 70 +- + drivers/pinctrl/mediatek/Kconfig | 10 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/mtk-eint.c | 5 + + drivers/pinctrl/mediatek/mtk-eint.h | 1 + + drivers/pinctrl/mediatek/pinctrl-airoha.c | 2349 ++++++++++---------- + drivers/pinctrl/mediatek/pinctrl-mt6878.c | 1478 ++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt6878.h | 2248 +++++++++++++++++++ + drivers/pinctrl/pinconf-generic.c | 65 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 40 +- + drivers/pinctrl/pinctrl-mpfs-iomux0.c | 278 +++ + drivers/pinctrl/pinctrl-pic64gx-gpio2.c | 356 +++ + drivers/pinctrl/pinctrl-rockchip.c | 442 +++- + drivers/pinctrl/pinctrl-rockchip.h | 4 + + drivers/pinctrl/pinctrl-scmi.c | 2 - + drivers/pinctrl/qcom/Kconfig.msm | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-glymur.c | 6 +- + drivers/pinctrl/qcom/pinctrl-kaanapali.c | 1803 +++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 9 + + drivers/pinctrl/renesas/pfc-emev2.c | 1 - + drivers/pinctrl/renesas/pfc-r8a73a4.c | 2 - + drivers/pinctrl/renesas/pfc-r8a7778.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77951.c | 1 - + drivers/pinctrl/renesas/pfc-r8a7796.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77965.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77970.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77980.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77995.c | 2 - + drivers/pinctrl/renesas/pfc-r8a779f0.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779g0.c | 100 +- + drivers/pinctrl/renesas/pfc-r8a779h0.c | 7 +- + drivers/pinctrl/renesas/pfc-sh7723.c | 1 - + drivers/pinctrl/renesas/pfc-sh7724.c | 1 - + drivers/pinctrl/renesas/pfc-sh7734.c | 1 - + drivers/pinctrl/renesas/pinctrl-rza1.c | 7 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 171 +- + drivers/pinctrl/renesas/pinctrl-rzt2h.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 10 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 206 ++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 416 +++- + drivers/pinctrl/stm32/pinctrl-stm32.h | 1 + + drivers/pinctrl/stm32/pinctrl-stm32mp257.c | 2 + + drivers/pinctrl/tegra/pinctrl-tegra20.c | 11 +- + include/linux/pinctrl/pinconf-generic.h | 19 +- + include/linux/pinctrl/pinmux.h | 10 + + 111 files changed, 12408 insertions(+), 2968 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/armada3700-xtal-clock.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s700-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s700-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/airoha,an7583-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,ns2-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,ns2-pinmux.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/cix,sky1-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada3710-xb-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,berlin2-soc-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt6878-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,mpfs-pinctrl-iomux0.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic64gx-pinctrl-gpio2.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,kaanapali-tlmm.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/sprd,pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/sprd,sc9860-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/sprd,sc9860-pinctrl.yaml + create mode 100644 drivers/pinctrl/cix/Kconfig + create mode 100644 drivers/pinctrl/cix/Makefile + create mode 100644 drivers/pinctrl/cix/pinctrl-sky1-base.c + create mode 100644 drivers/pinctrl/cix/pinctrl-sky1.c + create mode 100644 drivers/pinctrl/cix/pinctrl-sky1.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6878.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6878.h + create mode 100644 drivers/pinctrl/pinctrl-mpfs-iomux0.c + create mode 100644 drivers/pinctrl/pinctrl-pic64gx-gpio2.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-kaanapali.c +Merging pinctrl-intel/for-next (8daf70e6aa41 Merge patch series "pinctrl: intel: Export intel_gpio_add_pin_ranges() and use it") +$ 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 (3cfc60e09bdc pinctrl: samsung: Add ARTPEC-9 SoC specific configuration) +$ 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 (fae00ea9f003 pwm: rzg2l-gpt: Allow checking period_tick cache value only if sibling channel is enabled) +$ 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 +Auto-merging MAINTAINERS +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/helpers/helpers.c +Auto-merging rust/kernel/lib.rs +Auto-merging rust/macros/module.rs +CONFLICT (content): Merge conflict in rust/macros/module.rs +Resolved 'rust/macros/module.rs' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 53615ec025b7] Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pwm/thead,th1520-pwm.yaml | 48 ++ + MAINTAINERS | 10 + + drivers/pwm/Kconfig | 33 + + drivers/pwm/Makefile | 2 + + drivers/pwm/core.c | 8 +- + drivers/pwm/pwm-airoha.c | 622 +++++++++++++++++ + drivers/pwm/pwm-bcm2835.c | 28 +- + drivers/pwm/pwm-max7360.c | 2 +- + drivers/pwm/pwm-mediatek.c | 335 ++++++---- + drivers/pwm/pwm-rzg2l-gpt.c | 15 +- + drivers/pwm/pwm_th1520.rs | 387 +++++++++++ + include/linux/pwm.h | 39 +- + rust/bindings/bindings_helper.h | 1 + + rust/helpers/helpers.c | 1 + + rust/helpers/pwm.c | 20 + + rust/kernel/lib.rs | 2 + + rust/kernel/pwm.rs | 735 +++++++++++++++++++++ + rust/macros/module.rs | 8 + + 18 files changed, 2096 insertions(+), 200 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/thead,th1520-pwm.yaml + create mode 100644 drivers/pwm/pwm-airoha.c + create mode 100644 drivers/pwm/pwm_th1520.rs + create mode 100644 rust/helpers/pwm.c + create mode 100644 rust/kernel/pwm.rs +$ git am -3 ../patches/0001-fix-up-for-pwm-Add-Rust-driver-for-T-HEAD-TH1520-SoC.patch +Applying: fix up for "pwm: Add Rust driver for T-HEAD TH1520 SoC" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/pwm/pwm_th1520.rs +$ git add -A . +$ git commit -v -a --amend +[master 022d26cfe139] Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git + Date: Fri Nov 28 12:03:54 2025 +1100 +Merging ktest/for-next (a5e71638ddd7 ktest.pl: Add new PATCHCHECK_SKIP option to skip testing individual commits) +$ 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 (a2f7990d3309 selftests: tracing: Update fprobe selftest for ftrace based fprobe) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/dma/dma_map_benchmark.c +Merge made by the 'ort' strategy. + tools/dma/dma_map_benchmark.c | 2 +- + .../ftrace/test.d/00basic/trace_marker_raw.tc | 107 +++++++++++++++++++++ + .../ftrace/test.d/dynevent/add_remove_fprobe.tc | 18 +--- + .../test.d/dynevent/enable_disable_tprobe.tc | 40 ++++++++ + tools/testing/selftests/kselftest/runner.sh | 14 ++- + tools/testing/selftests/run_kselftest.sh | 14 +++ + 6 files changed, 176 insertions(+), 19 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc +Merging kunit/test (3a8660878839 Linux 6.18-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 (7bc16e72ddb9 kunit: Make filter parameters configurable via Kconfig) +$ 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. + Documentation/dev-tools/kunit/run_manual.rst | 6 ++++++ + lib/kunit/Kconfig | 24 ++++++++++++++++++++++++ + lib/kunit/executor.c | 8 +++++--- + 3 files changed, 35 insertions(+), 3 deletions(-) +Merging livepatching/for-next (5cb5575308bc selftests: livepatch: use canonical ftrace path) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Auto-merging kernel/livepatch/core.c +Merge made by the 'ort' strategy. + kernel/livepatch/core.c | 8 +++++++- + tools/testing/selftests/livepatch/functions.sh | 6 +++++- + 2 files changed, 12 insertions(+), 2 deletions(-) +Merging rtc/rtc-next (9d6d6b06933c rtc: nvvrs: add NVIDIA VRS RTC device driver) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging drivers/rtc/rtc-rx8025.c +Merge made by the 'ort' strategy. + .../bindings/rtc/andestech,atcrtc100.yaml | 43 ++ + .../devicetree/bindings/rtc/nvidia,vrs-10.yaml | 59 +++ + MAINTAINERS | 14 + + drivers/rtc/Kconfig | 24 + + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-amlogic-a4.c | 32 +- + drivers/rtc/rtc-atcrtc100.c | 379 ++++++++++++++ + drivers/rtc/rtc-ds1685.c | 3 - + drivers/rtc/rtc-nvidia-vrs10.c | 542 +++++++++++++++++++++ + drivers/rtc/rtc-pic32.c | 2 - + drivers/rtc/rtc-renesas-rtca3.c | 1 - + drivers/rtc/rtc-rv3028.c | 2 - + drivers/rtc/rtc-rv3032.c | 2 - + drivers/rtc/rtc-rv8803.c | 2 - + drivers/rtc/rtc-rx6110.c | 2 - + drivers/rtc/rtc-rx8010.c | 1 - + drivers/rtc/rtc-rx8025.c | 2 - + drivers/rtc/rtc-sa1100.c | 3 - + drivers/rtc/rtc-sh.c | 1 - + include/linux/rtc/ds1685.h | 1 - + 20 files changed, 1068 insertions(+), 49 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/andestech,atcrtc100.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,vrs-10.yaml + create mode 100644 drivers/rtc/rtc-atcrtc100.c + create mode 100644 drivers/rtc/rtc-nvidia-vrs10.c +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 +Merge made by the 'ort' strategy. + Documentation/driver-api/nvdimm/btt.rst | 2 +- + drivers/nvdimm/Kconfig | 19 +++ + drivers/nvdimm/Makefile | 1 + + drivers/nvdimm/ramdax.c | 282 ++++++++++++++++++++++++++++++++ + drivers/nvdimm/security.c | 4 +- + tools/testing/nvdimm/test/nfit.c | 7 +- + 6 files changed, 311 insertions(+), 4 deletions(-) + create mode 100644 drivers/nvdimm/ramdax.c +Merging at24/at24/for-next (aef72ebe9c86 dt-bindings: eeprom: at24: Add compatible for Belling BL24S64) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 1 + + 1 file changed, 1 insertion(+) +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 (b0c9bfbab925 selftests/seccomp: Add a test for the WAIT_KILLABLE_RECV fast reply race) +$ 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 (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging include/linux/xarray.h +Auto-merging lib/xarray.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 60 +++++++++++++++++++++++++++----------------------- + lib/xarray.c | 3 +-- + 2 files changed, 34 insertions(+), 29 deletions(-) +Merging hyperv/hyperv-next (a45a80914e51 mshv: Add ioctl for self targeted passthrough hvcalls) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/hyperv/hv_init.c +Auto-merging drivers/hv/mshv_root_main.c +CONFLICT (content): Merge conflict in drivers/hv/mshv_root_main.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging include/linux/compiler_types.h +Resolved 'drivers/hv/mshv_root_main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f671d8707563] Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/hyperv/coco.rst | 139 ++- + MAINTAINERS | 3 + + arch/x86/hyperv/Makefile | 16 +- + arch/x86/hyperv/hv_apic.c | 8 + + arch/x86/hyperv/hv_crash.c | 642 ++++++++++++++ + arch/x86/hyperv/hv_init.c | 8 + + arch/x86/hyperv/hv_trampoline.S | 101 +++ + arch/x86/hyperv/hv_vtl.c | 30 + + arch/x86/hyperv/mshv-asm-offsets.c | 37 + + arch/x86/hyperv/mshv_vtl_asm.S | 116 +++ + arch/x86/include/asm/mshyperv.h | 43 + + arch/x86/kernel/cpu/mshyperv.c | 86 +- + drivers/hv/Kconfig | 27 +- + drivers/hv/Makefile | 7 +- + drivers/hv/channel.c | 75 +- + drivers/hv/channel_mgmt.c | 27 +- + drivers/hv/connection.c | 6 +- + drivers/hv/hv.c | 377 ++++++--- + drivers/hv/hv_common.c | 27 +- + drivers/hv/hyperv_vmbus.h | 76 +- + drivers/hv/mshv_eventfd.c | 2 +- + drivers/hv/mshv_root.h | 26 +- + drivers/hv/mshv_root_hv_call.c | 190 ++++- + drivers/hv/mshv_root_main.c | 378 ++++++--- + drivers/hv/mshv_synic.c | 6 +- + drivers/hv/mshv_vtl.h | 25 + + drivers/hv/mshv_vtl_main.c | 1392 +++++++++++++++++++++++++++++++ + drivers/hv/ring_buffer.c | 5 +- + drivers/hv/vmbus_drv.c | 204 +++-- + include/asm-generic/mshyperv.h | 63 +- + include/hyperv/hvgdk_mini.h | 111 +++ + include/hyperv/hvhdk.h | 40 + + include/hyperv/hvhdk_mini.h | 88 ++ + include/linux/compiler_types.h | 8 +- + include/linux/hyperv.h | 69 +- + include/linux/static_call_types.h | 4 + + include/uapi/linux/mshv.h | 116 ++- + tools/include/linux/static_call_types.h | 4 + + 38 files changed, 4097 insertions(+), 485 deletions(-) + create mode 100644 arch/x86/hyperv/hv_crash.c + create mode 100644 arch/x86/hyperv/hv_trampoline.S + create mode 100644 arch/x86/hyperv/mshv-asm-offsets.c + create mode 100644 arch/x86/hyperv/mshv_vtl_asm.S + create mode 100644 drivers/hv/mshv_vtl.h + create mode 100644 drivers/hv/mshv_vtl_main.c +Merging auxdisplay/for-next (00de283c53c9 Merge patch series "auxdisplay: linedisp: support attribute attachment to auxdisplay devices") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-auxdisplay-linedisp | 90 ++++++++ + drivers/auxdisplay/line-display.c | 240 +++++++++++++++++++-- + drivers/auxdisplay/line-display.h | 4 + + 3 files changed, 312 insertions(+), 22 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-auxdisplay-linedisp +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 (e68f150bc11d memblock: drop for_each_free_mem_pfn_range_in_zone_from()) +$ 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 +Auto-merging drivers/acpi/numa/hmat.c +Auto-merging drivers/cxl/core/region.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-cxl | 11 +- + .../driver-api/cxl/allocation/page-allocator.rst | 31 -- + drivers/acpi/numa/hmat.c | 11 +- + drivers/cxl/acpi.c | 73 ++-- + drivers/cxl/core/cdat.c | 4 +- + drivers/cxl/core/hdm.c | 3 + + drivers/cxl/core/pci.c | 87 +--- + drivers/cxl/core/port.c | 1 - + drivers/cxl/core/region.c | 321 ++++++++++----- + drivers/cxl/cxl.h | 29 +- + drivers/cxl/cxlpci.h | 1 - + drivers/cxl/pci.c | 2 +- + tools/testing/cxl/Kbuild | 3 +- + tools/testing/cxl/test/Kbuild | 1 + + tools/testing/cxl/test/cxl.c | 86 ++-- + tools/testing/cxl/test/cxl_translate.c | 445 +++++++++++++++++++++ + tools/testing/cxl/test/mem.c | 11 +- + tools/testing/cxl/test/mock.c | 52 +-- + tools/testing/cxl/test/mock.h | 4 +- + 19 files changed, 844 insertions(+), 332 deletions(-) + create mode 100644 tools/testing/cxl/test/cxl_translate.c +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 +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging drivers/firmware/efi/riscv-runtime.c +Auto-merging include/linux/efi.h +Auto-merging include/ras/ras_event.h +Merge made by the 'ort' strategy. + Documentation/driver-api/firmware/efi/index.rst | 11 +- + drivers/acpi/apei/ghes.c | 27 ++--- + drivers/firmware/efi/cper-arm.c | 52 +++++---- + drivers/firmware/efi/cper.c | 62 ++++++++++- + drivers/firmware/efi/libstub/efi-stub.c | 2 +- + drivers/firmware/efi/libstub/efistub.h | 31 +++++- + drivers/firmware/efi/libstub/gop.c | 133 +++++++++++++++--------- + drivers/firmware/efi/libstub/x86-stub.c | 104 +++++++++++++++++- + drivers/firmware/efi/memattr.c | 7 +- + drivers/firmware/efi/riscv-runtime.c | 10 +- + drivers/firmware/efi/stmm/mm_communication.h | 6 +- + drivers/ras/ras.c | 40 ++++++- + include/linux/cper.h | 12 ++- + include/linux/efi.h | 6 +- + include/linux/ras.h | 16 ++- + include/ras/ras_event.h | 49 ++++++++- + 16 files changed, 436 insertions(+), 132 deletions(-) +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 (a8ec08bf3259 Merge branch 'slab/for-6.19/mempool_alloc_bulk' into slab/for-next) +$ 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/kasan/common.c +Auto-merging mm/kfence/core.c +Auto-merging mm/memcontrol.c +Auto-merging mm/mempool.c +Auto-merging mm/page_alloc.c +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + include/linux/fault-inject.h | 8 +- + include/linux/gfp_types.h | 6 - + include/linux/mempool.h | 58 ++-- + include/linux/page-flags.h | 16 +- + mm/kasan/common.c | 12 +- + mm/kfence/core.c | 14 +- + mm/memcontrol.c | 40 +-- + mm/mempool.c | 427 ++++++++++++++++---------- + mm/page_alloc.c | 15 +- + mm/slab.h | 112 ++++--- + mm/slab_common.c | 29 +- + mm/slub.c | 694 ++++++++++++++++++++++--------------------- + mm/usercopy.c | 24 +- + 13 files changed, 767 insertions(+), 688 deletions(-) +Merging random/master (90fb9b98fcf5 random: complete sentence of comment) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging drivers/char/random.c +Merge made by the 'ort' strategy. + drivers/char/random.c | 38 +++++++++++++----------- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 ++- + include/linux/prandom.h | 6 ---- + include/linux/random.h | 15 ---------- + 4 files changed, 24 insertions(+), 39 deletions(-) +Merging landlock/next (3ef6e4434e3a selftests/landlock: Add disconnected leafs and branch test suites) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging security/landlock/fs.c +Merge made by the 'ort' strategy. + Documentation/security/landlock.rst | 11 +- + security/landlock/errata/abi-1.h | 16 + + security/landlock/fs.c | 46 +- + security/landlock/ruleset.c | 12 +- + security/landlock/ruleset.h | 2 +- + tools/testing/selftests/landlock/Makefile | 2 +- + tools/testing/selftests/landlock/fs_test.c | 1335 +++++++++++++++++++++++++++- + 7 files changed, 1397 insertions(+), 27 deletions(-) + create mode 100644 security/landlock/errata/abi-1.h +Merging rust/rust-next (54e3eae85562 Merge patch series "`syn` support") +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/android/binder/freeze.rs +Auto-merging drivers/android/binder/process.rs +Auto-merging rust/Makefile +Auto-merging rust/kernel/debugfs.rs +Auto-merging rust/kernel/debugfs/file_ops.rs +CONFLICT (content): Merge conflict in rust/kernel/debugfs/file_ops.rs +Auto-merging rust/kernel/debugfs/traits.rs +CONFLICT (content): Merge conflict in rust/kernel/debugfs/traits.rs +Auto-merging rust/kernel/device.rs +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/opp.rs +CONFLICT (content): Merge conflict in rust/kernel/opp.rs +Auto-merging rust/kernel/pci/id.rs +CONFLICT (content): Merge conflict in rust/kernel/pci/id.rs +Auto-merging rust/kernel/prelude.rs +Auto-merging rust/kernel/str.rs +CONFLICT (content): Merge conflict in rust/kernel/str.rs +Auto-merging rust/kernel/sync.rs +Auto-merging rust/kernel/sync/condvar.rs +Auto-merging rust/kernel/sync/lock.rs +Auto-merging rust/kernel/sync/lock/global.rs +Auto-merging rust/macros/lib.rs +Auto-merging rust/macros/module.rs +Auto-merging samples/rust/rust_debugfs_scoped.rs +Auto-merging samples/rust/rust_driver_platform.rs +Resolved 'rust/kernel/debugfs/file_ops.rs' using previous resolution. +Resolved 'rust/kernel/debugfs/traits.rs' using previous resolution. +Resolved 'rust/kernel/opp.rs' using previous resolution. +Resolved 'rust/kernel/pci/id.rs' using previous resolution. +Resolved 'rust/kernel/str.rs' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aaec6e58c9e9] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/rust/quick-start.rst | 4 +- + MAINTAINERS | 9 +- + Makefile | 7 + + drivers/android/binder/error.rs | 5 +- + drivers/android/binder/freeze.rs | 4 +- + drivers/android/binder/process.rs | 4 +- + drivers/android/binder/range_alloc/tree.rs | 2 +- + drivers/android/binder/stats.rs | 6 +- + drivers/block/rnull/configfs.rs | 9 +- + kernel/kallsyms.c | 5 +- + rust/Makefile | 147 +- + rust/ffi.rs | 2 + + rust/kernel/alloc/kvec/errors.rs | 14 +- + rust/kernel/clk.rs | 4 +- + rust/kernel/configfs.rs | 2 +- + rust/kernel/debugfs.rs | 2 +- + rust/kernel/debugfs/callback_adapters.rs | 7 +- + rust/kernel/debugfs/entry.rs | 2 +- + rust/kernel/debugfs/file_ops.rs | 2 +- + rust/kernel/debugfs/traits.rs | 10 +- + rust/kernel/device.rs | 1 + + rust/kernel/drm/ioctl.rs | 4 +- + rust/kernel/error.rs | 2 + + rust/kernel/firmware.rs | 15 +- + rust/kernel/fmt.rs | 87 +- + rust/kernel/init.rs | 3 +- + rust/kernel/lib.rs | 1 + + rust/kernel/num.rs | 79 + + rust/kernel/num/bounded.rs | 1058 +++++ + rust/kernel/opp.rs | 6 +- + rust/kernel/pci/id.rs | 2 +- + rust/kernel/prelude.rs | 7 +- + rust/kernel/ptr.rs | 1 - + rust/kernel/rbtree.rs | 244 +- + rust/kernel/regulator.rs | 13 +- + rust/kernel/seq_file.rs | 2 +- + rust/kernel/str.rs | 482 +-- + rust/kernel/sync.rs | 3 +- + rust/kernel/sync/condvar.rs | 2 +- + rust/kernel/sync/lock.rs | 2 +- + rust/kernel/sync/lock/global.rs | 2 +- + rust/kernel/types.rs | 1 - + rust/macros/fmt.rs | 94 + + rust/macros/lib.rs | 19 + + rust/macros/module.rs | 2 +- + rust/macros/quote.rs | 7 + + rust/pin-init/README.md | 2 +- + rust/pin-init/src/macros.rs | 2 + + rust/proc-macro2/README.md | 13 + + rust/proc-macro2/detection.rs | 77 + + rust/proc-macro2/extra.rs | 153 + + rust/proc-macro2/fallback.rs | 1258 ++++++ + rust/proc-macro2/lib.rs | 1351 +++++++ + rust/proc-macro2/location.rs | 31 + + rust/proc-macro2/marker.rs | 19 + + rust/proc-macro2/parse.rs | 997 +++++ + rust/proc-macro2/probe.rs | 12 + + rust/proc-macro2/probe/proc_macro_span.rs | 53 + + rust/proc-macro2/probe/proc_macro_span_file.rs | 16 + + rust/proc-macro2/probe/proc_macro_span_location.rs | 23 + + rust/proc-macro2/rcvec.rs | 148 + + rust/proc-macro2/wrapper.rs | 986 +++++ + rust/quote/README.md | 12 + + rust/quote/ext.rs | 112 + + rust/quote/format.rs | 170 + + rust/quote/ident_fragment.rs | 90 + + rust/quote/lib.rs | 1456 +++++++ + rust/quote/runtime.rs | 494 +++ + rust/quote/spanned.rs | 52 + + rust/quote/to_tokens.rs | 273 ++ + rust/syn/README.md | 13 + + rust/syn/attr.rs | 838 ++++ + rust/syn/bigint.rs | 68 + + rust/syn/buffer.rs | 436 ++ + rust/syn/classify.rs | 313 ++ + rust/syn/custom_keyword.rs | 262 ++ + rust/syn/custom_punctuation.rs | 306 ++ + rust/syn/data.rs | 426 ++ + rust/syn/derive.rs | 261 ++ + rust/syn/discouraged.rs | 227 ++ + rust/syn/drops.rs | 60 + + rust/syn/error.rs | 469 +++ + rust/syn/export.rs | 75 + + rust/syn/expr.rs | 4175 ++++++++++++++++++++ + rust/syn/ext.rs | 138 + + rust/syn/file.rs | 127 + + rust/syn/fixup.rs | 775 ++++ + rust/syn/gen/clone.rs | 2269 +++++++++++ + rust/syn/gen/debug.rs | 3240 +++++++++++++++ + rust/syn/gen/eq.rs | 2308 +++++++++++ + rust/syn/gen/fold.rs | 3904 ++++++++++++++++++ + rust/syn/gen/hash.rs | 2878 ++++++++++++++ + rust/syn/gen/visit.rs | 3943 ++++++++++++++++++ + rust/syn/gen/visit_mut.rs | 3761 ++++++++++++++++++ + rust/syn/generics.rs | 1479 +++++++ + rust/syn/group.rs | 293 ++ + rust/syn/ident.rs | 110 + + rust/syn/item.rs | 3492 ++++++++++++++++ + rust/syn/lib.rs | 1013 +++++ + rust/syn/lifetime.rs | 158 + + rust/syn/lit.rs | 1862 +++++++++ + rust/syn/lookahead.rs | 334 ++ + rust/syn/mac.rs | 227 ++ + rust/syn/macros.rs | 184 + + rust/syn/meta.rs | 429 ++ + rust/syn/op.rs | 221 ++ + rust/syn/parse.rs | 1421 +++++++ + rust/syn/parse_macro_input.rs | 130 + + rust/syn/parse_quote.rs | 242 ++ + rust/syn/pat.rs | 957 +++++ + rust/syn/path.rs | 968 +++++ + rust/syn/precedence.rs | 212 + + rust/syn/print.rs | 18 + + rust/syn/punctuated.rs | 1157 ++++++ + rust/syn/restriction.rs | 180 + + rust/syn/scan_expr.rs | 267 ++ + rust/syn/sealed.rs | 6 + + rust/syn/span.rs | 65 + + rust/syn/spanned.rs | 120 + + rust/syn/stmt.rs | 486 +++ + rust/syn/thread.rs | 62 + + rust/syn/token.rs | 1098 +++++ + rust/syn/tt.rs | 109 + + rust/syn/ty.rs | 1273 ++++++ + rust/syn/verbatim.rs | 35 + + rust/syn/whitespace.rs | 67 + + samples/rust/rust_debugfs_scoped.rs | 2 +- + samples/rust/rust_driver_platform.rs | 4 +- + scripts/generate_rust_analyzer.py | 25 +- + scripts/rustdoc_test_gen.rs | 1 + + 131 files changed, 59678 insertions(+), 488 deletions(-) + create mode 100644 rust/kernel/num.rs + create mode 100644 rust/kernel/num/bounded.rs + create mode 100644 rust/macros/fmt.rs + create mode 100644 rust/proc-macro2/README.md + create mode 100644 rust/proc-macro2/detection.rs + create mode 100644 rust/proc-macro2/extra.rs + create mode 100644 rust/proc-macro2/fallback.rs + create mode 100644 rust/proc-macro2/lib.rs + create mode 100644 rust/proc-macro2/location.rs + create mode 100644 rust/proc-macro2/marker.rs + create mode 100644 rust/proc-macro2/parse.rs + create mode 100644 rust/proc-macro2/probe.rs + create mode 100644 rust/proc-macro2/probe/proc_macro_span.rs + create mode 100644 rust/proc-macro2/probe/proc_macro_span_file.rs + create mode 100644 rust/proc-macro2/probe/proc_macro_span_location.rs + create mode 100644 rust/proc-macro2/rcvec.rs + create mode 100644 rust/proc-macro2/wrapper.rs + create mode 100644 rust/quote/README.md + create mode 100644 rust/quote/ext.rs + create mode 100644 rust/quote/format.rs + create mode 100644 rust/quote/ident_fragment.rs + create mode 100644 rust/quote/lib.rs + create mode 100644 rust/quote/runtime.rs + create mode 100644 rust/quote/spanned.rs + create mode 100644 rust/quote/to_tokens.rs + create mode 100644 rust/syn/README.md + create mode 100644 rust/syn/attr.rs + create mode 100644 rust/syn/bigint.rs + create mode 100644 rust/syn/buffer.rs + create mode 100644 rust/syn/classify.rs + create mode 100644 rust/syn/custom_keyword.rs + create mode 100644 rust/syn/custom_punctuation.rs + create mode 100644 rust/syn/data.rs + create mode 100644 rust/syn/derive.rs + create mode 100644 rust/syn/discouraged.rs + create mode 100644 rust/syn/drops.rs + create mode 100644 rust/syn/error.rs + create mode 100644 rust/syn/export.rs + create mode 100644 rust/syn/expr.rs + create mode 100644 rust/syn/ext.rs + create mode 100644 rust/syn/file.rs + create mode 100644 rust/syn/fixup.rs + create mode 100644 rust/syn/gen/clone.rs + create mode 100644 rust/syn/gen/debug.rs + create mode 100644 rust/syn/gen/eq.rs + create mode 100644 rust/syn/gen/fold.rs + create mode 100644 rust/syn/gen/hash.rs + create mode 100644 rust/syn/gen/visit.rs + create mode 100644 rust/syn/gen/visit_mut.rs + create mode 100644 rust/syn/generics.rs + create mode 100644 rust/syn/group.rs + create mode 100644 rust/syn/ident.rs + create mode 100644 rust/syn/item.rs + create mode 100644 rust/syn/lib.rs + create mode 100644 rust/syn/lifetime.rs + create mode 100644 rust/syn/lit.rs + create mode 100644 rust/syn/lookahead.rs + create mode 100644 rust/syn/mac.rs + create mode 100644 rust/syn/macros.rs + create mode 100644 rust/syn/meta.rs + create mode 100644 rust/syn/op.rs + create mode 100644 rust/syn/parse.rs + create mode 100644 rust/syn/parse_macro_input.rs + create mode 100644 rust/syn/parse_quote.rs + create mode 100644 rust/syn/pat.rs + create mode 100644 rust/syn/path.rs + create mode 100644 rust/syn/precedence.rs + create mode 100644 rust/syn/print.rs + create mode 100644 rust/syn/punctuated.rs + create mode 100644 rust/syn/restriction.rs + create mode 100644 rust/syn/scan_expr.rs + create mode 100644 rust/syn/sealed.rs + create mode 100644 rust/syn/span.rs + create mode 100644 rust/syn/spanned.rs + create mode 100644 rust/syn/stmt.rs + create mode 100644 rust/syn/thread.rs + create mode 100644 rust/syn/token.rs + create mode 100644 rust/syn/tt.rs + create mode 100644 rust/syn/ty.rs + create mode 100644 rust/syn/verbatim.rs + create mode 100644 rust/syn/whitespace.rs +$ git am -3 ../patches/0001-fix-up-3-for-rust-replace-CStr-with-core-ffi-CStr.patch +Applying: fix up 3 for "rust: replace `CStr` with `core::ffi::CStr`" +$ git reset HEAD^ +Unstaged changes after reset: +M rust/kernel/module_param.rs +M rust/macros/module.rs +$ git add -A . +$ git commit -v -a --amend +[master 4721baad9851] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Fri Nov 28 12:36:12 2025 +1100 +Merging rust-alloc/alloc-next (3a8660878839 Linux 6.18-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 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 +Auto-merging fs/pipe.c +Auto-merging kernel/watchdog.c +Merge made by the 'ort' strategy. + fs/pipe.c | 28 +-- + include/linux/jiffies.h | 12 + + include/linux/sysctl.h | 157 ++++++++++-- + kernel/kstack_erase.c | 2 +- + kernel/sysctl.c | 649 ++++++++++++------------------------------------ + kernel/time/jiffies.c | 125 ++++++++++ + kernel/watchdog.c | 9 +- + 7 files changed, 436 insertions(+), 546 deletions(-) +Merging execve/for-next/execve (8c94db0ae97c binfmt_elf: preserve original ELF e_flags for core dumps) +$ 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 (a322638c15a6 rust_binder: use bitmap for allocation of handles) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/android/binder/process.rs +Auto-merging drivers/clk/renesas/rcar-gen4-cpg.c +Auto-merging drivers/edac/ie31200_edac.c +Auto-merging drivers/gpio/gpio-aspeed.c +Auto-merging drivers/soc/renesas/rz-sysc.c +Auto-merging include/linux/cpumask.h +Auto-merging sound/usb/mixer_quirks.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/x86/include/asm/cpumask.h | 2 + + drivers/android/binder/process.rs | 64 +++++++--- + drivers/clk/at91/clk-peripheral.c | 1 + + drivers/clk/at91/pmc.h | 3 - + drivers/clk/renesas/clk-div6.c | 6 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 15 +-- + drivers/clk/renesas/rcar-gen4-cpg.c | 9 +- + .../intel/qat/qat_common/adf_pm_dbgfs_utils.c | 8 +- + drivers/edac/ie31200_edac.c | 4 +- + drivers/gpio/gpio-aspeed.c | 5 +- + drivers/iio/dac/ad3530r.c | 3 - + drivers/iio/temperature/mlx90614.c | 5 +- + drivers/pinctrl/nuvoton/pinctrl-ma35.c | 4 - + drivers/soc/renesas/renesas-soc.c | 4 +- + drivers/soc/renesas/rz-sysc.c | 3 +- + include/linux/bitfield.h | 95 ++++++++++++-- + include/linux/cpumask.h | 12 +- + include/linux/nodemask.h | 9 +- + lib/hweight.c | 4 +- + rust/kernel/bitmap.rs | 43 ++++--- + rust/kernel/id_pool.rs | 139 +++++++++++++++------ + sound/usb/mixer_quirks.c | 4 - + 23 files changed, 302 insertions(+), 141 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-bitfield-Add-non-constant-field_-prep-get.patch +Applying: fix up for "bitfield: Add non-constant field_{prep,get}() helpers" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mtd/nand/raw/sunxi_nand.c +$ git add -A . +$ git commit -v -a --amend +[master f7a8a690c844] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git + Date: Fri Nov 28 12:36:16 2025 +1100 +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 +Auto-merging Makefile +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +Auto-merging include/linux/string.h +Merge made by the 'ort' strategy. + Makefile | 3 +++ + drivers/comedi/drivers/ni_670x.c | 2 +- + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 2 +- + include/linux/string.h | 7 +++++++ + 5 files changed, 13 insertions(+), 3 deletions(-) +Merging nolibc/for-next (1d573464749c selftests/nolibc: error out on linker warnings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Auto-merging tools/include/nolibc/arch-s390.h +Auto-merging tools/include/nolibc/arch.h +Auto-merging tools/testing/selftests/nolibc/Makefile.nolibc +Auto-merging tools/testing/selftests/nolibc/run-tests.sh +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 22 +++--- + tools/include/nolibc/arch-arm.h | 2 + + tools/include/nolibc/arch-arm64.h | 2 + + tools/include/nolibc/arch-loongarch.h | 2 + + tools/include/nolibc/arch-m68k.h | 2 + + tools/include/nolibc/arch-mips.h | 2 + + tools/include/nolibc/arch-powerpc.h | 2 + + tools/include/nolibc/arch-riscv.h | 2 + + tools/include/nolibc/arch-s390.h | 2 + + tools/include/nolibc/arch-sh.h | 2 + + tools/include/nolibc/arch-sparc.h | 2 + + tools/include/nolibc/arch-x86.h | 10 ++- + tools/include/nolibc/arch.h | 9 --- + tools/include/nolibc/compiler.h | 4 +- + tools/include/nolibc/crt.h | 3 + + tools/include/nolibc/dirent.h | 6 +- + tools/include/nolibc/getopt.h | 2 +- + tools/include/nolibc/inttypes.h | 3 + + tools/include/nolibc/nolibc.h | 2 + + tools/include/nolibc/stackprotector.h | 2 + + tools/include/nolibc/std.h | 4 +- + tools/include/nolibc/stdio.h | 10 ++- + tools/include/nolibc/stdlib.h | 2 + + tools/include/nolibc/string.h | 15 ++++ + tools/include/nolibc/sys.h | 74 +++++------------- + tools/include/nolibc/sys/auxv.h | 3 + + tools/include/nolibc/sys/mman.h | 5 -- + tools/include/nolibc/sys/reboot.h | 2 +- + tools/include/nolibc/sys/select.h | 103 +++++++++++++++++++++++++ + tools/include/nolibc/sys/uio.h | 49 ++++++++++++ + tools/include/nolibc/sys/wait.h | 18 +++-- + tools/include/nolibc/time.h | 16 +--- + tools/include/nolibc/types.h | 47 ----------- + tools/include/nolibc/unistd.h | 6 +- + tools/testing/selftests/nolibc/Makefile.nolibc | 1 + + tools/testing/selftests/nolibc/nolibc-test.c | 13 ++++ + tools/testing/selftests/nolibc/run-tests.sh | 2 +- + 37 files changed, 290 insertions(+), 163 deletions(-) + create mode 100644 tools/include/nolibc/inttypes.h + create mode 100644 tools/include/nolibc/sys/select.h + create mode 100644 tools/include/nolibc/sys/uio.h +Merging iommufd/for-next (5185c4d8a56b Merge branch 'iommufd_dmabuf' into k.o-iommufd/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c +Auto-merging drivers/iommu/iommufd/iommufd_private.h +Auto-merging drivers/iommu/iommufd/iommufd_test.h +Auto-merging drivers/iommu/iommufd/selftest.c +Auto-merging include/linux/vfio_pci_core.h +Auto-merging tools/testing/selftests/iommu/iommufd.c +Auto-merging tools/testing/selftests/iommu/iommufd_utils.h +Merge made by the 'ort' strategy. + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 13 +- + drivers/iommu/iommufd/io_pagetable.c | 78 +++- + drivers/iommu/iommufd/io_pagetable.h | 54 ++- + drivers/iommu/iommufd/ioas.c | 8 +- + drivers/iommu/iommufd/iommufd_private.h | 14 +- + drivers/iommu/iommufd/iommufd_test.h | 10 + + drivers/iommu/iommufd/main.c | 10 + + drivers/iommu/iommufd/pages.c | 414 ++++++++++++++++++--- + drivers/iommu/iommufd/selftest.c | 143 +++++++ + drivers/vfio/pci/vfio_pci_dmabuf.c | 34 ++ + include/linux/vfio_pci_core.h | 4 + + include/uapi/linux/iommufd.h | 10 + + tools/testing/selftests/iommu/iommufd.c | 43 +++ + tools/testing/selftests/iommu/iommufd_utils.h | 44 +++ + 14 files changed, 808 insertions(+), 71 deletions(-) +Merging turbostat/next (7d10c01f542a tools/power/turbostat: Set per_cpu_msr_sum to NULL after free) +$ 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 | 21 +- + tools/power/x86/turbostat/turbostat.c | 343 +++++++-------------- + .../x86_energy_perf_policy.c | 7 +- + 3 files changed, 132 insertions(+), 239 deletions(-) +Merging pwrseq/pwrseq/for-next (3a8660878839 Linux 6.18-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 +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. + security/commoncap.c | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) +Merging ipe/next (80bde9648247 ipe: Update documentation for script enforcement) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Auto-merging security/ipe/hooks.c +Auto-merging security/ipe/ipe.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/ipe.rst | 17 ++++++++++++++--- + security/ipe/audit.c | 1 + + security/ipe/hooks.c | 29 ++++++++++++++++++++++++++++- + security/ipe/hooks.h | 3 +++ + security/ipe/ipe.c | 1 + + 5 files changed, 47 insertions(+), 4 deletions(-) +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 (f7ae6d4ec652 PCI/TSM: Add 'dsm' and 'bound' attributes for dependent functions) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Auto-merging drivers/base/bus.c +Auto-merging drivers/pci/Makefile +Auto-merging drivers/pci/bus.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 81 ++ + Documentation/ABI/testing/sysfs-class-tsm | 19 + + .../ABI/testing/sysfs-devices-pci-host-bridge | 45 ++ + Documentation/driver-api/pci/index.rst | 1 + + Documentation/driver-api/pci/tsm.rst | 21 + + MAINTAINERS | 7 +- + drivers/Makefile | 2 +- + drivers/base/bus.c | 38 + + drivers/pci/Kconfig | 18 + + drivers/pci/Makefile | 2 + + drivers/pci/bus.c | 39 + + drivers/pci/doe.c | 2 - + drivers/pci/ide.c | 815 +++++++++++++++++++ + drivers/pci/pci-sysfs.c | 4 + + drivers/pci/pci.h | 21 + + drivers/pci/probe.c | 31 +- + drivers/pci/remove.c | 7 + + drivers/pci/search.c | 62 +- + drivers/pci/tsm.c | 900 +++++++++++++++++++++ + drivers/virt/coco/Kconfig | 3 + + drivers/virt/coco/Makefile | 1 + + drivers/virt/coco/tsm-core.c | 163 ++++ + include/linux/device/bus.h | 3 + + include/linux/ioport.h | 9 + + include/linux/pci-doe.h | 4 + + include/linux/pci-ide.h | 119 +++ + include/linux/pci-tsm.h | 243 ++++++ + include/linux/pci.h | 34 + + include/linux/tsm.h | 17 + + include/uapi/linux/pci_regs.h | 89 ++ + 30 files changed, 2786 insertions(+), 14 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-tsm + create mode 100644 Documentation/ABI/testing/sysfs-devices-pci-host-bridge + create mode 100644 Documentation/driver-api/pci/tsm.rst + create mode 100644 drivers/pci/ide.c + create mode 100644 drivers/pci/tsm.c + create mode 100644 drivers/virt/coco/tsm-core.c + create mode 100644 include/linux/pci-ide.h + create mode 100644 include/linux/pci-tsm.h +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. |