From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 20 May 2026 00:30:23 +0000 (-0400)
Subject: Merge PR #68987 into main
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8ebbbbbdd5d598387b611be475dfb19bca6f6e3;p=ceph.git

Merge PR #68987 into main

* refs/pull/68987/head:
	script/ptl-tool: use provided base even in conflict

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

f8ebbbbbdd5d598387b611be475dfb19bca6f6e3