From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 13 Dec 2021 09:17:10 +0000 (+0100)
Subject: Merge v5.15-rc5 into char-misc-next
X-Git-Tag: v5.17-rc1~82^2~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af40d16042d674442db8cf5fd654fabcd45fea44;p=thirdparty%2Fkernel%2Flinux.git

Merge v5.15-rc5 into char-misc-next

We need the fixes in here as well, and also resolve some merge conflicts
in:
	drivers/misc/eeprom/at25.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

af40d16042d674442db8cf5fd654fabcd45fea44