Merge tag 'for-linus-20160415' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2016 22:25:09 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2016 22:25:09 +0000 (15:25 -0700)
commit29dde7c25adafcdcbde3a14bce3f07e5a201dc30
tree2f39eb82f1a2504f4c567f0dadb0990c347a3c0c
parent2fffad128730526799eb9f37329e8b598f0fc8d8
parent20c07a5bf094198ff2382aa5e7c930b3c9807792
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