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

Commit c256d347 authored by Srinivasarao Pathipati's avatar Srinivasarao Pathipati
Browse files

Merge android11-5.4.161+ (5d7a491a) into msm-5.4 



* refs/heads/tmp-5d7a491a:
  UPSTREAM: lib/iov_iter: initialize "flags" in new pipe_buffer
  Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount"
  Revert "ANDROID: incremental-fs: fix mount_fs issue"
  FROMGIT: f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file
  UPSTREAM: usb: gadget: rndis: check size of RNDIS_MSG_SET command
  UPSTREAM: USB: gadget: validate interface OS descriptor requests
  Revert "tracefs: Have tracefs directories not set OTH permission bits by default"
  UPSTREAM: tipc: improve size validations for received domain records
  ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0
  ANDROID: GKI: db845c: Update symbols list and ABI
  ANDROID: Increase x86 cmdline size to 4k
  UPSTREAM: cgroup-v1: Require capabilities to set release_agent
  ANDROID: incremental-fs: remove index and incomplete dir on umount
  UPSTREAM: binder: fix async_free_space accounting for empty parcels
  UPSTREAM: tee: handle lookup of shm with reference count 0
  UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc

Change-Id: Icb1c0295b7d7da25c37c21a2580ea4d246069039
Signed-off-by: default avatarSrinivasarao Pathipati <quic_spathi@quicinc.com>
parents 62da0061 5d7a491a

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.161_b9d179c605d3
 
LTS_5.4.161_5d7a491ae4a7

android/abi_gki_aarch64.xml

+1868 −1836

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_db845c

+4 −1
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ 
  __kfifo_alloc

  __kfifo_free

  kmalloc_order_trace

  ktime_get_with_offset

  __local_bh_enable_ip

  memmove

  param_ops_ulong
@@ -590,6 +591,7 @@ 
  __rcu_read_lock

  __rcu_read_unlock

  regulatory_hint

  rfc1042_header

  skb_copy

  skb_realloc_headroom

  strlcat
@@ -660,6 +662,7 @@ 
  phy_pm_runtime_get_sync

  phy_pm_runtime_put_sync

  platform_get_irq_byname_optional

  pm_runtime_barrier

  system_freezable_wq

  usb_add_gadget_udc

  usb_decode_ctrl
@@ -733,7 +736,6 @@ 
  generic_file_read_iter

  generic_file_splice_read

  generic_read_dir

  generic_shutdown_super

  __get_free_pages

  get_zeroed_page

  iget5_locked
@@ -745,6 +747,7 @@ 
  kernel_read

  kernel_write

  kern_path

  kill_anon_super

  kobject_create_and_add

  kobject_put

  lockref_get

arch/arm64/configs/gki_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ CONFIG_SERIAL_8250=y 
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_SERIAL_8250_EXAR is not set

CONFIG_SERIAL_8250_RUNTIME_UARTS=0

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

arch/x86/configs/gki_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ CONFIG_INPUT_UINPUT=y 
CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_RUNTIME_UARTS=0

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_HW_RANDOM=y