git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78baab7 909c3a2)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.