From: Patrick Donnelly <pdonnell@ibm.com>
Date: Fri, 15 May 2026 15:15:46 +0000 (-0400)
Subject: Merge PR #68923 into main
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21f480d7f234cdd10bb91b2e1aa30a3170128095;p=ceph.git

Merge PR #68923 into main

* refs/pull/68923/head:
	script/ptl-tool: consolidate conflict reviews

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
---

21f480d7f234cdd10bb91b2e1aa30a3170128095