summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/futex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-07 17:07:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-07 17:07:20 -0700
commit9d2cd01b15d0782adb81e40094b67904d77b03df (patch)
treef8091fcd05f463a0b31485cfe3edcef0d0211da9 /arch/arm/include/asm/futex.h
parent57d326169e878a1a37b2bccd1cf81f6809ee67b9 (diff)
parentce5d36aac26cc395fe3bc45525cdbad3644f01e5 (diff)
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
Diffstat (limited to 'arch/arm/include/asm/futex.h')
0 files changed, 0 insertions, 0 deletions