From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jun 2016 05:48:48 +0000 (-0700)
Subject: Merge tag 'upstream-4.7-rc5' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=63c04ee7d3b7c8d8e2726cb7c5f8a5f6fcc1e3b2;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'upstream-4.7-rc5' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS fixes from Richard Weinberger:
 "This contains fixes for two critical bugs in UBI and UBIFS:

   - fix the possibility of losing data upon a power cut when UBI tries
     to recover from a write error

   - fix page migration on UBIFS.  It turned out that the default page
     migration function is not suitable for UBIFS"

* tag 'upstream-4.7-rc5' of git://git.infradead.org/linux-ubifs:
  UBIFS: Implement ->migratepage()
  mm: Export migrate_page_move_mapping and migrate_page_copy
  ubi: Make recover_peb power cut aware
  gpio: make library immune to error pointers
  gpio: make sure gpiod_to_irq() returns negative on NULL desc
  gpio: 104-idi-48: Fix missing spin_lock_init for ack_lock
---

63c04ee7d3b7c8d8e2726cb7c5f8a5f6fcc1e3b2