From: Tudor Ambarus <tudor.ambarus@linaro.org>
Date: Mon, 6 Feb 2023 09:23:34 +0000 (+0200)
Subject: Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next
X-Git-Tag: v6.3-rc1~77^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f047382519ca41702ebaee5a862e87390f687137;p=thirdparty%2Flinux.git

Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next

Merge 'mtd/fixes-for-6.2-rc4' into spi-nor/next to fix conflict on
include headers in drivers/mtd/spi-nor/core.c.

Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
---

f047382519ca41702ebaee5a862e87390f687137