diff options
| author | Linus Torvalds | 2016-03-04 17:31:32 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-04 17:31:32 -0800 |
| commit | 2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408 (patch) | |
| tree | 21d2465f170867584a2a0e5a8a9bd5227424ec82 /arch/parisc | |
| parent | 78baab7aa843ef01644195d341bee118cbe4bf19 (diff) | |
| parent | 909c3a22da3b8d2cfd3505ca5658f0176859d400 (diff) | |
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 'arch/parisc')
0 files changed, 0 insertions, 0 deletions