Merge 5.17-rc6 into char-misc-next

We need the char-misc fixes in here.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mtd/mtdcore.c
Simple merge

diff --cc drivers/nvmem/core.c
Simple merge

diff --cc include/linux/nvmem-provider.h
Simple merge