projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b266a5 3253d9d)
Merge tag 'vfs-5.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Nov 2019 18:48:24 +0000 (10:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Nov 2019 18:48:24 +0000 (10:48 -0800)
commitf112a2fd1f5999c6029551f901952392d900cf99
treeb9ee2d8856de063af2079236e92549b2078e6746tree | snapshot
parent3b266a52d8d6e02ea6c1bb52c96342128e624554commit | diff
parent3253d9d093376d62b4a56e609f15d2ec5085ac73commit | diff
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
Domain: System / Kernel;