Merge PR #40411 into master

* refs/pull/40411/head:
	doc: add note about removal of the `cephfs` nfs cluster type
	mgr/volumes/nfs: drop `type` param during cluster create

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>

diff --cc PendingReleaseNotes
index dce4ea0926f94fc6de355d5d00142b40a0cd5723,b45b37ee41c14b47a1fa6fdf7000ab6dcc2115a7..25ca9c132a4be9b6ac6440d27571967fa37b5872
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -9,11 -9,13 +9,16 @@@
    that were storing state in RADOS omap, especially without striping which
    limits scalability.
  
 +* RGW: `radosgw-admin realm delete` is now renamed to `radosgw-admin realm rm`. This
 +  is consistent with the help message.
 +
  >=16.0.0
  --------
+ * volumes/nfs: The ``cephfs`` cluster type has been removed from the
+   ``nfs cluster create`` subcommand. Clusters deployed by cephadm can
+   support an NFS export of both ``rgw`` and ``cephfs`` from a single
+   NFS cluster instance.
+ 
  * mgr-pg_autoscaler: Autoscaler will now start out by scaling each
    pool to have a full complements of pgs from the start and will only
    decrease it when other pools need more pgs due to increased usage.

diff --cc doc/cephfs/fs-nfs-exports.rst
Simple merge

diff --cc src/vstart.sh
Simple merge