Commit 43fef9ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata fix from Damien Le Moal:

 - Update my email address in the MAINTAINERS file

* tag 'ata-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  MAINTAINERS: Change ata maintainer email addresses
parents aa4c9185 2096134b

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -4461,14 +4461,14 @@ F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt 
F:	drivers/net/ieee802154/ca8210.c









CANAAN/KENDRYTE K210 SOC FPIOA DRIVER









M:	Damien Le Moal <damien.lemoal@wdc.com>









M:	Damien Le Moal <dlemoal@kernel.org>









L:	linux-riscv@lists.infradead.org









L:	linux-gpio@vger.kernel.org (pinctrl driver)









F:	Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml









F:	drivers/pinctrl/pinctrl-k210.c

















CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER









M:	Damien Le Moal <damien.lemoal@wdc.com>









M:	Damien Le Moal <dlemoal@kernel.org>









L:	linux-kernel@vger.kernel.org









L:	linux-riscv@lists.infradead.org









S:	Maintained








@@ -4476,7 +4476,7 @@ F:	Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml







F:	drivers/reset/reset-k210.c

















CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER









M:	Damien Le Moal <damien.lemoal@wdc.com>









M:	Damien Le Moal <dlemoal@kernel.org>









L:	linux-riscv@lists.infradead.org









S:	Maintained









F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml








@@ -11758,7 +11758,7 @@ 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:	Damien Le Moal <damien.lemoal@opensource.wdc.com>









M:	Damien Le Moal <dlemoal@kernel.org>









L:	linux-ide@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git








@@ -23115,7 +23115,7 @@ S:	Maintained







F:	arch/x86/kernel/cpu/zhaoxin.c

















ZONEFS FILESYSTEM









M:	Damien Le Moal <damien.lemoal@opensource.wdc.com>









M:	Damien Le Moal <dlemoal@kernel.org>









M:	Naohiro Aota <naohiro.aota@wdc.com>









R:	Johannes Thumshirn <jth@kernel.org>









L:	linux-fsdevel@vger.kernel.org