From: Richard Weinberger Date: Wed, 10 Feb 2021 09:21:34 +0000 (+0100) Subject: Merge tag 'spi-nor/for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b491f90ddff013e0be058297a8f704c59932c1fd;p=uclinux-h8%2Flinux.git Merge tag 'spi-nor/for-5.12' of git://git./linux/kernel/git/mtd/linux into mtd/next SPI NOR core changes: - Add non-uniform erase fixes. - Add Global Block Unlock command. It is defined by few flash vendors, and it is used for now just by sst. SPI NOR controller drivers changes: - intel-spi: Add support for Intel Alder Lake-P SPI serial flash. - hisi-sfc: Put child node np on error path. --- b491f90ddff013e0be058297a8f704c59932c1fd