From: Linus Torvalds Date: Sat, 26 Aug 2017 00:09:19 +0000 (-0700) Subject: Merge tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d580e80c7f2ffb8f86e2417495692ce8bcc91dad;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd Pull MTD fixes from Brian Norris: "Two fixes - one for a 4.13 regression, and the other for an older one: - Atmel NAND: since we started utilizing ONFI timings, we found that we were being too restrict at rejecting them, partly due to discrepancies in ONFI 4.0 and earlier versions. Relax the restriction to keep these platforms booting. This is a 4.13-rc1 regression. - nandsim: repeated probe/removal may not work after a failed init, because we didn't free up our debugfs files properly on the failure path. This has been around since 3.8, but it's nice to get this fixed now in a nice easy patch that can target -stable, since there's already refactoring work (that also fixes the issue) targeted for the next merge window" * tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd: mtd: nand: atmel: Relax tADL_min constraint mtd: nandsim: remove debugfs entries in error path --- d580e80c7f2ffb8f86e2417495692ce8bcc91dad