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

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

Merge android11-5.4.61+ (9c7cbdf8) into msm-5.4 



* refs/heads/tmp-9c7cbdf8:
  ANDROID: ABI: add symbols of drm_atomic_helper_setup_commit to unisoc
  ANDROID: ABI: update allowed list for galaxy
  UPSTREAM: HID: core: Correctly handle ReportSize being zero
  UPSTREAM: HID: core: Sanitize event code and type when mapping input
  FROMLIST: scripts: merge_config: add strict mode to fail upon any redefinition

Change-Id: I9ae5aa15a3bcef589ca072743ed5713bf0d0cacb
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents aa860b5b 9c7cbdf8

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.61_559c23e691b8
 
 No newline at end of file
 
LTS_5.4.61_9c7cbdf8b4cf

android/abi_gki_aarch64.xml

+511 −701

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_d6430e6763.xml

+1029 −1013

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_galaxy

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ 
  cfg80211_scan_done

  cfg80211_sched_scan_results

  cfg80211_sched_scan_stopped

  cfg80211_sched_scan_stopped_rtnl

  cfg80211_unlink_bss

  cfg80211_unregister_wdev

  cfg80211_vendor_cmd_reply
@@ -1386,6 +1387,7 @@ 
  krealloc

  kset_create_and_add

  kset_unregister

  ksize

  kstat

  kstrdup

  kstrdup_quotable

android/abi_gki_aarch64_unisoc

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
  drm_atomic_helper_plane_destroy_state

  drm_atomic_helper_plane_duplicate_state

  drm_atomic_helper_plane_reset

  drm_atomic_helper_setup_commit

  drm_compat_ioctl

  drm_dbg

  drm_dev_alloc
@@ -1049,6 +1050,7 @@ 


# required by mmc_hsq.ko

  mmc_cqe_request_done

  mmc_send_tuning



# required by musb_hdrc.ko

  device_wakeup_enable
@@ -2493,11 +2495,13 @@ 
  __arm_smccc_smc



# required by mali_gondul.ko

  __arch_clear_user

  bpf_trace_run5

  ktime_get_raw

  of_machine_is_compatible

  _totalram_pages

  trace_output_call

  __tracepoint_gpu_mem_total

  trace_print_array_seq

  trace_print_flags_seq

  vmf_insert_pfn_prot