Commit 8e76d559 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android15-6.6' into android15-6.6-lts



Catch the lts branch up with changes made in the normal branch.  Commits
included in here are:

* bbe47e1d Revert "of: remove internal arguments from of_property_for_each_u32()"
* 1badbd72 Revert "clk: fix an OF node reference leak in of_clk_get_parent_name()"
* e2479b65 Merge tag 'android15-6.6.77_r00' into android15-6.6
* a274e5f5 UPSTREAM: of/fdt: Restore possibility to use both ACPI and FDT from bootloader
* d48566e8 UPSTREAM: of: Create of_root if no dtb provided by firmware
* cb927ad8 BACKPORT: of: Always unflatten in unflatten_and_copy_device_tree()
* e664677e ANDROID: ABI: Update pixel symbol list
* a185832b ANDROID: KVM: arm64: Ensure TCR_EL2.PS is configured correctly
* b846078d ANDROID: abi_gki_aarch64_vivo: Update symbol list
* 5270683a ANDROID: vendor_hooks: add hook before batch free into pcp
* 383c3b10 ANDROID: GKI: Update symbol list for xiaomi
* 2a0173a4 ANDROID: mm: add a new vendor hook in filemap_map_pages
* 0de12a81 ANDROID: scsi: ufs: Fix a race condition related to device command processing
* 08d95e36 FROMLIST: scsi: ufs: Fix a race condition in the clock gating code
* 55cef593 BACKPORT: FROMLIST: usb: dwc3: Set SUSPENDENABLE soon after phy init
* a47cc5b9 ANDROID: abi_gki_aarch64_honor: whitelist symbols added for proactive compact
* 5b45df2d ANDROID: mm: create vendor hooks for mm  proactive compact
* a5fde818 ANDROID: GKI: Update symbol list for mtk
* 4f0a86ba ANDROID: KVM: arm64: Check for host provided order in kvm_iommu_refill()
* 0024e984 ANDROID: KVM: arm64: Ensure vCPU is initialised before bumping 'nr_vcpus'

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