From: Patrick Donnelly <pdonnell@ibm.com>
Date: Tue, 14 Jul 2026 00:11:13 +0000 (-0400)
Subject: Merge PR #70165 into main
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc779d5f8821ff2ec10b0a0c9caaea68fb1297e4;p=ceph.git

Merge PR #70165 into main

* refs/pull/70165/head:
	script/ptl-tool: handle cherry-pick conflicts on branch-specific commits

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

dc779d5f8821ff2ec10b0a0c9caaea68fb1297e4