]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Mar 2016 01:31:32 +0000 (17:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Mar 2016 01:31:32 +0000 (17:31 -0800)
commitfe336bccba0f5be559454976616feb5e79e624f7
tree21d2465f170867584a2a0e5a8a9bd5227424ec82
parentf10539e583b9c1679badc54df4a707bdbc3da646
parent2eca57e6f462ace611483163df3ea792b39978be
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