Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next
authorTudor Ambarus <tudor.ambarus@linaro.org>
Mon, 6 Feb 2023 09:23:34 +0000 (11:23 +0200)
committerTudor Ambarus <tudor.ambarus@linaro.org>
Mon, 6 Feb 2023 09:23:34 +0000 (11:23 +0200)
commitf047382519ca41702ebaee5a862e87390f687137
tree3108abb624004c540551bb9a954ac71fea696886
parent893fd950c89d516a7cf365700b2bd7bb3efc15a5
parentc0f7ae27539fbac267384a7bfc58296ea7550d52
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>