]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408
tree21d2465f170867584a2a0e5a8a9bd5227424ec82tree | snapshot
parent78baab7aa843ef01644195d341bee118cbe4bf19commit | diff
parent909c3a22da3b8d2cfd3505ca5658f0176859d400commit | 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 for KaRo TX COM modules