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