summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-27 15:45:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-27 15:45:45 -0800
commit80e0c505b22e64ab1787285b182a1e8395e53991 (patch)
treeea854bf26485574860ff0cc18245e4645ccc5d0d /.gitignore
parent7e4b9359f483fe270c176cc37aaad54d5d1b6a1c (diff)
parentdba72cb30b6a4811038128c8a98b268d18ca60fe (diff)
downloadop-kernel-dev-80e0c505b22e64ab1787285b182a1e8395e53991.zip
op-kernel-dev-80e0c505b22e64ab1787285b182a1e8395e53991.tar.gz
Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "This has Mark Fasheh's patches to fix quota accounting during subvol deletion, which we've been working on for a while now. The patch is pretty small but it's a key fix. Otherwise it's a random assortment" * 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: fix balance range usage filters in 4.4-rc btrfs: qgroup: account shared subtree during snapshot delete Btrfs: use btrfs_get_fs_root in resolve_indirect_ref btrfs: qgroup: fix quota disable during rescan Btrfs: fix race between cleaner kthread and space cache writeout Btrfs: fix scrub preventing unused block groups from being deleted Btrfs: fix race between scrub and block group deletion btrfs: fix rcu warning during device replace btrfs: Continue replace when set_block_ro failed btrfs: fix clashing number of the enhanced balance usage filter Btrfs: fix the number of transaction units needed to remove a block group Btrfs: use global reserve when deleting unused block group after ENOSPC Btrfs: tests: checking for NULL instead of IS_ERR() btrfs: fix signed overflows in btrfs_sync_file
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud