diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-05 02:31:32 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-05 02:31:32 +0100 |
commit | 2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408 (patch) | |
tree | 21d2465f170867584a2a0e5a8a9bd5227424ec82 /MAINTAINERS | |
parent | Merge tag 'trace-fixes-v4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | Btrfs: fix loading of orphan roots leading to BUG_ON (diff) | |
download | linux-2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408.tar.xz linux-2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408.zip |
Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"Filipe nailed down a problem where tree log replay would do some work
that orphan code wasn't expecting to be done yet, leading to BUG_ON"
* 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix loading of orphan roots leading to BUG_ON
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions