Merge remote-tracking branch 'remotes/josef/for-kdave' into v3.19.x
commit478a4f21e480096b6c2f54ee5dd6421a557f26ab
authorDavid Sterba <dsterba@suse.cz>
Tue, 10 Feb 2015 14:17:10 +0000 (10 15:17 +0100)
committerDavid Sterba <dsterba@suse.cz>
Tue, 10 Feb 2015 14:17:33 +0000 (10 15:17 +0100)
tree77ef50db2046f1977caea9dd93f345b1fb7163b1
parent8fa8156a0e8dc60403d3a182532ed0c0e5bcb287
parent4915964fc653033189c733ec738b4b23c87b9e5d
Merge remote-tracking branch 'remotes/josef/for-kdave' into v3.19.x

"This series of patches fixes up btrfsck in lots of ways and adds some
new functionality.  These patches were required to fix Hugo's broken
multi-disk fs as well as fix fsck so it would actually pass all of the
fsck tests.  This also fixes a long standing btrfs-image problem where
it wouldn't restore multi disk images onto a single disk properly."