From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Oct 2016 23:58:55 +0000 (-0700)
Subject: Merge tag 'upstream-4.9-rc2' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5ff93abc7a2aff167a91bf4ccd47bd0789f86fc0;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'upstream-4.9-rc2' of git://git.infradead.org/linux-ubifs

Pull UBI[FS] fixes from Richard Weinberger:
 "This contains fixes for issues in both UBI and UBIFS:

   - Fallout from the merge window, refactoring UBI code introduced some
     issues.

   - Fixes for an UBIFS readdir bug which can cause getdents() to busy
     loop for ever and a bug in the UBIFS xattr code"

* tag 'upstream-4.9-rc2' of git://git.infradead.org/linux-ubifs:
  ubifs: Abort readdir upon error
  UBI: Fix crash in try_recover_peb()
  ubi: fix swapped arguments to call to ubi_alloc_aeb
  ubifs: Fix xattr_names length in exit paths
  ubifs: Rename ubifs_rename2
---

5ff93abc7a2aff167a91bf4ccd47bd0789f86fc0