From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 May 2018 18:47:43 +0000 (-0700)
Subject: Merge tag 'for-4.17-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d7b66b4ab0344dcc4bf169e0bbfda6234cdf6966;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-4.17-rc6-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fix from David Sterba:
 "A one-liner that prevents leaking an internal error value 1 out of the
  ftruncate syscall.

  This has been observed in practice. The steps to reproduce make a
  common pattern (open/write/fync/ftruncate) but also need the
  application to not check only for negative values and happens only for
  compressed inlined files.

  The conditions are narrow but as this could break userspace I think
  it's better to merge it now and not wait for the merge window"

* tag 'for-4.17-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix error handling in btrfs_truncate()
---

d7b66b4ab0344dcc4bf169e0bbfda6234cdf6966