From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Nov 2019 18:48:24 +0000 (-0800)
Subject: Merge tag 'vfs-5.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v5.15~5039
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f112a2fd1f5999c6029551f901952392d900cf99;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'vfs-5.5-merge-1' of git://git./fs/xfs/xfs-linux

Pull splice fix from Darrick Wong:
 "Fix another place in the splice code where a pipe could ask a
  filesystem for a longer read than the pipe actually has free buffer
  space"

* tag 'vfs-5.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  splice: only read in as much information as there is pipe buffer space
---

f112a2fd1f5999c6029551f901952392d900cf99