]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'error-handling' into for-linus
authorChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:31:37 +0000 (20:31 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:31:37 +0000 (20:31 -0400)
commitf6e6116a4a305f14dd3800ce3f1705bd6ad508af
treea7dde6312ec24eb6368cad7a3efedbf368a5a70c
parent5c143387ff6aa17ab703b0a557a9a10aad484684
parent8532657a3619f821e05ef480f26871f33f436eac
Merge branch 'error-handling' into for-linus

Conflicts:
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode.c
fs/btrfs/scrub.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode-item.c
fs/btrfs/inode.c
fs/btrfs/scrub.c
fs/btrfs/volumes.c