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