From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 20 May 2021 19:43:25 +0000 (-0700)
Subject: Merge PR #41338 into master
X-Git-Tag: v17.1.0~1892
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12fda74def37d0b286415ad6ba118a2e4403d839;p=ceph.git

Merge PR #41338 into master

* refs/pull/41338/head:
	mds: reset code after cpu_profiler
	cpu_profiler: fix asok command crash

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

12fda74def37d0b286415ad6ba118a2e4403d839