projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17d084c e12199f)
Merge tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Oct 2017 22:53:36 +0000 (15:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Oct 2017 22:53:36 +0000 (15:53 -0700)
commiteab26ad197311ced6e95c8117a079fb9ae40697b
treef5401c0b2795f986421e07326bce7f3f3f352f5etree | snapshot
parent17d084c8d1b73fc07e48c1f5081ef3b8af338e15commit | diff
parente12199f85d0ad1b04ce6c425ad93cd847fe930bbcommit | diff
Merge tag 'xfs-4.14-fixes-4' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:

 - fix a race between overlapping copy on write aio

 - fix cow fork swapping when we defragment reflinked files

* tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: handle racy AIO in xfs_reflink_end_cow
  xfs: always swap the cow forks when swapping extents
John Crispins staging tree