diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 08:27:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 08:27:13 -0700 |
| commit | 85b5d4bcab8b46664f8e1993bd5919cb0f24a3ca (patch) | |
| tree | 904b271d66dfbe005f4006fbd5e0bcc97a2fb428 /MAINTAINERS | |
| parent | 11743c56785c751c087eecdb98713eef796609e0 (diff) | |
| parent | 9084cb6a24bf5838a665af92ded1af8363f9e563 (diff) | |
| download | blackbird-op-linux-85b5d4bcab8b46664f8e1993bd5919cb0f24a3ca.tar.gz blackbird-op-linux-85b5d4bcab8b46664f8e1993bd5919cb0f24a3ca.zip | |
Merge tag 'for-4.20-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull more btrfs updates from David Sterba:
"This contains a few minor updates and fixes that were under testing or
arrived shortly after the merge window freeze, mostly stable material"
* tag 'for-4.20-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix use-after-free when dumping free space
Btrfs: fix use-after-free during inode eviction
btrfs: move the dio_sem higher up the callchain
btrfs: don't run delayed_iputs in commit
btrfs: fix insert_reserved error handling
btrfs: only free reserved extent if we didn't insert it
btrfs: don't use ctl->free_space for max_extent_size
btrfs: set max_extent_size properly
btrfs: reset max_extent_size properly
MAINTAINERS: update my email address for btrfs
btrfs: delayed-ref: extract find_first_ref_head from find_ref_head
Btrfs: fix deadlock when writing out free space caches
Btrfs: fix assertion on fsync of regular file when using no-holes feature
Btrfs: fix null pointer dereference on compressed write path error
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 930241eb6e2d..5d1c3ae9f933 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3160,7 +3160,7 @@ F: drivers/gpio/gpio-bt8xx.c BTRFS FILE SYSTEM M: Chris Mason <clm@fb.com> -M: Josef Bacik <jbacik@fb.com> +M: Josef Bacik <josef@toxicpanda.com> M: David Sterba <dsterba@suse.com> L: linux-btrfs@vger.kernel.org W: http://btrfs.wiki.kernel.org/ |
