From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Apr 2016 22:25:09 +0000 (-0700)
Subject: Merge tag 'for-linus-20160415' of git://git.infradead.org/linux-mtd
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=29dde7c25adafcdcbde3a14bce3f07e5a201dc30;p=deliverable%2Flinux.git

Merge tag 'for-linus-20160415' of git://git.infradead.org/linux-mtd

Pull MTD fix from Brian Norris:
 "One MTD fix for v4.6-rc4:

  In the v4.4 cycle, we relaxed the requirement for assigning
  mtd->owner, but we didn't remove this error case.  It's hit only
  by drivers that are both:

   (a) using nand_scan() directly
  and
   (b) built as modules

  We haven't seen explicit complaints about this (most use cases don't
  fit one or both of the above), but we should definitely not be
  BUG()'ing here"

* tag 'for-linus-20160415' of git://git.infradead.org/linux-mtd:
  mtd: nand: Drop mtd.owner requirement in nand_scan
---

29dde7c25adafcdcbde3a14bce3f07e5a201dc30