From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 6 Jul 2021 20:07:53 +0000 (-0700)
Subject: Merge PR #42137 into master
X-Git-Tag: v17.1.0~1470
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f67f795294af59792453e87c27c30a5bdc4e8fe9;p=ceph.git

Merge PR #42137 into master

* refs/pull/42137/head:
	msg/async/net_handler: do not define variable unless it is used
	mds/cephfs_features: print size_t using "%zu"

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

f67f795294af59792453e87c27c30a5bdc4e8fe9