diff options
| author | Linus Torvalds <[email protected]> | 2016-06-04 11:56:28 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-06-04 11:56:28 -0700 | 
| commit | b2d5ad822322cfb5dd33e90484ed7df4ee6e68ee (patch) | |
| tree | a1e0d43201cfc2d3a563df06f0771820804b95f5 /tools/perf/scripts/python | |
| parent | a3021a59cac40681b2c131c84cdd4b471793d524 (diff) | |
| parent | 8dff9c85341032767d7b519217a79ea04cd676b0 (diff) | |
Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
 "The important part of this pull is Filipe's set of fixes for btrfs
  device replacement.  Filipe fixed a few issues seen on the list and a
  number he found on his own"
* 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: deal with duplciates during extent_map insertion in btrfs_get_extent
  Btrfs: fix race between device replace and read repair
  Btrfs: fix race between device replace and discard
  Btrfs: fix race between device replace and chunk allocation
  Btrfs: fix race setting block group back to RW mode during device replace
  Btrfs: fix unprotected assignment of the left cursor for device replace
  Btrfs: fix race setting block group readonly during device replace
  Btrfs: fix race between device replace and block group removal
  Btrfs: fix race between readahead and device replace/removal
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions