Merge pull request #21452 from vcaputo/mmap-cache-fd

author Daan De Meyer <daan.j.demeyer@gmail.com>

Mon, 22 Nov 2021 09:35:34 +0000 (10:35 +0100)

committer GitHub <noreply@github.com>

Mon, 22 Nov 2021 09:35:34 +0000 (10:35 +0100)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Mon, 22 Nov 2021 09:35:34 +0000 (10:35 +0100)
committer GitHub <noreply@github.com>
Mon, 22 Nov 2021 09:35:34 +0000 (10:35 +0100)
diff --cc src/libsystemd/sd-journal/journal-file.c
Simple merge
diff --cc src/libsystemd/sd-journal/journal-verify.c
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Mon, 22 Nov 2021 09:35:34 +0000 (10:35 +0100)
committer	GitHub <noreply@github.com>
	Mon, 22 Nov 2021 09:35:34 +0000 (10:35 +0100)
		1	2
src/libsystemd/sd-journal/journal-file.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-journal/journal-verify.c	patch \|	diff1 \|	diff2 \|	blob \| history