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

Skip to content
Commit 8ec6c200 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android11-5.4.61+ (1d9c43fa) into msm-5.4



* refs/heads/tmp-1d9c43fa:
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: build_config: drop CONFIG_KASAN_PANIC_ON_WARN
  BACKPORT: bpf: add bpf_ktime_get_boot_ns()
  ANDROID: ABI: update allowed list for QCOM
  BACKPORT: clk: composite: Export clk_hw_register_composite()
  ANDROID: PCI: dwc: Export symbols for ep driver
  UPSTREAM: futex: Handle faults correctly for PI futexes
  UPSTREAM: futex: Simplify fixup_pi_state_owner()
  UPSTREAM: futex: Use pi_state_update_owner() in put_pi_state()
  UPSTREAM: rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
  UPSTREAM: futex: Provide and use pi_state_update_owner()
  UPSTREAM: futex: Replace pointless printk in fixup_owner()
  UPSTREAM: futex: Ensure the correct return value from futex_lock_pi()
  UPSTREAM: Revert "mm/slub: fix a memory leak in sysfs_slab_add()"

Change-Id: I87be53a117320a1855f7671ca07ed7602bef806b
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents f1a388a8 1d9c43fa
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment