From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Mar 2016 01:31:32 +0000 (-0800)
Subject: Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-linus-4.5' of git://git./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
---

2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408