Commit 1658c42d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.4' into android12-5.4-lts



Do a back-merge to catch the latest -lts merge sync with the
android12-5.4 branch.  Changes included in here are:

* 1cca65ac Merge tag 'android12-5.4.283_r00' into android12-5.4
* 0984daab ANDROID: GKI: Add wl18xx/wlcore/wlcore_sdio symbols for hikey
* 12d0c1ec ANDROID: GKI: Add syscon-reboot-mode symbols for hikey
* 233d229d ANDROID: GKI: Add spi-pl022/spidev symbols for hikey
* 877a2777 ANDROID: GKI: Add snd-soc-xxx modules symbols for hikey
* bba7e0fd ANDROID: GKI: Add rtc-efi symbols for hikey
* f44475bc ANDROID: GKI: Add rfcomm/rfkill-gpio symbols for hikey
* f47723f4 ANDROID: GKI: Add pwrseq_emmc/pwrseq_simple/reboot-mode symbols for hikey
* eb16b166 ANDROID: GKI: Add phy-hi6220-usb symbols for hikey
* 637b2e6c ANDROID: GKI: Add ohci-hcd/ohci-pci symbols for hikey
* cf1ca0ca ANDROID: GKI: Add mmc_spi/of_mmc_spi for hikey
* cddc7c28 ANDROID: GKI: Add mali symbols for hikey
* f9163b7d ANDROID: GKI: Add kirin-dsi symbols for hikey
* 22ddc50d ANDROID: GKI: Add kirin-drm symbols for hikey
* 30ac17df ANDROID: GKI: Add k3dma symbols for hikey
* 4a304f78 ANDROID: GKI: Add ion_cma_heap symbols for hikey
* 84fe271d ANDROID: GKI: Add i2c-designware-core/i2c-designware-platform symbols for hikey
* e796c384 ANDROID: GKI: Add hisi-reboot/hisi_powerkey symbols for hikey
* ec87aad8 ANDROID: GKI: Add hidp symbols for hikey
* 3c38aa5b ANDROID: GKI: Add hi6210-i2s/hi655x-pmic/hi655x-regulator symbols for hikey
* 4c354d61 ANDROID: GKI: Add hci_uart symbols for hikey
* e3add918 ANDROID: GKI: Add gpio_keys symbols for hikey
* a4767e27 ANDROID: GKI: Add ehci-hcd/ehci-pci/ehci-platform symbols for hikey
* a463e9fe ANDROID: GKI: Add dw_mmc-k3/dw_mmc/dwc2 symbols for hikey
* c8a568fb ANDROID: GKI: Add btqca/clk-hi655x/cpufreq-dt symbols for hikey
* 44b5e98c ANDROID: GKI: Add 8250_dw/adv7511/armmmci symbols for hikey
* 71c35e4b ANDROID: GKI: Add commonly used symbols for hikey build
* 7d4d03eb ANDROID: GKI: Enable SERIAL_8250_DW
* e6678935 ANDROID: delete tool added by mistake
* 729ca65c ANDROID: fix ENOMEM check of binder_proc_ext
* f16dd65f ANDROID: binder: fix KMI issues due to frozen notification
* cdff17f1 BACKPORT: FROMGIT: binder: frozen notification binder_features flag
* f8201dc8 BACKPORT: FROMGIT: binder: frozen notification
* ada6f701 BACKPORT: selftests/binderfs: add test for feature files
* 524bfd32 UPSTREAM: docs: binderfs: add section about feature files
* 07b1b431 BACKPORT: binderfs: add support for feature files

Change-Id: Ib400067849b2a14c0af96bc2a5f1abbaf6ab2323
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4c1ebfcd 1cca65ac
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment