Merge tag 'nand/for-5.17' into mtd/next