]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 22e80a7 8d8342d)
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)
commit2f10caafc26bfd34b7d4c96d63e572ae0a4fe01a
tree21d2465f170867584a2a0e5a8a9bd5227424ec82tree | snapshot
parent22e80a7cb092cf527087c65a07e0d1dbfc993a3dcommit | diff
parent8d8342d4eac5d0ee9c6f965df361e3fc8ef31cb5commit | 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
Linux Kernel Source Tree.