Merge tag 'compiler-attributes-for-linus-v5.15-rc1-v2' of git://github.com/ojeda...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 947c0cd..eeb4c70 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3313,7 +3313,6 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 F:     block/
 F:     drivers/block/
-F:     fs/block_dev.c
 F:     include/linux/blk*
 F:     kernel/trace/blktrace.c
 F:     lib/sbitmap.c
@@ -4685,6 +4684,7 @@ F:        drivers/platform/x86/compal-laptop.c
 
 COMPILER ATTRIBUTES
 M:     Miguel Ojeda <ojeda@kernel.org>
+R:     Nick Desaulniers <ndesaulniers@google.com>
 S:     Maintained
 F:     include/linux/compiler_attributes.h
 
@@ -10622,10 +10622,10 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 F:     drivers/ata/sata_promise.*
 
 LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
-M:     Jens Axboe <axboe@kernel.dk>
+M:     Damien Le Moal <damien.lemoal@opensource.wdc.com>
 L:     linux-ide@vger.kernel.org
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 F:     Documentation/devicetree/bindings/ata/
 F:     drivers/ata/
 F:     include/linux/ata.h
@@ -13409,7 +13409,7 @@ F:      include/linux/nvme-fc.h
 NVM EXPRESS TARGET DRIVER
 M:     Christoph Hellwig <hch@lst.de>
 M:     Sagi Grimberg <sagi@grimberg.me>
-M:     Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+M:     Chaitanya Kulkarni <kch@nvidia.com>
 L:     linux-nvme@lists.infradead.org
 S:     Supported
 W:     http://git.infradead.org/nvme.git