]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
Merge branch 'for-6.16/tsm-mr' into tsm-next
authorDan Williams <dan.j.williams@intel.com>
Tue, 13 May 2025 05:12:44 +0000 (22:12 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 13 May 2025 05:12:44 +0000 (22:12 -0700)
commit15ff5d0e90bb044b94d9a4ac57276829861a954d
tree28bcf60949db629b0b772f6eebf026714dc38fe9
parenta0372b3831785e15de605cd13d2ed78a79a9b435
parent7c3f259dfe03f5dcd898126602818a8fbe94d3c5
Merge branch 'for-6.16/tsm-mr' into tsm-next

Merge measurement-register infrastructure for v6.16. Resolve conflicts
with the establishment of drivers/virt/coco/guest/ for cross-vendor
common TSM functionality.

Address a mis-merge with a fixup from Lukas:

Link: http://lore.kernel.org/20250509134031.70559-1-lukas.bulwahn@redhat.com
Documentation/driver-api/coco/measurement-registers.rst
MAINTAINERS
drivers/virt/coco/Makefile
drivers/virt/coco/guest/Kconfig
drivers/virt/coco/guest/Makefile
drivers/virt/coco/guest/tsm-mr.c
drivers/virt/coco/tdx-guest/tdx-guest.c