6c6a9bb51f
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 949aee6377)
[Peter: drop 5.15.x / 5.16.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>