From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jun 2014 00:07:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd into next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9d2cd01b15d0782adb81e40094b67904d77b03df;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd into next

Pull exofs raid6 support from Boaz Harrosh:
 "These simple patches will enable raid6 using the kernel's raid6_pq
  engine for support under exofs and pnfs-objects.

  There is nothing needed to do at exofs and pnfs-obj.  Just fire your
  mkfs.exofs with --raid=6 (that was already supported before) and off
  you go as usual.  The ORE will pick up the new map and will start
  writing two devices of redundancy bits.  The patches are so simple
  because most of the ORE was already for the general raid case, only a
  few bug fixes were needed and the actual wiring into the raid6_pq
  engine"

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  ore: Support for raid 6
  ore: Remove redundant dev_order(), more cleanups
  ore: (trivial) reformat some code
---

9d2cd01b15d0782adb81e40094b67904d77b03df