diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-03-29 02:31:37 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-29 02:31:37 +0200 |
| commit | 1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225 (patch) | |
| tree | a7dde6312ec24eb6368cad7a3efedbf368a5a70c /fs/eventpoll.c | |
| parent | Btrfs: change scrub to support big blocks (diff) | |
| parent | btrfs: disallow unequal data/metadata blocksize for mixed block groups (diff) | |
| download | linux-1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225.tar.xz linux-1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225.zip | |
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>
Diffstat (limited to 'fs/eventpoll.c')
0 files changed, 0 insertions, 0 deletions