From: Michael Ellerman <mpe@ellerman.id.au>
Date: Sun, 12 Feb 2023 11:11:56 +0000 (+1100)
Subject: Merge branch 'fixes' into next
X-Git-Tag: v6.3-rc1~87^2~62
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fc8a898cfdbb0e63cfde547715c2031de22e7893;p=tomoyo%2Ftomoyo-test1.git

Merge branch 'fixes' into next

Merge our fixes branch to bring in some changes that conflict with
upcoming next content.
---

fc8a898cfdbb0e63cfde547715c2031de22e7893