summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_qm_syscalls.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-02 01:08:34 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-02 01:08:34 +0200
commit82d2a348bb9a1e265fe1c62e39341128ec014ed9 (patch)
treef5ec3d92e66d6047d134f4278080437ad9562196 /fs/xfs/xfs_qm_syscalls.c
parentMerge tag 'for-linus' of git://github.com/martinbrandenburg/linux (diff)
parentMerge branch 'misc-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kdav... (diff)
downloadlinux-82d2a348bb9a1e265fe1c62e39341128ec014ed9.tar.xz
linux-82d2a348bb9a1e265fe1c62e39341128ec014ed9.zip
Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "This has a few fixes Dave Sterba had queued up. These are all pretty small, but since they were tested I decided against waiting for more" * 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: transaction_kthread() is not freezable btrfs: cleaner_kthread() doesn't need explicit freeze btrfs: do not write corrupted metadata blocks to disk btrfs: csum_tree_block: return proper errno value
Diffstat (limited to 'fs/xfs/xfs_qm_syscalls.c')
0 files changed, 0 insertions, 0 deletions