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

Commit f65f0825 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android11-5.4.86+ (48ffcbf0) into msm-5.4 



* refs/heads/tmp-48ffcbf0:
  FROMGIT: kbuild: update config_data.gz only when the content of .config is changed
  ANDROID: ABI: add pm_system_cancel_wakeup symbol
  ANDROID: power: export pm_system_cancel_wakeup
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: Incremental fs: Set credentials before reading/writing
  Revert "ANDROID: Incremental fs: Fix memory leak on closing file"
  Revert "ANDROID: Incremental fs: Set credentials before reading/writing"
  Revert "ANDROID: Incremental fs: Fix selinux issues"
  ANDROID: ABI: update allowed list for QCOM

Change-Id: I8a3170ad830b20cd7503d73c4377b83f29085566
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents e1807351 48ffcbf0

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.86_ccdcd307cf7e
 
LTS_5.4.86_48ffcbf0b9e7

android/abi_gki_aarch64.xml

+362 −408

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_ccdcd307cf7e.xml→android/abi_gki_aarch64_48ffcbf0b9e7.xml

+1883 −916

File changed and moved.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+4 −0
Original line number Diff line number Diff line
@@ -45,10 +45,12 @@ 
  backlight_device_unregister

  bin2hex

  __bitmap_clear

  bitmap_find_free_region

  bitmap_find_next_zero_area_off

  bitmap_free

  bitmap_parselist

  bitmap_print_to_pagebuf

  bitmap_release_region

  __bitmap_set

  __bitmap_subset

  bitmap_zalloc
@@ -1803,6 +1805,7 @@ 
  __pm_runtime_use_autosuspend

  __pm_stay_awake

  pm_stay_awake

  pm_system_cancel_wakeup

  pm_system_wakeup

  pm_wakeup_dev_event

  pm_wakeup_ws_event
@@ -2024,6 +2027,7 @@ 
  rpmsg_set_signals

  rpmsg_trysend

  rpmsg_unregister_device

  rtc_add_group

  rtc_class_close

  rtc_class_open

  rtc_read_time

drivers/base/power/wakeup.c

+1 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ void pm_system_cancel_wakeup(void) 
{

	atomic_dec_if_positive(&pm_abort_suspend);

}

EXPORT_SYMBOL_GPL(pm_system_cancel_wakeup);



void pm_wakeup_clear(bool reset)

{