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

Commit cb91f259 authored Dec 17, 2020 by Srinivasarao P

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



* refs/heads/tmp-e0b1644a:
  BACKPORT: dmabuf: fix NULL pointer dereference in dma_buf_release()
  ANDROID: mm/memblock: export memblock_end_of_DRAM
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: x86: configs: gki: add missing CONFIG_BLK_CGROUP
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: kthread: break dependency between worker->lock and task_struct->pi_lock

Change-Id: Ia1e6fdce120a69891dad59858a1207211f05fbe7
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

parents b70099d4 e0b1644a

android/GKI_VERSION

+1 −1

Original line number	Diff line number	Diff line
		LTS_5.4.61_9c7cbdf8b4cf
		LTS_5.4.61_e0b1644a472e

android/abi_gki_aarch64.xml

+445 −431

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_d6430e6763.xml

+492 −482

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+2 −0

Original line number	Diff line number	Diff line
		@@ -1468,6 +1468,7 @@
		netlink_unicast
		net_ratelimit
		new_inode
		nf_conntrack_destroy
		nla_memcpy
		__nla_parse
		nla_put_64bit
		@@ -1665,6 +1666,7 @@
		pci_walk_bus
		pci_write_config_dword
		pci_write_config_word
		pci_dev_present
		PDE_DATA
		__per_cpu_offset
		perf_trace_buf_alloc

arch/x86/configs/gki_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ CONFIG_UCLAMP_TASK=y
		CONFIG_CGROUPS=y
		CONFIG_MEMCG=y
		CONFIG_MEMCG_SWAP=y
		CONFIG_BLK_CGROUP=y
		CONFIG_CGROUP_SCHED=y
		# CONFIG_FAIR_GROUP_SCHED is not set
		CONFIG_UCLAMP_TASK_GROUP=y