From: Venky Shankar <vshankar@redhat.com>
Date: Tue, 4 Mar 2025 12:52:34 +0000 (+0530)
Subject: Merge PR #60726 into main
X-Git-Tag: v20.3.0~461
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b5ca6c18203ca2d52b655e82a14d34526f450dff;p=ceph.git

Merge PR #60726 into main

* refs/pull/60726/head:
	qa: add test checking 'journal import' from empty dump file
	cephfs-journal-tool: fix segfault during 'journal import' from invalid dump file

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

b5ca6c18203ca2d52b655e82a14d34526f450dff