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

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

diff --combined MAINTAINERS
index 4485969f58f124ae7b43321c3b75e6ae62dbfbcc,8e156c754e2075e1fce3ba2b0528e3c50febb65d..0e64787aace84000d521d749c44966c8126eb56d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -73,7 -73,7 +73,7 @@@ Tips for patch submitter
        and ideally, should come with a patch proposal. Please do not send
        automated reports to this list either. Such bugs will be handled
        better and faster in the usual public places. See
 -      Documentation/admin-guide/security-bugs.rst for details.
 +      Documentation/process/security-bugs.rst for details.
  
  8.    Happy hacking.
  
@@@ -224,13 -224,13 +224,13 @@@ S:      Orphan / Obsolet
  F:    drivers/net/ethernet/8390/
  
  9P FILE SYSTEM
 -M:    Eric Van Hensbergen <ericvh@gmail.com>
 +M:    Eric Van Hensbergen <ericvh@kernel.org>
  M:    Latchesar Ionkov <[email protected]>
  M:    Dominique Martinet <[email protected]>
  R:    Christian Schoenebeck <[email protected]>
 -L:    v9fs[email protected]
 +L:    v9fs@lists.linux.dev
  S:    Maintained
 -W:    http://swik.net/v9fs
 +W:    http://github.com/v9fs
  Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  T:    git git://github.com/martinetd/linux.git
@@@ -4461,14 -4461,14 +4461,14 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/ieee802154/ca8210.c
  
  CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
- M:    Damien Le Moal <d[email protected]>
+ M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  L:    [email protected] (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 <d[email protected]>
+ M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -4476,7 -4476,7 +4476,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    drivers/reset/reset-k210.c
  
  CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
- M:    Damien Le Moal <d[email protected]>
+ M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  S:    Maintained
  F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
@@@ -5971,7 -5971,7 +5971,7 @@@ F:      include/linux/dm-*.
  F:    include/uapi/linux/dm-*.h
  
  DEVLINK
 -M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/devlink
@@@ -8216,7 -8216,6 +8216,7 @@@ F:      drivers/net/ethernet/freescale/dpa
  
  FREESCALE QORIQ DPAA FMAN DRIVER
  M:    Madalin Bucur <[email protected]>
 +R:    Sean Anderson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/fsl-fman.txt
@@@ -11758,7 -11757,7 +11758,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/sata_promise.*
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
- M:    Damien Le Moal <d[email protected]>
+ M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
@@@ -14657,8 -14656,10 +14657,8 @@@ F:  net/ipv4/nexthop.
  
  NFC SUBSYSTEM
  M:    Krzysztof Kozlowski <[email protected]>
 -L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
 -B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/net/nfc/
  F:    drivers/nfc/
  F:    include/linux/platform_data/nfcmrvl.h
@@@ -14669,6 -14670,7 +14669,6 @@@ F:   net/nfc
  NFC VIRTUAL NCI DEVICE DRIVER
  M:    Bongsu Jeon <[email protected]>
  L:    [email protected]
 -L:    [email protected] (subscribers-only)
  S:    Supported
  F:    drivers/nfc/virtual_ncidev.c
  F:    tools/testing/selftests/nci/
@@@ -14870,12 -14872,12 +14870,12 @@@ M:        Sagi Grimberg <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/nvme.git
 -T:    git://git.infradead.org/nvme.git
 +T:    git git://git.infradead.org/nvme.git
  F:    Documentation/nvme/
 -F:    drivers/nvme/host/
  F:    drivers/nvme/common/
 -F:    include/linux/nvme.h
 +F:    drivers/nvme/host/
  F:    include/linux/nvme-*.h
 +F:    include/linux/nvme.h
  F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS FABRICS AUTHENTICATION
@@@ -14910,7 -14912,7 +14910,7 @@@ M:   Chaitanya Kulkarni <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/nvme.git
 -T:    git://git.infradead.org/nvme.git
 +T:    git git://git.infradead.org/nvme.git
  F:    drivers/nvme/target/
  
  NVMEM FRAMEWORK
@@@ -15040,6 -15042,7 +15040,6 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa989x.c
  
  NXP-NCI NFC DRIVER
 -L:    [email protected] (subscribers-only)
  S:    Orphan
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
@@@ -15076,7 -15079,7 +15076,7 @@@ F:   Documentation/hwmon/nzxt-smart2.rs
  F:    drivers/hwmon/nzxt-smart2.c
  
  OBJAGG
 -M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    [email protected]
  S:    Supported
  F:    include/linux/objagg.h
@@@ -15850,7 -15853,7 +15850,7 @@@ F:   drivers/video/logo/logo_parisc
  F:    include/linux/hp_sdc.h
  
  PARMAN
 -M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    [email protected]
  S:    Supported
  F:    include/linux/parman.h
@@@ -17987,7 -17990,7 +17987,7 @@@ F:   Documentation/devicetree/bindings/sp
  F:    Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
  F:    arch/riscv/boot/dts/microchip/
  F:    drivers/char/hw_random/mpfs-rng.c
 -F:    drivers/clk/microchip/clk-mpfs.c
 +F:    drivers/clk/microchip/clk-mpfs*.c
  F:    drivers/i2c/busses/i2c-microchip-corei2c.c
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/pci/controller/pcie-microchip-host.c
@@@ -18288,9 -18291,8 +18288,9 @@@ F:   drivers/s390/block/dasd
  F:    include/linux/dasd_mod.h
  
  S390 IOMMU (PCI)
 +M:    Niklas Schnelle <[email protected]>
  M:    Matthew Rosato <[email protected]>
 -M:    Gerald Schaefer <[email protected]>
 +R:    Gerald Schaefer <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/iommu/s390-iommu.c
@@@ -18485,6 -18487,7 +18485,6 @@@ F:   include/media/drv-intf/s3c_camif.
  
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
 -L:    [email protected] (subscribers-only)
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
  F:    drivers/nfc/s3fwrn5
@@@ -18799,7 -18802,7 +18799,7 @@@ F:   include/uapi/linux/sed
  SECURITY CONTACT
  M:    Security Officers <[email protected]>
  S:    Supported
 -F:    Documentation/admin-guide/security-bugs.rst
 +F:    Documentation/process/security-bugs.rst
  
  SECURITY SUBSYSTEM
  M:    Paul Moore <[email protected]>
@@@ -19147,7 -19150,9 +19147,7 @@@ W:   http://www.brownhat.org/sis900.htm
  F:    drivers/net/ethernet/sis/sis900.*
  
  SIS FRAMEBUFFER DRIVER
 -M:    Thomas Winischhofer <[email protected]>
 -S:    Maintained
 -W:    http://www.winischhofer.net/linuxsisvga.shtml
 +S:    Orphan
  F:    Documentation/fb/sisfb.rst
  F:    drivers/video/fbdev/sis/
  F:    include/video/sisfb.h
@@@ -20642,6 -20647,7 +20642,6 @@@ F:   sound/soc/codecs/tscs*.
  TENSILICA XTENSA PORT (xtensa)
  M:    Chris Zankel <[email protected]>
  M:    Max Filippov <[email protected]>
 -L:    [email protected]
  S:    Maintained
  T:    git https://github.com/jcmvbkbc/linux-xtensa.git
  F:    arch/xtensa/
@@@ -20977,6 -20983,7 +20977,6 @@@ F:   drivers/iio/magnetometer/tmag5273.
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <[email protected]>
  L:    [email protected]
 -L:    [email protected] (subscribers-only)
  S:    Supported
  F:    Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
  F:    drivers/nfc/trf7970a.c
@@@ -21638,7 -21645,6 +21638,7 @@@ USB OVER IP DRIVE
  M:    Valentina Manea <[email protected]>
  M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
 +R:    Hongren Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usbip_protocol.rst
@@@ -23033,6 -23039,7 +23033,6 @@@ F:   drivers/gpio/gpio-xra1403.
  
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
 -L:    [email protected]
  S:    Maintained
  F:    drivers/spi/spi-xtensa-xtfpga.c
  F:    sound/soc/xtensa/xtfpga-i2s.c
@@@ -23115,7 -23122,7 +23115,7 @@@ S:   Maintaine
  F:    arch/x86/kernel/cpu/zhaoxin.c
  
  ZONEFS FILESYSTEM
- M:    Damien Le Moal <d[email protected]>
+ M:    Damien Le Moal <d[email protected]>
  M:    Naohiro Aota <[email protected]>
  R:    Johannes Thumshirn <[email protected]>
  L:    [email protected]