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

Commit 82b6e178 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:

617c7432 ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0
813b1245 ANDROID: GKI: db845c: Update symbols list and ABI
15dd5a8b ANDROID: Increase x86 cmdline size to 4k
4ec7ffac UPSTREAM: cgroup-v1: Require capabilities to set release_agent
fe0c18d0 ANDROID: incremental-fs: remove index and incomplete dir on umount
7aedba61 UPSTREAM: binder: fix async_free_space accounting for empty parcels
f1a1171f UPSTREAM: tee: handle lookup of shm with reference count 0
693158f7 UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc
b9d179c6 UPSTREAM: driver core: Fix possible memory leak in device_link_add()
3aeff147 UPSTREAM: blk-mq: fix kernel panic during iterating over flush request
54e1868c UPSTREAM: net: xfrm: fix memory leak in xfrm_user_rcv_msg
a4e84758 UPSTREAM: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
013b7ed7 ANDROID: incremental-fs: fix mount_fs issue
ba4942c8 Merge tag 'android11-5.4.161_r00' into android11-5.4
202bc843 UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param

New symbols tracked due to them being added in the android11-5.4 branch:

Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

1 Added function:

  [A] 'function void kill_anon_super(super_block*)'

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I89df6d21c7c36bb6b2a9047b1f7e2988f48a5637
parents 58b36178 617c7432

android/abi_gki_aarch64.xml

+1216 −1211

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
@@ -289,6 +289,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

arch/x86/include/asm/setup.h

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


#include <uapi/asm/setup.h>



#define COMMAND_LINE_SIZE 2048

#define COMMAND_LINE_SIZE 4096



#include <linux/linkage.h>

#include <asm/page_types.h>