diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 10:47:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 10:47:38 -0700 |
| commit | 90290c4ebe5c64ee34fea0d2cc3025cb934917b8 (patch) | |
| tree | f57eff4c719ca6a39f1e5ca70598cb80e82ccf96 /fs/nilfs2/Makefile | |
| parent | d471ce53b1fab60110e4e9f647a345cea31752de (diff) | |
| parent | 115930cb2d444a684975cf2325759cb48ebf80cc (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next
Pull btrfs fixes from Josef Bacik:
"I'm playing the role of Chris Mason this week while he's on vacation.
There are a few critical fixes for btrfs here, all regressions and
have been tested well"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next:
Btrfs: fix wrong write offset when replacing a device
Btrfs: re-add root to dead root list if we stop dropping it
Btrfs: fix lock leak when resuming snapshot deletion
Btrfs: update drop progress before stopping snapshot dropping
Diffstat (limited to 'fs/nilfs2/Makefile')
0 files changed, 0 insertions, 0 deletions