Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b251bcc91f0138fc169c6063516f197e3f5d18f..de6a64b248ae73950f69d7adfb7dab0ebf0bc50c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2377,8 +2377,8 @@ M:        Sean Wang <sean.wang@mediatek.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/rtc/rtc-mt2712.txt
-F:     Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
+F:     Documentation/devicetree/bindings/rtc/mediatek,mt2712-rtc.yaml
+F:     Documentation/devicetree/bindings/rtc/mediatek,mt7622-rtc.yaml
 F:     drivers/rtc/rtc-mt2712.c
 F:     drivers/rtc/rtc-mt6397.c
 F:     drivers/rtc/rtc-mt7622.c
@@ -2617,6 +2617,7 @@ F:        drivers/pci/controller/dwc/pcie-qcom.c
 F:     drivers/phy/qualcomm/
 F:     drivers/power/*/msm*
 F:     drivers/reset/reset-qcom-*
+F:     drivers/rtc/rtc-pm8xxx.c
 F:     drivers/spi/spi-geni-qcom.c
 F:     drivers/spi/spi-qcom-qspi.c
 F:     drivers/spi/spi-qup.c
@@ -15237,7 +15238,6 @@ F:      drivers/net/ethernet/neterion/
 NETFILTER
 M:     Pablo Neira Ayuso <pablo@netfilter.org>
 M:     Jozsef Kadlecsik <kadlec@netfilter.org>
-M:     Florian Westphal <fw@strlen.de>
 L:     netfilter-devel@vger.kernel.org
 L:     coreteam@netfilter.org
 S:     Maintained
@@ -22574,6 +22574,7 @@ F:      include/uapi/misc/uacce/
 
 UBI FILE SYSTEM (UBIFS)
 M:     Richard Weinberger <richard@nod.at>
+R:     Zhihao Cheng <chengzhihao1@huawei.com>
 L:     linux-mtd@lists.infradead.org
 S:     Supported
 W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
@@ -22719,6 +22720,7 @@ F:      drivers/ufs/host/ufs-renesas.c
 
 UNSORTED BLOCK IMAGES (UBI)
 M:     Richard Weinberger <richard@nod.at>
+R:     Zhihao Cheng <chengzhihao1@huawei.com>
 L:     linux-mtd@lists.infradead.org
 S:     Supported
 W:     http://www.linux-mtd.infradead.org/