Google Git
Sign in
kernel / pub / scm / linux / kernel / git / sailus / linux-next / refs/heads/pm-direct-on-next / . / Next / merge.log
blob: d2e826a5e1dea292c086e0666452cfa088b40ef1 [file] [log] [blame]
$ date -R
Fri, 13 Jun 2025 08:45:20 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 488ef3560196 KEYS: Invert FINAL_PUT bit
Merging origin/master (27605c8c0f69 Merge tag 'net-6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating 488ef3560196..27605c8c0f69
Fast-forward (no commit created; -m option ignored)
.mailmap | 4 +
.../pinctrl/starfive,jh7110-aon-pinctrl.yaml | 2 +-
.../pinctrl/starfive,jh7110-sys-pinctrl.yaml | 2 +-
MAINTAINERS | 10 +-
arch/alpha/include/asm/pgtable.h | 2 +-
arch/arc/include/asm/arcregs.h | 2 +-
arch/arc/include/asm/atomic.h | 4 +-
arch/arc/include/asm/atomic64-arcv2.h | 15 +--
arch/arc/include/asm/bitops.h | 4 +-
arch/arc/include/asm/bug.h | 4 +-
arch/arc/include/asm/cache.h | 4 +-
arch/arc/include/asm/current.h | 4 +-
arch/arc/include/asm/dsp-impl.h | 2 +-
arch/arc/include/asm/dsp.h | 4 +-
arch/arc/include/asm/dwarf.h | 4 +-
arch/arc/include/asm/entry.h | 4 +-
arch/arc/include/asm/irqflags-arcv2.h | 4 +-
arch/arc/include/asm/irqflags-compact.h | 4 +-
arch/arc/include/asm/jump_label.h | 4 +-
arch/arc/include/asm/linkage.h | 6 +-
arch/arc/include/asm/mmu-arcv2.h | 4 +-
arch/arc/include/asm/mmu.h | 2 +-
arch/arc/include/asm/page.h | 4 +-
arch/arc/include/asm/pgtable-bits-arcv2.h | 6 +-
arch/arc/include/asm/pgtable-levels.h | 4 +-
arch/arc/include/asm/pgtable.h | 4 +-
arch/arc/include/asm/processor.h | 4 +-
arch/arc/include/asm/ptrace.h | 4 +-
arch/arc/include/asm/switch_to.h | 2 +-
arch/arc/include/asm/thread_info.h | 4 +-
arch/arc/include/uapi/asm/ptrace.h | 4 +-
arch/arc/kernel/unwind.c | 11 +-
arch/arm/include/asm/pgtable.h | 2 +-
arch/arm64/include/asm/pgtable.h | 2 +-
arch/csky/include/asm/pgtable.h | 2 +-
arch/hexagon/include/asm/pgtable.h | 2 +-
arch/loongarch/include/asm/pgtable.h | 2 +-
arch/m68k/include/asm/mcf_pgtable.h | 2 +-
arch/m68k/include/asm/motorola_pgtable.h | 2 +-
arch/m68k/include/asm/sun3_pgtable.h | 2 +-
arch/microblaze/include/asm/pgtable.h | 2 +-
arch/mips/include/asm/pgtable.h | 4 +-
arch/nios2/include/asm/pgtable.h | 2 +-
arch/openrisc/include/asm/pgtable.h | 2 +-
arch/parisc/include/asm/pgtable.h | 2 +-
arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +-
arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +-
arch/powerpc/include/asm/nohash/pgtable.h | 2 +-
arch/riscv/include/asm/pgtable.h | 2 +-
arch/s390/include/asm/pgtable.h | 2 +-
arch/sh/include/asm/pgtable_32.h | 2 +-
arch/sparc/include/asm/pgtable_32.h | 2 +-
arch/sparc/include/asm/pgtable_64.h | 2 +-
arch/um/include/asm/pgtable.h | 2 +-
arch/x86/include/asm/pgtable.h | 2 +-
arch/xtensa/include/asm/pgtable.h | 2 +-
drivers/bluetooth/btintel_pcie.c | 31 +++--
drivers/bluetooth/btintel_pcie.h | 10 +-
drivers/net/dsa/b53/b53_common.c | 6 +-
drivers/net/ethernet/airoha/airoha_regs.h | 3 +-
drivers/net/ethernet/freescale/enetc/Kconfig | 6 +-
drivers/net/ethernet/intel/e1000/e1000_main.c | 8 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +-
drivers/net/ethernet/intel/iavf/iavf_main.c | 11 ++
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 17 +++
drivers/net/ethernet/intel/ice/ice_ptp.c | 1 +
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +-
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 +-
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 21 +--
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 +-
.../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +-
.../mellanox/mlx5/core/steering/hws/action.c | 14 +-
.../mellanox/mlx5/core/steering/hws/bwc_complex.c | 19 ++-
.../mellanox/mlx5/core/steering/hws/definer.c | 3 +
.../mellanox/mlx5/core/steering/hws/fs_hws.c | 5 +-
.../mellanox/mlx5/core/steering/hws/mlx5hws.h | 1 +
drivers/net/macsec.c | 40 +++++-
drivers/net/netconsole.c | 3 +-
drivers/net/netdevsim/netdev.c | 3 +-
drivers/net/phy/mdio_bus.c | 12 ++
drivers/net/phy/phy_caps.c | 18 ++-
drivers/net/usb/r8152.c | 1 +
drivers/net/veth.c | 4 +-
drivers/net/wireless/ath/ath10k/mac.c | 33 +++--
drivers/net/wireless/ath/ath10k/snoc.c | 4 +-
drivers/net/wireless/ath/ath11k/core.c | 29 ++--
drivers/net/wireless/ath/ath11k/core.h | 4 +-
drivers/net/wireless/ath/ath11k/debugfs.c | 148 ++-------------------
drivers/net/wireless/ath/ath11k/debugfs.h | 10 +-
drivers/net/wireless/ath/ath11k/mac.c | 127 ++++++++++++------
drivers/net/wireless/ath/ath11k/mac.h | 4 +-
drivers/net/wireless/ath/ath11k/wmi.c | 49 ++++++-
drivers/net/wireless/ath/ath12k/core.c | 10 +-
drivers/net/wireless/ath/ath12k/hal.h | 3 +-
drivers/net/wireless/ath/ath12k/hw.c | 6 +
drivers/net/wireless/ath/ath12k/hw.h | 2 +
drivers/net/wireless/ath/ath12k/pci.c | 6 +-
drivers/net/wireless/ath/ath12k/pci.h | 4 +-
drivers/net/wireless/ath/wil6210/interrupt.c | 26 ++--
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +++-
drivers/net/wireless/marvell/mwifiex/11n.c | 6 +-
drivers/pinctrl/pinctrl-st.c | 5 -
drivers/pinctrl/pinctrl-tb10x.c | 2 +-
drivers/pinctrl/qcom/pinctrl-apq8064.c | 1 -
drivers/pinctrl/qcom/pinctrl-apq8084.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq4019.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq5018.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq5332.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq5424.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq6018.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq8064.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq8074.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq9574.c | 1 -
drivers/pinctrl/qcom/pinctrl-mdm9607.c | 1 -
drivers/pinctrl/qcom/pinctrl-mdm9615.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm.c | 11 +-
drivers/pinctrl/qcom/pinctrl-msm.h | 1 -
drivers/pinctrl/qcom/pinctrl-msm8226.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8660.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8909.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8916.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8917.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8953.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8960.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8976.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8994.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8996.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8998.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8x74.c | 1 -
drivers/pinctrl/qcom/pinctrl-qcm2290.c | 10 +-
drivers/pinctrl/qcom/pinctrl-qcs404.c | 1 -
drivers/pinctrl/qcom/pinctrl-qcs615.c | 1 -
drivers/pinctrl/qcom/pinctrl-qcs8300.c | 1 -
drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 1 -
drivers/pinctrl/qcom/pinctrl-qdu1000.c | 1 -
drivers/pinctrl/qcom/pinctrl-sa8775p.c | 1 -
drivers/pinctrl/qcom/pinctrl-sar2130p.c | 1 -
drivers/pinctrl/qcom/pinctrl-sc7180.c | 1 -
drivers/pinctrl/qcom/pinctrl-sc7280.c | 1 -
drivers/pinctrl/qcom/pinctrl-sc8180x.c | 1 -
drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 1 -
drivers/pinctrl/qcom/pinctrl-sdm660.c | 1 -
drivers/pinctrl/qcom/pinctrl-sdm670.c | 1 -
drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 -
drivers/pinctrl/qcom/pinctrl-sdx55.c | 1 -
drivers/pinctrl/qcom/pinctrl-sdx65.c | 1 -
drivers/pinctrl/qcom/pinctrl-sdx75.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm4450.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm6115.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm6125.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm6350.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm6375.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm7150.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8150.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8250.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8350.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8450.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8550.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8650.c | 1 -
drivers/pinctrl/qcom/pinctrl-sm8750.c | 1 -
drivers/pinctrl/qcom/pinctrl-x1e80100.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c | 8 +-
drivers/ptp/ptp_private.h | 12 +-
include/net/bluetooth/hci_core.h | 11 +-
include/net/bluetooth/hci_sync.h | 4 +-
include/net/sch_generic.h | 8 --
include/net/sock.h | 7 +-
net/bluetooth/eir.c | 17 ++-
net/bluetooth/eir.h | 2 +-
net/bluetooth/hci_conn.c | 31 ++++-
net/bluetooth/hci_core.c | 32 +++--
net/bluetooth/hci_sync.c | 45 +++++--
net/bluetooth/iso.c | 17 ++-
net/bluetooth/mgmt.c | 140 +++++++++----------
net/bluetooth/mgmt_util.c | 32 ++++-
net/bluetooth/mgmt_util.h | 4 +-
net/core/filter.c | 19 ++-
net/ethtool/ioctl.c | 3 +-
net/ipv6/route.c | 110 +++++++--------
net/sched/sch_ets.c | 2 +-
net/sched/sch_prio.c | 2 +-
net/sched/sch_red.c | 2 +-
net/sched/sch_sfq.c | 15 ++-
net/sched/sch_tbf.c | 2 +-
net/unix/af_unix.c | 3 +-
net/wireless/nl80211.c | 2 +-
tools/bpf/resolve_btfids/Makefile | 2 +-
tools/lib/bpf/btf.c | 6 +-
tools/testing/selftests/drivers/net/hw/rss_ctx.py | 59 +++++++-
tools/testing/selftests/net/Makefile | 1 +
tools/testing/selftests/net/nat6to4.sh | 15 +++
191 files changed, 923 insertions(+), 733 deletions(-)
create mode 100755 tools/testing/selftests/net/nat6to4.sh
Merging fixes/fixes (b3c623b9a94f Merge tag 'thermal-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
Already up to date.
Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes
Already up to date.
Merging vfs-brauner-fixes/vfs.fixes (ad5a0351064c VFS: change try_lookup_noperm() to skip revalidation)
$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes
Auto-merging fs/overlayfs/namei.c
Merge made by the 'ort' strategy.
fs/namei.c | 17 +++++++++++++----
fs/overlayfs/namei.c | 10 ++++++++--
fs/pidfs.c | 2 +-
fs/xattr.c | 1 +
include/linux/fs.h | 4 +++-
5 files changed, 26 insertions(+), 8 deletions(-)
Merging fscrypt-current/for-current (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
Already up to date.
Merging fsverity-current/for-current (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
Already up to date.
Merging btrfs-fixes/next-fixes (336f36773aec Merge branch 'misc-6.16' into next-fixes)
$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
Merge made by the 'ort' strategy.
Merging vfs-fixes/fixes (12f147ddd6de do_change_type(): refuse to operate on unmounted/not ours mounts)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
Already up to date.
Merging erofs-fixes/fixes (35076d2223c7 erofs: ensure the extra temporary copy is valid for shortened bvecs)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
Already up to date.
Merging nfsd-fixes/nfsd-fixes (d72c2f10a515 SUNRPC: Cleanup/fix initial rq_pages allocation)
$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
Merge made by the 'ort' strategy.
fs/nfsd/nfs4callback.c | 1 +
fs/nfsd/nfsctl.c | 5 ++---
net/sunrpc/svc.c | 6 +-----
3 files changed, 4 insertions(+), 8 deletions(-)
Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1)
$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
Already up to date.
Merging overlayfs-fixes/ovl-fixes (924577e4f6ca ovl: Fix nested backing file paths)
$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes
Already up to date.
Merging bcachefs/for-next (d7db0758f154 bcachefs: btree iter tracepoints)
$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next
Merge made by the 'ort' strategy.
fs/bcachefs/bcachefs.h | 3 +-
fs/bcachefs/btree_gc.c | 95 +++++++++++++++++++++++--------------
fs/bcachefs/btree_io.c | 26 +++++++---
fs/bcachefs/btree_iter.c | 67 ++++++++++++++++++++++++--
fs/bcachefs/btree_locking.c | 2 +-
fs/bcachefs/btree_locking.h | 6 ++-
fs/bcachefs/btree_types.h | 29 +++++++++++
fs/bcachefs/btree_update_interior.c | 64 ++++++++++++++++---------
fs/bcachefs/btree_update_interior.h | 7 +++
fs/bcachefs/chardev.c | 4 +-
fs/bcachefs/dirent.c | 2 +-
fs/bcachefs/disk_accounting.c | 4 +-
fs/bcachefs/error.c | 5 +-
fs/bcachefs/extent_update.c | 13 ++++-
fs/bcachefs/fs.c | 12 ++++-
fs/bcachefs/fsck.c | 12 +----
fs/bcachefs/inode.c | 2 +-
fs/bcachefs/io_read.c | 11 ++++-
fs/bcachefs/io_read.h | 1 +
fs/bcachefs/movinggc.c | 22 +++++----
fs/bcachefs/namei.c | 10 ++++
fs/bcachefs/rcu_pending.c | 22 ++++-----
fs/bcachefs/recovery.c | 27 ++++++++---
fs/bcachefs/recovery_passes.c | 14 ++++--
fs/bcachefs/sb-downgrade.c | 5 +-
fs/bcachefs/sb-errors_format.h | 10 ++--
fs/bcachefs/sb-members.c | 34 +++++++++++--
fs/bcachefs/str_hash.h | 2 +-
fs/bcachefs/super.c | 62 +++++++++++++++---------
fs/bcachefs/trace.h | 25 ++++++++++
fs/bcachefs/util.c | 10 +---
fs/bcachefs/util.h | 2 +-
32 files changed, 444 insertions(+), 166 deletions(-)
Merging fscrypt/for-next (c07d3aede2b2 fscrypt: add support for hardware-wrapped keys)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
Already up to date.
Merging btrfs/for-next (e281e86fc99f Merge branch 'for-next-next-v6.16-20250611' into for-next-20250611)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
Merge made by the 'ort' strategy.
fs/btrfs/Kconfig | 1 +
fs/btrfs/backref.c | 31 ++--
fs/btrfs/backref.h | 20 ++-
fs/btrfs/bio.c | 20 +--
fs/btrfs/btrfs_inode.h | 17 +++
fs/btrfs/ctree.c | 175 +++++++++++-----------
fs/btrfs/ctree.h | 18 +--
fs/btrfs/defrag.c | 48 +++---
fs/btrfs/delayed-inode.c | 111 +++++++-------
fs/btrfs/delayed-inode.h | 7 +-
fs/btrfs/delayed-ref.h | 6 +-
fs/btrfs/discard.c | 4 +-
fs/btrfs/disk-io.c | 28 +++-
fs/btrfs/extent-io-tree.c | 17 +--
fs/btrfs/extent-tree.c | 248 +++++++++++++++++++++++--------
fs/btrfs/extent-tree.h | 7 +-
fs/btrfs/extent_io.c | 118 +++++++--------
fs/btrfs/extent_io.h | 2 +-
fs/btrfs/fiemap.c | 2 +-
fs/btrfs/file-item.c | 2 +-
fs/btrfs/file.c | 29 ++--
fs/btrfs/free-space-cache.c | 35 +++--
fs/btrfs/free-space-cache.h | 8 +-
fs/btrfs/free-space-tree.c | 32 ++--
fs/btrfs/fs.h | 5 +-
fs/btrfs/inode-item.c | 11 +-
fs/btrfs/inode.c | 339 ++++++++++++++++++++++++-------------------
fs/btrfs/ioctl.c | 64 +++++++-
fs/btrfs/misc.h | 31 ++--
fs/btrfs/print-tree.c | 2 +-
fs/btrfs/qgroup.c | 168 +++++++++++----------
fs/btrfs/raid-stripe-tree.c | 7 +-
fs/btrfs/ref-verify.c | 146 ++++++++-----------
fs/btrfs/ref-verify.h | 4 +-
fs/btrfs/reflink.c | 20 +--
fs/btrfs/relocation.c | 38 +++--
fs/btrfs/scrub.c | 61 ++++----
fs/btrfs/space-info.c | 8 +-
fs/btrfs/space-info.h | 1 -
fs/btrfs/subpage.c | 239 +++++++++++++++---------------
fs/btrfs/subpage.h | 46 ++++--
fs/btrfs/super.c | 166 +++++++++++----------
fs/btrfs/sysfs.c | 16 +-
fs/btrfs/transaction.c | 38 ++---
fs/btrfs/tree-log.c | 159 +++++++++++---------
fs/btrfs/ulist.c | 55 ++++---
fs/btrfs/volumes.c | 16 +-
fs/btrfs/volumes.h | 3 +-
fs/btrfs/zoned.c | 5 +-
include/trace/events/btrfs.h | 2 +-
include/uapi/linux/btrfs.h | 53 +++++++
51 files changed, 1534 insertions(+), 1155 deletions(-)
Merging ceph/master (b828b4bf29d1 ceph: fix variable dereferenced before check in ceph_umount_begin())
$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
Already up to date.
Merging cifs/for-next (9f2b27e4f9e3 cifs: Fix lstat() and AT_SYMLINK_NOFOLLOW to work on broken symlink nodes)
$ 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.
Documentation/admin-guide/cifs/usage.rst | 2 ++
fs/smb/client/cached_dir.h | 8 ++---
fs/smb/client/cifsfs.c | 3 +-
fs/smb/client/connect.c | 10 ++++--
fs/smb/client/file.c | 9 +++--
fs/smb/client/inode.c | 24 +++++++++++++
fs/smb/client/readdir.c | 28 ++++++++-------
fs/smb/client/reparse.c | 61 +++++++++++++++++++++++++-------
fs/smb/client/smb2file.c | 10 +++---
9 files changed, 116 insertions(+), 39 deletions(-)
Merging configfs/configfs-next (c6b190822459 MAINTAINERS: add configfs Rust abstractions)
$ git merge -m Merge branch 'configfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next
Already up to date.
Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
Auto-merging fs/ecryptfs/crypto.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'ort' strategy.
fs/ecryptfs/crypto.c | 2 +-
fs/ecryptfs/ecryptfs_kernel.h | 1 -
fs/ecryptfs/keystore.c | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
Merging dlm/next (6f8b4788266c dlm: drop SCTP Kconfig dependency)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
Already up to date.
Merging erofs/dev (b4a29efc5146 erofs: support DEFLATE decompression by using Intel QAT)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
Already up to date.
Merging exfat/dev (46a557694b46 exfat: do not clear volume dirty flag during sync)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
Already up to date.
Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next
Already up to date.
Merging ext3/for_next (e56f3c6159f2 Merge unpriviledged fanotify watching.)
$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
Merge made by the 'ort' strategy.
Merging ext4/dev (7acd1b315cdc ext4: Add a WARN_ON_ONCE for querying LAST_IN_LEAF instead)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
Already up to date.
Merging f2fs/dev (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
Already up to date.
Merging fsverity/for-next (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
Already up to date.
Merging fuse/for-next (dabb90391028 fuse: increase readdir buffer size)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Already up to date.
Merging gfs2/for-next (fe4281644c62 Merge tag 'gfs2-for-6.16-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
Already up to date.
Merging jfs/jfs-next (5dff41a86377 jfs: fix array-index-out-of-bounds read in add_missing_indices)
$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
Already up to date.
Merging ksmbd/ksmbd-for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
Already up to date.
Merging nfs/linux-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (e3e3775392f3 flexfiles/pNFS: update stats on NFS4ERR_DELAY for v4.1 DSes)
$ 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 (245f35685cdb sunrpc: unexport csum_partial_copy_to_xdr)
$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
Merge made by the 'ort' strategy.
fs/nfsd/nfs3proc.c | 2 +-
fs/nfsd/nfs4state.c | 84 +++++++++++++++--------
fs/nfsd/nfsproc.c | 2 +-
fs/nfsd/state.h | 1 +
include/linux/sunrpc/xdr.h | 3 +-
net/sunrpc/socklib.c | 162 ++++++++++++++++-----------------------------
net/sunrpc/xdr.c | 11 ++-
7 files changed, 121 insertions(+), 144 deletions(-)
Merging ntfs3/master (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
Already up to date.
Merging orangefs/for-next (4dc784e92d4f orangefs: Convert to use the new mount API)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (6f9ccdad0fea ovl: Annotate struct ovl_entry with __counted_by())
$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
Already up to date.
Merging ubifs/next (2b6d96503255 jffs2: check jffs2_prealloc_raw_node_refs() result in few other places)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Already up to date.
Merging v9fs/9p-next (4210030d8bc4 docs: fs/9p: Add missing "not" in cache documentation)
$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
Already up to date.
Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
Already up to date.
Merging xfs/for-next (6d444c8db0ac Merge branch 'xfs-6.15-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
Auto-merging fs/xfs/xfs_super.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Resolved 'fs/xfs/xfs_super.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[fs-next b03c0d83448b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
$ git diff -M --stat --summary HEAD^..
Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
Already up to date.
Merging vfs-brauner/vfs.all (381011d6ae29 Merge branch 'vfs-6.17.async.dir' into vfs.all)
$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
Merge made by the 'ort' strategy.
Documentation/filesystems/porting.rst | 3 -
fs/backing-file.c | 4 +-
fs/coda/dir.c | 12 +-
fs/coredump.c | 344 +++--
fs/exportfs/expfs.c | 4 +-
fs/file_table.c | 13 +-
fs/internal.h | 1 +
fs/locks.c | 2 +-
fs/namei.c | 37 +-
fs/overlayfs/file.c | 2 +-
fs/pipe.c | 8 +-
fs/read_write.c | 2 +-
include/linux/filelock.h | 7 +-
include/linux/fs.h | 6 +-
include/uapi/linux/coredump.h | 104 ++
io_uring/openclose.c | 2 -
tools/include/uapi/linux/coredump.h | 104 ++
tools/testing/selftests/coredump/Makefile | 2 +-
tools/testing/selftests/coredump/config | 3 +
tools/testing/selftests/coredump/stackdump_test.c | 1679 ++++++++++++++++++---
20 files changed, 1939 insertions(+), 400 deletions(-)
create mode 100644 include/uapi/linux/coredump.h
create mode 100644 tools/include/uapi/linux/coredump.h
create mode 100644 tools/testing/selftests/coredump/config
Merging vfs/for-next (1b9892d82b6f Merge branch 'work.automount' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
Merge made by the 'ort' strategy.
Merging mm-hotfixes/mm-hotfixes-unstable (46697c7fa194 mm/hugetlb: remove unnecessary holding of hugetlb_lock)
$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
Documentation/filesystems/proc.rst | 4 ++-
MAINTAINERS | 1 +
drivers/rapidio/rio_cm.c | 3 ++
include/linux/fs.h | 6 ++--
include/linux/scatterlist.h | 4 +--
init/initramfs.c | 1 +
init/main.c | 1 +
kernel/kexec_handover.c | 29 ++++++++++-------
lib/scatterlist.c | 8 ++---
mm/gup.c | 14 +++++---
mm/hugetlb.c | 54 ++++++++++---------------------
mm/madvise.c | 2 ++
mm/memory.c | 20 ------------
mm/shmem.c | 6 +++-
mm/swap.h | 23 +++++++++++++
mm/userfaultfd.c | 33 +++++++++++++++++--
mm/util.c | 40 +++++++++++++++++++++++
mm/vma.c | 23 +++----------
mm/vma.h | 47 +++++++++++++++++++++++++++
tools/testing/selftests/mm/gup_longterm.c | 7 +++-
tools/testing/selftests/mm/settings | 2 +-
tools/testing/vma/vma_internal.h | 16 +++++++++
22 files changed, 238 insertions(+), 106 deletions(-)
Merging fs-current (a36bcf06b42e Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
$ git merge -m Merge branch 'fs-current' of linux-next fs-current
Auto-merging include/linux/fs.h
Merge made by the 'ort' strategy.
fs/namei.c | 17 +++++++++++++----
fs/nfsd/nfs4callback.c | 1 +
fs/nfsd/nfsctl.c | 5 ++---
fs/overlayfs/namei.c | 10 ++++++++--
fs/pidfs.c | 2 +-
fs/xattr.c | 1 +
include/linux/fs.h | 4 +++-
net/sunrpc/svc.c | 6 +-----
8 files changed, 30 insertions(+), 16 deletions(-)
Merging kbuild-current/fixes (8630c59e9936 Merge tag 'kbuild-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (179e949719fe ARC: Replace __ASSEMBLY__ with __ASSEMBLER__ in the non-uapi headers)
$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
Already up to date.
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (39dfc971e42d arm64/ptrace: Fix stack-out-of-bounds read in regs_get_kernel_stack_nth())
$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
Merge made by the 'ort' strategy.
Documentation/arch/arm64/booting.rst | 2 +-
arch/arm64/kernel/process.c | 4 +++-
arch/arm64/kernel/ptrace.c | 2 +-
arch/arm64/mm/mmu.c | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
Merging arm-soc-fixes/arm/fixes (070d04f002dd Merge tag 'mvebu-fixes-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes)
$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
Already up to date.
Merging davinci-current/davinci/for-current (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
Already up to date.
Merging drivers-memory-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes
Already up to date.
Merging sophgo-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes
Already up to date.
Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes
Already up to date.
Merging m68k-current/for-linus (f440518f379d m68k: defconfig: Update defconfigs for v6.15-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (0d67f0dee6c9 powerpc/vas: Return -EINVAL if the offset is non-zero in mmap())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
Already up to date.
Merging s390-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
Already up to date.
Merging net/main (27605c8c0f69 Merge tag 'net-6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
Already up to date.
Merging bpf/master (9cc7d5904bab Merge tag 'pinctrl-v6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
Already up to date.
Merging ipsec/master (766f6a784bdf Merge branch 'xfrm: fixes for xfrm_state_find under preemption')
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Auto-merging net/xfrm/xfrm_state.c
Merge made by the 'ort' strategy.
net/xfrm/xfrm_state.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
Merging netfilter/main (fdd9ebccfc32 Merge tag 'for-net-2025-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
Already up to date.
Merging ipvs/main (57a92d14659d net: phy: mscc: Stop clearing the the UDPv4 checksum for L2 frames)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
Already up to date.
Merging wireless/for-next (27605c8c0f69 Merge tag 'net-6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
Already up to date.
Merging ath/for-current (27605c8c0f69 Merge tag 'net-6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current
Already up to date.
Merging iwlwifi/fixes (f81aa834bfa9 wifi: iwlwifi: mld: Move regulatory domain initialization)
$ 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 git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
Already up to date.
Merging rdma-fixes/for-rc (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
Already up to date.
Merging sound-current/for-linus (4c267ae2ef34 ALSA: sb: Force to disable DMAs once when DMA mode is changed)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Merge made by the 'ort' strategy.
sound/isa/sb/sb16_main.c | 7 +++++++
sound/pci/ctxfi/xfi.c | 4 ++--
sound/pci/hda/hda_intel.c | 2 ++
sound/pci/hda/patch_realtek.c | 4 ++++
4 files changed, 15 insertions(+), 2 deletions(-)
Merging sound-asoc-fixes/for-linus (ba06528ad5a3 ASoC: amd: yc: Add quirk for MSI Bravo 17 D7VF internal mic)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
Merge made by the 'ort' strategy.
sound/soc/amd/yc/acp6x-mach.c | 7 +++++++
sound/soc/codecs/cs48l32.c | 4 ++++
sound/soc/codecs/es8326.c | 3 +--
sound/soc/loongson/loongson_i2s.c | 1 +
sound/soc/sdw_utils/soc_sdw_utils.c | 2 ++
5 files changed, 15 insertions(+), 2 deletions(-)
Merging regmap-fixes/for-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
Already up to date.
Merging regulator-fixes/for-linus (06118ae36855 regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt())
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
Merge made by the 'ort' strategy.
drivers/regulator/max20086-regulator.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Merging spi-fixes/for-linus (83f066fac3c2 spi: stm32-ospi: clean up on error in probe())
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
Merge made by the 'ort' strategy.
drivers/spi/spi-loongson-core.c | 1 +
drivers/spi/spi-offload.c | 2 +-
drivers/spi/spi-omap2-mcspi.c | 30 ++++++++++++++++++------------
drivers/spi/spi-pci1xxxx.c | 2 +-
drivers/spi/spi-stm32-ospi.c | 24 +++++++++++++++++++-----
5 files changed, 40 insertions(+), 19 deletions(-)
Merging pci-current/for-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'driver-core-linus' of git://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 (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
Already up to date.
Merging usb-serial-fixes/usb-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
Already up to date.
Merging phy/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
Already up to date.
Merging staging.current/staging-linus (8630c59e9936 Merge tag 'kbuild-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
Already up to date.
Merging iio-fixes/fixes-togreg (7cdfbc0113d0 iio: adc: ad7944: mask high bits on direct read)
$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
Already up to date.
Merging counter-current/counter-current (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
Already up to date.
Merging char-misc.current/char-misc-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
Already up to date.
Merging soundwire-fixes/fixes (86a4371b7697 soundwire: amd: fix for handling slave alerts after link is down)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
Merge made by the 'ort' strategy.
drivers/soundwire/amd_manager.c | 2 ++
1 file changed, 2 insertions(+)
Merging thunderbolt-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (805f5bbaa507 Input: psmouse - switch to use scnprintf() to suppress truncation warning)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Auto-merging drivers/input/mouse/alps.c
Merge made by the 'ort' strategy.
drivers/input/joystick/fsia6b.c | 2 +-
drivers/input/keyboard/atkbd.c | 4 ++--
drivers/input/misc/iqs626a.c | 2 +-
drivers/input/mouse/alps.c | 6 +++---
drivers/input/mouse/lifebook.c | 4 ++--
drivers/input/mouse/psmouse-base.c | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
Merging crypto-current/master (40a98e702b52 crypto: hkdf - move to late_initcall)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
Merge made by the 'ort' strategy.
crypto/hkdf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging libcrypto-fixes/libcrypto-fixes (34acef85bf47 crypto: lib/curve25519-hacl64 - Disable KASAN with clang-17 and older)
$ git merge -m Merge branch 'libcrypto-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes
Merge made by the 'ort' strategy.
lib/crypto/Makefile | 4 ++++
lib/crypto/aescfb.c | 8 ++++----
lib/crypto/aesgcm.c | 46 +++++++++++++++++++++++-----------------------
3 files changed, 31 insertions(+), 27 deletions(-)
Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to order)
$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
Already up to date.
Merging dmaengine-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/mtd/fixes (1c1fd374a2fe mtd: spinand: Fix build with gcc < 7.5)
$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (38fec10eb60d Linux 6.14)
$ 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 (c44572e0cc13 MIPS: Fix MAX_REG_OFFSET)
$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
Already up to date.
Merging at91-fixes/at91-fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (8046d29dde17 KVM: x86/mmu: Reject direct bits in gpa passed to KVM_PRE_FAULT_MEMORY)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
Merge made by the 'ort' strategy.
arch/arm64/include/asm/kvm_host.h | 34 +++++++++---
arch/arm64/kvm/arch_timer.c | 18 +++----
arch/arm64/kvm/debug.c | 4 +-
arch/arm64/kvm/fpsimd.c | 4 +-
arch/arm64/kvm/hyp/exception.c | 4 +-
arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +-
arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 6 +--
arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 +-
arch/arm64/kvm/hyp/vhe/switch.c | 4 +-
arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 46 ++++++++---------
arch/arm64/kvm/nested.c | 2 +-
arch/arm64/kvm/pmu-emul.c | 24 ++++-----
arch/arm64/kvm/sys_regs.c | 60 +++++++++++-----------
arch/arm64/kvm/sys_regs.h | 4 +-
arch/arm64/kvm/vgic/vgic-v3-nested.c | 10 ++--
arch/x86/kvm/mmu/mmu.c | 9 +++-
arch/x86/kvm/svm/sev.c | 44 ++++++++++++----
.../selftests/kvm/arm64/arch_timer_edge_cases.c | 39 +++++++++-----
18 files changed, 194 insertions(+), 126 deletions(-)
Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (78ca360f14d1 hwmon: (ltc4282) avoid repeated register write)
$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Merge made by the 'ort' strategy.
drivers/hwmon/ftsteutates.c | 9 +-
drivers/hwmon/ltc4282.c | 7 --
drivers/hwmon/occ/common.c | 238 ++++++++++++++++++--------------------------
3 files changed, 103 insertions(+), 151 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (62a65b32bddb dt-bindings: pmem: Convert binding to YAML)
$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.../devicetree/bindings/pmem/pmem-region.txt | 65 ----------------------
.../devicetree/bindings/pmem/pmem-region.yaml | 48 ++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 49 insertions(+), 66 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/pmem/pmem-region.txt
create mode 100644 Documentation/devicetree/bindings/pmem/pmem-region.yaml
Merging cxl-fixes/fixes (85cc50bfcb8b cxl/Documentation: Add more description about min/max scrub cycle)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-edac-scrub | 16 ++++++++++++++++
drivers/cxl/core/edac.c | 8 ++++++--
drivers/cxl/core/features.c | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
Merging dma-mapping-fixes/dma-mapping-fixes (aa807b9f22df dma-contiguous: hornor the cma address limit setup by user)
$ git merge -m Merge branch 'dma-mapping-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes
Merge made by the 'ort' strategy.
kernel/dma/contiguous.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Merging drivers-x86-fixes/fixes (3fbf25ecf8b7 MAINTAINERS: .mailmap: Update Hans de Goede's email address)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
Auto-merging .mailmap
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.mailmap | 1 +
MAINTAINERS | 72 +++++++-------
drivers/platform/x86/amd/hsmp/hsmp.c | 14 ++-
drivers/platform/x86/amd/pmc/pmc.c | 2 +
drivers/platform/x86/amd/pmf/core.c | 3 +-
drivers/platform/x86/amd/pmf/tee-if.c | 108 ++++++++-------------
drivers/platform/x86/dell/dell_rbu.c | 10 +-
drivers/platform/x86/ideapad-laptop.c | 19 +++-
drivers/platform/x86/intel/tpmi_power_domains.c | 4 +-
.../intel/uncore-frequency/uncore-frequency-tpmi.c | 9 +-
drivers/platform/x86/samsung-galaxybook.c | 1 +
11 files changed, 116 insertions(+), 127 deletions(-)
Merging samsung-krzk-fixes/fixes (5cac59c59bbc mux: mmio: Fix missing CONFIG_REGMAP_MMIO)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
Merge made by the 'ort' strategy.
drivers/mux/Kconfig | 1 +
1 file changed, 1 insertion(+)
Merging pinctrl-samsung-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
Already up to date.
Merging devicetree-fixes/dt/linus (f75794b6077e dt-bindings: serial: Convert altr,uart-1.0 to DT schema)
$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
Auto-merging Documentation/devicetree/bindings/soc/fsl/fsl,ls1028a-reset.yaml
Merge made by the 'ort' strategy.
.../bindings/display/bridge/ti,sn65dsi83.yaml | 4 ----
.../devicetree/bindings/serial/altera_jtaguart.txt | 5 -----
.../devicetree/bindings/serial/altera_uart.txt | 8 -------
.../devicetree/bindings/serial/altr,juart-1.0.yaml | 19 ++++++++++++++++
.../devicetree/bindings/serial/altr,uart-1.0.yaml | 25 ++++++++++++++++++++++
.../bindings/soc/fsl/fsl,ls1028a-reset.yaml | 2 +-
6 files changed, 45 insertions(+), 18 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/serial/altera_jtaguart.txt
delete mode 100644 Documentation/devicetree/bindings/serial/altera_uart.txt
create mode 100644 Documentation/devicetree/bindings/serial/altr,juart-1.0.yaml
create mode 100644 Documentation/devicetree/bindings/serial/altr,uart-1.0.yaml
Merging dt-krzk-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
Already up to date.
Merging scsi-fixes/fixes (5c3ba81923e0 scsi: error: alua: I/O errors for ALUA state transitions)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
Merge made by the 'ort' strategy.
drivers/s390/scsi/zfcp_sysfs.c | 2 ++
drivers/scsi/mvsas/mv_defs.h | 4 ++--
drivers/scsi/scsi_error.c | 3 ++-
drivers/scsi/scsi_transport_iscsi.c | 11 +++++------
drivers/scsi/storvsc_drv.c | 10 ++++++----
drivers/ufs/core/ufshcd.c | 7 ++++++-
6 files changed, 23 insertions(+), 14 deletions(-)
Merging drm-fixes/drm-fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (539d80575b81 mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
Merge made by the 'ort' strategy.
drivers/mmc/core/quirks.h | 12 ++++++------
drivers/mmc/host/mtk-sd.c | 3 ++-
drivers/mmc/host/sdhci-of-k1.c | 3 ++-
3 files changed, 10 insertions(+), 8 deletions(-)
Merging rtc-fixes/rtc-fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (14ae3003e73e Drivers: hv: Fix bad ref to hv_synic_eventring_tail when CPU goes offline)
$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
Already up to date.
Merging risc-v-fixes/fixes (2aa5801ada29 RISC-V: uaccess: Wrap the get_user_8 uaccess macro)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
Merge made by the 'ort' strategy.
arch/riscv/include/asm/runtime-const.h | 2 +-
arch/riscv/include/asm/uaccess.h | 3 ++-
arch/riscv/include/asm/vdso/getrandom.h | 2 +-
arch/riscv/include/asm/vector.h | 12 ++++-----
arch/riscv/kernel/vdso/vdso.lds.S | 2 +-
lib/raid6/rvv.c | 48 +++++++++++++++++++--------------
6 files changed, 39 insertions(+), 30 deletions(-)
Merging riscv-dt-fixes/riscv-dt-fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes
Already up to date.
Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes
Already up to date.
Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
Already up to date.
Merging spdx/spdx-linus (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
Already up to date.
Merging gpio-brgl-fixes/gpio/for-current (72f37957007d gpio: loongson-64bit: Correct Loongson-7A2000 ACPI GPIO access mode)
$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
MAINTAINERS | 2 +-
drivers/gpio/gpio-loongson-64bit.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging gpio-intel-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
Already up to date.
Merging pinctrl-intel-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
Already up to date.
Merging auxdisplay-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes
Already up to date.
Merging kunit-fixes/kunit-fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
Already up to date.
Merging memblock-fixes/fixes (da8bf5daa5e5 memblock: Accept allocated memory before use in memblock_double_array())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
Already up to date.
Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
Already up to date.
Merging perf-current/perf-tools (a913ef6fd883 perf callchain: Always populate the addr_location map when adding IP)
$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
Already up to date.
Merging efi-fixes/urgent (c33453d08a56 efi: Drop preprocessor directives from zboot.lds)
$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
Merge made by the 'ort' strategy.
drivers/firmware/efi/libstub/zboot.lds | 2 --
1 file changed, 2 deletions(-)
Merging battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
Already up to date.
Merging iommufd-fixes/for-rc (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
Already up to date.
Merging rust-fixes/rust-fixes (5b2d595efbfc rust: time: Fix compile error in impl_has_hr_timer macro)
$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
Merge made by the 'ort' strategy.
rust/kernel/time/hrtimer.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging w1-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
Already up to date.
Merging pmdomain-fixes/fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes
Already up to date.
Merging i2c-host-fixes/i2c/i2c-host-fixes (903cc7096db2 dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties)
$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes
Merge made by the 'ort' strategy.
.../bindings/i2c/nvidia,tegra20-i2c.yaml | 24 +++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus
Already up to date.
Merging clk-fixes/clk-fixes (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes
Already up to date.
Merging thead-clk-fixes/thead-clk-fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'thead-clk-fixes' of https://github.com/pdp7/linux.git thead-clk-fixes/thead-clk-fixes
Already up to date.
Merging pwrseq-fixes/pwrseq/for-current (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'pwrseq/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current
Already up to date.
Merging thead-dt-fixes/thead-dt-fixes (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes
Already up to date.
Merging ftrace-fixes/ftrace/fixes (2fa6a01345b5 tracing: Fix memory leak when reading set_event file)
$ git merge -m Merge branch 'ftrace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes
Already up to date.
Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio())
$ git merge -m Merge branch 'ring-buffer/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes
Already up to date.
Merging trace-fixes/trace/fixes (8a157d8a00e8 tracing: Do not free "head" on error path of filter_free_subsystem_filters())
$ git merge -m Merge branch 'trace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes
Merge made by the 'ort' strategy.
kernel/trace/trace_events_filter.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
$ git merge -m Merge branch 'tracefs/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes
Already up to date.
Merging spacemit-fixes/fixes (19272b37aa4f Linux 6.16-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 (41b6f51a8347 Merge branch into tip/master: 'x86/urgent')
$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent
Merge made by the 'ort' strategy.
arch/x86/Kconfig | 2 +-
arch/x86/include/asm/module.h | 8 ++
arch/x86/include/asm/sighandling.h | 22 ++++
arch/x86/include/asm/tdx.h | 2 +-
arch/x86/kernel/alternative.c | 79 +++++++++-----
arch/x86/kernel/signal_32.c | 4 +
arch/x86/kernel/signal_64.c | 4 +
arch/x86/mm/init_32.c | 3 -
arch/x86/mm/init_64.c | 3 -
arch/x86/mm/pat/set_memory.c | 3 +
arch/x86/virt/vmx/tdx/tdx.c | 5 +-
include/linux/execmem.h | 8 +-
include/linux/module.h | 5 -
include/linux/perf_event.h | 42 +++++++-
kernel/events/core.c | 116 +++++++++++++--------
kernel/exit.c | 17 +--
kernel/futex/core.c | 14 ++-
mm/execmem.c | 40 +------
.../selftests/futex/functional/futex_numa_mpol.c | 10 +-
.../selftests/futex/functional/futex_priv_hash.c | 2 +-
tools/testing/selftests/x86/Makefile | 2 +-
tools/testing/selftests/x86/sigtrap_loop.c | 101 ++++++++++++++++++
22 files changed, 350 insertions(+), 142 deletions(-)
create mode 100644 tools/testing/selftests/x86/sigtrap_loop.c
Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up slab->obj_exts always)
$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes
Already up to date.
Merging drm-msm-fixes/msm-fixes (0838fc3e6718 drm/msm/adreno: Check for recognized GPU before bind)
$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes
Auto-merging drivers/gpu/drm/msm/msm_gpu.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 --
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 18 ++++++++
drivers/gpu/drm/msm/adreno/adreno_device.c | 39 ++++++++++++----
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 54 +++++++++++++++++-----
drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +
.../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 14 ++++--
drivers/gpu/drm/msm/dp/dp_display.c | 7 ++-
drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 7 +++
drivers/gpu/drm/msm/msm_debugfs.c | 32 +++++++++++++
drivers/gpu/drm/msm/msm_drv.c | 10 ++--
drivers/gpu/drm/msm/msm_drv.h | 23 +++++++++
drivers/gpu/drm/msm/msm_gem_submit.c | 17 ++++++-
drivers/gpu/drm/msm/msm_gpu.c | 20 ++++----
drivers/gpu/drm/msm/msm_gpu.h | 9 ++--
drivers/gpu/drm/msm/msm_iommu.c | 12 ++---
drivers/gpu/drm/msm/msm_mmu.h | 2 +-
.../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 3 +-
drivers/gpu/drm/msm/registers/gen_header.py | 8 ++--
19 files changed, 217 insertions(+), 67 deletions(-)
Merging uml-fixes/fixes (01f95500a162 Merge tag 'uml-for-linux-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
Already up to date.
Merging fwctl-fixes/for-rc (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-rc' of git//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 git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (8ecbad4853f8 drm/arm/malidp: Silence informational message)
$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes
Merge made by the 'ort' strategy.
drivers/accel/amdxdna/aie2_psp.c | 4 +--
drivers/dma-buf/dma-buf.c | 2 +-
drivers/dma-buf/udmabuf.c | 5 ++-
drivers/gpu/drm/arm/malidp_planes.c | 2 +-
drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 +-
drivers/gpu/drm/meson/meson_vclk.c | 55 ++++++++++++++++++------------
drivers/gpu/drm/sitronix/Kconfig | 1 +
drivers/gpu/drm/solomon/ssd130x.c | 2 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 12 +++----
9 files changed, 49 insertions(+), 36 deletions(-)
Merging linus/for-next (ffd294d346d1 Linux 6.13)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linus/for-next
Already up to date.
Merging mm-stable/mm-stable (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
Already up to date.
Merging mm-nonmm-stable/mm-nonmm-stable (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
Already up to date.
Merging mm-unstable/mm-unstable (51418be98e2d mm/memfd: clarify error handling labels in memfd_create())
$ git merge -m Merge branch 'mm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable
Auto-merging MAINTAINERS
Auto-merging arch/arm64/include/asm/pgtable.h
Auto-merging include/linux/fs.h
Auto-merging mm/damon/Kconfig
Merge made by the 'ort' strategy.
Documentation/admin-guide/mm/damon/index.rst | 1 +
Documentation/admin-guide/mm/damon/stat.rst | 69 ++++
Documentation/core-api/memory-hotplug.rst | 76 +++-
Documentation/mm/process_addrs.rst | 54 ++-
.../translations/zh_CN/core-api/memory-hotplug.rst | 3 -
MAINTAINERS | 5 +
arch/arm64/include/asm/pgtable.h | 8 +
arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +-
drivers/acpi/numa/hmat.c | 8 +-
drivers/base/memory.c | 21 +-
drivers/base/node.c | 117 +++---
drivers/cxl/core/region.c | 16 +-
drivers/cxl/cxl.h | 4 +-
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +-
drivers/gpu/drm/ttm/ttm_backup.c | 9 +-
fs/fuse/file.c | 11 -
fs/hugetlbfs/inode.c | 19 +
fs/nfs/write.c | 2 +-
fs/proc/generic.c | 2 +
fs/proc/inode.c | 2 +-
fs/proc/internal.h | 5 +
fs/proc/task_mmu.c | 14 +-
fs/userfaultfd.c | 76 ++--
include/asm-generic/codetag.lds.h | 6 -
include/linux/fs.h | 11 +-
include/linux/ksm.h | 8 +-
include/linux/memory.h | 20 +-
include/linux/mm.h | 5 +
include/linux/mmdebug.h | 12 +
include/linux/mmzone.h | 14 +-
include/linux/node.h | 81 ++--
include/linux/pageblock-flags.h | 8 +-
include/linux/pgtable.h | 11 +
include/linux/proc_fs.h | 1 +
include/linux/shmem_fs.h | 5 +-
include/linux/userfaultfd_k.h | 6 +-
include/linux/vmstat.h | 4 +-
include/linux/writeback.h | 11 -
include/trace/events/btrfs.h | 7 +-
include/trace/events/mmap.h | 52 ---
include/trace/events/writeback.h | 8 +-
init/Kconfig | 1 +
kernel/cgroup/cpuset.c | 2 +-
lib/test_hmm.c | 14 +-
lib/xarray.c | 3 +
mm/Kconfig | 17 +-
mm/cma.c | 4 +-
mm/damon/Kconfig | 16 +
mm/damon/Makefile | 1 +
mm/damon/stat.c | 246 +++++++++++
mm/filemap.c | 65 ++-
mm/gup.c | 41 +-
mm/hugetlb.c | 4 +-
mm/internal.h | 3 +-
mm/ksm.c | 51 ++-
mm/list_lru.c | 34 +-
mm/madvise.c | 209 +++++++---
mm/memfd.c | 8 +-
mm/memory-tiers.c | 19 +-
mm/memory_hotplug.c | 172 ++++----
mm/mempolicy.c | 26 +-
mm/mm_init.c | 2 +-
mm/page_alloc.c | 42 +-
mm/page_ext.c | 16 +-
mm/page_io.c | 71 ++--
mm/readahead.c | 36 +-
mm/shmem.c | 18 +-
mm/slub.c | 60 +--
mm/swap.h | 9 +-
mm/userfaultfd.c | 66 ++-
mm/vma.c | 44 +-
mm/vmscan.c | 233 +++++------
mm/vmstat.c | 449 +++++++++++----------
mm/zswap.c | 5 +-
scripts/module.lds.S | 5 -
tools/mm/show_page_info.py | 169 ++++++++
tools/testing/selftests/mm/cow.c | 44 +-
tools/testing/selftests/mm/merge.c | 83 +++-
tools/testing/selftests/mm/run_vmtests.sh | 4 +-
tools/testing/vma/vma_internal.h | 11 +
80 files changed, 1959 insertions(+), 1141 deletions(-)
create mode 100644 Documentation/admin-guide/mm/damon/stat.rst
create mode 100644 mm/damon/stat.c
create mode 100644 tools/mm/show_page_info.py
Merging mm-nonmm-unstable/mm-nonmm-unstable (00a61893568c bcache: fix the tail IO latency regression by using equality-aware min heap API)
$ git merge -m Merge branch 'mm-nonmm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable
Merge made by the 'ort' strategy.
Documentation/core-api/min_heap.rst | 20 ++++++
arch/alpha/kernel/core_marvel.c | 11 +--
arch/riscv/Kconfig | 1 +
arch/riscv/kernel/setup.c | 5 ++
drivers/md/bcache/alloc.c | 15 +++--
fs/ocfs2/stack_user.c | 15 ++---
include/linux/gcd.h | 3 +
include/linux/jhash.h | 8 +--
include/linux/min_heap.h | 131 ++++++++++++++++++++++++++++++------
kernel/fork.c | 73 ++++++++++----------
kernel/relay.c | 3 +-
lib/math/gcd.c | 27 ++++----
lib/min_heap.c | 23 ++++---
13 files changed, 230 insertions(+), 105 deletions(-)
Merging kbuild/for-next (8630c59e9936 Merge tag 'kbuild-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
Already up to date.
Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
Already up to date.
Merging perf/perf-tools-next (ae0756933e87 perf thread: Ensure comm_lock held for comm_list)
$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
Merge made by the 'ort' strategy.
tools/build/Makefile.feature | 6 ---
tools/build/feature/Makefile | 21 ---------
tools/perf/Documentation/perf-trace.txt | 8 ----
tools/perf/bench/evlist-open-close.c | 36 +++++++++------
tools/perf/builtin-ftrace.c | 1 -
tools/perf/builtin-kvm.c | 2 -
tools/perf/builtin-record.c | 27 ++++++-----
tools/perf/builtin-stat.c | 4 +-
tools/perf/builtin-top.c | 22 +++++----
tools/perf/builtin-trace.c | 27 +++++++----
tools/perf/jvmti/libjvmti.c | 4 +-
tools/perf/tests/backward-ring-buffer.c | 1 -
tools/perf/tests/event-times.c | 8 ++--
tools/perf/tests/keep-tracking.c | 2 +-
tools/perf/tests/mmap-basic.c | 2 +-
tools/perf/tests/openat-syscall-all-cpus.c | 2 +-
tools/perf/tests/openat-syscall-tp-fields.c | 1 -
tools/perf/tests/openat-syscall.c | 2 +-
tools/perf/tests/perf-record.c | 1 -
tools/perf/tests/perf-time-to-tsc.c | 2 +-
tools/perf/tests/shell/record.sh | 26 +++++++++++
tools/perf/tests/shell/trace_btf_enum.sh | 17 +++----
tools/perf/tests/shell/trace_btf_general.sh | 19 ++++----
tools/perf/tests/switch-tracking.c | 2 +-
tools/perf/tests/task-exit.c | 1 -
tools/perf/tests/thread-map.c | 2 +-
tools/perf/util/bpf-filter.c | 30 +++++++++++-
tools/perf/util/bpf-filter.h | 3 ++
tools/perf/util/cap.c | 1 -
tools/perf/util/cap.h | 5 ++
tools/perf/util/comm.c | 2 +
tools/perf/util/db-export.c | 11 +++--
tools/perf/util/evlist.c | 3 +-
tools/perf/util/parse-events.c | 47 ++++++++++++++-----
tools/perf/util/parse-events.h | 2 +
tools/perf/util/python.c | 10 ++--
.../util/scripting-engines/trace-event-python.c | 2 +-
tools/perf/util/target.c | 54 +++-------------------
tools/perf/util/target.h | 15 ++----
tools/perf/util/thread.c | 26 +++++++++--
tools/perf/util/thread.h | 11 +++--
tools/perf/util/thread_map.c | 32 ++-----------
tools/perf/util/thread_map.h | 6 +--
tools/perf/util/top.c | 4 +-
tools/perf/util/top.h | 1 +
45 files changed, 260 insertions(+), 251 deletions(-)
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 (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'dma-mapping-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next
Already up to date.
Merging asm-generic/master (582847f97024 Makefile.kcov: apply needed compiler option unconditionally in CFLAGS_KCOV)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
Already up to date.
Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
$ git merge -m Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next
Already up to date.
Merging arm/for-next (293bb049380e ARM: 9446/1: Disallow kernel mode NEON when IRQs are disabled)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next
Already up to date.
Merging arm64/for-next/core (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
Already up to date.
Merging arm-perf/for-next/perf (8c138a189f6d perf/arm-cmn: Add CMN S3 ACPI binding)
$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
Already up to date.
Merging arm-soc/for-next (ffa1d4e41f30 Merge branch 'soc/dt' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
Merge made by the 'ort' strategy.
arch/arm/arm-soc-for-next-contents.txt | 209 +++++++++++++++++++++++++++++++++
1 file changed, 209 insertions(+)
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging amlogic/for-next (9eefedf65051 Merge branch 'v6.17/arm64-dt' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
Merge made by the 'ort' strategy.
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging asahi-soc/asahi-soc/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
Already up to date.
Merging aspeed/for-next (34c87a24e268 Merge branches 'aspeed/dt', 'aspeed/fixes', 'aspeed/drivers', 'nuvoton/arm/dt' and 'nuvoton/arm64/dt' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 +
.../devicetree/bindings/ipmi/ipmb-dev.yaml | 56 +
arch/arm/boot/dts/aspeed/Makefile | 2 +-
.../boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts | 2 +-
.../aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +-
.../dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts | 2 +-
.../boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts | 4 +-
.../boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts | 2 +-
.../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 5 -
.../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 197 +++-
.../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 2 +-
.../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 2 +-
.../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 4 +-
.../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 139 ++-
.../boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts | 46 +-
.../boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts | 68 +-
.../dts/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts | 1128 ++++++++++++++++++++
.../arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 14 +-
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 10 +-
.../boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts | 40 +-
.../arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 6 +-
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 974 -----------------
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 8 +-
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 93 +-
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 109 +-
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 249 +++--
26 files changed, 1773 insertions(+), 1394 deletions(-)
create mode 100644 Documentation/devicetree/bindings/ipmi/ipmb-dev.yaml
create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts
delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts
Merging at91/at91-next (05aeace8757f Merge branch 'at91-dt' into at91-next)
$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
Merge made by the 'ort' strategy.
Merging broadcom/next (72538b5e06da Merge branch 'maintainers/next' into next)
$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.../bindings/clock/raspberrypi,rp1-clocks.yaml | 58 +
.../devicetree/bindings/misc/pci1de4,1.yaml | 137 ++
.../bindings/pinctrl/raspberrypi,rp1-gpio.yaml | 198 +++
.../devicetree/bindings/rng/brcm,iproc-rng200.yaml | 6 +
MAINTAINERS | 8 +
arch/arm/boot/dts/broadcom/bcm63138.dtsi | 79 +-
arch/arm/boot/dts/broadcom/bcm63148.dtsi | 64 +
arch/arm/boot/dts/broadcom/bcm63178.dtsi | 112 ++
arch/arm/boot/dts/broadcom/bcm6846.dtsi | 1 +
arch/arm/boot/dts/broadcom/bcm6855.dtsi | 127 ++
arch/arm/boot/dts/broadcom/bcm6878.dtsi | 120 +-
.../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi | 7 +-
arch/arm64/boot/dts/broadcom/Makefile | 4 +-
.../boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts | 121 ++
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 113 +-
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 120 +-
arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 129 ++
arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 130 +-
arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 119 +-
arch/arm64/boot/dts/broadcom/rp1-common.dtsi | 42 +
arch/arm64/boot/dts/broadcom/rp1-nexus.dtsi | 14 +
arch/arm64/boot/dts/broadcom/rp1.dtso | 11 +
arch/arm64/configs/defconfig | 4 +
drivers/clk/Kconfig | 9 +
drivers/clk/Makefile | 1 +
drivers/clk/clk-rp1.c | 1494 ++++++++++++++++++++
drivers/misc/Kconfig | 1 +
drivers/misc/Makefile | 1 +
drivers/misc/rp1/Kconfig | 20 +
drivers/misc/rp1/Makefile | 3 +
drivers/misc/rp1/rp1-pci.dtso | 25 +
drivers/misc/rp1/rp1_pci.c | 333 +++++
drivers/pci/quirks.c | 1 +
drivers/pinctrl/Kconfig | 11 +
drivers/pinctrl/Makefile | 1 +
drivers/pinctrl/pinctrl-rp1.c | 790 +++++++++++
include/dt-bindings/clock/raspberrypi,rp1-clocks.h | 61 +
include/linux/pci_ids.h | 3 +
38 files changed, 4363 insertions(+), 115 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/raspberrypi,rp1-clocks.yaml
create mode 100644 Documentation/devicetree/bindings/misc/pci1de4,1.yaml
create mode 100644 Documentation/devicetree/bindings/pinctrl/raspberrypi,rp1-gpio.yaml
create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
create mode 100644 arch/arm64/boot/dts/broadcom/rp1-common.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/rp1-nexus.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/rp1.dtso
create mode 100644 drivers/clk/clk-rp1.c
create mode 100644 drivers/misc/rp1/Kconfig
create mode 100644 drivers/misc/rp1/Makefile
create mode 100644 drivers/misc/rp1/rp1-pci.dtso
create mode 100644 drivers/misc/rp1/rp1_pci.c
create mode 100644 drivers/pinctrl/pinctrl-rp1.c
create mode 100644 include/dt-bindings/clock/raspberrypi,rp1-clocks.h
Merging davinci/davinci/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
Already up to date.
Merging drivers-memory/for-next (a0be20055d41 memory: omap-gpmx: Use dev_fwnode())
$ 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.
.../bindings/memory-controllers/arm,pl172.txt | 127 ------------
.../bindings/memory-controllers/arm,pl172.yaml | 222 +++++++++++++++++++++
drivers/memory/emif.c | 1 +
drivers/memory/mtk-smi.c | 33 +++
drivers/memory/omap-gpmc.c | 4 +-
drivers/memory/stm32_omm.c | 21 +-
6 files changed, 264 insertions(+), 144 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl172.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl172.yaml
Merging imx-mxs/for-next (1a2ad59da68d arm64: dts: imx8mp: Enable gpu passive throttling)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
Merge made by the 'ort' strategy.
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 13 +++++++++++--
arch/arm64/boot/dts/freescale/imx95.dtsi | 10 ++++------
2 files changed, 15 insertions(+), 8 deletions(-)
Merging mediatek/for-next (6df944d2cf58 Merge branch 'v6.15-next/dts64' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
Merge made by the 'ort' strategy.
Merging mvebu/for-next (89373e7d4125 Merge branch 'mvebu/dt' into mvebu/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
Merge made by the 'ort' strategy.
arch/arm/boot/dts/marvell/kirkwood-km_common.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging omap/for-next (6d658392b3f0 Merge branch 'omap-for-v6.16/drivers' into tmp/omap-next-20250508.062442)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next
Merge made by the 'ort' strategy.
Merging qcom/for-next (82cd89a5220c Merge branches 'arm32-for-6.17', 'arm64-defconfig-fixes-for-6.16', 'arm64-defconfig-for-6.17', 'arm64-fixes-for-6.16', 'arm64-for-6.17' and 'clk-for-6.17' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'ort' strategy.
Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
.../bindings/clock/qcom,sa8775p-camcc.yaml | 15 +
.../bindings/clock/qcom,sc8180x-camcc.yaml | 67 +
.../bindings/clock/qcom,sm8450-camcc.yaml | 20 +-
.../bindings/clock/qcom,sm8450-videocc.yaml | 18 +-
arch/arm/boot/dts/qcom/Makefile | 1 +
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 10 +-
.../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 3 +-
.../qcom/qcom-msm8974-sony-xperia-rhine-amami.dts | 16 +
.../qcom/qcom-msm8974-sony-xperia-rhine-honami.dts | 16 +
.../qcom/qcom-msm8974-sony-xperia-rhine-togari.dts | 16 +
.../dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 20 +-
.../dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 1 +
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 20 +-
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 40 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 54 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 20 +-
arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 4 +
arch/arm64/boot/dts/qcom/qcs8300.dtsi | 71 +
arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 232 ++
arch/arm64/boot/dts/qcom/sa8775p.dtsi | 205 +-
arch/arm64/boot/dts/qcom/sar2130p.dtsi | 12 +-
arch/arm64/boot/dts/qcom/sc7280.dtsi | 14 +-
arch/arm64/boot/dts/qcom/sc8180x.dtsi | 38 +-
.../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +
arch/arm64/boot/dts/qcom/sdm845.dtsi | 40 +-
.../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 6 +
arch/arm64/boot/dts/qcom/sm6350.dtsi | 14 +
arch/arm64/boot/dts/qcom/sm8150.dtsi | 12 +-
arch/arm64/boot/dts/qcom/sm8250.dtsi | 18 +-
arch/arm64/boot/dts/qcom/sm8350.dtsi | 12 +-
arch/arm64/boot/dts/qcom/sm8650.dtsi | 3 +-
arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 215 ++
arch/arm64/boot/dts/qcom/sm8750-qrd.dts | 225 ++
arch/arm64/boot/dts/qcom/sm8750.dtsi | 126 +-
.../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 59 +-
.../boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 98 +-
arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 1 +
arch/arm64/boot/dts/qcom/x1e80100.dtsi | 20 +-
arch/arm64/boot/dts/qcom/x1p42100.dtsi | 556 ++++
arch/arm64/configs/defconfig | 4 +
drivers/clk/qcom/Kconfig | 19 +
drivers/clk/qcom/Makefile | 2 +
drivers/clk/qcom/camcc-sc8180x.c | 2889 ++++++++++++++++++++
drivers/clk/qcom/camcc-sm8450.c | 89 +-
drivers/clk/qcom/camcc-sm8550.c | 85 +-
drivers/clk/qcom/camcc-sm8650.c | 83 +-
drivers/clk/qcom/camcc-x1e80100.c | 67 +-
drivers/clk/qcom/clk-alpha-pll.c | 57 +
drivers/clk/qcom/clk-alpha-pll.h | 3 +
drivers/clk/qcom/common.c | 81 +-
drivers/clk/qcom/common.h | 10 +
drivers/clk/qcom/dispcc-sm8750.c | 10 +-
drivers/clk/qcom/gcc-ipq8074.c | 6 +-
drivers/clk/qcom/videocc-sc7180.c | 2 +-
drivers/clk/qcom/videocc-sdm845.c | 4 +-
drivers/clk/qcom/videocc-sm6350.c | 355 +++
drivers/clk/qcom/videocc-sm7150.c | 4 +-
drivers/clk/qcom/videocc-sm8150.c | 4 +-
drivers/clk/qcom/videocc-sm8450.c | 62 +-
drivers/clk/qcom/videocc-sm8550.c | 66 +-
include/dt-bindings/clock/qcom,gcc-sc8180x.h | 10 +
include/dt-bindings/clock/qcom,sc8180x-camcc.h | 181 ++
63 files changed, 6020 insertions(+), 394 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc8180x-camcc.yaml
create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-togari.dts
create mode 100644 drivers/clk/qcom/camcc-sc8180x.c
create mode 100644 drivers/clk/qcom/videocc-sm6350.c
create mode 100644 include/dt-bindings/clock/qcom,sc8180x-camcc.h
Merging renesas/next (a4b72ba3d3e5 Merge branches 'renesas-arm-defconfig-for-v6.17', 'renesas-drivers-for-v6.17', 'renesas-dt-bindings-for-v6.17' and 'renesas-dts-for-v6.17' into renesas-next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'ort' strategy.
.../devicetree/bindings/soc/renesas/renesas.yaml | 2 +-
.../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 60 +++
arch/arm64/boot/dts/renesas/Makefile | 3 +
.../boot/dts/renesas/r8a779g3-sparrow-hawk.dts | 26 +-
arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 90 ++++
.../renesas/r9a09g047e57-smarc-cru-csi-ov5645.dtso | 21 +
arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 10 +
arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 569 +++++++++++++++++++++
.../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 211 ++++++++
arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 322 ++++++++++++
.../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 133 +++++
arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 6 +
arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 46 ++
arch/arm64/configs/defconfig | 3 +-
drivers/soc/renesas/Kconfig | 6 +
15 files changed, 1493 insertions(+), 15 deletions(-)
create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e57-smarc-cru-csi-ov5645.dtso
Merging reset/reset/next (1c64de886b88 dt-bindings: reset: sophgo: Add SG2044 bindings.)
$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
Already up to date.
Merging rockchip/for-next (44b0c3fa2f3a Merge branch 'v6.17-armsoc/dts64' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/arm/rockchip.yaml | 17 +
.../devicetree/bindings/vendor-prefixes.yaml | 4 +
arch/arm64/boot/dts/rockchip/Makefile | 17 +
.../boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts | 265 +++++++
.../boot/dts/rockchip/rk3399-rockpro64-screen.dtso | 86 ++
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 64 --
arch/arm64/boot/dts/rockchip/rk3528.dtsi | 28 +
arch/arm64/boot/dts/rockchip/rk3562.dtsi | 37 +-
.../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +-
.../boot/dts/rockchip/rk3576-armsom-sige5.dts | 35 +-
.../boot/dts/rockchip/rk3576-luckfox-core3576.dtsi | 749 ++++++++++++++++++
.../boot/dts/rockchip/rk3576-luckfox-omni3576.dts | 51 ++
arch/arm64/boot/dts/rockchip/rk3576.dtsi | 2 +-
.../boot/dts/rockchip/rk3588-base-pinctrl.dtsi | 20 +-
.../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 1 +
.../boot/dts/rockchip/rk3588-extra-pinctrl.dtsi | 5 +-
.../rockchip/rk3588-jaguar-ethernet-switch.dtso | 195 +++++
.../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 878 ++++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 881 +--------------------
arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 105 +++
.../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 11 -
arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 1 +
.../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 66 +-
arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi | 35 +
25 files changed, 2564 insertions(+), 993 deletions(-)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64-screen.dtso
create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-luckfox-core3576.dtsi
create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-luckfox-omni3576.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-jaguar-ethernet-switch.dtso
create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
Merging samsung-krzk/for-next (d1598ed132fa Merge branches 'next/clk' and 'next/dt64' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
Auto-merging MAINTAINERS
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'ort' strategy.
.../bindings/arm/samsung/samsung-boards.yaml | 6 +
.../clock/samsung,exynosautov920-clock.yaml | 37 +-
.../bindings/soc/samsung/exynos-pmu.yaml | 3 +
MAINTAINERS | 10 +
arch/arm64/boot/dts/exynos/Makefile | 1 +
arch/arm64/boot/dts/exynos/exynos2200-g0s.dts | 169 ++
arch/arm64/boot/dts/exynos/exynos2200-pinctrl.dtsi | 1765 ++++++++++++++++++++
arch/arm64/boot/dts/exynos/exynos2200.dtsi | 561 +++++++
arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 17 +
arch/arm64/configs/defconfig | 2 +-
drivers/clk/samsung/clk-exynos850.c | 2 +-
drivers/clk/samsung/clk-exynosautov920.c | 72 +
drivers/clk/samsung/clk-gs101.c | 4 +-
drivers/firmware/samsung/exynos-acpm.c | 27 +-
include/dt-bindings/clock/samsung,exynosautov920.h | 9 +
15 files changed, 2658 insertions(+), 27 deletions(-)
create mode 100644 arch/arm64/boot/dts/exynos/exynos2200-g0s.dts
create mode 100644 arch/arm64/boot/dts/exynos/exynos2200-pinctrl.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos2200.dtsi
Merging scmi/for-linux-next (719a2bed3aab Merge branch 'for-next/smccc/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
Merge made by the 'ort' strategy.
drivers/firmware/arm_ffa/driver.c | 71 ++++++++++++++++++++-------------------
drivers/firmware/smccc/smccc.c | 5 +--
include/linux/arm_ffa.h | 1 +
3 files changed, 38 insertions(+), 39 deletions(-)
Merging sophgo/for-next (3a8cef361be5 riscv: dts: sophgo: cv18xx: Add RTCSYS device node)
$ 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 | 12 ++++++++++++
1 file changed, 12 insertions(+)
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 (37df56ac5002 riscv: dts: spacemit: enable eMMC for K1 SoC)
$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next
Merge made by the 'ort' strategy.
arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 10 ++++++++++
arch/riscv/boot/dts/spacemit/k1.dtsi | 9 +++++++++
2 files changed, 19 insertions(+)
Merging stm32/stm32-next (dc392342b7bb ARM: dts: stm32: Add nvmem-cells to ethernet nodes for constant mac-addresses)
$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
Auto-merging MAINTAINERS
Auto-merging arch/arm/boot/dts/st/stm32mp131.dtsi
Auto-merging arch/arm/boot/dts/st/stm32mp133.dtsi
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'ort' strategy.
arch/arm/boot/dts/st/stm32mp131.dtsi | 2 ++
arch/arm/boot/dts/st/stm32mp133.dtsi | 2 ++
2 files changed, 4 insertions(+)
Merging sunxi/sunxi/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
Already up to date.
Merging tee/next (c580875fc93a Merge branch 'optee_fix_for_6.16' into next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next
Merge made by the 'ort' strategy.
drivers/tee/optee/ffa_abi.c | 41 ++++++++++++++++++++++++++++++---------
drivers/tee/optee/optee_private.h | 2 ++
2 files changed, 34 insertions(+), 9 deletions(-)
Merging tegra/for-next (5e98350146c3 Merge branch for-6.16/arm64/dt into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
Merge made by the 'ort' strategy.
Merging thead-dt/thead-dt-for-next (a4c95b924d51 riscv: dts: thead: Add device tree VO clock controller)
$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next
Already up to date.
Merging ti/ti-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
Already up to date.
Merging xilinx/for-next (487e52a21734 firmware: xilinx: Add debugfs support for PM_GET_NODE_STATUS)
$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
Merge made by the 'ort' strategy.
drivers/firmware/xilinx/zynqmp-debug.c | 13 +++++++++++
drivers/firmware/xilinx/zynqmp.c | 41 +++++++++++++++++++++++++++++++++-
include/linux/firmware/xlnx-zynqmp.h | 12 +++++++++-
3 files changed, 64 insertions(+), 2 deletions(-)
Merging clk/clk-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
Already up to date.
Merging clk-imx/for-next (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
Already up to date.
Merging clk-renesas/renesas-clk (b263e653c372 clk: renesas: rzg2l: Rename mstp_clock to mod_clock)
$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
Merge made by the 'ort' strategy.
.../bindings/clock/renesas,cpg-mssr.yaml | 46 +-
.../bindings/clock/renesas,rzg2l-cpg.yaml | 18 +-
drivers/clk/renesas/Kconfig | 5 +
drivers/clk/renesas/Makefile | 1 +
drivers/clk/renesas/r7s9210-cpg-mssr.c | 7 +-
drivers/clk/renesas/r8a77970-cpg-mssr.c | 8 +-
drivers/clk/renesas/r9a07g043-cpg.c | 132 ++---
drivers/clk/renesas/r9a07g044-cpg.c | 168 +++----
drivers/clk/renesas/r9a08g045-cpg.c | 227 ++++-----
drivers/clk/renesas/r9a09g011-cpg.c | 116 ++---
drivers/clk/renesas/r9a09g056-cpg.c | 165 +++++++
drivers/clk/renesas/r9a09g057-cpg.c | 64 +++
drivers/clk/renesas/r9a09g077-cpg.c | 241 ++++++++++
drivers/clk/renesas/rcar-gen2-cpg.c | 5 +-
drivers/clk/renesas/rcar-gen2-cpg.h | 3 +-
drivers/clk/renesas/rcar-gen3-cpg.c | 6 +-
drivers/clk/renesas/rcar-gen3-cpg.h | 3 +-
drivers/clk/renesas/rcar-gen4-cpg.c | 6 +-
drivers/clk/renesas/rcar-gen4-cpg.h | 3 +-
drivers/clk/renesas/renesas-cpg-mssr.c | 189 +++++---
drivers/clk/renesas/renesas-cpg-mssr.h | 32 +-
drivers/clk/renesas/rzg2l-cpg.c | 529 ++++++++++++---------
drivers/clk/renesas/rzg2l-cpg.h | 66 +--
drivers/clk/renesas/rzv2h-cpg.c | 30 +-
drivers/clk/renesas/rzv2h-cpg.h | 24 +-
include/dt-bindings/clock/r9a07g043-cpg.h | 53 ---
include/dt-bindings/clock/r9a07g044-cpg.h | 58 ---
include/dt-bindings/clock/r9a07g054-cpg.h | 58 ---
include/dt-bindings/clock/r9a08g045-cpg.h | 71 ---
.../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 27 ++
30 files changed, 1392 insertions(+), 969 deletions(-)
create mode 100644 drivers/clk/renesas/r9a09g077-cpg.c
create mode 100644 include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
Merging thead-clk/thead-clk-for-next (50d4b157fa96 clk: thead: Add clock support for VO subsystem in T-HEAD TH1520 SoC)
$ git merge -m Merge branch 'thead-clk-for-next' of https://github.com/pdp7/linux.git thead-clk/thead-clk-for-next
Already up to date.
Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
Merge made by the 'ort' strategy.
arch/csky/mm/fault.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging loongarch/loongarch-next (f78fb2576f22 platform/loongarch: laptop: Unregister generic_sub_drivers on exit)
$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
Already up to date.
Merging m68k/for-next (f440518f379d m68k: defconfig: Update defconfigs for v6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
Already up to date.
Merging m68knommu/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
Already up to date.
Merging microblaze/next (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
Auto-merging arch/microblaze/include/asm/pgtable.h
Merge made by the 'ort' strategy.
arch/microblaze/Kconfig.platform | 10 +++++-----
arch/microblaze/include/asm/asm-compat.h | 2 +-
arch/microblaze/include/asm/current.h | 4 ++--
arch/microblaze/include/asm/entry.h | 4 ++--
arch/microblaze/include/asm/exceptions.h | 4 ++--
arch/microblaze/include/asm/fixmap.h | 4 ++--
arch/microblaze/include/asm/ftrace.h | 2 +-
arch/microblaze/include/asm/kgdb.h | 4 ++--
arch/microblaze/include/asm/mmu.h | 4 ++--
arch/microblaze/include/asm/page.h | 8 ++++----
arch/microblaze/include/asm/pgtable.h | 18 +++++++++---------
arch/microblaze/include/asm/processor.h | 8 ++++----
arch/microblaze/include/asm/ptrace.h | 4 ++--
arch/microblaze/include/asm/sections.h | 4 ++--
arch/microblaze/include/asm/setup.h | 4 ++--
arch/microblaze/include/asm/thread_info.h | 4 ++--
arch/microblaze/include/asm/unistd.h | 4 ++--
arch/microblaze/include/asm/xilinx_mb_manager.h | 4 ++--
arch/microblaze/include/uapi/asm/ptrace.h | 4 ++--
19 files changed, 50 insertions(+), 50 deletions(-)
Merging mips/mips-next (5a0c749125c0 MIPS: loongson2ef: lemote-2f: add missing function prototypes)
$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
Already up to date.
Merging openrisc/for-next (f0eedcf22581 openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
Auto-merging arch/openrisc/include/asm/pgtable.h
Merge made by the 'ort' strategy.
arch/openrisc/include/asm/mmu.h | 2 +-
arch/openrisc/include/asm/page.h | 8 ++++----
arch/openrisc/include/asm/pgtable.h | 4 ++--
arch/openrisc/include/asm/processor.h | 4 ++--
arch/openrisc/include/asm/ptrace.h | 4 ++--
arch/openrisc/include/asm/setup.h | 2 +-
arch/openrisc/include/asm/thread_info.h | 8 ++++----
arch/openrisc/include/uapi/asm/ptrace.h | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
Merging parisc-hd/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
Already up to date.
Merging powerpc/next (8682a5749a3d MAINTAINERS: powerpc: Remove myself as a reviewer)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
Already up to date.
Merging risc-v/for-next (306e57988197 Merge patch "riscv: defconfig: run savedefconfig to reorder it")
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
Merge made by the 'ort' strategy.
arch/riscv/configs/defconfig | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Merging riscv-dt/riscv-dt-for-next (d50108706a63 riscv: dts: starfive: jh7110-common: bootph-pre-ram hinting needed by boot loader)
$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next
Already up to date.
Merging riscv-soc/riscv-soc-for-next (59986662d2f4 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next)
$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
Auto-merging Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
Merge made by the 'ort' strategy.
Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging s390/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
Already up to date.
Merging sh/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
Already up to date.
Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next
Already up to date.
Merging uml/next (cfc4ca8986bb Merge tag 'uml-for-linux-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
Already up to date.
Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
Auto-merging arch/xtensa/include/asm/pgtable.h
Auto-merging arch/xtensa/include/asm/ptrace.h
Merge made by the 'ort' strategy.
arch/xtensa/include/asm/bootparam.h | 2 +-
arch/xtensa/include/asm/cmpxchg.h | 4 ++--
arch/xtensa/include/asm/coprocessor.h | 8 ++++----
arch/xtensa/include/asm/current.h | 2 +-
arch/xtensa/include/asm/ftrace.h | 8 ++++----
arch/xtensa/include/asm/initialize_mmu.h | 4 ++--
arch/xtensa/include/asm/jump_label.h | 4 ++--
arch/xtensa/include/asm/kasan.h | 2 +-
arch/xtensa/include/asm/kmem_layout.h | 2 +-
arch/xtensa/include/asm/page.h | 4 ++--
arch/xtensa/include/asm/pgtable.h | 8 ++++----
arch/xtensa/include/asm/processor.h | 4 ++--
arch/xtensa/include/asm/ptrace.h | 6 +++---
arch/xtensa/include/asm/signal.h | 4 ++--
arch/xtensa/include/asm/thread_info.h | 8 ++++----
arch/xtensa/include/asm/tlbflush.h | 4 ++--
arch/xtensa/include/uapi/asm/ptrace.h | 2 +-
arch/xtensa/include/uapi/asm/signal.h | 6 +++---
arch/xtensa/include/uapi/asm/types.h | 4 ++--
19 files changed, 43 insertions(+), 43 deletions(-)
Merging fs-next (1e2fda2ad027 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
$ git merge -m Merge branch 'fs-next' of linux-next fs-next
Auto-merging include/linux/fs.h
Auto-merging include/trace/events/btrfs.h
Merge made by the 'ort' strategy.
Documentation/admin-guide/cifs/usage.rst | 2 +
Documentation/filesystems/porting.rst | 3 -
fs/backing-file.c | 4 +-
fs/bcachefs/bcachefs.h | 3 +-
fs/bcachefs/btree_gc.c | 95 +-
fs/bcachefs/btree_io.c | 26 +-
fs/bcachefs/btree_iter.c | 67 +-
fs/bcachefs/btree_locking.c | 2 +-
fs/bcachefs/btree_locking.h | 6 +-
fs/bcachefs/btree_types.h | 29 +
fs/bcachefs/btree_update_interior.c | 64 +-
fs/bcachefs/btree_update_interior.h | 7 +
fs/bcachefs/chardev.c | 4 +-
fs/bcachefs/dirent.c | 2 +-
fs/bcachefs/disk_accounting.c | 4 +-
fs/bcachefs/error.c | 5 +-
fs/bcachefs/extent_update.c | 13 +-
fs/bcachefs/fs.c | 12 +-
fs/bcachefs/fsck.c | 12 +-
fs/bcachefs/inode.c | 2 +-
fs/bcachefs/io_read.c | 11 +-
fs/bcachefs/io_read.h | 1 +
fs/bcachefs/movinggc.c | 22 +-
fs/bcachefs/namei.c | 10 +
fs/bcachefs/rcu_pending.c | 22 +-
fs/bcachefs/recovery.c | 27 +-
fs/bcachefs/recovery_passes.c | 14 +-
fs/bcachefs/sb-downgrade.c | 5 +-
fs/bcachefs/sb-errors_format.h | 10 +-
fs/bcachefs/sb-members.c | 34 +-
fs/bcachefs/str_hash.h | 2 +-
fs/bcachefs/super.c | 62 +-
fs/bcachefs/trace.h | 25 +
fs/bcachefs/util.c | 10 +-
fs/bcachefs/util.h | 2 +-
fs/btrfs/Kconfig | 1 +
fs/btrfs/backref.c | 31 +-
fs/btrfs/backref.h | 20 +-
fs/btrfs/bio.c | 20 +-
fs/btrfs/btrfs_inode.h | 17 +
fs/btrfs/ctree.c | 175 +--
fs/btrfs/ctree.h | 18 +-
fs/btrfs/defrag.c | 48 +-
fs/btrfs/delayed-inode.c | 111 +-
fs/btrfs/delayed-inode.h | 7 +-
fs/btrfs/delayed-ref.h | 6 +-
fs/btrfs/discard.c | 4 +-
fs/btrfs/disk-io.c | 28 +-
fs/btrfs/extent-io-tree.c | 17 +-
fs/btrfs/extent-tree.c | 248 ++-
fs/btrfs/extent-tree.h | 7 +-
fs/btrfs/extent_io.c | 118 +-
fs/btrfs/extent_io.h | 2 +-
fs/btrfs/fiemap.c | 2 +-
fs/btrfs/file-item.c | 2 +-
fs/btrfs/file.c | 29 +-
fs/btrfs/free-space-cache.c | 35 +-
fs/btrfs/free-space-cache.h | 8 +-
fs/btrfs/free-space-tree.c | 32 +-
fs/btrfs/fs.h | 5 +-
fs/btrfs/inode-item.c | 11 +-
fs/btrfs/inode.c | 339 +++--
fs/btrfs/ioctl.c | 64 +-
fs/btrfs/misc.h | 31 +-
fs/btrfs/print-tree.c | 2 +-
fs/btrfs/qgroup.c | 168 +--
fs/btrfs/raid-stripe-tree.c | 7 +-
fs/btrfs/ref-verify.c | 146 +-
fs/btrfs/ref-verify.h | 4 +-
fs/btrfs/reflink.c | 20 +-
fs/btrfs/relocation.c | 38 +-
fs/btrfs/scrub.c | 61 +-
fs/btrfs/space-info.c | 8 +-
fs/btrfs/space-info.h | 1 -
fs/btrfs/subpage.c | 239 ++-
fs/btrfs/subpage.h | 46 +-
fs/btrfs/super.c | 166 +-
fs/btrfs/sysfs.c | 16 +-
fs/btrfs/transaction.c | 38 +-
fs/btrfs/tree-log.c | 159 +-
fs/btrfs/ulist.c | 55 +-
fs/btrfs/volumes.c | 16 +-
fs/btrfs/volumes.h | 3 +-
fs/btrfs/zoned.c | 5 +-
fs/coda/dir.c | 12 +-
fs/coredump.c | 344 +++--
fs/ecryptfs/crypto.c | 2 +-
fs/ecryptfs/ecryptfs_kernel.h | 1 -
fs/ecryptfs/keystore.c | 4 +-
fs/exportfs/expfs.c | 4 +-
fs/file_table.c | 13 +-
fs/internal.h | 1 +
fs/locks.c | 2 +-
fs/namei.c | 37 +-
fs/nfsd/nfs3proc.c | 2 +-
fs/nfsd/nfs4state.c | 84 +-
fs/nfsd/nfsproc.c | 2 +-
fs/nfsd/state.h | 1 +
fs/overlayfs/file.c | 2 +-
fs/pipe.c | 8 +-
fs/read_write.c | 2 +-
fs/smb/client/cached_dir.h | 8 +-
fs/smb/client/cifsfs.c | 3 +-
fs/smb/client/connect.c | 10 +-
fs/smb/client/file.c | 9 +-
fs/smb/client/inode.c | 24 +
fs/smb/client/readdir.c | 28 +-
fs/smb/client/reparse.c | 61 +-
fs/smb/client/smb2file.c | 10 +-
include/linux/filelock.h | 7 +-
include/linux/fs.h | 6 +-
include/linux/sunrpc/xdr.h | 3 +-
include/trace/events/btrfs.h | 2 +-
include/uapi/linux/btrfs.h | 53 +
include/uapi/linux/coredump.h | 104 ++
io_uring/openclose.c | 2 -
net/sunrpc/socklib.c | 162 +-
net/sunrpc/xdr.c | 11 +-
tools/include/uapi/linux/coredump.h | 104 ++
tools/testing/selftests/coredump/Makefile | 2 +-
tools/testing/selftests/coredump/config | 3 +
tools/testing/selftests/coredump/stackdump_test.c | 1679 ++++++++++++++++++---
122 files changed, 4157 insertions(+), 1908 deletions(-)
create mode 100644 include/uapi/linux/coredump.h
create mode 100644 tools/include/uapi/linux/coredump.h
create mode 100644 tools/testing/selftests/coredump/config
Merging printk/for-next (87c59d7c12a1 Merge branch 'rework/optimizations' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Auto-merging lib/vsprintf.c
Auto-merging mm/slub.c
Merge made by the 'ort' strategy.
Documentation/admin-guide/kernel-parameters.txt | 38 +++++++++-----
include/linux/compiler-gcc.h | 2 +
include/linux/sprintf.h | 2 +-
kernel/printk/internal.h | 2 +
kernel/printk/nbcon.c | 26 ++++++++-
kernel/printk/printk.c | 20 +++----
lib/vsprintf.c | 70 +++++++++++++++++++++----
mm/slub.c | 5 +-
8 files changed, 129 insertions(+), 36 deletions(-)
Merging pci/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
Already up to date.
Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comments for better understanding)
$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
Merge made by the 'ort' strategy.
fs/pstore/zone.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
Merging hid/for-next (da04eb7791c4 Merge branch 'for-6.17/multitouch' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Auto-merging drivers/hid/hid-apple.c
Auto-merging drivers/hid/hid-multitouch.c
Merge made by the 'ort' strategy.
Documentation/hid/intel-thc-hid.rst | 27 +++
drivers/hid/Kconfig | 1 +
drivers/hid/hid-apple.c | 220 ++++++++++++---------
drivers/hid/hid-debug.c | 2 +-
drivers/hid/hid-ids.h | 34 ++--
drivers/hid/hid-input.c | 2 +-
drivers/hid/hid-lenovo.c | 11 +-
drivers/hid/hid-multitouch.c | 62 +++++-
drivers/hid/hid-nintendo.c | 38 +++-
drivers/hid/hid-quirks.c | 12 +-
drivers/hid/hid-universal-pidff.c | 5 +-
drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 +
drivers/hid/intel-ish-hid/ipc/pci-ish.c | 12 +-
drivers/hid/intel-thc-hid/Makefile | 1 +
.../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 216 ++++++++++++--------
.../intel-thc-hid/intel-quicki2c/quicki2c-dev.h | 55 ++++--
.../intel-quicki2c/quicki2c-protocol.c | 26 ++-
.../intel-thc-hid/intel-quickspi/pci-quickspi.c | 15 ++
.../hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 140 +++++++++++++
.../hid/intel-thc-hid/intel-thc/intel-thc-dev.h | 33 +++-
.../hid/intel-thc-hid/intel-thc/intel-thc-dma.c | 40 ++++
.../hid/intel-thc-hid/intel-thc/intel-thc-dma.h | 38 ++--
drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h | 5 +
.../hid/intel-thc-hid/intel-thc/intel-thc-wot.c | 94 +++++++++
.../hid/intel-thc-hid/intel-thc/intel-thc-wot.h | 26 +++
drivers/hid/usbhid/hid-pidff.c | 46 ++---
drivers/hid/usbhid/hid-pidff.h | 3 +-
drivers/hid/wacom_sys.c | 7 +-
28 files changed, 896 insertions(+), 276 deletions(-)
create mode 100644 drivers/hid/intel-thc-hid/intel-thc/intel-thc-wot.c
create mode 100644 drivers/hid/intel-thc-hid/intel-thc/intel-thc-wot.h
Merging i2c/i2c/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
Already up to date.
Merging i2c-host/i2c/i2c-host (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host
Already up to date.
Merging i3c/i3c/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
Already up to date.
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
Already up to date.
Merging hwmon-staging/hwmon-next (e8d63ffe031f hwmon: (ltc4282) fix copy paste on variable name)
$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
Auto-merging drivers/hwmon/ltc4282.c
Merge made by the 'ort' strategy.
.../bindings/hwmon/pmbus/isil,isl68137.yaml | 1 +
Documentation/hwmon/asus_ec_sensors.rst | 2 +
drivers/hwmon/asus-ec-sensors.c | 60 ++++++++++++++++++++++
drivers/hwmon/ltc4282.c | 4 +-
drivers/hwmon/pmbus/isl68137.c | 3 ++
5 files changed, 68 insertions(+), 2 deletions(-)
Merging jc_docs/docs-next (d3f825032091 docs/sched: Make the sched-stats documentation consistent)
$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
Merge made by the 'ort' strategy.
Documentation/arch/powerpc/index.rst | 1 +
Documentation/core-api/dma-api.rst | 6 +
Documentation/core-api/packing.rst | 2 +-
Documentation/process/changes.rst | 14 --
Documentation/scheduler/sched-deadline.rst | 77 ++++++---
Documentation/scheduler/sched-stats.rst | 53 ++++---
Documentation/sphinx-static/custom.css | 15 ++
Documentation/sphinx/automarkup.py | 27 ++--
Documentation/trace/boottime-trace.rst | 4 +-
Documentation/userspace-api/fwctl/fwctl.rst | 30 ++--
.../userspace-api/sysfs-platform_profile.rst | 6 +-
scripts/lib/kdoc/kdoc_parser.py | 172 +++++++++++----------
scripts/ver_linux | 2 -
13 files changed, 225 insertions(+), 184 deletions(-)
Merging v4l-dvb/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
Already up to date.
Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
Already up to date.
Merging pm/linux-next (87bcbb544a0c Merge branch 'fixes' into linux-next)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
MAINTAINERS | 1 +
arch/x86/kernel/smp.c | 24 ++++++
arch/x86/kernel/smpboot.c | 54 ++-----------
arch/x86/power/hibernate.c | 17 ++--
drivers/acpi/acpi_pad.c | 2 +-
drivers/acpi/apei/einj-core.c | 9 +--
drivers/acpi/cppc_acpi.c | 2 +-
drivers/acpi/ec.c | 17 ++++
drivers/acpi/internal.h | 6 ++
drivers/acpi/processor_driver.c | 3 +
drivers/acpi/processor_idle.c | 8 ++
drivers/acpi/resource.c | 7 ++
drivers/base/faux.c | 3 +-
drivers/cpufreq/rcpufreq_dt.rs | 4 +-
drivers/idle/intel_idle.c | 12 +--
include/linux/cpu.h | 3 +
rust/helpers/cpu.c | 8 ++
rust/helpers/helpers.c | 1 +
rust/kernel/cpu.rs | 125 ++++++++++++++++++++++++++++-
rust/kernel/cpufreq.rs | 173 +++++++++++++++++++++++++++++-----------
rust/kernel/cpumask.rs | 51 ++++++++----
tools/power/cpupower/Makefile | 9 ++-
22 files changed, 398 insertions(+), 141 deletions(-)
create mode 100644 rust/helpers/cpu.c
Merging cpufreq-arm/cpufreq/arm/linux-next (c7f005f70d22 rust: cpu: Add CpuId::current() to retrieve current CPU ID)
$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
Already up to date.
Merging cpupower/cpupower (e044b8a9545c cpupower: split unitdir from libdir in Makefile)
$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
Already up to date.
Merging devfreq/devfreq-next (a579e91b6fd2 PM / devfreq: rockchip-dfi: double count on RK3588)
$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
Merge made by the 'ort' strategy.
drivers/devfreq/devfreq.c | 22 ++++++---------------
drivers/devfreq/event/rockchip-dfi.c | 7 ++++++-
drivers/devfreq/governor_userspace.c | 6 +++++-
drivers/devfreq/sun8i-a33-mbus.c | 38 +++++++++---------------------------
4 files changed, 26 insertions(+), 47 deletions(-)
Merging pmdomain/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
Already up to date.
Merging opp/opp/linux-next (03eadcbd981b OPP: switch to use kmemdup_array())
$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
Already up to date.
Merging thermal/thermal/linux-next (e23cba0ab49a thermal/drivers/airoha: Fix spelling mistake)
$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
Already up to date.
Merging rdma/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
Already up to date.
Merging net-next/main (6d4e01d29d87 net: Use dev_fwnode())
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.../bindings/net/renesas,r9a09g057-gbeth.yaml | 2 +
Documentation/netlink/specs/conntrack.yaml | 38 +-
Documentation/netlink/specs/devlink.yaml | 208 ++---
Documentation/netlink/specs/dpll.yaml | 14 +-
Documentation/netlink/specs/ethtool.yaml | 70 +-
Documentation/netlink/specs/fou.yaml | 14 +-
Documentation/netlink/specs/handshake.yaml | 10 +-
Documentation/netlink/specs/lockd.yaml | 4 +-
Documentation/netlink/specs/mptcp_pm.yaml | 192 ++---
Documentation/netlink/specs/net_shaper.yaml | 7 +-
Documentation/netlink/specs/netdev.yaml | 43 +-
Documentation/netlink/specs/nfsd.yaml | 10 +-
Documentation/netlink/specs/nftables.yaml | 16 +-
Documentation/netlink/specs/nl80211.yaml | 109 +--
Documentation/netlink/specs/nlctrl.yaml | 6 +-
Documentation/netlink/specs/ovpn.yaml | 26 +-
Documentation/netlink/specs/ovs_datapath.yaml | 2 +-
Documentation/netlink/specs/ovs_flow.yaml | 16 +-
Documentation/netlink/specs/ovs_vport.yaml | 4 +-
Documentation/netlink/specs/rt-addr.yaml | 2 +-
Documentation/netlink/specs/rt-link.yaml | 2 +-
Documentation/netlink/specs/rt-neigh.yaml | 2 +-
Documentation/netlink/specs/rt-route.yaml | 10 +-
Documentation/netlink/specs/rt-rule.yaml | 2 +-
Documentation/netlink/specs/tc.yaml | 27 +-
Documentation/netlink/specs/tcp_metrics.yaml | 8 +-
Documentation/netlink/specs/team.yaml | 16 +-
Documentation/networking/can.rst | 11 +-
.../device_drivers/ethernet/intel/ice.rst | 13 +
MAINTAINERS | 1 +
drivers/net/can/dev/calc_bittiming.c | 2 +-
drivers/net/can/dev/netlink.c | 26 +-
drivers/net/can/usb/etas_es58x/es58x_fd.c | 2 +-
drivers/net/can/xilinx_can.c | 2 +-
drivers/net/dsa/microchip/ksz_common.c | 3 +-
drivers/net/dsa/microchip/ksz_ptp.c | 4 +-
drivers/net/dsa/mv88e6xxx/global2.c | 6 +-
drivers/net/dsa/qca/ar9331.c | 4 +-
drivers/net/ethernet/airoha/airoha_ppe.c | 31 +-
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 6 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +-
drivers/net/ethernet/cadence/macb_main.c | 15 +
drivers/net/ethernet/chelsio/cxgb3/l2t.c | 37 -
drivers/net/ethernet/chelsio/cxgb3/l2t.h | 1 -
drivers/net/ethernet/dlink/dl2k.c | 57 +-
drivers/net/ethernet/dlink/dl2k.h | 2 +
drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +-
drivers/net/ethernet/google/gve/gve_ethtool.c | 6 -
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +-
drivers/net/ethernet/huawei/hinic3/hinic3_tx.c | 23 +-
drivers/net/ethernet/intel/i40e/i40e.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 91 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 25 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 43 +-
drivers/net/ethernet/intel/i40e/i40e_type.h | 32 -
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 46 +-
drivers/net/ethernet/intel/iavf/iavf.h | 12 +-
drivers/net/ethernet/intel/iavf/iavf_main.c | 75 +-
drivers/net/ethernet/intel/iavf/iavf_txrx.c | 3 +-
drivers/net/ethernet/intel/iavf/iavf_txrx.h | 40 +-
drivers/net/ethernet/intel/iavf/iavf_type.h | 32 -
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 33 +-
drivers/net/ethernet/intel/ice/ice.h | 1 +
drivers/net/ethernet/intel/ice/ice_base.c | 5 +-
drivers/net/ethernet/intel/ice/ice_dpll.c | 927 ++++++++++++++++++++-
drivers/net/ethernet/intel/ice/ice_dpll.h | 23 +-
drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 +
drivers/net/ethernet/intel/ice/ice_flow.c | 45 +-
drivers/net/ethernet/intel/ice/ice_flow.h | 68 +-
drivers/net/ethernet/intel/ice/ice_lib.c | 5 +-
drivers/net/ethernet/intel/ice/ice_main.c | 3 +
drivers/net/ethernet/intel/ice/ice_ptp.c | 256 +-----
drivers/net/ethernet/intel/ice/ice_ptp.h | 3 -
drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 1 +
drivers/net/ethernet/intel/ice/ice_txrx.c | 87 +-
drivers/net/ethernet/intel/ice/ice_txrx.h | 3 +-
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 44 +-
drivers/net/ethernet/intel/ice/ice_virtchnl.h | 4 +-
.../ethernet/intel/ice/ice_virtchnl_allowlist.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 28 +-
drivers/net/ethernet/marvell/mvneta.c | 2 -
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 12 +-
.../ethernet/marvell/octeontx2/nic/otx2_common.c | 17 +-
.../ethernet/marvell/octeontx2/nic/otx2_common.h | 11 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +-
.../net/ethernet/marvell/octeontx2/nic/qos_sq.c | 5 +-
drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 53 ++
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 1 +
drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 112 +++
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 177 ++--
drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h | 19 +
drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 72 ++
drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 4 +
drivers/net/ethernet/microsoft/mana/hw_channel.c | 6 +-
drivers/net/ethernet/microsoft/mana/mana_en.c | 87 +-
drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 76 +-
drivers/net/ethernet/realtek/r8169_main.c | 3 -
drivers/net/ethernet/sfc/ethtool.c | 1 +
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +
drivers/net/hyperv/netvsc_drv.c | 30 +-
drivers/net/mdio/mdio-mux-gpio.c | 3 +-
drivers/net/netconsole.c | 67 +-
drivers/net/phy/dp83822.c | 7 +-
drivers/net/phy/dp83869.c | 7 +-
drivers/net/phy/intel-xway.c | 7 +-
drivers/net/phy/mdio_bus_provider.c | 1 -
drivers/net/phy/mdio_device.c | 5 +-
drivers/net/phy/micrel.c | 111 ++-
drivers/net/phy/mscc/mscc_main.c | 5 +-
drivers/net/phy/phy-c45.c | 7 -
drivers/net/phy/phy_device.c | 13 +-
drivers/net/ppp/ppp_generic.c | 52 +-
drivers/net/usb/lan78xx.c | 8 +-
drivers/net/virtio_net.c | 47 +-
drivers/net/vmxnet3/vmxnet3_ethtool.c | 74 +-
include/linux/avf/virtchnl.h | 23 +-
include/linux/can/bittiming.h | 2 +-
include/linux/can/dev.h | 4 +-
include/linux/ethtool.h | 25 +-
include/linux/mdio.h | 1 -
include/linux/net/intel/libie/pctype.h | 41 +
include/linux/phy.h | 7 +-
include/net/dropreason-core.h | 18 +
include/net/mana/mana.h | 131 +++
include/net/netdev_queues.h | 9 +
include/net/sock.h | 1 -
include/uapi/linux/in6.h | 4 +-
net/can/af_can.c | 6 +-
net/can/bcm.c | 5 +-
net/can/isotp.c | 5 +-
net/can/j1939/socket.c | 5 +-
net/can/raw.c | 5 +-
net/core/dev.c | 45 +-
net/core/sock.c | 8 -
net/ethtool/ioctl.c | 121 ++-
net/ncsi/internal.h | 2 +-
net/ncsi/ncsi-rsp.c | 1 +
.../selftests/drivers/net/lib/sh/lib_netcons.sh | 27 +-
.../testing/selftests/drivers/net/netcons_basic.sh | 48 +-
tools/testing/selftests/net/nl_netdev.py | 38 +-
.../selftests/net/packetdrill/ksft_runner.sh | 4 +
tools/testing/selftests/net/tcp_ao/seq-ext.c | 2 +-
tools/testing/selftests/vsock/.gitignore | 2 +
tools/testing/selftests/vsock/Makefile | 17 +
tools/testing/selftests/vsock/config | 111 +++
tools/testing/selftests/vsock/settings | 1 +
tools/testing/selftests/vsock/vmtest.sh | 487 +++++++++++
152 files changed, 3888 insertions(+), 1544 deletions(-)
create mode 100644 include/linux/net/intel/libie/pctype.h
create mode 100644 tools/testing/selftests/vsock/.gitignore
create mode 100644 tools/testing/selftests/vsock/Makefile
create mode 100644 tools/testing/selftests/vsock/config
create mode 100644 tools/testing/selftests/vsock/settings
create mode 100755 tools/testing/selftests/vsock/vmtest.sh
Merging bpf-next/for-next (fa6932577c07 bpf: Initialize used but uninit variable in propagate_liveness())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
Auto-merging include/uapi/linux/bpf.h
Auto-merging tools/include/uapi/linux/bpf.h
Merge made by the 'ort' strategy.
Documentation/bpf/bpf_devel_QA.rst | 7 +-
.../bpf/standardization/instruction-set.rst | 6 +-
arch/arm64/net/bpf_jit.h | 5 +
arch/arm64/net/bpf_jit_comp.c | 28 +-
arch/powerpc/net/bpf_jit_comp64.c | 80 +-
include/linux/bpf-cgroup-defs.h | 1 +
include/linux/bpf.h | 11 +-
include/linux/bpf_verifier.h | 80 +-
include/linux/filter.h | 2 +-
include/uapi/linux/bpf.h | 13 +-
kernel/bpf/cgroup.c | 182 ++-
kernel/bpf/core.c | 32 +-
kernel/bpf/syscall.c | 180 ++-
kernel/bpf/verifier.c | 1539 +++++++++++++-------
kernel/cgroup/cgroup.c | 5 +
tools/bpf/bpftool/link.c | 6 +
tools/include/uapi/linux/bpf.h | 13 +-
tools/lib/bpf/bpf.c | 44 +
tools/lib/bpf/bpf.h | 5 +
tools/lib/bpf/btf.h | 3 +-
tools/lib/bpf/btf_dump.c | 55 +-
tools/lib/bpf/libbpf.c | 28 +
tools/lib/bpf/libbpf.h | 15 +
tools/lib/bpf/libbpf.map | 1 +
tools/lib/bpf/usdt.c | 10 +-
.../testing/selftests/bpf/prog_tests/bpf_cookie.c | 50 +-
.../selftests/bpf/prog_tests/bpf_mod_race.c | 2 +-
tools/testing/selftests/bpf/prog_tests/btf_dump.c | 118 ++
.../selftests/bpf/prog_tests/cgroup_mprog_opts.c | 617 ++++++++
.../bpf/prog_tests/cgroup_mprog_ordering.c | 77 +
tools/testing/selftests/bpf/prog_tests/ringbuf.c | 4 +-
.../selftests/bpf/prog_tests/sockmap_listen.c | 2 +
.../testing/selftests/bpf/prog_tests/tc_helpers.h | 28 -
.../selftests/bpf/prog_tests/user_ringbuf.c | 10 +-
.../selftests/bpf/prog_tests/xdp_adjust_tail.c | 18 +-
tools/testing/selftests/bpf/progs/bpf_misc.h | 4 +
tools/testing/selftests/bpf/progs/cgroup_mprog.c | 30 +
tools/testing/selftests/bpf/progs/iters.c | 277 ++++
tools/testing/selftests/bpf/progs/rbtree.c | 14 +-
.../selftests/bpf/progs/test_ringbuf_write.c | 4 +-
tools/testing/selftests/bpf/progs/verifier_and.c | 8 +-
.../testing/selftests/bpf/progs/verifier_bounds.c | 61 +-
.../selftests/bpf/progs/verifier_map_in_map.c | 118 ++
tools/testing/selftests/bpf/progs/verifier_movsx.c | 16 +-
.../testing/selftests/bpf/progs/verifier_unpriv.c | 84 +-
.../selftests/bpf/progs/verifier_value_ptr_arith.c | 16 +-
tools/testing/selftests/bpf/test_progs.h | 28 +
tools/testing/selftests/bpf/verifier/dead_code.c | 3 +-
tools/testing/selftests/bpf/verifier/jmp32.c | 33 +-
tools/testing/selftests/bpf/verifier/jset.c | 10 +-
50 files changed, 3220 insertions(+), 763 deletions(-)
create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c
create mode 100644 tools/testing/selftests/bpf/progs/cgroup_mprog.c
Merging ipsec-next/master (0097c4195b1d net: airoha: Add PPPoE offload support)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (f550694e88b7 net/mlx5: Add IFC bits for PPCNT recovery counters group)
$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/main (3e52667a9c32 Merge branch 'lan78xx-phylink-prep')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
Already up to date.
Merging ipvs-next/main (6da5f1b4b4a0 selftests: netfilter: Fix skip of wildcard interface test)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
Already up to date.
Merging bluetooth/master (6c31dab4ff1e driver: bluetooth: hci_qca:fix unable to load the BT driver)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
Auto-merging drivers/bluetooth/btintel_pcie.c
Auto-merging drivers/bluetooth/btintel_pcie.h
Auto-merging drivers/bluetooth/btnxpuart.c
Auto-merging drivers/bluetooth/hci_qca.c
Auto-merging net/bluetooth/l2cap_core.c
Merge made by the 'ort' strategy.
drivers/bluetooth/btintel_pcie.c | 254 ++++++++++++++++++++++++++++++++++++++-
drivers/bluetooth/btintel_pcie.h | 4 +-
drivers/bluetooth/btusb.c | 7 ++
drivers/bluetooth/hci_qca.c | 13 +-
net/bluetooth/l2cap_core.c | 9 +-
5 files changed, 278 insertions(+), 9 deletions(-)
Merging wireless-next/for-next (535de528015b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
Already up to date.
Merging ath-next/for-next (ed73728fd14e Merge tag 'mt76-next-2025-05-21' of https://github.com/nbd168/wireless)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next
Already up to date.
Merging iwlwifi-next/next (45f7fe7a7d3a wifi: iwlwifi: convert to use secs_to_jiffies())
$ 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/mld/d3.c
Auto-merging drivers/net/wireless/intel/iwlwifi/mld/mld.c
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
Merge made by the 'ort' strategy.
drivers/net/wireless/intel/iwlwifi/Kconfig | 1 +
drivers/net/wireless/intel/iwlwifi/Makefile | 8 +-
drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 4 +-
drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 4 +-
drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 4 +-
drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 2 +
drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 14 +--
drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 4 +-
drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 2 +
drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 2 +-
drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 +
drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 6 +-
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 23 +++-
drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +-
drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 +
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 48 ++++----
drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 10 ++
drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 10 +-
drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 4 +-
drivers/net/wireless/intel/iwlwifi/iwl-utils.c | 113 +++++++++++++++++-
drivers/net/wireless/intel/iwlwifi/iwl-utils.h | 4 +-
drivers/net/wireless/intel/iwlwifi/mei/sap.h | 30 ++---
drivers/net/wireless/intel/iwlwifi/mld/Makefile | 4 -
drivers/net/wireless/intel/iwlwifi/mld/d3.c | 79 ++-----------
drivers/net/wireless/intel/iwlwifi/mld/debugfs.c | 5 +
drivers/net/wireless/intel/iwlwifi/mld/iface.c | 15 +++
drivers/net/wireless/intel/iwlwifi/mld/iface.h | 12 ++
drivers/net/wireless/intel/iwlwifi/mld/link.c | 4 +
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 11 +-
drivers/net/wireless/intel/iwlwifi/mld/mld.c | 12 ++
drivers/net/wireless/intel/iwlwifi/mld/mld.h | 2 +
drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 4 +-
drivers/net/wireless/intel/iwlwifi/mld/phy.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mld/scan.c | 16 ++-
drivers/net/wireless/intel/iwlwifi/mld/scan.h | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 129 ++++++++++-----------
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +-
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 -
drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 1 +
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 117 +------------------
drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 3 +-
.../net/wireless/intel/iwlwifi/mvm/tests/Makefile | 2 +-
.../net/wireless/intel/iwlwifi/mvm/time-event.h | 8 +-
.../net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c | 6 +-
.../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +-
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 11 +-
.../intel/iwlwifi/pcie/{ => gen1_2}/internal.h | 17 ++-
.../wireless/intel/iwlwifi/pcie/{ => gen1_2}/rx.c | 34 +++++-
.../intel/iwlwifi/pcie/{ => gen1_2}/trans-gen2.c | 9 +-
.../intel/iwlwifi/pcie/{ => gen1_2}/trans.c | 35 ++++--
.../intel/iwlwifi/pcie/{ => gen1_2}/tx-gen2.c | 0
.../wireless/intel/iwlwifi/pcie/{ => gen1_2}/tx.c | 0
.../intel/iwlwifi/{ => pcie}/iwl-context-info-v2.h | 6 +-
.../intel/iwlwifi/{ => pcie}/iwl-context-info.h | 0
drivers/net/wireless/intel/iwlwifi/tests/Makefile | 2 +-
.../iwlwifi/{mvm/tests/scan.c => tests/utils.c} | 43 ++++---
57 files changed, 509 insertions(+), 388 deletions(-)
rename drivers/net/wireless/intel/iwlwifi/pcie/{ => gen1_2}/internal.h (98%)
rename drivers/net/wireless/intel/iwlwifi/pcie/{ => gen1_2}/rx.c (98%)
rename drivers/net/wireless/intel/iwlwifi/pcie/{ => gen1_2}/trans-gen2.c (98%)
rename drivers/net/wireless/intel/iwlwifi/pcie/{ => gen1_2}/trans.c (99%)
rename drivers/net/wireless/intel/iwlwifi/pcie/{ => gen1_2}/tx-gen2.c (100%)
rename drivers/net/wireless/intel/iwlwifi/pcie/{ => gen1_2}/tx.c (100%)
rename drivers/net/wireless/intel/iwlwifi/{ => pcie}/iwl-context-info-v2.h (98%)
rename drivers/net/wireless/intel/iwlwifi/{ => pcie}/iwl-context-info.h (100%)
rename drivers/net/wireless/intel/iwlwifi/{mvm/tests/scan.c => tests/utils.c} (63%)
Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit())
$ git merge -m Merge branch 'master' of git://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 git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
Already up to date.
Merging mtd/mtd/next (aa702923258f Merge tag 'nand/for-6.16' into mtd/next)
$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
Already up to date.
Merging nand/nand/next (3bfb22cecfe6 mtd: rawnand: brcmnand: legacy exec_op implementation)
$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
Already up to date.
Merging spi-nor/spi-nor/next (594c8df92b94 mtd: spi-nor: macronix: Add fixups for MX25L3255E)
$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (4ccd065a69df crypto: ahash - Add support for drivers with no fallback)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
Merge made by the 'ort' strategy.
crypto/ahash.c | 10 +++++++++-
include/linux/crypto.h | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
Merging libcrypto/libcrypto-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'libcrypto-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next
Already up to date.
Merging drm/drm-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
Already up to date.
Merging drm-exynos/for-linux-next (81a50378559b drm/exynos: Remove unnecessary checking)
$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next
Merge made by the 'ort' strategy.
Merging drm-misc/for-linux-next (e2944dc6587f drm: renesas: rz-du: mipi_dsi: Add function pointers for configuring VCLK and mode validation)
$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
Auto-merging MAINTAINERS
Auto-merging drivers/dma-buf/udmabuf.c
Auto-merging drivers/gpu/drm/meson/meson_encoder_hdmi.c
Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c
Auto-merging drivers/gpu/drm/sitronix/Kconfig
Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c
Resolved 'drivers/gpu/drm/vc4/vc4_hdmi.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 668b0084a2ca] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/sysfs-driver-qaic | 18 +
.../display/allwinner,sun8i-a83t-de2-mixer.yaml | 34 +-
.../fsl,imx8qxp-dc-axi-performance-counter.yaml | 57 ++
.../display/imx/fsl,imx8qxp-dc-blit-engine.yaml | 204 +++++++
.../display/imx/fsl,imx8qxp-dc-blitblend.yaml | 41 ++
.../bindings/display/imx/fsl,imx8qxp-dc-clut.yaml | 44 ++
.../imx/fsl,imx8qxp-dc-command-sequencer.yaml | 67 +++
.../display/imx/fsl,imx8qxp-dc-constframe.yaml | 44 ++
.../display/imx/fsl,imx8qxp-dc-display-engine.yaml | 152 +++++
.../display/imx/fsl,imx8qxp-dc-dither.yaml | 45 ++
.../display/imx/fsl,imx8qxp-dc-extdst.yaml | 72 +++
.../display/imx/fsl,imx8qxp-dc-fetchunit.yaml | 141 +++++
.../display/imx/fsl,imx8qxp-dc-filter.yaml | 43 ++
.../display/imx/fsl,imx8qxp-dc-framegen.yaml | 64 ++
.../display/imx/fsl,imx8qxp-dc-gammacor.yaml | 32 +
.../display/imx/fsl,imx8qxp-dc-layerblend.yaml | 39 ++
.../display/imx/fsl,imx8qxp-dc-matrix.yaml | 44 ++
.../display/imx/fsl,imx8qxp-dc-pixel-engine.yaml | 250 ++++++++
.../bindings/display/imx/fsl,imx8qxp-dc-rop.yaml | 43 ++
.../display/imx/fsl,imx8qxp-dc-safety.yaml | 34 ++
.../display/imx/fsl,imx8qxp-dc-scaling-engine.yaml | 83 +++
.../display/imx/fsl,imx8qxp-dc-signature.yaml | 53 ++
.../bindings/display/imx/fsl,imx8qxp-dc-store.yaml | 96 +++
.../bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml | 45 ++
.../bindings/display/imx/fsl,imx8qxp-dc.yaml | 236 ++++++++
.../bindings/display/panel/himax,hx8394.yaml | 17 +-
.../bindings/display/panel/ilitek,ili9881c.yaml | 1 +
.../bindings/display/panel/panel-simple.yaml | 2 +
.../bindings/display/panel/renesas,r61307.yaml | 94 +++
.../bindings/display/panel/renesas,r69328.yaml | 73 +++
.../bindings/display/panel/sitronix,st7701.yaml | 1 +
.../bindings/display/panel/visionox,rm69299.yaml | 4 +-
.../bindings/display/renesas,rzg2l-du.yaml | 23 +-
.../bindings/display/ti/ti,am65x-dss.yaml | 21 +-
.../devicetree/bindings/gpu/arm,mali-utgard.yaml | 2 +
.../interrupt-controller/fsl,imx8qxp-dc-intc.yaml | 318 ++++++++++
.../devicetree/bindings/vendor-prefixes.yaml | 2 +
Documentation/gpu/drm-uapi.rst | 19 +
Documentation/gpu/todo.rst | 15 +
Documentation/gpu/vkms.rst | 15 +-
MAINTAINERS | 39 +-
drivers/accel/amdxdna/aie2_ctx.c | 3 +-
drivers/accel/habanalabs/common/device.c | 25 +-
drivers/accel/ivpu/ivpu_drv.h | 1 +
drivers/accel/ivpu/ivpu_hw.c | 4 +
drivers/accel/ivpu/ivpu_pm.c | 15 +-
drivers/accel/qaic/Makefile | 1 +
drivers/accel/qaic/qaic.h | 10 +-
drivers/accel/qaic/qaic_data.c | 1 -
drivers/accel/qaic/qaic_drv.c | 6 +
drivers/accel/qaic/qaic_ras.c | 642 ++++++++++++++++++++
drivers/accel/qaic/qaic_ras.h | 10 +
drivers/dma-buf/Kconfig | 1 -
drivers/dma-buf/dma-fence-chain.c | 7 +-
drivers/dma-buf/dma-fence.c | 66 ++-
drivers/dma-buf/sw_sync.c | 2 +-
drivers/dma-buf/sync_file.c | 8 +-
drivers/dma-buf/udmabuf.c | 23 +-
drivers/gpu/drm/adp/adp-mipi.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 32 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 5 +-
drivers/gpu/drm/arm/hdlcd_crtc.c | 23 +-
drivers/gpu/drm/ast/ast_drv.c | 2 +-
drivers/gpu/drm/ast/ast_mode.c | 69 ++-
drivers/gpu/drm/bridge/adv7511/Kconfig | 5 +-
drivers/gpu/drm/bridge/adv7511/adv7511.h | 53 +-
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 77 +--
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 57 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 357 +++++------
drivers/gpu/drm/bridge/adv7511/adv7533.c | 9 +-
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 9 +-
drivers/gpu/drm/bridge/analogix/anx7625.c | 7 +-
drivers/gpu/drm/bridge/aux-bridge.c | 8 +-
drivers/gpu/drm/bridge/aux-hpd-bridge.c | 9 +-
drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 72 +--
.../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 8 +-
drivers/gpu/drm/bridge/chipone-icn6211.c | 8 +-
drivers/gpu/drm/bridge/chrontel-ch7033.c | 8 +-
drivers/gpu/drm/bridge/cros-ec-anx7688.c | 8 +-
drivers/gpu/drm/bridge/fsl-ldb.c | 7 +-
drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c | 8 +-
drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 8 +-
.../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 27 +-
drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 8 +-
drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 8 +-
drivers/gpu/drm/bridge/ite-it6263.c | 8 +-
drivers/gpu/drm/bridge/ite-it6505.c | 8 +-
drivers/gpu/drm/bridge/ite-it66121.c | 8 +-
drivers/gpu/drm/bridge/lontium-lt8912b.c | 8 +-
drivers/gpu/drm/bridge/lontium-lt9211.c | 7 +-
drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +-
drivers/gpu/drm/bridge/lvds-codec.c | 9 +-
.../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 11 +-
drivers/gpu/drm/bridge/microchip-lvds.c | 8 +-
drivers/gpu/drm/bridge/nwl-dsi.c | 8 +-
drivers/gpu/drm/bridge/nxp-ptn3460.c | 9 +-
drivers/gpu/drm/bridge/panel.c | 12 +-
drivers/gpu/drm/bridge/parade-ps8622.c | 8 +-
drivers/gpu/drm/bridge/parade-ps8640.c | 8 +-
drivers/gpu/drm/bridge/sii902x.c | 7 +-
drivers/gpu/drm/bridge/sii9234.c | 8 +-
drivers/gpu/drm/bridge/sil-sii8620.c | 8 +-
drivers/gpu/drm/bridge/simple-bridge.c | 8 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 8 +-
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 8 +-
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 8 +-
drivers/gpu/drm/bridge/tc358762.c | 8 +-
drivers/gpu/drm/bridge/tc358764.c | 8 +-
drivers/gpu/drm/bridge/tc358768.c | 8 +-
drivers/gpu/drm/bridge/tc358775.c | 8 +-
drivers/gpu/drm/bridge/thc63lvd1024.c | 8 +-
drivers/gpu/drm/bridge/ti-dlpc3433.c | 8 +-
drivers/gpu/drm/bridge/ti-tdp158.c | 8 +-
drivers/gpu/drm/bridge/ti-tfp410.c | 8 +-
drivers/gpu/drm/bridge/ti-tpd12s015.c | 8 +-
drivers/gpu/drm/display/Kconfig | 13 +-
drivers/gpu/drm/display/Makefile | 4 +
drivers/gpu/drm/display/drm_bridge_connector.c | 107 ++++
drivers/gpu/drm/display/drm_hdmi_audio_helper.c | 3 +
drivers/gpu/drm/display/drm_hdmi_cec_helper.c | 192 ++++++
.../gpu/drm/display/drm_hdmi_cec_notifier_helper.c | 64 ++
drivers/gpu/drm/display/drm_hdmi_state_helper.c | 129 ++--
drivers/gpu/drm/drm_atomic_helper.c | 160 ++++-
drivers/gpu/drm/drm_auth.c | 64 +-
drivers/gpu/drm/drm_bridge.c | 19 +
drivers/gpu/drm/drm_client.c | 35 +-
drivers/gpu/drm/drm_color_mgmt.c | 209 +++++++
drivers/gpu/drm/drm_connector.c | 41 ++
drivers/gpu/drm/drm_debugfs.c | 10 +-
drivers/gpu/drm/drm_file.c | 6 +-
drivers/gpu/drm/drm_fourcc.c | 27 +
drivers/gpu/drm/drm_gem.c | 34 +-
drivers/gpu/drm/drm_gem_framebuffer_helper.c | 5 +-
drivers/gpu/drm/drm_gem_shmem_helper.c | 61 ++
drivers/gpu/drm/drm_gem_vram_helper.c | 79 +--
drivers/gpu/drm/drm_internal.h | 5 +-
drivers/gpu/drm/drm_panel.c | 51 +-
drivers/gpu/drm/drm_prime.c | 114 ++--
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +-
drivers/gpu/drm/hyperv/hyperv_drm.h | 4 +-
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 210 +++++--
drivers/gpu/drm/i915/display/icl_dsi.c | 4 +
drivers/gpu/drm/i915/display/intel_connector.c | 23 +-
drivers/gpu/drm/i915/display/intel_display_types.h | 4 +
drivers/gpu/drm/i915/display/intel_panel.c | 131 +++++
drivers/gpu/drm/i915/display/intel_panel.h | 6 +
drivers/gpu/drm/i915/gt/intel_gt_requests.c | 4 +-
drivers/gpu/drm/i915/i915_request.c | 2 +-
drivers/gpu/drm/i915/i915_sw_fence.c | 4 +-
drivers/gpu/drm/imagination/pvr_job.c | 2 +-
drivers/gpu/drm/imagination/pvr_queue.c | 5 +-
drivers/gpu/drm/imagination/pvr_queue.h | 2 +-
drivers/gpu/drm/imx/Kconfig | 1 +
drivers/gpu/drm/imx/Makefile | 1 +
drivers/gpu/drm/imx/dc/Kconfig | 13 +
drivers/gpu/drm/imx/dc/Makefile | 7 +
drivers/gpu/drm/imx/dc/dc-cf.c | 172 ++++++
drivers/gpu/drm/imx/dc/dc-crtc.c | 555 ++++++++++++++++++
drivers/gpu/drm/imx/dc/dc-de.c | 177 ++++++
drivers/gpu/drm/imx/dc/dc-de.h | 59 ++
drivers/gpu/drm/imx/dc/dc-drv.c | 293 ++++++++++
drivers/gpu/drm/imx/dc/dc-drv.h | 102 ++++
drivers/gpu/drm/imx/dc/dc-ed.c | 288 +++++++++
drivers/gpu/drm/imx/dc/dc-fg.c | 376 ++++++++++++
drivers/gpu/drm/imx/dc/dc-fl.c | 185 ++++++
drivers/gpu/drm/imx/dc/dc-fu.c | 258 ++++++++
drivers/gpu/drm/imx/dc/dc-fu.h | 129 ++++
drivers/gpu/drm/imx/dc/dc-fw.c | 222 +++++++
drivers/gpu/drm/imx/dc/dc-ic.c | 282 +++++++++
drivers/gpu/drm/imx/dc/dc-kms.c | 143 +++++
drivers/gpu/drm/imx/dc/dc-kms.h | 131 +++++
drivers/gpu/drm/imx/dc/dc-lb.c | 325 ++++++++++
drivers/gpu/drm/imx/dc/dc-pe.c | 158 +++++
drivers/gpu/drm/imx/dc/dc-pe.h | 101 ++++
drivers/gpu/drm/imx/dc/dc-plane.c | 224 +++++++
drivers/gpu/drm/imx/dc/dc-tc.c | 141 +++++
drivers/gpu/drm/lima/lima_gem.c | 2 +-
drivers/gpu/drm/lima/lima_sched.c | 6 +-
drivers/gpu/drm/lima/lima_sched.h | 3 +-
drivers/gpu/drm/lima/lima_trace.h | 6 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 8 +-
drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +-
drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +-
drivers/gpu/drm/mediatek/mtk_hdmi.c | 8 +-
drivers/gpu/drm/meson/meson_encoder_cvbs.c | 10 +-
drivers/gpu/drm/meson/meson_encoder_dsi.c | 10 +-
drivers/gpu/drm/meson/meson_encoder_hdmi.c | 10 +-
drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +-
drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_g200se.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_mode.c | 82 ++-
drivers/gpu/drm/msm/msm_gem_submit.c | 8 +-
drivers/gpu/drm/nouveau/nouveau_fence.c | 72 +--
drivers/gpu/drm/nouveau/nouveau_sched.c | 3 +-
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 2 +-
.../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c | 2 +-
drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +-
drivers/gpu/drm/omapdrm/dss/dpi.c | 7 +-
drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +-
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 26 +-
drivers/gpu/drm/omapdrm/dss/hdmi5.c | 26 +-
drivers/gpu/drm/omapdrm/dss/sdi.c | 25 +-
drivers/gpu/drm/omapdrm/dss/venc.c | 23 +-
drivers/gpu/drm/panel/Kconfig | 26 +
drivers/gpu/drm/panel/Makefile | 2 +
drivers/gpu/drm/panel/panel-edp.c | 6 +-
drivers/gpu/drm/panel/panel-elida-kd35t133.c | 10 +-
drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 11 +-
.../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 10 +-
drivers/gpu/drm/panel/panel-himax-hx83112a.c | 10 +-
drivers/gpu/drm/panel/panel-himax-hx8394.c | 153 ++++-
drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 10 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 11 +-
drivers/gpu/drm/panel/panel-ilitek-ili9805.c | 12 +-
drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 10 +-
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 236 +++++++-
drivers/gpu/drm/panel/panel-innolux-ej030na.c | 11 +-
drivers/gpu/drm/panel/panel-innolux-p079zca.c | 11 +-
drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 10 +-
drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 10 +-
drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 11 +-
drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 11 +-
drivers/gpu/drm/panel/panel-lg-lb035q02.c | 10 +-
drivers/gpu/drm/panel/panel-lg-lg4573.c | 11 +-
drivers/gpu/drm/panel/panel-lincolntech-lcd197.c | 11 +-
drivers/gpu/drm/panel/panel-lvds.c | 12 +-
.../gpu/drm/panel/panel-magnachip-d53e6ea8966.c | 11 +-
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 11 +-
drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 10 +-
drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 11 +-
drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 10 +-
drivers/gpu/drm/panel/panel-novatek-nt35510.c | 12 +-
drivers/gpu/drm/panel/panel-novatek-nt35560.c | 12 +-
drivers/gpu/drm/panel/panel-novatek-nt35950.c | 10 +-
drivers/gpu/drm/panel/panel-novatek-nt36523.c | 9 +-
drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 10 +-
drivers/gpu/drm/panel/panel-novatek-nt39016.c | 10 +-
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 11 +-
drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 11 +-
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +-
drivers/gpu/drm/panel/panel-raydium-rm67191.c | 10 +-
drivers/gpu/drm/panel/panel-raydium-rm67200.c | 11 +-
drivers/gpu/drm/panel/panel-raydium-rm68200.c | 11 +-
drivers/gpu/drm/panel/panel-raydium-rm692e5.c | 10 +-
drivers/gpu/drm/panel/panel-raydium-rm69380.c | 10 +-
drivers/gpu/drm/panel/panel-renesas-r61307.c | 325 ++++++++++
drivers/gpu/drm/panel/panel-renesas-r69328.c | 281 +++++++++
drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-ams581vf01.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-ams639rq08.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-db7430.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-ld9040.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 10 +-
.../drm/panel/panel-samsung-s6e88a0-ams427ap24.c | 10 +-
.../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 11 +-
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 10 +-
drivers/gpu/drm/panel/panel-samsung-sofef00.c | 11 +-
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 11 +-
drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 10 +-
drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 11 +-
drivers/gpu/drm/panel/panel-simple.c | 27 +
drivers/gpu/drm/panel/panel-sitronix-st7701.c | 132 ++++-
drivers/gpu/drm/panel/panel-sitronix-st7703.c | 11 +-
drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 10 +-
drivers/gpu/drm/panel/panel-sony-acx565akm.c | 10 +-
drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 11 +-
.../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 11 +-
drivers/gpu/drm/panel/panel-summit.c | 10 +-
drivers/gpu/drm/panel/panel-synaptics-r63353.c | 11 +-
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 11 +-
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 10 +-
drivers/gpu/drm/panel/panel-tpo-tpg110.c | 11 +-
drivers/gpu/drm/panel/panel-visionox-r66451.c | 9 +-
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 257 +++++---
drivers/gpu/drm/panel/panel-visionox-rm692e5.c | 10 +-
drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 11 +-
drivers/gpu/drm/panel/panel-widechips-ws2401.c | 11 +-
drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 10 +-
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 4 +-
drivers/gpu/drm/panfrost/panfrost_device.c | 5 +
drivers/gpu/drm/panfrost/panfrost_device.h | 15 +
drivers/gpu/drm/panfrost/panfrost_drv.c | 81 ++-
drivers/gpu/drm/panfrost/panfrost_gem.c | 186 ++++++
drivers/gpu/drm/panfrost/panfrost_gem.h | 66 +++
drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 2 +
drivers/gpu/drm/panthor/panthor_device.h | 89 +++
drivers/gpu/drm/panthor/panthor_drv.c | 63 +-
drivers/gpu/drm/panthor/panthor_fw.c | 9 +-
drivers/gpu/drm/panthor/panthor_gpu.c | 159 ++---
drivers/gpu/drm/panthor/panthor_gpu.h | 12 +-
drivers/gpu/drm/panthor/panthor_mmu.c | 36 +-
drivers/gpu/drm/panthor/panthor_regs.h | 90 +--
drivers/gpu/drm/panthor/panthor_sched.c | 5 +-
drivers/gpu/drm/panthor/panthor_sched.h | 3 +-
drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.h | 2 +-
drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 8 +-
drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 8 +-
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 11 +
drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 44 +-
drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 355 +++++++++--
.../gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 56 +-
drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 9 +-
drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 103 +++-
drivers/gpu/drm/scheduler/sched_entity.c | 25 +-
drivers/gpu/drm/scheduler/sched_fence.c | 5 +-
drivers/gpu/drm/scheduler/sched_internal.h | 2 +-
drivers/gpu/drm/scheduler/sched_main.c | 36 +-
drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 8 +-
drivers/gpu/drm/scheduler/tests/sched_tests.h | 1 -
drivers/gpu/drm/sitronix/Kconfig | 10 -
drivers/gpu/drm/sti/sti_dvo.c | 29 +-
drivers/gpu/drm/stm/lvds.c | 7 +-
drivers/gpu/drm/sun4i/sun8i_csc.c | 4 +-
drivers/gpu/drm/sun4i/sun8i_mixer.c | 168 ++++--
drivers/gpu/drm/sun4i/sun8i_mixer.h | 31 +-
drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 27 +-
drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 2 +-
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 14 +-
drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 6 +-
drivers/gpu/drm/sysfb/ofdrm.c | 80 +--
drivers/gpu/drm/sysfb/vesadrm.c | 100 ++--
drivers/gpu/drm/tests/drm_bridge_test.c | 176 ++++--
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 651 +++++++++++++++------
drivers/gpu/drm/tests/drm_kunit_edid.h | 232 ++++++++
drivers/gpu/drm/tidss/tidss_crtc.c | 4 +-
drivers/gpu/drm/tidss/tidss_dispc.c | 195 ++++--
drivers/gpu/drm/tidss/tidss_dispc.h | 13 +-
drivers/gpu/drm/tidss/tidss_drv.c | 1 +
drivers/gpu/drm/tidss/tidss_kms.c | 2 +-
drivers/gpu/drm/tidss/tidss_plane.c | 2 +-
drivers/gpu/drm/ttm/ttm_bo.c | 1 +
drivers/gpu/drm/ttm/ttm_bo_internal.h | 58 ++
drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +
drivers/gpu/drm/ttm/ttm_device.c | 1 +
drivers/gpu/drm/ttm/ttm_pool.c | 30 +-
drivers/gpu/drm/ttm/ttm_resource.c | 3 +
drivers/gpu/drm/udl/udl_drv.c | 2 +-
drivers/gpu/drm/v3d/v3d_submit.c | 2 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_drv.h | 1 +
drivers/gpu/drm/virtio/virtgpu_prime.c | 3 +-
drivers/gpu/drm/vkms/tests/Makefile | 1 +
drivers/gpu/drm/vkms/tests/vkms_format_test.c | 280 +++++++++
drivers/gpu/drm/vkms/vkms_drv.h | 35 ++
drivers/gpu/drm/vkms/vkms_formats.c | 467 ++++++++++++++-
drivers/gpu/drm/vkms/vkms_formats.h | 9 +
drivers/gpu/drm/vkms/vkms_plane.c | 29 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 14 +-
drivers/gpu/drm/xe/xe_hw_fence.c | 2 +-
drivers/gpu/drm/xe/xe_sched_job.c | 17 +-
drivers/gpu/drm/xlnx/zynqmp_dp.c | 31 +-
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 -
include/drm/display/drm_hdmi_audio_helper.h | 1 +
include/drm/display/drm_hdmi_cec_helper.h | 72 +++
include/drm/drm_bridge.h | 337 ++++++++---
include/drm/drm_color_mgmt.h | 27 +
include/drm/drm_connector.h | 48 ++
include/drm/drm_gem.h | 3 +-
include/drm/drm_gem_shmem_helper.h | 15 +
include/drm/drm_gem_vram_helper.h | 2 -
include/drm/drm_prime.h | 3 +
include/drm/gpu_scheduler.h | 15 +-
include/drm/ttm/ttm_bo.h | 28 -
include/linux/dma-fence.h | 32 +-
include/trace/events/dma_fence.h | 4 +-
include/uapi/drm/drm_fourcc.h | 36 ++
include/uapi/drm/panfrost_drm.h | 21 +
include/uapi/drm/panthor_drm.h | 41 ++
382 files changed, 15449 insertions(+), 2873 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-driver-qaic
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-axi-performance-counter.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-blit-engine.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-blitblend.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-clut.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-command-sequencer.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-constframe.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-display-engine.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-dither.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-extdst.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-fetchunit.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-filter.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-framegen.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-gammacor.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-layerblend.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-matrix.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-pixel-engine.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-rop.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-safety.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-scaling-engine.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-signature.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-store.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml
create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc.yaml
create mode 100644 Documentation/devicetree/bindings/display/panel/renesas,r61307.yaml
create mode 100644 Documentation/devicetree/bindings/display/panel/renesas,r69328.yaml
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,imx8qxp-dc-intc.yaml
create mode 100644 drivers/accel/qaic/qaic_ras.c
create mode 100644 drivers/accel/qaic/qaic_ras.h
create mode 100644 drivers/gpu/drm/display/drm_hdmi_cec_helper.c
create mode 100644 drivers/gpu/drm/display/drm_hdmi_cec_notifier_helper.c
create mode 100644 drivers/gpu/drm/imx/dc/Kconfig
create mode 100644 drivers/gpu/drm/imx/dc/Makefile
create mode 100644 drivers/gpu/drm/imx/dc/dc-cf.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-crtc.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-de.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-de.h
create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.h
create mode 100644 drivers/gpu/drm/imx/dc/dc-ed.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-fg.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-fl.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-fu.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-fu.h
create mode 100644 drivers/gpu/drm/imx/dc/dc-fw.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-ic.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-kms.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-kms.h
create mode 100644 drivers/gpu/drm/imx/dc/dc-lb.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-pe.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-pe.h
create mode 100644 drivers/gpu/drm/imx/dc/dc-plane.c
create mode 100644 drivers/gpu/drm/imx/dc/dc-tc.c
create mode 100644 drivers/gpu/drm/panel/panel-renesas-r61307.c
create mode 100644 drivers/gpu/drm/panel/panel-renesas-r69328.c
create mode 100644 drivers/gpu/drm/ttm/ttm_bo_internal.h
create mode 100644 drivers/gpu/drm/vkms/tests/vkms_format_test.c
create mode 100644 include/drm/display/drm_hdmi_cec_helper.h
Merging amdgpu/drm-next (78d7032b0838 drm/amd/display: Promote DAL to 3.2.336)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
Merge made by the 'ort' strategy.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 37 +--
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +-
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 12 +-
drivers/gpu/drm/amd/display/dc/dc.h | 47 +++-
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 59 ++++-
drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 19 +-
drivers/gpu/drm/amd/display/dc/dc_types.h | 10 +-
.../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 6 +-
.../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 45 ++--
.../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 12 +-
.../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 6 +-
.../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 2 +-
.../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +-
.../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.h | 2 +-
.../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 30 ++-
.../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 +-
.../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 4 +-
.../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h | 2 +-
.../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 4 +-
.../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.h | 2 +-
.../dc/dml2/dml21/dml21_translation_helper.c | 4 +-
.../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 14 +-
.../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 9 +-
.../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 11 +-
.../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 1 -
.../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 10 +-
.../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 7 +-
.../dml21/src/dml2_core/dml2_core_shared_types.h | 82 +++++-
.../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 3 -
.../dml21/src/inc/dml2_internal_shared_types.h | 10 +-
.../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 +-
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 11 +-
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 4 +-
.../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 10 +-
.../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 290 +--------------------
.../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 8 -
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 9 +-
drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +-
drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 3 +-
.../gpu/drm/amd/display/dc/link/link_validation.c | 8 +
.../dc/link/protocols/link_edp_panel_control.c | 21 ++
.../gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.c | 3 -
drivers/gpu/drm/amd/display/dc/os_types.h | 1 +
.../display/dc/resource/dce100/dce100_resource.c | 2 +-
.../display/dc/resource/dce110/dce110_resource.c | 2 +-
.../display/dc/resource/dce112/dce112_resource.c | 2 +-
.../display/dc/resource/dce112/dce112_resource.h | 2 +-
.../amd/display/dc/resource/dce60/dce60_resource.c | 2 +-
.../amd/display/dc/resource/dce80/dce80_resource.c | 2 +-
.../amd/display/dc/resource/dcn10/dcn10_resource.c | 4 +-
.../amd/display/dc/resource/dcn20/dcn20_resource.c | 8 +-
.../amd/display/dc/resource/dcn20/dcn20_resource.h | 4 +-
.../amd/display/dc/resource/dcn21/dcn21_resource.c | 8 +-
.../amd/display/dc/resource/dcn21/dcn21_resource.h | 2 +-
.../amd/display/dc/resource/dcn30/dcn30_resource.c | 22 +-
.../amd/display/dc/resource/dcn30/dcn30_resource.h | 6 +-
.../amd/display/dc/resource/dcn31/dcn31_resource.c | 18 +-
.../amd/display/dc/resource/dcn31/dcn31_resource.h | 4 +-
.../display/dc/resource/dcn314/dcn314_resource.c | 14 +-
.../display/dc/resource/dcn314/dcn314_resource.h | 2 +-
.../display/dc/resource/dcn315/dcn315_resource.c | 4 +-
.../display/dc/resource/dcn316/dcn316_resource.c | 4 +-
.../amd/display/dc/resource/dcn32/dcn32_resource.c | 26 +-
.../amd/display/dc/resource/dcn32/dcn32_resource.h | 4 +-
.../amd/display/dc/resource/dcn35/dcn35_resource.c | 6 +-
.../display/dc/resource/dcn351/dcn351_resource.c | 6 +-
.../amd/display/dc/resource/dcn36/dcn36_resource.c | 6 +-
.../display/dc/resource/dcn401/dcn401_resource.c | 31 ++-
.../display/dc/resource/dcn401/dcn401_resource.h | 2 +-
drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 28 +-
drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 2 +
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 204 ++++++++++++++-
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 16 +-
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 9 +-
75 files changed, 733 insertions(+), 565 deletions(-)
Merging drm-intel/for-linux-next (ed3648b9ec4c drm/i915/dp: Disable the AUX DPCD probe quirk if it's not required)
$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c
Auto-merging drivers/gpu/drm/i915/display/intel_connector.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging include/drm/drm_connector.h
Merge made by the 'ort' strategy.
drivers/gpu/drm/display/drm_dp_helper.c | 44 +-
drivers/gpu/drm/drm_edid.c | 232 +-
drivers/gpu/drm/i915/Makefile | 7 +-
drivers/gpu/drm/i915/display/g4x_dp.c | 1 +
drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 +
drivers/gpu/drm/i915/display/hsw_ips.c | 1 +
drivers/gpu/drm/i915/display/i9xx_display_sr.c | 2 +-
drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +
drivers/gpu/drm/i915/display/i9xx_wm.c | 36 +-
drivers/gpu/drm/i915/display/icl_dsi.c | 7 +-
drivers/gpu/drm/i915/display/icl_dsi_regs.h | 1 +
drivers/gpu/drm/i915/display/intel_alpm.c | 70 +-
drivers/gpu/drm/i915/display/intel_alpm.h | 4 +
drivers/gpu/drm/i915/display/intel_atomic.c | 4 +-
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 -
drivers/gpu/drm/i915/display/intel_backlight.c | 2 +-
drivers/gpu/drm/i915/display/intel_bios.c | 1 +
drivers/gpu/drm/i915/display/intel_bw.c | 51 +-
drivers/gpu/drm/i915/display/intel_cdclk.c | 48 +-
drivers/gpu/drm/i915/display/intel_cmtg.c | 4 +-
drivers/gpu/drm/i915/display/intel_cmtg_regs.h | 2 +-
drivers/gpu/drm/i915/display/intel_color.c | 73 +-
drivers/gpu/drm/i915/display/intel_color.h | 2 +
drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +-
.../gpu/drm/i915/display/intel_combo_phy_regs.h | 2 +-
drivers/gpu/drm/i915/display/intel_connector.c | 3 +-
drivers/gpu/drm/i915/display/intel_crt.c | 3 +-
drivers/gpu/drm/i915/display/intel_crtc.c | 5 +-
drivers/gpu/drm/i915/display/intel_cursor.c | 1 -
drivers/gpu/drm/i915/display/intel_cx0_phy.c | 33 +-
drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 +
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 5 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 81 +-
drivers/gpu/drm/i915/display/intel_ddi.h | 6 +-
drivers/gpu/drm/i915/display/intel_de.h | 20 +-
drivers/gpu/drm/i915/display/intel_display.c | 117 +-
drivers/gpu/drm/i915/display/intel_display.h | 26 +-
.../drm/i915/display/intel_display_conversion.c | 3 +-
drivers/gpu/drm/i915/display/intel_display_core.h | 17 +-
.../gpu/drm/i915/display/intel_display_debugfs.c | 13 +-
.../gpu/drm/i915/display/intel_display_device.c | 11 +-
.../gpu/drm/i915/display/intel_display_device.h | 3 +
.../gpu/drm/i915/display/intel_display_driver.c | 14 +-
drivers/gpu/drm/i915/display/intel_display_irq.c | 22 +-
drivers/gpu/drm/i915/display/intel_display_power.c | 18 +-
.../gpu/drm/i915/display/intel_display_power_map.c | 4 +-
.../drm/i915/display/intel_display_power_well.c | 72 +-
drivers/gpu/drm/i915/display/intel_display_regs.h | 2935 +++++++++++++++++++
drivers/gpu/drm/i915/display/intel_display_reset.c | 1 +
drivers/gpu/drm/i915/display/intel_display_rpm.c | 1 +
drivers/gpu/drm/i915/display/intel_display_rps.c | 4 +-
drivers/gpu/drm/i915/display/intel_display_types.h | 18 +-
drivers/gpu/drm/i915/display/intel_display_wa.c | 1 +
drivers/gpu/drm/i915/display/intel_dkl_phy.c | 4 +-
drivers/gpu/drm/i915/display/intel_dkl_phy_regs.h | 2 +
drivers/gpu/drm/i915/display/intel_dmc.c | 162 +-
drivers/gpu/drm/i915/display/intel_dmc.h | 2 +
drivers/gpu/drm/i915/display/intel_dmc_regs.h | 299 +-
drivers/gpu/drm/i915/display/intel_dmc_wl.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp.c | 76 +-
drivers/gpu/drm/i915/display/intel_dp.h | 7 +-
drivers/gpu/drm/i915/display/intel_dp_aux.c | 3 +-
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_mst.c | 94 +-
drivers/gpu/drm/i915/display/intel_dp_test.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpio_phy.c | 203 +-
drivers/gpu/drm/i915/display/intel_dpll.c | 197 +-
drivers/gpu/drm/i915/display/intel_dpll.h | 4 +-
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 539 ++--
drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 80 +-
drivers/gpu/drm/i915/display/intel_dpt.c | 3 +-
drivers/gpu/drm/i915/display/intel_dpt_common.c | 2 +-
drivers/gpu/drm/i915/display/intel_drrs.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsb.c | 149 +-
drivers/gpu/drm/i915/display/intel_dsb.h | 3 +
drivers/gpu/drm/i915/display/intel_dsb_regs.h | 2 +
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 +-
drivers/gpu/drm/i915/display/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_encoder.c | 2 +-
drivers/gpu/drm/i915/display/intel_fb.c | 1 +
drivers/gpu/drm/i915/display/intel_fb_bo.c | 1 +
drivers/gpu/drm/i915/display/intel_fb_pin.c | 1 +
drivers/gpu/drm/i915/display/intel_fbc.c | 4 +-
drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 1 +
drivers/gpu/drm/i915/display/intel_fdi.c | 3 +-
drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 1 +
drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +-
drivers/gpu/drm/i915/display/intel_gmbus_regs.h | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 1 +
drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +-
drivers/gpu/drm/i915/display/intel_hotplug.c | 7 +
drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 1 +
drivers/gpu/drm/i915/display/intel_hti_regs.h | 2 +-
drivers/gpu/drm/i915/display/intel_link_bw.c | 239 +-
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_lvds.c | 3 +-
drivers/gpu/drm/i915/display/intel_modeset_setup.c | 11 +-
.../gpu/drm/i915/display/intel_modeset_verify.c | 4 +-
drivers/gpu/drm/i915/display/intel_opregion.c | 1 +
drivers/gpu/drm/i915/display/intel_overlay.c | 2 +
drivers/gpu/drm/i915/display/intel_pch_display.c | 21 +-
drivers/gpu/drm/i915/display/intel_pch_refclk.c | 154 +-
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_initial.c | 1 +
drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +-
drivers/gpu/drm/i915/display/intel_pps.c | 1 +
drivers/gpu/drm/i915/display/intel_pps_regs.h | 15 +-
drivers/gpu/drm/i915/display/intel_psr.c | 79 +-
drivers/gpu/drm/i915/display/intel_psr.h | 2 +
drivers/gpu/drm/i915/display/intel_psr_regs.h | 10 +
drivers/gpu/drm/i915/display/intel_sbi.c | 90 +
drivers/gpu/drm/i915/display/intel_sbi.h | 27 +
drivers/gpu/drm/i915/display/intel_sbi_regs.h | 65 +
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +-
drivers/gpu/drm/i915/display/intel_tc.c | 1 +
drivers/gpu/drm/i915/display/intel_tv.c | 2 +-
drivers/gpu/drm/i915/display/intel_vblank.c | 2 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 +-
drivers/gpu/drm/i915/display/intel_vga.c | 1 -
drivers/gpu/drm/i915/display/intel_vrr.c | 25 +-
drivers/gpu/drm/i915/display/intel_vrr_regs.h | 6 +
drivers/gpu/drm/i915/display/skl_scaler.c | 19 +-
drivers/gpu/drm/i915/display/skl_universal_plane.c | 5 +-
drivers/gpu/drm/i915/display/skl_watermark.c | 17 +-
drivers/gpu/drm/i915/display/vlv_dsi.c | 27 +-
drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 46 +-
drivers/gpu/drm/i915/display/vlv_sideband.c | 50 +
drivers/gpu/drm/i915/display/vlv_sideband.h | 156 ++
drivers/gpu/drm/i915/gem/i915_gem_domain.c | 1 -
.../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 2 +-
.../drm/i915/gem/selftests/i915_gem_client_blt.c | 1 +
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +-
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 8 +-
drivers/gpu/drm/i915/gt/intel_reset.c | 4 +-
drivers/gpu/drm/i915/gt/intel_rps.c | 62 +-
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 +-
drivers/gpu/drm/i915/gvt/display.c | 12 +-
drivers/gpu/drm/i915/gvt/display.h | 13 -
drivers/gpu/drm/i915/gvt/edid.c | 1 +
drivers/gpu/drm/i915/gvt/fb_decoder.c | 8 +-
drivers/gpu/drm/i915/gvt/handlers.c | 40 +-
drivers/gpu/drm/i915/gvt/interrupt.c | 1 +
drivers/gpu/drm/i915/gvt/mmio.c | 1 +
drivers/gpu/drm/i915/i915_driver.c | 75 +-
drivers/gpu/drm/i915/i915_drv.h | 34 +-
drivers/gpu/drm/i915/i915_getparam.c | 2 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 156 +-
drivers/gpu/drm/i915/i915_reg.h | 2963 --------------------
drivers/gpu/drm/i915/i915_switcheroo.c | 2 +
drivers/gpu/drm/i915/intel_clock_gating.c | 6 +-
drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 +
drivers/gpu/drm/i915/intel_sbi.c | 94 -
drivers/gpu/drm/i915/intel_sbi.h | 27 -
drivers/gpu/drm/i915/intel_uncore.c | 8 +-
drivers/gpu/drm/i915/intel_uncore.h | 5 +-
drivers/gpu/drm/i915/selftests/mock_gem_device.c | 12 +-
drivers/gpu/drm/i915/soc/intel_dram.c | 87 +-
drivers/gpu/drm/i915/soc/intel_dram.h | 26 +-
drivers/gpu/drm/i915/soc/intel_gmch.c | 2 +
.../gpu/drm/i915/{vlv_sideband.c => vlv_iosf_sb.c} | 190 +-
drivers/gpu/drm/i915/vlv_iosf_sb.h | 37 +
.../i915/{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} | 6 +-
drivers/gpu/drm/i915/vlv_sideband.h | 125 -
.../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 5 +-
.../gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h | 42 +
.../{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} | 2 +-
.../gpu/drm/xe/compat-i915-headers/vlv_sideband.h | 132 -
drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 1 +
drivers/gpu/drm/xe/display/xe_display.c | 99 +-
drivers/gpu/drm/xe/display/xe_display.h | 4 -
drivers/gpu/drm/xe/display/xe_display_rpm.c | 4 +-
drivers/gpu/drm/xe/display/xe_display_wa.c | 2 +-
drivers/gpu/drm/xe/display/xe_fb_pin.c | 6 +-
drivers/gpu/drm/xe/display/xe_plane_initial.c | 3 +-
drivers/gpu/drm/xe/display/xe_tdf.c | 4 +-
drivers/gpu/drm/xe/xe_device.c | 4 -
drivers/gpu/drm/xe/xe_device_types.h | 29 +-
include/drm/display/drm_dp.h | 22 +-
include/drm/display/drm_dp_helper.h | 6 +
include/drm/drm_connector.h | 4 +-
include/drm/drm_edid.h | 8 +
187 files changed, 6263 insertions(+), 5162 deletions(-)
create mode 100644 drivers/gpu/drm/i915/display/intel_display_regs.h
create mode 100644 drivers/gpu/drm/i915/display/intel_sbi.c
create mode 100644 drivers/gpu/drm/i915/display/intel_sbi.h
create mode 100644 drivers/gpu/drm/i915/display/intel_sbi_regs.h
create mode 100644 drivers/gpu/drm/i915/display/vlv_sideband.c
create mode 100644 drivers/gpu/drm/i915/display/vlv_sideband.h
delete mode 100644 drivers/gpu/drm/i915/intel_sbi.c
delete mode 100644 drivers/gpu/drm/i915/intel_sbi.h
rename drivers/gpu/drm/i915/{vlv_sideband.c => vlv_iosf_sb.c} (54%)
create mode 100644 drivers/gpu/drm/i915/vlv_iosf_sb.h
rename drivers/gpu/drm/i915/{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} (98%)
delete mode 100644 drivers/gpu/drm/i915/vlv_sideband.h
create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h
rename drivers/gpu/drm/xe/compat-i915-headers/{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} (66%)
delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband.h
Merging drm-msm/msm-next (ee11d953fd23 MAINTAINERS: .mailmap: update Rob Clark's email address)
$ 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 (fc5c669c902c dt-bindings: display: msm: correct example in SM8350 MDSS schema)
$ 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-nova/nova-next (19272b37aa4f Linux 6.16-rc1)
$ 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 (87c648c31322 drm/xe: Add helper function to inject fault into ct_dead_capture())
$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next
Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c
Auto-merging drivers/gpu/drm/xe/display/xe_plane_initial.c
Auto-merging drivers/gpu/drm/xe/xe_device.c
Auto-merging drivers/gpu/drm/xe/xe_device_types.h
Merge made by the 'ort' strategy.
.../ABI/testing/sysfs-driver-intel-xe-hwmon | 48 +++
Documentation/gpu/xe/xe_configfs.rst | 10 +-
drivers/gpu/drm/drm_gpusvm.c | 34 +++
drivers/gpu/drm/xe/Kconfig | 1 -
drivers/gpu/drm/xe/Kconfig.debug | 11 +-
drivers/gpu/drm/xe/Makefile | 3 +-
drivers/gpu/drm/xe/abi/guc_actions_abi.h | 31 ++
drivers/gpu/drm/xe/abi/guc_errors_abi.h | 14 +-
drivers/gpu/drm/xe/display/xe_fb_pin.c | 50 ++--
drivers/gpu/drm/xe/display/xe_plane_initial.c | 6 +-
drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 2 -
drivers/gpu/drm/xe/regs/xe_pmt.h | 5 +
drivers/gpu/drm/xe/tests/xe_bo.c | 4 +-
drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 11 +-
drivers/gpu/drm/xe/xe_bo.c | 69 +++--
drivers/gpu/drm/xe/xe_bo_evict.c | 4 +-
drivers/gpu/drm/xe/xe_configfs.c | 160 ++++++++++
drivers/gpu/drm/xe/xe_configfs.h | 11 +-
drivers/gpu/drm/xe/xe_debugfs.c | 38 +++
drivers/gpu/drm/xe/xe_device.c | 21 +-
drivers/gpu/drm/xe/xe_device.h | 2 +
drivers/gpu/drm/xe/xe_device_types.h | 3 +
drivers/gpu/drm/xe/xe_ggtt.c | 249 ++++++++++++----
drivers/gpu/drm/xe/xe_ggtt.h | 24 +-
drivers/gpu/drm/xe/xe_ggtt_types.h | 4 +-
drivers/gpu/drm/xe/xe_gt.c | 4 +-
drivers/gpu/drm/xe/xe_gt_debugfs.c | 96 ++++--
drivers/gpu/drm/xe/xe_gt_pagefault.c | 109 +++----
drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 6 +-
drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 4 +-
drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 297 +++++++++----------
drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 9 +-
drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 21 +-
drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 8 +
drivers/gpu/drm/xe/xe_gt_topology.c | 44 +--
drivers/gpu/drm/xe/xe_guc.c | 19 +-
drivers/gpu/drm/xe/xe_guc_ads.c | 27 +-
drivers/gpu/drm/xe/xe_guc_buf.c | 4 -
drivers/gpu/drm/xe/xe_guc_ct.c | 330 +++++++++++++++++++--
drivers/gpu/drm/xe/xe_guc_ct.h | 7 +
drivers/gpu/drm/xe/xe_guc_ct_types.h | 15 +
drivers/gpu/drm/xe/xe_guc_engine_activity.c | 2 +-
drivers/gpu/drm/xe/xe_guc_log.h | 2 +-
drivers/gpu/drm/xe/xe_guc_submit.c | 25 +-
drivers/gpu/drm/xe/xe_hw_engine.c | 37 ++-
drivers/gpu/drm/xe/xe_hwmon.c | 230 +++++++++-----
drivers/gpu/drm/xe/xe_lrc.c | 97 ++++--
drivers/gpu/drm/xe/xe_lrc_types.h | 3 -
drivers/gpu/drm/xe/xe_map.h | 18 ++
drivers/gpu/drm/xe/xe_pat.c | 3 +-
drivers/gpu/drm/xe/xe_pci.c | 1 +
drivers/gpu/drm/xe/xe_pt.c | 100 +++++--
drivers/gpu/drm/xe/xe_pxp.c | 153 ++++++----
drivers/gpu/drm/xe/xe_shrinker.c | 37 ++-
drivers/gpu/drm/xe/xe_shrinker.h | 4 +-
drivers/gpu/drm/xe/xe_sriov_vf.c | 58 ++++
drivers/gpu/drm/xe/xe_svm.c | 255 +++++++++++-----
drivers/gpu/drm/xe/xe_svm.h | 138 +++++++++
drivers/gpu/drm/xe/xe_tile.c | 6 +-
drivers/gpu/drm/xe/xe_tile_sriov_vf.c | 254 ++++++++++++++++
drivers/gpu/drm/xe/xe_tile_sriov_vf.h | 18 ++
drivers/gpu/drm/xe/xe_tuning.c | 5 +
drivers/gpu/drm/xe/xe_uc_fw.c | 56 ++--
drivers/gpu/drm/xe/xe_uc_fw_types.h | 2 +
drivers/gpu/drm/xe/xe_vm.c | 278 +++++++++++++++--
drivers/gpu/drm/xe/xe_vm.h | 2 +
drivers/gpu/drm/xe/xe_vm_types.h | 26 +-
drivers/gpu/drm/xe/xe_vsec.c | 4 +-
drivers/gpu/drm/xe/xe_vsec.h | 4 +
drivers/gpu/drm/xe/xe_wa.c | 46 +--
drivers/gpu/drm/xe/xe_wa_oob.rules | 4 +-
include/drm/drm_gpusvm.h | 5 +
include/drm/intel/pciids.h | 7 +-
73 files changed, 2834 insertions(+), 861 deletions(-)
create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_vf.c
create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_vf.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 (59d1fc7b3e1a fbdev: pm3fb: fix potential divide by zero)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
Merge made by the 'ort' strategy.
drivers/video/fbdev/nvidia/nv_local.h | 2 +-
drivers/video/fbdev/pm3fb.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
Merging regmap/for-next (c8c4694ede7e regmap: kunit: Constify regmap_range_cfg array)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
Merge made by the 'ort' strategy.
drivers/base/regmap/regmap-kunit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging sound/for-next (30f85eddbdeb ALSA: hda/ca0132: Use const char * for strings)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
Merge made by the 'ort' strategy.
sound/core/pcm_native.c | 19 +-
sound/mips/sgio2audio.c | 9 +-
sound/pci/hda/patch_ca0132.c | 30 +--
sound/pci/hda/tas2781_hda_i2c.c | 5 +-
sound/usb/mixer_quirks.c | 571 +++++++++++++++++++++++++++++-----------
5 files changed, 456 insertions(+), 178 deletions(-)
Merging ieee1394/for-next (f657a680f84e firewire: core: use from_work() macro to expand parent structure of work_struct)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
Merge made by the 'ort' strategy.
drivers/firewire/core-card.c | 4 ++--
drivers/firewire/core-cdev.c | 3 +--
drivers/firewire/core-device.c | 15 +++++----------
drivers/firewire/ohci.c | 11 +++++------
4 files changed, 13 insertions(+), 20 deletions(-)
Merging sound-asoc/for-next (bc6adb5e0cc4 Merge remote-tracking branch 'asoc/for-6.17' into asoc-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
Merge made by the 'ort' strategy.
.../bindings/sound/fsl,mxs-audio-sgtl5000.yaml | 81 +++
.../bindings/sound/mxs-audio-sgtl5000.txt | 42 --
.../devicetree/bindings/sound/qcom,wcd939x.yaml | 3 +
.../devicetree/bindings/sound/richtek,rt9123.yaml | 9 +-
.../devicetree/bindings/sound/ti,tas57xx.yaml | 2 +
include/sound/soc-component.h | 1 -
include/sound/tas2781.h | 4 +
sound/soc/amd/acp/acp-pci.c | 8 +-
sound/soc/amd/acp/amd-acpi-mach.c | 4 +-
sound/soc/amd/acp/amd.h | 8 +-
sound/soc/codecs/Kconfig | 12 +-
sound/soc/codecs/Makefile | 4 +-
sound/soc/codecs/cs35l36.c | 2 +-
sound/soc/codecs/da7218.c | 2 +-
sound/soc/codecs/da7219.c | 4 +-
sound/soc/codecs/es8375.c | 2 +-
sound/soc/codecs/hdac_hdmi.c | 297 -----------
sound/soc/codecs/hdac_hdmi.h | 10 -
sound/soc/codecs/lpass-rx-macro.c | 1 -
sound/soc/codecs/lpass-tx-macro.c | 1 -
sound/soc/codecs/lpass-va-macro.c | 1 -
sound/soc/codecs/lpass-wsa-macro.c | 1 -
sound/soc/codecs/max98363.c | 2 +-
sound/soc/codecs/max98373-i2c.c | 2 +-
sound/soc/codecs/max98373-sdw.c | 2 +-
sound/soc/codecs/max98388.c | 2 +-
sound/soc/codecs/max98390.c | 2 +-
sound/soc/codecs/max98396.c | 4 +-
sound/soc/codecs/max98504.c | 2 +-
sound/soc/codecs/max98520.c | 2 +-
sound/soc/codecs/max98927.c | 2 +-
sound/soc/codecs/rt5640.c | 43 +-
sound/soc/codecs/rt5640.h | 6 +-
sound/soc/codecs/rt722-sdca-sdw.c | 2 +-
sound/soc/codecs/rtq9124.c | 543 +++++++++++++++++++++
sound/soc/codecs/tas2781-i2c.c | 3 -
sound/soc/codecs/tas571x.c | 52 ++
sound/soc/codecs/wcd9335.c | 5 -
sound/soc/codecs/wcd934x.c | 4 -
sound/soc/codecs/wcd937x.c | 32 +-
sound/soc/codecs/wcd937x.h | 1 -
sound/soc/codecs/wcd938x.c | 52 +-
sound/soc/codecs/wcd939x.c | 46 +-
sound/soc/codecs/wsa881x.c | 4 +-
sound/soc/codecs/wsa883x.c | 2 +-
sound/soc/codecs/wsa884x.c | 2 +-
sound/soc/fsl/fsl_asrc.c | 2 +-
sound/soc/fsl/fsl_sai.c | 4 +-
sound/soc/fsl/imx-card.c | 13 +-
sound/soc/intel/avs/board_selection.c | 27 +
sound/soc/intel/avs/boards/Kconfig | 12 +
sound/soc/intel/avs/boards/Makefile | 2 +
sound/soc/intel/avs/boards/rt5640.c | 270 ++++++++++
sound/soc/meson/axg-card.c | 3 +-
sound/soc/meson/meson-card-utils.c | 16 +-
sound/soc/qcom/lpass-platform.c | 27 +-
sound/soc/qcom/sm8250.c | 27 +-
sound/soc/renesas/rcar/core.c | 35 +-
sound/soc/renesas/rcar/ctu.c | 8 +-
sound/soc/renesas/rcar/dma.c | 4 +-
sound/soc/renesas/rcar/dvc.c | 8 +-
sound/soc/renesas/rcar/mix.c | 8 +-
sound/soc/renesas/rcar/msiof.c | 94 ++--
sound/soc/renesas/rcar/src.c | 10 +-
sound/soc/renesas/rcar/ssi.c | 18 +-
sound/soc/renesas/rcar/ssiu.c | 7 +-
sound/soc/rockchip/rockchip_sai.c | 51 +-
sound/soc/soc-core.c | 14 +-
sound/soc/soc-dai.c | 16 +-
sound/soc/soc-ops.c | 28 +-
70 files changed, 1260 insertions(+), 760 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/fsl,mxs-audio-sgtl5000.yaml
delete mode 100644 Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt
delete mode 100644 sound/soc/codecs/hdac_hdmi.h
create mode 100644 sound/soc/codecs/rtq9124.c
create mode 100644 sound/soc/intel/avs/boards/rt5640.c
Merging modules/modules-next (a0b018a495a3 module: Remove outdated comment about text_size)
$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next
Already up to date.
Merging input/next (a95ef0199e80 Input: ims-pcu - check record size in ims_pcu_flash_firmware())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Already up to date.
Merging block/for-next (c73e4b8bde5f Merge branch 'for-6.17/io_uring' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
Merge made by the 'ort' strategy.
Documentation/block/ublk.rst | 75 ++++++++++++++++++++++++++++++++++++++++++
block/blk-merge.c | 26 +++++++--------
block/blk-zoned.c | 8 +++--
drivers/block/loop.c | 11 +++----
include/linux/io_uring_types.h | 5 +++
io_uring/fdinfo.c | 12 +++++--
io_uring/io_uring.c | 43 +++++++++++++++++++-----
io_uring/opdef.c | 1 +
io_uring/opdef.h | 1 +
io_uring/register.c | 7 ++--
io_uring/sqpoll.c | 43 +++++++++++++++---------
io_uring/sqpoll.h | 8 ++++-
io_uring/uring_cmd.c | 43 +++++++++++-------------
io_uring/uring_cmd.h | 1 +
14 files changed, 210 insertions(+), 74 deletions(-)
Merging device-mapper/for-next (9f2f6316d753 dm-stripe: small code cleanup)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
Already up to date.
Merging libata/for-next (6f29d393061c ata: ahci: Use correct BIOS build date for ThinkPad W541 quirk)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next
Merge made by the 'ort' strategy.
drivers/ata/ahci.c | 8 +-------
drivers/ata/libata-acpi.c | 24 ++++++++++++++++--------
drivers/ata/pata_cs5536.c | 2 +-
drivers/ata/pata_macio.c | 2 +-
drivers/ata/pata_via.c | 9 ++++-----
include/linux/libata.h | 7 +++----
6 files changed, 26 insertions(+), 26 deletions(-)
Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (a18ed7f56d26 mmc: sdhci-uhs2: Adjust some error messages and register dump for SD UHS-II card)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
Merge made by the 'ort' strategy.
drivers/mmc/core/sd_uhs2.c | 4 +-
drivers/mmc/host/sdhci-acpi.c | 8 +--
drivers/mmc/host/sdhci-esdhc-imx.c | 74 ++++++++++++++--------
drivers/mmc/host/sdhci-of-at91.c | 8 +--
drivers/mmc/host/sdhci-of-k1.c | 126 +++++++++++++++++++------------------
drivers/mmc/host/sdhci-pci-core.c | 19 ++----
drivers/mmc/host/sdhci-pxav3.c | 8 +--
drivers/mmc/host/sdhci-s3c.c | 10 ++-
drivers/mmc/host/sdhci-uhs2.c | 20 +++---
drivers/mmc/host/sdhci-xenon.c | 9 +--
drivers/mmc/host/sdhci.c | 8 +--
drivers/mmc/host/sdhci.h | 20 +++++-
drivers/mmc/host/sdhci_am654.c | 8 +--
13 files changed, 166 insertions(+), 156 deletions(-)
Merging mfd/for-mfd-next (ffb006aa433e mfd: maxim: Correct Samsung "Electronics" spelling in copyright headers)
$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
Already up to date.
Merging backlight/for-backlight-next (e12d3e1624a0 backlight: pm8941: Add NULL check in wled_configure())
$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
Already up to date.
Merging battery/for-next (b1d8766052eb power: supply: rt9471: Simplify definition of some struct linear_range)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
Already up to date.
Merging regulator/for-next (c39ecd6007b4 Merge remote-tracking branch 'regulator/for-6.17' into regulator-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
Merge made by the 'ort' strategy.
.../bindings/regulator/nxp,pca9450-regulator.yaml | 14 +++
...pberrypi,7inch-touchscreen-panel-regulator.yaml | 7 +-
drivers/regulator/Kconfig | 11 ++
drivers/regulator/Makefile | 1 +
drivers/regulator/bd718x7-regulator.c | 27 ++---
drivers/regulator/pca9450-regulator.c | 120 ++++++++++++++++++++-
drivers/regulator/rpi-panel-v2-regulator.c | 114 ++++++++++++++++++++
drivers/regulator/tps6594-regulator.c | 62 +++++------
.../dt-bindings/regulator/nxp,pca9450-regulator.h | 18 ++++
9 files changed, 324 insertions(+), 50 deletions(-)
create mode 100644 drivers/regulator/rpi-panel-v2-regulator.c
create mode 100644 include/dt-bindings/regulator/nxp,pca9450-regulator.h
Merging security/next (a7d6fb31a4db lsm: trivial comment fix)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
Merge made by the 'ort' strategy.
security/security.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging apparmor/apparmor-next (1fdb22c54a5f apparmor: mitigate parser generating large xtables)
$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
Auto-merging security/apparmor/apparmorfs.c
Auto-merging security/apparmor/lsm.c
Merge made by the 'ort' strategy.
security/apparmor/Kconfig | 3 +-
security/apparmor/Makefile | 6 +-
security/apparmor/af_unix.c | 702 +++++++++++++++++++++++++++++++++
security/apparmor/apparmorfs.c | 36 +-
security/apparmor/audit.c | 2 +-
security/apparmor/capability.c | 56 +++
security/apparmor/crypto.c | 85 +---
security/apparmor/domain.c | 182 ++++++---
security/apparmor/file.c | 61 +--
security/apparmor/include/af_unix.h | 57 +++
security/apparmor/include/apparmor.h | 4 +-
security/apparmor/include/capability.h | 1 +
security/apparmor/include/cred.h | 2 +-
security/apparmor/include/file.h | 11 +-
security/apparmor/include/ipc.h | 3 +
security/apparmor/include/label.h | 24 +-
security/apparmor/include/lib.h | 46 ++-
security/apparmor/include/match.h | 10 +-
security/apparmor/include/net.h | 31 +-
security/apparmor/include/path.h | 1 +
security/apparmor/include/perms.h | 8 +-
security/apparmor/include/policy.h | 55 ++-
security/apparmor/include/sig_names.h | 6 +-
security/apparmor/include/signal.h | 19 +
security/apparmor/ipc.c | 10 +-
security/apparmor/label.c | 37 +-
security/apparmor/lib.c | 114 ++++++
security/apparmor/lsm.c | 249 ++++++++++--
security/apparmor/match.c | 23 +-
security/apparmor/net.c | 180 ++++++++-
security/apparmor/policy.c | 39 +-
security/apparmor/policy_compat.c | 6 +-
security/apparmor/policy_ns.c | 2 +-
security/apparmor/policy_unpack.c | 60 ++-
security/apparmor/procattr.c | 6 +-
35 files changed, 1791 insertions(+), 346 deletions(-)
create mode 100644 security/apparmor/af_unix.c
create mode 100644 security/apparmor/include/af_unix.h
create mode 100644 security/apparmor/include/signal.h
Merging integrity/next-integrity (fe3aebf27dc1 ima: do not copy measurement list to kdump kernel)
$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
Already up to date.
Merging selinux/next (be28fa230e05 selinux: add a 5 second sleep to /sys/fs/selinux/user)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
Merge made by the 'ort' strategy.
security/selinux/selinuxfs.c | 1 +
1 file changed, 1 insertion(+)
Merging smack/next (4b59f4fd0a36 security/smack/smackfs: small kernel-doc fixes)
$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
Already up to date.
Merging tomoyo/master (f09079bd04a9 Merge tag 'powerpc-6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master
Already up to date.
Merging tpmdd/next (e271ed52b344 Merge tag 'pm-6.16-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
Already up to date.
Merging watchdog/master (158f9f2f7152 watchdog: iTCO_wdt: Update the heartbeat value after clamping timeout)
$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
Already up to date.
Merging iommu/next (879b141b7cfa Merge branches 'fixes', 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'fsl/pamu', 'mediatek', 'renesas/ipmmu', 's390', 'intel/vt-d', 'amd/amd-vi' and 'core' into next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
Already up to date.
Merging audit/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
Already up to date.
Merging devicetree/for-next (d205b07e7e85 dt-bindings: display: convert himax,hx8357d.txt to yaml format)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.../devicetree/bindings/display/arm,pl11x.yaml | 3 +
.../devicetree/bindings/display/fsl,lcdif.yaml | 19 +++++-
.../devicetree/bindings/display/himax,hx8357.yaml | 78 ++++++++++++++++++++++
.../devicetree/bindings/display/himax,hx8357d.txt | 26 --------
.../bindings/display/sitronix,st7586.txt | 22 ------
.../bindings/display/sitronix,st7586.yaml | 61 +++++++++++++++++
.../bindings/soc/fsl/fsl,imx23-digctl.yaml | 53 +++++++++++++++
MAINTAINERS | 4 +-
8 files changed, 215 insertions(+), 51 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/himax,hx8357.yaml
delete mode 100644 Documentation/devicetree/bindings/display/himax,hx8357d.txt
delete mode 100644 Documentation/devicetree/bindings/display/sitronix,st7586.txt
create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7586.yaml
create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,imx23-digctl.yaml
Merging dt-krzk/for-next (6cd594ed969d ARM: dts: vt8500: Add L2 cache controller on WM8850/WM8950)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
Merge made by the 'ort' strategy.
arch/arm/boot/dts/vt8500/vt8500-bv07.dts | 5 +++++
arch/arm/boot/dts/vt8500/vt8500.dtsi | 12 ++++--------
arch/arm/boot/dts/vt8500/wm8505-ref.dts | 5 +++++
arch/arm/boot/dts/vt8500/wm8505.dtsi | 12 ++++--------
arch/arm/boot/dts/vt8500/wm8650-mid.dts | 5 +++++
arch/arm/boot/dts/vt8500/wm8650.dtsi | 12 ++++--------
arch/arm/boot/dts/vt8500/wm8750-apc8750.dts | 5 +++++
arch/arm/boot/dts/vt8500/wm8750.dtsi | 12 ++++--------
arch/arm/boot/dts/vt8500/wm8850-w70v2.dts | 5 +++++
arch/arm/boot/dts/vt8500/wm8850.dtsi | 21 +++++++++++++++------
10 files changed, 56 insertions(+), 38 deletions(-)
Merging mailbox/for-next (d0b497df02e9 mailbox: qcom-apcs-ipc: Assign OF node to clock controller child device)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next
Already up to date.
Merging spi/for-next (39995b55b940 Merge remote-tracking branch 'spi/for-6.17' into spi-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/spi/fsl,dspi.yaml | 18 ++
.../bindings/spi/mediatek,spi-mt65xx.yaml | 5 +
Documentation/devicetree/bindings/spi/mxs-spi.yaml | 3 +
drivers/spi/Kconfig | 4 +-
drivers/spi/spi-fsl-dspi.c | 356 ++++++++++++++-------
drivers/spi/spi-mt65xx.c | 11 +
drivers/spi/spi-pci1xxxx.c | 9 +-
drivers/spi/spi-qpic-snand.c | 37 +--
8 files changed, 288 insertions(+), 155 deletions(-)
Merging tip/master (b75dc5e1399d Merge branch into tip/master: 'sched/core')
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
Merge made by the 'ort' strategy.
kernel/sched/autogroup.c | 3 +++
kernel/sched/autogroup.h | 2 ++
kernel/sched/clock.c | 3 +++
kernel/sched/completion.c | 5 +++++
kernel/sched/core_sched.c | 2 ++
kernel/sched/cpuacct.c | 2 ++
kernel/sched/cpudeadline.c | 1 +
kernel/sched/cpudeadline.h | 2 ++
kernel/sched/cpufreq.c | 1 +
kernel/sched/cpufreq_schedutil.c | 2 ++
kernel/sched/cpupri.c | 1 +
kernel/sched/cpupri.h | 3 +++
kernel/sched/cputime.c | 3 +++
kernel/sched/deadline.c | 4 ++++
kernel/sched/debug.c | 3 +++
kernel/sched/fair.c | 2 +-
kernel/sched/idle.c | 5 +++++
kernel/sched/isolation.c | 2 ++
kernel/sched/loadavg.c | 2 ++
kernel/sched/membarrier.c | 2 ++
kernel/sched/pelt.c | 1 +
kernel/sched/pelt.h | 7 ++++++-
kernel/sched/psi.c | 4 ++++
kernel/sched/rt.c | 3 +++
kernel/sched/sched-pelt.h | 1 +
kernel/sched/sched.h | 1 +
kernel/sched/smp.h | 7 +++++++
kernel/sched/stats.c | 1 +
kernel/sched/stop_task.c | 1 +
kernel/sched/swait.c | 1 +
kernel/sched/topology.c | 2 ++
kernel/sched/wait.c | 1 +
kernel/sched/wait_bit.c | 3 +++
33 files changed, 81 insertions(+), 2 deletions(-)
Merging clockevents/timers/drivers/next (d204e391a0d8 clocksource/drivers/renesas-ostm: Unconditionally enable reprobe support)
$ git merge -m Merge branch 'timers/drivers/next' of git://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 (855b5de2e562 Merge ras/edac-drivers into for-next)
$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
Merge made by the 'ort' strategy.
Merging ftrace/for-next (9cca84d73fae Merge tools/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
Merge made by the 'ort' strategy.
Merging rcu/next (96d02a89721a rcutorture: Make BUSTED scenario check and log readers)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next
Merge made by the 'ort' strategy.
include/linux/context_tracking_irq.h | 2 +
kernel/context_tracking.c | 14 +
kernel/rcu/rcutorture.c | 349 ++++++++++++++++++---
kernel/rcu/srcutree.c | 2 +
kernel/rcu/tree.c | 39 ++-
kernel/rcu/tree_exp.h | 69 ++--
kernel/rcu/tree_plugin.h | 14 +-
.../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
tools/testing/selftests/rcutorture/bin/kvm.sh | 15 +-
tools/testing/selftests/rcutorture/bin/mktestid.sh | 29 ++
tools/testing/selftests/rcutorture/bin/torture.sh | 78 ++++-
.../selftests/rcutorture/configs/rcu/BUSTED | 3 +
12 files changed, 471 insertions(+), 145 deletions(-)
create mode 100755 tools/testing/selftests/rcutorture/bin/mktestid.sh
Merging paulmck/non-rcu/next (e55dc2e5b2e3 Merge branches 'lkmm.2025.04.22a' and 'ratelimit.2025.05.08a' into HEAD)
$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next
Auto-merging lib/Kconfig.debug
Auto-merging lib/tests/Makefile
Merge made by the 'ort' strategy.
lib/Kconfig.debug | 11 ++++
lib/tests/Makefile | 1 +
lib/tests/test_ratelimit.c | 144 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 156 insertions(+)
create mode 100644 lib/tests/test_ratelimit.c
Merging kvm/next (8046d29dde17 KVM: x86/mmu: Reject direct bits in gpa passed to KVM_PRE_FAULT_MEMORY)
$ 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 (1b85d923ba8c Merge branch kvm-arm64/misc-6.16 into kvmarm-master/next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
Already up to date.
Merging kvms390/next (d6c8097803cb KVM: s390: Simplify and move pv code)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Already up to date.
Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2)
$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm
Already up to date.
Merging kvm-riscv/riscv_kvm_next (7917be170928 RISC-V: KVM: lock the correct mp_state during reset)
$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next
Already up to date.
Merging kvm-x86/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
Already up to date.
Merging xen-tip/linux-next (7f9bbc1140ff xen/arm: call uaccess_ttbr0_enable for dm_op hypercall)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Already up to date.
Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
Already up to date.
Merging workqueues/for-next (0998f0ac308c workqueue: fix opencoded cpumask_next_and_wrap() in wq_select_unbound_cpu())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
Merge made by the 'ort' strategy.
kernel/workqueue.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
Merging sched-ext/for-next (fd36ba4ea299 Merge branch 'for-6.16-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
Documentation/scheduler/sched-ext.rst | 11 ++++++++---
MAINTAINERS | 2 +-
kernel/sched/ext.c | 18 ++----------------
kernel/sched/ext.h | 16 ++++++++++++++++
kernel/sched/ext_idle.c | 28 +++++++++++++++++-----------
kernel/sched/ext_idle.h | 7 -------
6 files changed, 44 insertions(+), 38 deletions(-)
Merging drivers-x86/for-next (458957b8e3d5 platform/x86: intel_telemetry: Remove unused telemetry_raw_read_events())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
Auto-merging drivers/platform/x86/ideapad-laptop.c
Merge made by the 'ort' strategy.
.../ABI/obsolete/sysfs-platform-ideapad-laptop | 8 +
.../ABI/testing/sysfs-platform-ideapad-laptop | 9 -
arch/x86/include/asm/intel_telemetry.h | 37 ----
drivers/platform/x86/Kconfig | 1 +
drivers/platform/x86/amd/hsmp/hsmp.h | 3 +-
drivers/platform/x86/dell/alienware-wmi-wmax.c | 100 +++++----
drivers/platform/x86/ideapad-laptop.c | 110 +++++++++-
drivers/platform/x86/intel/telemetry/core.c | 177 ----------------
drivers/platform/x86/intel/telemetry/pltdrv.c | 231 ---------------------
9 files changed, 181 insertions(+), 495 deletions(-)
create mode 100644 Documentation/ABI/obsolete/sysfs-platform-ideapad-laptop
Merging chrome-platform/for-next (8866f4e557eb platform/chrome: cros_ec_typec: Defer probe on missing EC parent)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
Merge made by the 'ort' strategy.
drivers/platform/chrome/cros_ec_typec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging chrome-platform-firmware/for-firmware-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next
Already up to date.
Merging hsi/for-next (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Already up to date.
Merging leds-lj/for-leds-next (b338a2ae9b31 leds: tps6131x: Add support for Texas Instruments TPS6131X flash LED driver)
$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
Already up to date.
Merging ipmi/for-next (cd2e103d57e5 Merge tag 'hardening-v6.16-rc1-fix1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
Already up to date.
Merging thunderbolt/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
Already up to date.
Merging usb-serial/usb-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
Already up to date.
Merging tty/tty-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
Already up to date.
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
Already up to date.
Merging coresight/next (408c97c4a5e0 coresight: prevent deactivate active config while enabling the config)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
Already up to date.
Merging fastrpc/for-next (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
Already up to date.
Merging fpga/for-next (6ebf1982038a fpga: fix potential null pointer deref in fpga_mgr_test_img_load_sgt())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
Already up to date.
Merging icc/icc-next (5fed7fe33c2c Merge branch 'icc-sa8775p' into icc-next)
$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
Already up to date.
Merging iio/togreg (0c86e3381978 dt-bindings: iio: adc: Add ROHM BD79100G)
$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
Already up to date.
Merging phy-next/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
Already up to date.
Merging soundwire/next (393350c1691f soundwire: update Intel BPT message length limitation)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
Auto-merging MAINTAINERS
Auto-merging drivers/soundwire/amd_manager.c
Merge made by the 'ort' strategy.
Documentation/driver-api/soundwire/bra.rst | 2 +-
MAINTAINERS | 1 -
drivers/soundwire/amd_manager.c | 7 +++--
drivers/soundwire/bus.c | 6 ++--
drivers/soundwire/intel_ace2x.c | 11 +++----
drivers/soundwire/qcom.c | 6 ++--
sound/soc/codecs/cs42l43-jack.c | 46 ++++++++++++------------------
sound/soc/codecs/cs42l43.c | 24 ++++------------
sound/soc/codecs/cs42l43.h | 5 ----
9 files changed, 40 insertions(+), 68 deletions(-)
Merging extcon/extcon-next (195609a5d811 extcon: fsa9480: Avoid buffer overflow in fsa9480_handle_change())
$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/extcon/maxim,max14526.yaml | 80 ++++++
drivers/extcon/Kconfig | 13 +
drivers/extcon/Makefile | 1 +
drivers/extcon/extcon-adc-jack.c | 2 +
drivers/extcon/extcon-axp288.c | 2 +-
drivers/extcon/extcon-fsa9480.c | 6 +-
drivers/extcon/extcon-max14526.c | 302 +++++++++++++++++++++
drivers/extcon/extcon-qcom-spmi-misc.c | 2 +-
8 files changed, 404 insertions(+), 4 deletions(-)
create mode 100644 Documentation/devicetree/bindings/extcon/maxim,max14526.yaml
create mode 100644 drivers/extcon/extcon-max14526.c
Merging gnss/gnss-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
Already up to date.
Merging vfio/next (4518e5a60c7f vfio/type1: Fix error unwind in migration dirty bitmap allocation)
$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
Already up to date.
Merging w1/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://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 git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next
Already up to date.
Merging staging/staging-next (8630c59e9936 Merge tag 'kbuild-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
Already up to date.
Merging counter-next/counter-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
Already up to date.
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next
Already up to date.
Merging mux/for-next (59b723cd2adb Linux 6.12-rc6)
$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
Already up to date.
Merging dmaengine/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
Already up to date.
Merging cgroup/for-next (1486a0d1733a Merge branch 'for-6.17' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
Merge made by the 'ort' strategy.
Documentation/admin-guide/cgroup-v2.rst | 9 +++++++++
include/linux/cgroup-defs.h | 10 ++++------
2 files changed, 13 insertions(+), 6 deletions(-)
Merging scsi/for-next (5c3ba81923e0 scsi: error: alua: I/O errors for ALUA state transitions)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
Already up to date.
Merging scsi-mkp/for-next (9d2c232d575a scsi: trace: Show rtn in string for scsi_dispatch_cmd_error())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
Auto-merging drivers/ufs/core/ufshcd.c
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-driver-ufs | 83 +++++++++++++
Documentation/scsi/scsi_fc_transport.rst | 35 +++++-
drivers/scsi/fcoe/fcoe.c | 22 +---
drivers/ufs/core/ufs-sysfs.c | 190 +++++++++++++++++++++++++++++
drivers/ufs/core/ufshcd.c | 4 +
include/trace/events/scsi.h | 13 +-
include/ufs/ufs.h | 26 ++++
7 files changed, 349 insertions(+), 24 deletions(-)
Merging vhost/linux-next (f248703d67a5 media: add virtio-media driver)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
MAINTAINERS | 6 +
drivers/gpu/drm/virtio/virtgpu_drv.c | 8 +-
drivers/media/Kconfig | 13 +
drivers/media/Makefile | 2 +
drivers/media/virtio/Makefile | 9 +
drivers/media/virtio/protocol.h | 288 ++++++
drivers/media/virtio/scatterlist_builder.c | 563 ++++++++++++
drivers/media/virtio/scatterlist_builder.h | 111 +++
drivers/media/virtio/session.h | 109 +++
drivers/media/virtio/virtio_media.h | 93 ++
drivers/media/virtio/virtio_media_driver.c | 959 ++++++++++++++++++++
drivers/media/virtio/virtio_media_ioctls.c | 1297 ++++++++++++++++++++++++++++
drivers/virtio/virtio_ring.c | 4 +
include/uapi/linux/virtio_ids.h | 1 +
14 files changed, 3459 insertions(+), 4 deletions(-)
create mode 100644 drivers/media/virtio/Makefile
create mode 100644 drivers/media/virtio/protocol.h
create mode 100644 drivers/media/virtio/scatterlist_builder.c
create mode 100644 drivers/media/virtio/scatterlist_builder.h
create mode 100644 drivers/media/virtio/session.h
create mode 100644 drivers/media/virtio/virtio_media.h
create mode 100644 drivers/media/virtio/virtio_media_driver.c
create mode 100644 drivers/media/virtio/virtio_media_ioctls.c
Merging rpmsg/for-next (148fc4ed6fa6 Merge branch 'rproc-next' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
Merge made by the 'ort' strategy.
.../bindings/remoteproc/qcom,sm8150-pas.yaml | 65 ++-
drivers/remoteproc/Kconfig | 11 +-
drivers/remoteproc/qcom_q6v5_pas.c | 615 ++++++++++-----------
3 files changed, 348 insertions(+), 343 deletions(-)
Merging gpio-brgl/gpio/for-next (97a7ea2b8f4a gpio: TODO: add a task for removing MMIO-specific fields from gpio_chip)
$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/gpio/gpio-74xx-mmio.txt | 30 ---------
.../devicetree/bindings/gpio/gpio-pisosr.txt | 34 ----------
.../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 59 ----------------
.../devicetree/bindings/gpio/nxp,lpc1850-gpio.yaml | 78 ++++++++++++++++++++++
.../devicetree/bindings/gpio/pisosr-gpio.yaml | 67 +++++++++++++++++++
.../devicetree/bindings/gpio/ti,7416374.yaml | 56 ++++++++++++++++
Documentation/driver-api/driver-model/devres.rst | 1 -
drivers/gpio/TODO | 5 ++
drivers/gpio/gpiolib-legacy.c | 38 -----------
drivers/gpio/gpiolib.c | 13 ++++
drivers/usb/gadget/udc/pxa25x_udc.c | 5 +-
include/linux/gpio.h | 33 ---------
12 files changed, 221 insertions(+), 198 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-74xx-mmio.txt
delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-pisosr.txt
delete mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.txt
create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.yaml
create mode 100644 Documentation/devicetree/bindings/gpio/pisosr-gpio.yaml
create mode 100644 Documentation/devicetree/bindings/gpio/ti,7416374.yaml
Merging gpio-intel/for-next (9ab29ed50555 gpiolib: acpi: Add a quirk for Acer Nitro V15)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
Merge made by the 'ort' strategy.
drivers/gpio/gpiolib-acpi-quirks.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
Merging pinctrl/for-next (b26c4958439c Merge branch 'devel' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
Merge made by the 'ort' strategy.
.../bindings/pinctrl/amlogic,pinctrl-a4.yaml | 9 +-
.../bindings/pinctrl/rockchip,pinctrl.yaml | 2 +-
drivers/pinctrl/cirrus/pinctrl-madera-core.c | 14 +--
drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 118 ++++++++++++++++-----
4 files changed, 106 insertions(+), 37 deletions(-)
Merging pinctrl-intel/for-next (3b4408038da9 pinctrl: intel: fix build warnings about export.h)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
Merge made by the 'ort' strategy.
drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +++++---
drivers/pinctrl/intel/pinctrl-cherryview.c | 6 ++++--
drivers/pinctrl/intel/pinctrl-intel.c | 20 ++++++++++++++------
drivers/pinctrl/intel/pinctrl-lynxpoint.c | 6 ++++--
4 files changed, 27 insertions(+), 13 deletions(-)
Merging pinctrl-renesas/renesas-pinctrl (5488aa013e9e pinctrl: renesas: rzg2l: Add support for RZ/V2N SoC)
$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
Already up to date.
Merging pinctrl-samsung/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
Already up to date.
Merging pwm/pwm/for-next (60fdef1d4a99 dt-bindings: pwm: adi,axi-pwmgen: Update documentation link)
$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/pwm/adi,axi-pwmgen.yaml | 2 +-
.../devicetree/bindings/pwm/marvell,pxa-pwm.yaml | 35 ++-
.../devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml | 4 +-
.../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 12 +-
.../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 12 +-
drivers/pwm/Kconfig | 2 +-
drivers/pwm/core.c | 322 ++++++++++++++++++++-
drivers/pwm/pwm-pxa.c | 6 +
drivers/pwm/pwm-sifive.c | 52 +++-
drivers/pwm/pwm-sophgo-sg2042.c | 143 +++++++--
include/linux/pwm.h | 3 +
include/uapi/linux/pwm.h | 53 ++++
12 files changed, 574 insertions(+), 72 deletions(-)
create mode 100644 include/uapi/linux/pwm.h
Merging ktest/for-next (5a1bed232781 ktest: Fix Test Failures Due to Missing LOG_FILE Directories)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
Already up to date.
Merging kselftest/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
Already up to date.
Merging kunit/test (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
Already up to date.
Merging kunit-next/kunit (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
Already up to date.
Merging livepatching/for-next (a8e905a819fd Merge branch 'for-6.15/ftrace-test' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
Merge made by the 'ort' strategy.
Merging rtc/rtc-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (ef1d3455bbc1 libnvdimm/labels: Fix divide error in nd_label_data_init())
$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
Already up to date.
Merging at24/at24/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (0cadf92e93d4 NTB/msi: Remove unused functions)
$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
Auto-merging drivers/ntb/msi.c
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 (a9b33aae79ce selftests: seccomp: Fix "performace" to "performance")
$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
Already up to date.
Merging slimbus/for-next (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
Already up to date.
Merging nvmem/for-next (0af2f6be1b42 Linux 6.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
Already up to date.
Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
Auto-merging 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 (96959283a58d Drivers: hv: Always select CONFIG_SYSFB for Hyper-V guests)
$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
Already up to date.
Merging auxdisplay/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
Already up to date.
Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls)
$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
Already up to date.
Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
Already up to date.
Merging cfi/cfi/next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
Already up to date.
Merging mhi/mhi-next (6348f62ef7ec bus: mhi: host: pci_generic: Add Telit FN920C04 modem support)
$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
Already up to date.
Merging memblock/for-next (3b394dff15e1 memblock tests: add test for memblock_set_node)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
Already up to date.
Merging cxl/next (529a56be66aa Documentation: fix typo in CXL driver documentation)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
Merge made by the 'ort' strategy.
Documentation/driver-api/cxl/conventions.rst | 47 ++++++++++++++++++++++
Documentation/driver-api/cxl/index.rst | 1 +
Documentation/driver-api/cxl/linux/cxl-driver.rst | 2 +-
.../driver-api/cxl/theory-of-operation.rst | 12 +++---
drivers/cxl/pci.c | 2 +-
tools/testing/cxl/config_check.c | 1 +
tools/testing/cxl/test/cxl.c | 7 +++-
7 files changed, 63 insertions(+), 9 deletions(-)
create mode 100644 Documentation/driver-api/cxl/conventions.rst
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 (46550e2b878d include: pe.h: Fix PE definitions)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
Already up to date.
Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
Already up to date.
Merging slab/slab/for-next (7819d7e0d830 Merge branch 'slab/for-6.16/testing' into slab/for-next)
$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next
Auto-merging include/linux/mm.h
Merge made by the 'ort' strategy.
include/linux/mm.h | 1 +
1 file changed, 1 insertion(+)
Merging random/master (3778dcb2dcc1 random: use offstack cpumask when necessary)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
Merge made by the 'ort' strategy.
drivers/char/random.c | 23 ++++++++++++++---------
drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +++-
include/linux/prandom.h | 6 ------
3 files changed, 17 insertions(+), 16 deletions(-)
Merging landlock/next (3039ed432745 landlock: Improve bit operations in audit code)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
Already up to date.
Merging rust/rust-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
Already up to date.
Merging rust-alloc/alloc-next (47d8101924b5 rust: vec: impl Default for Vec with any allocator)
$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next
Merge made by the 'ort' strategy.
rust/kernel/alloc/kvec.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging rust-pin-init/pin-init-next (fc3870dc5cad rust: pin-init: examples, tests: use `ignore` instead of conditionally compiling tests)
$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next
Merge made by the 'ort' strategy.
rust/kernel/block/mq/tag_set.rs | 12 +-
rust/kernel/configfs.rs | 4 +-
rust/kernel/init.rs | 28 ++---
rust/pin-init/README.md | 2 +-
rust/pin-init/examples/big_struct_in_place.rs | 28 +++--
rust/pin-init/examples/linked_list.rs | 10 +-
rust/pin-init/examples/mutex.rs | 97 +++++++++-------
rust/pin-init/examples/pthread_mutex.rs | 4 +
rust/pin-init/examples/static_init.rs | 75 ++++++------
rust/pin-init/src/__internal.rs | 1 +
rust/pin-init/src/lib.rs | 158 ++++++++++++++++++++++----
rust/pin-init/src/macros.rs | 16 +--
12 files changed, 287 insertions(+), 148 deletions(-)
Merging rust-timekeeping/timekeeping-next (679185904972 MAINTAINERS: rust: Add a new section for all of the time stuff)
$ 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 (f8dd46ea3a2b sysctl: Remove superfluous includes from kernel/sysctl.c)
$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next
Auto-merging include/linux/module.h
Auto-merging kernel/fork.c
Auto-merging mm/memory.c
Merge made by the 'ort' strategy.
drivers/parisc/power.c | 20 +++-
drivers/tty/sysrq.c | 41 ++++++++
include/linux/kmod.h | 3 -
include/linux/module.h | 1 -
include/linux/panic.h | 2 -
include/linux/rtmutex.h | 2 -
include/linux/sysctl.h | 4 -
kernel/fork.c | 20 +++-
kernel/locking/rtmutex.c | 23 +++++
kernel/locking/rtmutex_api.c | 5 -
kernel/module/internal.h | 3 +
kernel/module/main.c | 30 +++++-
kernel/panic.c | 60 +++++++++++
kernel/pid.c | 31 ++++++
kernel/rcu/tree_stall.h | 33 +++++-
kernel/sysctl.c | 233 -------------------------------------------
mm/memory.c | 18 ++++
17 files changed, 274 insertions(+), 255 deletions(-)
Merging execve/for-next/execve (11854fe263eb binfmt_elf: Move brk for static PIE even if ASLR disabled)
$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
Already up to date.
Merging bitmap/bitmap-for-next (11fcf368506d uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again)
$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
Merge made by the 'ort' strategy.
include/uapi/linux/bits.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
Already up to date.
Merging kspp/for-next/kspp (c50b612bef51 ubsan: Fix incorrect hand-side used in handle)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
Auto-merging lib/ubsan.c
Merge made by the 'ort' strategy.
lib/ubsan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Merging nolibc/for-next (b2c765778a2e selftests/nolibc: make stackprotector probing more robust)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next
Merge made by the 'ort' strategy.
tools/testing/selftests/nolibc/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Merging iommufd/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
Already up to date.
Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next
Auto-merging tools/power/x86/turbostat/turbostat.8
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8
Auto-merging tools/power/x86/turbostat/turbostat.c
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
Resolved 'tools/power/x86/turbostat/turbostat.8' using previous resolution.
Resolved 'tools/power/x86/turbostat/turbostat.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master d81c80522306] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
$ git diff -M --stat --summary HEAD^..
tools/power/x86/turbostat/turbostat.8 | 17 +-
tools/power/x86/turbostat/turbostat.c | 534 ++++++++--------------------------
2 files changed, 131 insertions(+), 420 deletions(-)
Merging pwrseq/pwrseq/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next
Already up to date.
Merging capabilities-next/caps-next (4ae89b1fe7c2 capability: Remove unused has_capability)
$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next
Already up to date.
Merging ipe/next (324692100cc9 ipe: use SHA-256 library API instead of crypto_shash API)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next
Merge made by the 'ort' strategy.
security/ipe/Kconfig | 1 +
security/ipe/audit.c | 33 +++++----------------------------
2 files changed, 6 insertions(+), 28 deletions(-)
Merging kcsan/next (9d89551994a4 Linux 6.13-rc6)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next
Already up to date.
Merging crc/crc-next (7234baeec076 lib/crc: remove ARCH_HAS_* kconfig symbols)
$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next
Auto-merging MAINTAINERS
Auto-merging arch/riscv/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging lib/Kconfig.debug
Auto-merging lib/tests/Makefile
Merge made by the 'ort' strategy.
Documentation/core-api/kernel-api.rst | 14 +-
MAINTAINERS | 4 +-
arch/arm/Kconfig | 2 -
arch/arm/configs/multi_v7_defconfig | 1 -
arch/arm/lib/Makefile | 6 -
arch/arm64/Kconfig | 2 -
arch/arm64/lib/Makefile | 6 -
arch/loongarch/Kconfig | 1 -
arch/loongarch/lib/Makefile | 2 -
arch/mips/Kconfig | 1 -
arch/mips/lib/Makefile | 2 -
arch/powerpc/Kconfig | 2 -
arch/powerpc/lib/Makefile | 6 -
arch/riscv/Kconfig | 3 -
arch/riscv/lib/Makefile | 6 -
arch/s390/Kconfig | 1 -
arch/s390/lib/Makefile | 3 -
arch/sparc/Kconfig | 1 -
arch/sparc/lib/Makefile | 2 -
arch/x86/Kconfig | 3 -
arch/x86/lib/Makefile | 10 -
crypto/crc32.c | 69 +--
crypto/crc32c.c | 70 +--
crypto/testmgr.c | 55 +--
drivers/crypto/inside-secure/safexcel.c | 1 -
drivers/crypto/inside-secure/safexcel.h | 1 -
drivers/crypto/inside-secure/safexcel_hash.c | 92 +---
drivers/crypto/stm32/Kconfig | 9 -
drivers/crypto/stm32/Makefile | 1 -
drivers/crypto/stm32/stm32-crc32.c | 480 ---------------------
include/linux/crc-t10dif.h | 10 +-
include/linux/crc32.h | 55 +--
include/linux/crc64.h | 22 +-
lib/Kconfig | 87 +---
lib/Kconfig.debug | 21 -
lib/Makefile | 32 +-
lib/crc/.gitignore | 5 +
lib/crc/Kconfig | 118 +++++
lib/crc/Makefile | 63 +++
{arch/arm/lib => lib/crc/arm}/crc-t10dif-core.S | 0
.../lib/crc-t10dif.c => lib/crc/arm/crc-t10dif.h | 23 +-
{arch/arm/lib => lib/crc/arm}/crc32-core.S | 0
arch/arm/lib/crc32.c => lib/crc/arm/crc32.h | 38 +-
.../arm64/lib => lib/crc/arm64}/crc-t10dif-core.S | 0
.../lib/crc-t10dif.c => lib/crc/arm64/crc-t10dif.h | 22 +-
{arch/arm64/lib => lib/crc/arm64}/crc32-core.S | 0
arch/arm64/lib/crc32.c => lib/crc/arm64/crc32.h | 19 +-
lib/{ => crc}/crc-ccitt.c | 3 -
lib/{ => crc}/crc-itu-t.c | 0
lib/{crc-t10dif.c => crc/crc-t10dif-main.c} | 39 +-
lib/{ => crc}/crc16.c | 0
lib/crc/crc32-main.c | 104 +++++
lib/{ => crc}/crc4.c | 0
lib/{crc64.c => crc/crc64-main.c} | 47 +-
lib/{ => crc}/crc7.c | 0
lib/{ => crc}/crc8.c | 0
lib/{ => crc}/gen_crc32table.c | 4 +-
lib/{ => crc}/gen_crc64table.c | 11 +-
.../crc32-loongarch.c => lib/crc/loongarch/crc32.h | 32 +-
arch/mips/lib/crc32-mips.c => lib/crc/mips/crc32.h | 33 +-
.../crc-t10dif.c => lib/crc/powerpc/crc-t10dif.h | 20 +-
.../lib => lib/crc/powerpc}/crc-vpmsum-template.S | 0
.../powerpc/lib/crc32.c => lib/crc/powerpc/crc32.h | 38 +-
.../lib => lib/crc/powerpc}/crc32c-vpmsum_asm.S | 0
.../lib => lib/crc/powerpc}/crct10dif-vpmsum_asm.S | 0
.../riscv/lib => lib/crc/riscv}/crc-clmul-consts.h | 0
.../lib => lib/crc/riscv}/crc-clmul-template.h | 0
{arch/riscv/lib => lib/crc/riscv}/crc-clmul.h | 0
.../lib/crc-t10dif.c => lib/crc/riscv/crc-t10dif.h | 8 +-
{arch/riscv/lib => lib/crc/riscv}/crc16_msb.c | 0
arch/riscv/lib/crc32.c => lib/crc/riscv/crc32.h | 17 +-
{arch/riscv/lib => lib/crc/riscv}/crc32_lsb.c | 0
{arch/riscv/lib => lib/crc/riscv}/crc32_msb.c | 0
arch/riscv/lib/crc64.c => lib/crc/riscv/crc64.h | 11 +-
{arch/riscv/lib => lib/crc/riscv}/crc64_lsb.c | 0
{arch/riscv/lib => lib/crc/riscv}/crc64_msb.c | 0
{arch/s390/lib => lib/crc/s390}/crc32-vx.h | 0
arch/s390/lib/crc32.c => lib/crc/s390/crc32.h | 16 +-
{arch/s390/lib => lib/crc/s390}/crc32be-vx.c | 0
{arch/s390/lib => lib/crc/s390}/crc32le-vx.c | 0
arch/sparc/lib/crc32.c => lib/crc/sparc/crc32.h | 42 +-
{arch/sparc/lib => lib/crc/sparc}/crc32c_asm.S | 0
lib/crc/tests/Makefile | 2 +
lib/{ => crc}/tests/crc_kunit.c | 39 +-
{arch/x86/lib => lib/crc/x86}/crc-pclmul-consts.h | 0
.../x86/lib => lib/crc/x86}/crc-pclmul-template.S | 7 -
.../x86/lib => lib/crc/x86}/crc-pclmul-template.h | 3 +-
.../lib/crc-t10dif.c => lib/crc/x86/crc-t10dif.h | 18 +-
{arch/x86/lib => lib/crc/x86}/crc16-msb-pclmul.S | 0
{arch/x86/lib => lib/crc/x86}/crc32-pclmul.S | 0
arch/x86/lib/crc32.c => lib/crc/x86/crc32.h | 30 +-
{arch/x86/lib => lib/crc/x86}/crc32c-3way.S | 0
{arch/x86/lib => lib/crc/x86}/crc64-pclmul.S | 0
arch/x86/lib/crc64.c => lib/crc/x86/crc64.h | 21 +-
lib/crc32.c | 126 ------
lib/tests/Makefile | 1 -
96 files changed, 480 insertions(+), 1563 deletions(-)
delete mode 100644 drivers/crypto/stm32/stm32-crc32.c
create mode 100644 lib/crc/.gitignore
create mode 100644 lib/crc/Kconfig
create mode 100644 lib/crc/Makefile
rename {arch/arm/lib => lib/crc/arm}/crc-t10dif-core.S (100%)
rename arch/arm/lib/crc-t10dif.c => lib/crc/arm/crc-t10dif.h (70%)
rename {arch/arm/lib => lib/crc/arm}/crc32-core.S (100%)
rename arch/arm/lib/crc32.c => lib/crc/arm/crc32.h (69%)
rename {arch/arm64/lib => lib/crc/arm64}/crc-t10dif-core.S (100%)
rename arch/arm64/lib/crc-t10dif.c => lib/crc/arm64/crc-t10dif.h (70%)
rename {arch/arm64/lib => lib/crc/arm64}/crc32-core.S (100%)
rename arch/arm64/lib/crc32.c => lib/crc/arm64/crc32.h (81%)
rename lib/{ => crc}/crc-ccitt.c (98%)
rename lib/{ => crc}/crc-itu-t.c (100%)
rename lib/{crc-t10dif.c => crc/crc-t10dif-main.c} (78%)
rename lib/{ => crc}/crc16.c (100%)
create mode 100644 lib/crc/crc32-main.c
rename lib/{ => crc}/crc4.c (100%)
rename lib/{crc64.c => crc/crc64-main.c} (66%)
rename lib/{ => crc}/crc7.c (100%)
rename lib/{ => crc}/crc8.c (100%)
rename lib/{ => crc}/gen_crc32table.c (95%)
rename lib/{ => crc}/gen_crc64table.c (81%)
rename arch/loongarch/lib/crc32-loongarch.c => lib/crc/loongarch/crc32.h (71%)
rename arch/mips/lib/crc32-mips.c => lib/crc/mips/crc32.h (82%)
rename arch/powerpc/lib/crc-t10dif.c => lib/crc/powerpc/crc-t10dif.h (75%)
rename {arch/powerpc/lib => lib/crc/powerpc}/crc-vpmsum-template.S (100%)
rename arch/powerpc/lib/crc32.c => lib/crc/powerpc/crc32.h (64%)
rename {arch/powerpc/lib => lib/crc/powerpc}/crc32c-vpmsum_asm.S (100%)
rename {arch/powerpc/lib => lib/crc/powerpc}/crct10dif-vpmsum_asm.S (100%)
rename {arch/riscv/lib => lib/crc/riscv}/crc-clmul-consts.h (100%)
rename {arch/riscv/lib => lib/crc/riscv}/crc-clmul-template.h (100%)
rename {arch/riscv/lib => lib/crc/riscv}/crc-clmul.h (100%)
rename arch/riscv/lib/crc-t10dif.c => lib/crc/riscv/crc-t10dif.h (62%)
rename {arch/riscv/lib => lib/crc/riscv}/crc16_msb.c (100%)
rename arch/riscv/lib/crc32.c => lib/crc/riscv/crc32.h (66%)
rename {arch/riscv/lib => lib/crc/riscv}/crc32_lsb.c (100%)
rename {arch/riscv/lib => lib/crc/riscv}/crc32_msb.c (100%)
rename arch/riscv/lib/crc64.c => lib/crc/riscv/crc64.h (65%)
rename {arch/riscv/lib => lib/crc/riscv}/crc64_lsb.c (100%)
rename {arch/riscv/lib => lib/crc/riscv}/crc64_msb.c (100%)
rename {arch/s390/lib => lib/crc/s390}/crc32-vx.h (100%)
rename arch/s390/lib/crc32.c => lib/crc/s390/crc32.h (81%)
rename {arch/s390/lib => lib/crc/s390}/crc32be-vx.c (100%)
rename {arch/s390/lib => lib/crc/s390}/crc32le-vx.c (100%)
rename arch/sparc/lib/crc32.c => lib/crc/sparc/crc32.h (60%)
rename {arch/sparc/lib => lib/crc/sparc}/crc32c_asm.S (100%)
create mode 100644 lib/crc/tests/Makefile
rename lib/{ => crc}/tests/crc_kunit.c (89%)
rename {arch/x86/lib => lib/crc/x86}/crc-pclmul-consts.h (100%)
rename {arch/x86/lib => lib/crc/x86}/crc-pclmul-template.S (98%)
rename {arch/x86/lib => lib/crc/x86}/crc-pclmul-template.h (96%)
rename arch/x86/lib/crc-t10dif.c => lib/crc/x86/crc-t10dif.h (56%)
rename {arch/x86/lib => lib/crc/x86}/crc16-msb-pclmul.S (100%)
rename {arch/x86/lib => lib/crc/x86}/crc32-pclmul.S (100%)
rename arch/x86/lib/crc32.c => lib/crc/x86/crc32.h (76%)
rename {arch/x86/lib => lib/crc/x86}/crc32c-3way.S (100%)
rename {arch/x86/lib => lib/crc/x86}/crc64-pclmul.S (100%)
rename arch/x86/lib/crc64.c => lib/crc/x86/crc64.h (61%)
delete mode 100644 lib/crc32.c
Merging fwctl/for-next (19272b37aa4f Linux 6.16-rc1)
$ git merge -m Merge branch 'for-next' of git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next
Already up to date.
Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into tsm-next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next
Already up to date.
Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next
Already up to date.