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

Commit c47e2335 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (37201331) into msm-5.4 



* refs/heads/tmp-37201331:
  ANDROID: ABI: Update allowed list for QCOM
  FROMGIT: Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE
  ANDROID: GKI: add allowed list for Exynosauto SoC
  ANDROID: GKI: update allowed list for Exynosauto SoC
  UPSTREAM: mfd: sprd: Add wakeup capability for PMIC IRQ
  UPSTREAM: tick/common: Touch watchdog in tick_unfreeze() on all CPUs
  FROMLIST: thermal: Fix NULL pointer dereference issue
  ANDROID: ABI: Update allowed list for QCOM
  UPSTREAM: spi: Fix regression to return zero on success instead of positive value
  UPSTREAM: thermal: power_allocator: Fix Kconfig warning
  UPSTREAM: of/platform: Unconditionally pause/resume sync state during kernel init
  UPSTREAM: selinux: ensure the policy has been loaded before reading the sidtab stats
  UPSTREAM: MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel
  UPSTREAM: mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy
  UPSTREAM: ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS
  UPSTREAM: ARM: socfpga_defconfig: Add back DEBUG_FS
  UPSTREAM: um: Fix header inclusion
  UPSTREAM: net: fix fraglist segmentation reference count leak
  UPSTREAM: ipv6: ndisc: RFC-ietf-6man-ra-pref64-09 is now published as RFC8781
  UPSTREAM: of: property: Fix create device links for all child-supplier dependencies
  UPSTREAM: of: property: Do not link to disabled devices
  UPSTREAM: mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE
  UPSTREAM: usb: renesas-xhci: include correct header for get_unaligned_le16()
  UPSTREAM: wil6210: account for napi_gro_receive never returning GRO_DROP
  UPSTREAM: nl80211: fix memory leak when parsing NL80211_ATTR_HE_BSS_COLOR
  UPSTREAM: thermal/drivers/sprd: Fix return value of sprd_thm_probe()
  UPSTREAM: fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS
  UPSTREAM: fscrypt: use smp_load_acquire() for fscrypt_prepared_key
  UPSTREAM: nvmem: sprd: Fix return value of sprd_efuse_probe()
  UPSTREAM: mac80211: fix warning in 6 GHz IE addition in mesh mode
  UPSTREAM: scsi: ufs: Fix interrupt error message for shared interrupts
  UPSTREAM: sched/fair: Fix wrong negative conversion in find_energy_efficient_cpu()
  UPSTREAM: driver core: Fix device_pm_lock() locking for device links
  UPSTREAM: fscrypt: restrict IV_INO_LBLK_32 to ino_bits <= 32
  UPSTREAM: scsi: ufs: ufs-mediatek: Eliminate error message for unbound mphy
  UPSTREAM: scsi: ufs: ufs-mediatek: Fix HOST_PA_TACTIVATE quirk
  UPSTREAM: cfg80211: fix 6 GHz channel conversion
  ANDROID: GKI: update symbol list for exynosauto soc
  ANDROID: ABI: update allowed list for galaxy
  ANDROID: GKI: initial upload list for exynosauto soc
  ANDROID: ABI: Update allowed list for QCOM

 Conflicts:
	drivers/thermal/thermal_sysfs.c
	kernel/sched/fair.c

Change-Id: I9a0af53ba055157468e6b3cee41f4c8bda1f34af
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 6dd62948 37201331

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.61_dc2d5a0ace05
 
LTS_5.4.61_37201331c48d

android/abi_gki_aarch64.xml

+1859 −960

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_d6430e6763.xml

+498 −233

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_exynosauto

0 → 100644
+1462 −0

File added.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_galaxy

+20 −0
Original line number Diff line number Diff line
@@ -144,8 +144,11 @@ 
  __spi_alloc_controller

  __spi_register_driver

  __spmi_driver_register

  __srcu_read_lock

  __srcu_read_unlock

  __stack_chk_fail

  __stack_chk_guard

  __sw_hweight8

  __sw_hweight32

  __sw_hweight64

  __sync_dirty_buffer
@@ -177,6 +180,7 @@ 
  __wake_up

  __wake_up_locked

  __warn_printk

  __xa_alloc

  _bcd2bin

  _bin2bcd

  _copy_from_iter_full
@@ -441,6 +445,7 @@ 
  cpufreq_table_index_unsorted

  cpufreq_unregister_driver

  cpufreq_unregister_notifier

  cpufreq_update_policy

  cpuhp_tasks_frozen

  cpuidle_pause_and_lock

  cpuidle_resume_and_unlock
@@ -457,6 +462,8 @@ 
  crypto_destroy_tfm

  crypto_register_rngs

  crypto_shash_digest

  crypto_shash_final

  crypto_shash_update

  crypto_unregister_rngs

  csum_partial

  d_add
@@ -575,6 +582,7 @@ 
  devm_gpio_request_one

  devm_gpiochip_add_data

  devm_gpiod_get

  devm_gpiod_get_index

  devm_gpiod_get_optional

  devm_iio_channel_get

  devm_iio_device_alloc
@@ -678,6 +686,7 @@ 
  dma_fence_context_alloc

  dma_fence_default_wait

  dma_fence_enable_sw_signaling

  dma_fence_free

  dma_fence_get_status

  dma_fence_init

  dma_fence_release
@@ -1079,6 +1088,7 @@ 
  gpiod_direction_input

  gpiod_direction_output

  gpiod_direction_output_raw

  gpiod_cansleep

  gpiod_get_optional

  gpiod_get_raw_value

  gpiod_get_raw_value_cansleep
@@ -1115,6 +1125,7 @@ 
  hrtimer_try_to_cancel

  hvc_alloc

  hvc_kick

  hvc_poll

  hvc_remove

  hwrng_register

  hwrng_unregister
@@ -1192,6 +1203,7 @@ 
  in6_pton

  init_dummy_netdev

  init_net

  init_srcu_struct

  init_task

  init_timer_key

  init_uts_ns
@@ -1336,6 +1348,7 @@ 
  kernel_kobj

  kernel_read

  kernel_recvmsg

  kernel_restart

  kernel_sendmsg

  kernel_setsockopt

  kernel_write
@@ -1376,6 +1389,7 @@ 
  kstat

  kstrdup

  kstrdup_quotable

  kstrdup_quotable_cmdline

  kstrndup

  kstrtobool

  kstrtobool_from_user
@@ -1812,6 +1826,7 @@ 
  power_supply_unregister

  preempt_schedule

  preempt_schedule_notrace

  prepare_to_wait

  prepare_to_wait_event

  print_hex_dump

  printk
@@ -1913,6 +1928,7 @@ 
  regulator_enable

  regulator_force_disable

  regulator_get

  regulator_get_current_limit

  regulator_get_mode

  regulator_get_optional

  regulator_get_voltage
@@ -1933,6 +1949,7 @@ 
  regulatory_hint

  release_firmware

  release_sock

  regmap_mmio_detach_clk

  remap_pfn_range

  remap_vmalloc_range

  remove_proc_entry
@@ -2113,6 +2130,7 @@ 
  smp_call_function_single

  smp_call_function_single_async

  smp_call_on_cpu

  smpboot_register_percpu_thread

  smpboot_unregister_percpu_thread

  snd_card_free

  snd_card_new
@@ -2321,6 +2339,7 @@ 
  sync_filesystem

  synchronize_irq

  synchronize_rcu

  synchronize_srcu

  sys_tz

  syscon_node_to_regmap

  syscon_regmap_lookup_by_phandle
@@ -2379,6 +2398,7 @@ 
  trace_raw_output_prep

  trace_seq_printf

  tracepoint_probe_register

  tracing_off

  truncate_inode_pages

  try_module_get

  try_wait_for_completion