From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Oct 2015 22:17:58 +0000 (+0900)
Subject: Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=37902bc190f1396a8c232783b29ddfcaa4026028;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-linus-4.3' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "I have two more small fixes this week:

  Qu's fix avoids unneeded COW during fallocate, and Christian found a
  memory leak in the error handling of an earlier fix"

* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix possible leak in btrfs_ioctl_balance()
  btrfs: Avoid truncate tailing page if fallocate range doesn't exceed inode size
---

37902bc190f1396a8c232783b29ddfcaa4026028