Merge android11-5.4.58+ (33cc3e74) into msm-5.4
* refs/heads/tmp-33cc3e74: ANDROID: db845c: set BUILD_INITRAMFS=1 ANDROID: GKI: Build CEC_{CORE,NOTIFIER,PIN} in ANDROID: GKI: Enable CEC support ANDROID: ABI: Update ABI snapshot after additions to struct io_pgtable_cfg ANDROID: iommu/io-pgtable: Allow IOMMU drivers to allocate/free page-table memory ANDROID: update ABI UPSTREAM: update to latest version of scripts/checkpatch.pl FROMLIST: ufs: change the way to complete fDeviceInit ANDROID: GKI: add built-in BCM Bluetooth driver Revert "Revert "genetlink: remove genl_bind"" ANDROID: GKI: enable CONFIG_LEDS_TRIGGER_TIMER ANDROID: GKI: add abi_gki_aarch64_oplus ANDROID: GKI: fix up abi .xml file due to previous changes. ANDROID: GKI: add some padding to some driver core structures ANDROID: vendor_hooks: add waiting information for blocked tasks ANDROID: GKI: Update abi_gki_aarch64_exynos ANDROID: include/linux: add low power mode and fps to notifier BACKPORT: scsi: ufs: Fix and simplify setup_xfer_req variant operation ANDROID: GKI: enable USB UVC drivers ANDROID: GKI: enabled CONFIG_USB_CONFIGFS_NCM=y ANDROID: GKI: enable LEDS_CLASS_FLASH Conflicts: drivers/iommu/io-pgtable-arm.c drivers/iommu/io-pgtable.c include/linux/io-pgtable.h scripts/checkpatch.pl Change-Id: I6cbac7d913653388280a4c58f4f98e6f8b6b29f7 Signed-off-by:Ivaylo Georgiev <irgeorgiev@codeaurora.org> Signed-off-by:
Blagovest Kolenichev <bkolenichev@codeaurora.org>
Loading
Please register or sign in to comment