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

Commit c1983ae3 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:

f59ee361 ANDROID: GKI: Add KMI symbol list for Sony Android Walkman products
f8878f4c ANDROID: ABI: Update allowed list for QCOM

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I2111e5e1487fac1a3005f4ca55afb200980e422a
parents dd07a63f f59ee361
Loading
Loading
Loading
Loading
+210 −107

File changed.

Preview size limit exceeded, changes collapsed.

+3 −0
Original line number Diff line number Diff line
@@ -939,6 +939,7 @@
  fsl8250_handle_irq
  fs_kobj
  fsstack_copy_attr_all
  ftrace_set_clr_event
  full_name_hash
  fwnode_connection_find_match
  fwnode_get_parent
@@ -2438,6 +2439,8 @@
  timer_unstable_counter_workaround
  timespec64_to_jiffies
  _totalram_pages
  trace_array_create
  trace_array_destroy
  __trace_bprintk
  trace_define_field
  trace_event_buffer_commit
+1846 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ android/abi_gki_aarch64_oneplus
android/abi_gki_aarch64_oplus
android/abi_gki_aarch64_qcom
android/abi_gki_aarch64_sony
android/abi_gki_aarch64_sonywalkman
android/abi_gki_aarch64_sunxi
android/abi_gki_aarch64_unisoc
android/abi_gki_aarch64_vivo