From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 May 2017 17:23:12 +0000 (-0700)
Subject: Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b53c4d5eb7cda86f7bf495f52116ae43bdc9cf23;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS updates from Richard Weinberger:

 - new config option CONFIG_UBIFS_FS_SECURITY

 - minor improvements

 - random fixes

* tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs:
  ubi: Add debugfs file for tracking PEB state
  ubifs: Fix a typo in comment of ioctl2ubifs & ubifs2ioctl
  ubifs: Remove unnecessary assignment
  ubifs: Fix cut and paste error on sb type comparisons
  ubi: fastmap: Fix slab corruption
  ubifs: Add CONFIG_UBIFS_FS_SECURITY to disable/enable security labels
  ubi: Make mtd parameter readable
  ubi: Fix section mismatch
---

b53c4d5eb7cda86f7bf495f52116ae43bdc9cf23