Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'android11-5.4' into 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

3dbc1d36 UPSTREAM: ovl: simplify file splice
5b845491 Merge tag 'android11-5.4.147_r00' android11-5.4
0dedfe3f ANDROID: ABI: update allowed list for galaxy
008930a8 ANDROID: ABI: Update allowed list for QCOM

Change-Id: I45d2f4263285c4450ac26b5df5e1d9c07c3b9ea1
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fa6db427 3dbc1d36

android/abi_gki_aarch64.xml

+356 −350

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_galaxy

+1 −0
Original line number Diff line number Diff line
@@ -1975,6 +1975,7 @@ 
  regulator_unlock

  regulator_unregister_notifier

  regulatory_hint

  regulatory_set_wiphy_regd_sync_rtnl

  release_firmware

  release_sock

  regmap_mmio_detach_clk

android/abi_gki_aarch64_qcom

+1 −0
Original line number Diff line number Diff line
@@ -2118,6 +2118,7 @@ 
  scsi_unblock_requests

  sdev_prefix_printk

  __sdhci_add_host

  __sdhci_set_timeout

  sdhci_add_host

  sdhci_cleanup_host

  sdhci_cqe_disable