Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged

Bug: 166295507
Merged-In: I670b163eede4bb60c197e2ded9491d45ad4b6541
Change-Id: I17d9409df815d08e2379f77a1088880c5bd3b6a2
diff --git a/hikey960/5.4/8250_dw.ko b/hikey960/5.4/8250_dw.ko
deleted file mode 100644
index f3b8a86..0000000
--- a/hikey960/5.4/8250_dw.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/Image.gz b/hikey960/5.4/Image.gz
index ffee073..bd59a57 100644
--- a/hikey960/5.4/Image.gz
+++ b/hikey960/5.4/Image.gz
Binary files differ
diff --git a/hikey960/5.4/Image.gz-dtb b/hikey960/5.4/Image.gz-dtb
index 76cafdb..59164ea 100644
--- a/hikey960/5.4/Image.gz-dtb
+++ b/hikey960/5.4/Image.gz-dtb
Binary files differ
diff --git a/hikey960/5.4/adv7511.ko b/hikey960/5.4/adv7511.ko
index fa8b652..6212552 100644
--- a/hikey960/5.4/adv7511.ko
+++ b/hikey960/5.4/adv7511.ko
Binary files differ
diff --git a/hikey960/5.4/ambakmi.ko b/hikey960/5.4/ambakmi.ko
index 6344d8f..c3e0aca 100644
--- a/hikey960/5.4/ambakmi.ko
+++ b/hikey960/5.4/ambakmi.ko
Binary files differ
diff --git a/hikey960/5.4/armmmci.ko b/hikey960/5.4/armmmci.ko
index 7474860..2a3c7e5 100644
--- a/hikey960/5.4/armmmci.ko
+++ b/hikey960/5.4/armmmci.ko
Binary files differ
diff --git a/hikey960/5.4/btsdio.ko b/hikey960/5.4/btsdio.ko
deleted file mode 100644
index 212d51e..0000000
--- a/hikey960/5.4/btsdio.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/cec.ko b/hikey960/5.4/cec.ko
index a89b4f5..5812635 100644
--- a/hikey960/5.4/cec.ko
+++ b/hikey960/5.4/cec.ko
Binary files differ
diff --git a/hikey960/5.4/clk-hi655x.ko b/hikey960/5.4/clk-hi655x.ko
index 55f053f..f0abdc9 100644
--- a/hikey960/5.4/clk-hi655x.ko
+++ b/hikey960/5.4/clk-hi655x.ko
Binary files differ
diff --git a/hikey960/5.4/cn.ko b/hikey960/5.4/cn.ko
index 61cbf1b..13ca2ae 100644
--- a/hikey960/5.4/cn.ko
+++ b/hikey960/5.4/cn.ko
Binary files differ
diff --git a/hikey960/5.4/cpufreq-dt.ko b/hikey960/5.4/cpufreq-dt.ko
index b180bd4..8b01239 100644
--- a/hikey960/5.4/cpufreq-dt.ko
+++ b/hikey960/5.4/cpufreq-dt.ko
Binary files differ
diff --git a/hikey960/5.4/crc-itu-t.ko b/hikey960/5.4/crc-itu-t.ko
index 55d05d5..9a76d61 100644
--- a/hikey960/5.4/crc-itu-t.ko
+++ b/hikey960/5.4/crc-itu-t.ko
Binary files differ
diff --git a/hikey960/5.4/crc7.ko b/hikey960/5.4/crc7.ko
index f3d5484..18342b2 100644
--- a/hikey960/5.4/crc7.ko
+++ b/hikey960/5.4/crc7.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-exynos.ko b/hikey960/5.4/dw_mmc-exynos.ko
index d5c69ea..8bad3b0 100644
--- a/hikey960/5.4/dw_mmc-exynos.ko
+++ b/hikey960/5.4/dw_mmc-exynos.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-k3.ko b/hikey960/5.4/dw_mmc-k3.ko
index b740689..97251da 100644
--- a/hikey960/5.4/dw_mmc-k3.ko
+++ b/hikey960/5.4/dw_mmc-k3.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-pltfm.ko b/hikey960/5.4/dw_mmc-pltfm.ko
index 50c9313..b6e0188 100644
--- a/hikey960/5.4/dw_mmc-pltfm.ko
+++ b/hikey960/5.4/dw_mmc-pltfm.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc.ko b/hikey960/5.4/dw_mmc.ko
index 3f280ba..7bc75a5 100644
--- a/hikey960/5.4/dw_mmc.ko
+++ b/hikey960/5.4/dw_mmc.ko
Binary files differ
diff --git a/hikey960/5.4/dwc3-haps.ko b/hikey960/5.4/dwc3-haps.ko
index f4aa19f..93cceb2 100644
--- a/hikey960/5.4/dwc3-haps.ko
+++ b/hikey960/5.4/dwc3-haps.ko
Binary files differ
diff --git a/hikey960/5.4/dwc3-of-simple.ko b/hikey960/5.4/dwc3-of-simple.ko
index 48029c0..47cc779 100644
--- a/hikey960/5.4/dwc3-of-simple.ko
+++ b/hikey960/5.4/dwc3-of-simple.ko
Binary files differ
diff --git a/hikey960/5.4/dwc3-qcom.ko b/hikey960/5.4/dwc3-qcom.ko
index 58c779e..5cb1038 100644
--- a/hikey960/5.4/dwc3-qcom.ko
+++ b/hikey960/5.4/dwc3-qcom.ko
Binary files differ
diff --git a/hikey960/5.4/dwc3.ko b/hikey960/5.4/dwc3.ko
index 3abeb52..0928860 100644
--- a/hikey960/5.4/dwc3.ko
+++ b/hikey960/5.4/dwc3.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-hcd.ko b/hikey960/5.4/ehci-hcd.ko
index d269dcd..1730e1b 100644
--- a/hikey960/5.4/ehci-hcd.ko
+++ b/hikey960/5.4/ehci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-pci.ko b/hikey960/5.4/ehci-pci.ko
index 504162b..954ceb8 100644
--- a/hikey960/5.4/ehci-pci.ko
+++ b/hikey960/5.4/ehci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-platform.ko b/hikey960/5.4/ehci-platform.ko
index f40bbb7..0eeeb1a 100644
--- a/hikey960/5.4/ehci-platform.ko
+++ b/hikey960/5.4/ehci-platform.ko
Binary files differ
diff --git a/hikey960/5.4/erofs.ko b/hikey960/5.4/erofs.ko
new file mode 100644
index 0000000..7ee78f9
--- /dev/null
+++ b/hikey960/5.4/erofs.ko
Binary files differ
diff --git a/hikey960/5.4/gadgetfs.ko b/hikey960/5.4/gadgetfs.ko
index 97d6086..d04736d 100644
--- a/hikey960/5.4/gadgetfs.ko
+++ b/hikey960/5.4/gadgetfs.ko
Binary files differ
diff --git a/hikey960/5.4/hci_uart.ko b/hikey960/5.4/hci_uart.ko
deleted file mode 100644
index b9c2581..0000000
--- a/hikey960/5.4/hci_uart.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/hi3660-i2s.ko b/hikey960/5.4/hi3660-i2s.ko
index f170f62..5fffb0d 100644
--- a/hikey960/5.4/hi3660-i2s.ko
+++ b/hikey960/5.4/hi3660-i2s.ko
Binary files differ
diff --git a/hikey960/5.4/hi3660-mailbox.ko b/hikey960/5.4/hi3660-mailbox.ko
index 8a12f7a..0a1bcd2 100644
--- a/hikey960/5.4/hi3660-mailbox.ko
+++ b/hikey960/5.4/hi3660-mailbox.ko
Binary files differ
diff --git a/hikey960/5.4/hi6421-pmic-core.ko b/hikey960/5.4/hi6421-pmic-core.ko
index c64736f..aad49be 100644
--- a/hikey960/5.4/hi6421-pmic-core.ko
+++ b/hikey960/5.4/hi6421-pmic-core.ko
Binary files differ
diff --git a/hikey960/5.4/hi6421v530-regulator.ko b/hikey960/5.4/hi6421v530-regulator.ko
index 84af673..cf91f19 100644
--- a/hikey960/5.4/hi6421v530-regulator.ko
+++ b/hikey960/5.4/hi6421v530-regulator.ko
Binary files differ
diff --git a/hikey960/5.4/hi655x-pmic.ko b/hikey960/5.4/hi655x-pmic.ko
index 5fda83a..ea327a7 100644
--- a/hikey960/5.4/hi655x-pmic.ko
+++ b/hikey960/5.4/hi655x-pmic.ko
Binary files differ
diff --git a/hikey960/5.4/hi655x-regulator.ko b/hikey960/5.4/hi655x-regulator.ko
index 210c71c..6cd0199 100644
--- a/hikey960/5.4/hi655x-regulator.ko
+++ b/hikey960/5.4/hi655x-regulator.ko
Binary files differ
diff --git a/hikey960/5.4/hidp.ko b/hikey960/5.4/hidp.ko
deleted file mode 100644
index 079b6e6..0000000
--- a/hikey960/5.4/hidp.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/hisi_hikey_usb.ko b/hikey960/5.4/hisi_hikey_usb.ko
index 413caea..7985bdd 100644
--- a/hikey960/5.4/hisi_hikey_usb.ko
+++ b/hikey960/5.4/hisi_hikey_usb.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_powerkey.ko b/hikey960/5.4/hisi_powerkey.ko
index 76fd26e..4175c37 100644
--- a/hikey960/5.4/hisi_powerkey.ko
+++ b/hikey960/5.4/hisi_powerkey.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_thermal.ko b/hikey960/5.4/hisi_thermal.ko
index c0387b8..f8b0a15 100644
--- a/hikey960/5.4/hisi_thermal.ko
+++ b/hikey960/5.4/hisi_thermal.ko
Binary files differ
diff --git a/hikey960/5.4/hwmon.ko b/hikey960/5.4/hwmon.ko
index f5139a2..cd626bc 100644
--- a/hikey960/5.4/hwmon.ko
+++ b/hikey960/5.4/hwmon.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-designware-core.ko b/hikey960/5.4/i2c-designware-core.ko
index 1c42844..6b41384 100644
--- a/hikey960/5.4/i2c-designware-core.ko
+++ b/hikey960/5.4/i2c-designware-core.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-designware-platform.ko b/hikey960/5.4/i2c-designware-platform.ko
index 2c9cb5d..7a78ec0 100644
--- a/hikey960/5.4/i2c-designware-platform.ko
+++ b/hikey960/5.4/i2c-designware-platform.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-dev.ko b/hikey960/5.4/i2c-dev.ko
index fe672f2..d80588e 100644
--- a/hikey960/5.4/i2c-dev.ko
+++ b/hikey960/5.4/i2c-dev.ko
Binary files differ
diff --git a/hikey960/5.4/incrementalfs.ko b/hikey960/5.4/incrementalfs.ko
new file mode 100644
index 0000000..636d2f9
--- /dev/null
+++ b/hikey960/5.4/incrementalfs.ko
Binary files differ
diff --git a/hikey960/5.4/ion_cma_heap.ko b/hikey960/5.4/ion_cma_heap.ko
index 20874cc..151871f 100644
--- a/hikey960/5.4/ion_cma_heap.ko
+++ b/hikey960/5.4/ion_cma_heap.ko
Binary files differ
diff --git a/hikey960/5.4/k3dma.ko b/hikey960/5.4/k3dma.ko
index 634917f..8a5be5f 100644
--- a/hikey960/5.4/k3dma.ko
+++ b/hikey960/5.4/k3dma.ko
Binary files differ
diff --git a/hikey960/5.4/kirin-drm.ko b/hikey960/5.4/kirin-drm.ko
index d69d175..4bcac1d 100644
--- a/hikey960/5.4/kirin-drm.ko
+++ b/hikey960/5.4/kirin-drm.ko
Binary files differ
diff --git a/hikey960/5.4/kirin-dsi.ko b/hikey960/5.4/kirin-dsi.ko
index fcc4e41..259b3ad 100644
--- a/hikey960/5.4/kirin-dsi.ko
+++ b/hikey960/5.4/kirin-dsi.ko
Binary files differ
diff --git a/hikey960/5.4/mali_kbase.ko b/hikey960/5.4/mali_kbase.ko
index aea2e91..d0ae9ba 100644
--- a/hikey960/5.4/mali_kbase.ko
+++ b/hikey960/5.4/mali_kbase.ko
Binary files differ
diff --git a/hikey960/5.4/mmc_block.ko b/hikey960/5.4/mmc_block.ko
index 93ac072..4ceae56 100644
--- a/hikey960/5.4/mmc_block.ko
+++ b/hikey960/5.4/mmc_block.ko
Binary files differ
diff --git a/hikey960/5.4/mmc_spi.ko b/hikey960/5.4/mmc_spi.ko
index 2489063..835ccd9 100644
--- a/hikey960/5.4/mmc_spi.ko
+++ b/hikey960/5.4/mmc_spi.ko
Binary files differ
diff --git a/hikey960/5.4/nvme-core.ko b/hikey960/5.4/nvme-core.ko
index 3e867d0..cdef9a7 100644
--- a/hikey960/5.4/nvme-core.ko
+++ b/hikey960/5.4/nvme-core.ko
Binary files differ
diff --git a/hikey960/5.4/nvme.ko b/hikey960/5.4/nvme.ko
index 94f7d76..4f2ef9e 100644
--- a/hikey960/5.4/nvme.ko
+++ b/hikey960/5.4/nvme.ko
Binary files differ
diff --git a/hikey960/5.4/nvmet.ko b/hikey960/5.4/nvmet.ko
index d612ae3..2a4d8ec 100644
--- a/hikey960/5.4/nvmet.ko
+++ b/hikey960/5.4/nvmet.ko
Binary files differ
diff --git a/hikey960/5.4/of_mmc_spi.ko b/hikey960/5.4/of_mmc_spi.ko
index 9ddb94c..7b56258 100644
--- a/hikey960/5.4/of_mmc_spi.ko
+++ b/hikey960/5.4/of_mmc_spi.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-hcd.ko b/hikey960/5.4/ohci-hcd.ko
index 2fe88fe..31285ef 100644
--- a/hikey960/5.4/ohci-hcd.ko
+++ b/hikey960/5.4/ohci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-pci.ko b/hikey960/5.4/ohci-pci.ko
index 24c3226..88f7954 100644
--- a/hikey960/5.4/ohci-pci.ko
+++ b/hikey960/5.4/ohci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-platform.ko b/hikey960/5.4/ohci-platform.ko
index 4e37986..d6a996f 100644
--- a/hikey960/5.4/ohci-platform.ko
+++ b/hikey960/5.4/ohci-platform.ko
Binary files differ
diff --git a/hikey960/5.4/phy-hi3660-usb3.ko b/hikey960/5.4/phy-hi3660-usb3.ko
index efdf422..a8c2f1c 100644
--- a/hikey960/5.4/phy-hi3660-usb3.ko
+++ b/hikey960/5.4/phy-hi3660-usb3.ko
Binary files differ
diff --git a/hikey960/5.4/reboot-mode.ko b/hikey960/5.4/reboot-mode.ko
index bec720d..8b1aa04 100644
--- a/hikey960/5.4/reboot-mode.ko
+++ b/hikey960/5.4/reboot-mode.ko
Binary files differ
diff --git a/hikey960/5.4/rfcomm.ko b/hikey960/5.4/rfcomm.ko
deleted file mode 100644
index c1ba30a..0000000
--- a/hikey960/5.4/rfcomm.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/rfkill-gpio.ko b/hikey960/5.4/rfkill-gpio.ko
index f2afe23..3a35ef0 100644
--- a/hikey960/5.4/rfkill-gpio.ko
+++ b/hikey960/5.4/rfkill-gpio.ko
Binary files differ
diff --git a/hikey960/5.4/roles.ko b/hikey960/5.4/roles.ko
deleted file mode 100644
index fd9fb23..0000000
--- a/hikey960/5.4/roles.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/rtc-efi.ko b/hikey960/5.4/rtc-efi.ko
index c42c045..52c833b 100644
--- a/hikey960/5.4/rtc-efi.ko
+++ b/hikey960/5.4/rtc-efi.ko
Binary files differ
diff --git a/hikey960/5.4/sdcardfs.ko b/hikey960/5.4/sdcardfs.ko
index 56ab6c0..c1ef07c 100644
--- a/hikey960/5.4/sdcardfs.ko
+++ b/hikey960/5.4/sdcardfs.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-hdmi-codec.ko b/hikey960/5.4/snd-soc-hdmi-codec.ko
index aae84ce..c5c9b93 100644
--- a/hikey960/5.4/snd-soc-hdmi-codec.ko
+++ b/hikey960/5.4/snd-soc-hdmi-codec.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-simple-card-utils.ko b/hikey960/5.4/snd-soc-simple-card-utils.ko
index 8960642..dde8929 100644
--- a/hikey960/5.4/snd-soc-simple-card-utils.ko
+++ b/hikey960/5.4/snd-soc-simple-card-utils.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-simple-card.ko b/hikey960/5.4/snd-soc-simple-card.ko
index 957d6e5..a44ad9e 100644
--- a/hikey960/5.4/snd-soc-simple-card.ko
+++ b/hikey960/5.4/snd-soc-simple-card.ko
Binary files differ
diff --git a/hikey960/5.4/spi-pl022.ko b/hikey960/5.4/spi-pl022.ko
index 9bd2e41..520faa5 100644
--- a/hikey960/5.4/spi-pl022.ko
+++ b/hikey960/5.4/spi-pl022.ko
Binary files differ
diff --git a/hikey960/5.4/spidev.ko b/hikey960/5.4/spidev.ko
index 1ff7beb..8c1ba3e 100644
--- a/hikey960/5.4/spidev.ko
+++ b/hikey960/5.4/spidev.ko
Binary files differ
diff --git a/hikey960/5.4/syscon-reboot-mode.ko b/hikey960/5.4/syscon-reboot-mode.ko
index f4a51be..34da951 100644
--- a/hikey960/5.4/syscon-reboot-mode.ko
+++ b/hikey960/5.4/syscon-reboot-mode.ko
Binary files differ
diff --git a/hikey960/5.4/tcpci.ko b/hikey960/5.4/tcpci.ko
index 953fa3f..486094a 100644
--- a/hikey960/5.4/tcpci.ko
+++ b/hikey960/5.4/tcpci.ko
Binary files differ
diff --git a/hikey960/5.4/tcpci_rt1711h.ko b/hikey960/5.4/tcpci_rt1711h.ko
index 687855d..ff28059 100644
--- a/hikey960/5.4/tcpci_rt1711h.ko
+++ b/hikey960/5.4/tcpci_rt1711h.ko
Binary files differ
diff --git a/hikey960/5.4/tcpm.ko b/hikey960/5.4/tcpm.ko
deleted file mode 100644
index 0722ade..0000000
--- a/hikey960/5.4/tcpm.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/ufs-hisi.ko b/hikey960/5.4/ufs-hisi.ko
deleted file mode 100644
index 2fb9778..0000000
--- a/hikey960/5.4/ufs-hisi.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/virt-dma.ko b/hikey960/5.4/virt-dma.ko
index 0ed3ab9..2bdc3bc 100644
--- a/hikey960/5.4/virt-dma.ko
+++ b/hikey960/5.4/virt-dma.ko
Binary files differ
diff --git a/hikey960/5.4/wl18xx.ko b/hikey960/5.4/wl18xx.ko
index 1e7d290..94d43dc 100644
--- a/hikey960/5.4/wl18xx.ko
+++ b/hikey960/5.4/wl18xx.ko
Binary files differ
diff --git a/hikey960/5.4/wlcore.ko b/hikey960/5.4/wlcore.ko
index e13f769..9574429 100644
--- a/hikey960/5.4/wlcore.ko
+++ b/hikey960/5.4/wlcore.ko
Binary files differ
diff --git a/hikey960/5.4/wlcore_sdio.ko b/hikey960/5.4/wlcore_sdio.ko
index d867bcb..b1be2c4 100644
--- a/hikey960/5.4/wlcore_sdio.ko
+++ b/hikey960/5.4/wlcore_sdio.ko
Binary files differ
diff --git a/hikey960/5.4/xhci-hcd.ko b/hikey960/5.4/xhci-hcd.ko
index 7e78579..f4bffcd 100644
--- a/hikey960/5.4/xhci-hcd.ko
+++ b/hikey960/5.4/xhci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/xhci-pci.ko b/hikey960/5.4/xhci-pci.ko
index a6853f2..c9d485b 100644
--- a/hikey960/5.4/xhci-pci.ko
+++ b/hikey960/5.4/xhci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/xhci-plat-hcd.ko b/hikey960/5.4/xhci-plat-hcd.ko
index 7b7b3dc..0a093c8 100644
--- a/hikey960/5.4/xhci-plat-hcd.ko
+++ b/hikey960/5.4/xhci-plat-hcd.ko
Binary files differ