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

Commit c33437e7 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 90bd82d3 c256d347
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
LTS_5.4.161_b9d179c605d3
LTS_5.4.161_5d7a491ae4a7
+1868 −1836

File changed.

File size exceeds preview limit.

+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
+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
+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
Loading