summaryrefslogtreecommitdiffstats
path: root/fs/ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-18 20:18:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-18 20:18:00 +0200
commit366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085 (patch)
tree7008e59815214b760003707257bd06df46a55a9e /fs/ioctl.c
parentMerge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff)
parentDocumentation: filesystem: Convert xfs.txt to ReST (diff)
downloadlinux-366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085.tar.xz
linux-366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085.zip
Merge tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs cleanups from Darrick Wong: "We had a few more lateish cleanup patches come in for 5.3 -- a couple of syncups with the userspace libxfs code and a conversion of the XFS administrator's guide to ReST format. Summary: - Bring fs/xfs/libxfs/xfs_trans_inode.c in sync with userspace libxfs. - Convert the xfs administrator guide to rst and move it into the official admin guide under Documentation" * tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: Documentation: filesystem: Convert xfs.txt to ReST xfs: sync up xfs_trans_inode with userspace xfs: move xfs_trans_inode.c to libxfs/
Diffstat (limited to 'fs/ioctl.c')
0 files changed, 0 insertions, 0 deletions