---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c09766beb7ef..06eb670c6c36 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 16
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -vsprime
 NAME = Baby Opossum Posse
 
 # *DOCUMENTATION*
-- 
2.48.1

From: vsshingne <vaibhavshigne66@gmail.com>

Signed-off-by: vsshingne <vaibhavshigne66@gmail.com>
---
 Documentation/arch/powerpc/index.rst | 1 +
 Documentation/virt/kvm/api.rst       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/arch/powerpc/index.rst b/Documentation/arch/powerpc/index.rst
index 0560cbae5fa1..173a787b6cc3 100644
--- a/Documentation/arch/powerpc/index.rst
+++ b/Documentation/arch/powerpc/index.rst
@@ -36,6 +36,7 @@ powerpc
     vas-api
     vcpudispatch_stats
     vmemmap_dedup
+    htm
 
     features
 
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index 43ed57e048a8..41e1a72bd593 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -7230,8 +7230,9 @@ inputs and outputs of the TDVMCALL.  Currently the following values of
    placed in fields from ``r11`` to ``r14`` of the ``get_tdvmcall_info``
    field of the union.
 
-* ``TDVMCALL_SETUP_EVENT_NOTIFY_INTERRUPT``: the guest has requested to
-set up a notification interrupt for vector ``vector``.
+ * ``TDVMCALL_SETUP_EVENT_NOTIFY_INTERRUPT``: the guest has requested to
+   set up a notification interrupt for vector ``vector``.
+
 
 KVM may add support for more values in the future that may cause a userspace
 exit, even without calls to ``KVM_ENABLE_CAP`` or similar.  In this case,
-- 
2.48.1

From: vsshingne <vaibhavshigne66@gmail.com>

Fixes kernel-doc warnings by adding descriptions for the 'mcm' and 'rmcm'
members of the 'struct mpc_funcs' in mpc.h. These members were previously
undocumented, leading to Sphinx build warnings.

No functional changes; documentation only.

Signed-off-by: vsshingne <vaibhavshigne66@gmail.com>
---
 drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
index 6e303b81bfb0..d941aff89645 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
@@ -305,6 +305,8 @@ struct mpcc_state {
 
 /**
  * struct mpc_funcs - funcs
+ * @mcm: Set of function pointers for programming MPC memory color module (3D LUTs, bias, bit depth, etc.)
+ * @rmcm: Extended set of function pointers for redundant MPC memory color module (includes power and fast-load)
  */
 struct mpc_funcs {
 	/**
-- 
2.48.1