From: Linus Torvalds Date: Wed, 26 Oct 2011 19:33:50 +0000 (+0200) Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd X-Git-Tag: firefly_0821_release~3680^2~4299 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c28cfd60e4ec3f494b73ef7d6c661f5f491cd84f;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: (21 commits) ore: Enable RAID5 mounts exofs: Support for RAID5 read-4-write interface. ore: RAID5 Write ore: RAID5 read fs/Makefile: Always inspect exofs/ ore: Make ore_calc_stripe_info EXPORT_SYMBOL ore/exofs: Change ore_check_io API ore/exofs: Define new ore_verify_layout ore: Support for partial component table ore: Support for short read/writes exofs: Support for short read/writes ore: Remove check for ios->kern_buff in _prepare_for_striping to later ore: cleanup: Embed an ore_striping_info inside ore_io_state ore: Only IO one group at a time (API change) ore/exofs: Change the type of the devices array (API change) ore: Make ore_striping_info and ore_calc_stripe_info public exofs: Remove unused data_map member from exofs_sb_info exofs: Rename struct ore_components comps => oc exofs/super.c: local functions should be static exofs/ore.c: local functions should be static ... --- c28cfd60e4ec3f494b73ef7d6c661f5f491cd84f