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

Commit 20eb9c4e authored May 02, 2021 by Srinivasarao P

Merge android11-5.4.86+ (ccdcd307) into msm-5.4



* refs/heads/tmp-ccdcd307:
  ANDROID: Update the KMI for virtual platform modules
  ANDROID: ABI: Update symbol list for imx
  ANDROID: clang: update to 12.0.5
  FROMGIT: virt_wifi: Return micros for BSS TSF values
  ANDROID: android/OWNERS: drop gki-abi-approvers@
  ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS

 Conflicts:
	build.config.common

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

parents 2bbcc098 ccdcd307

Documentation/filesystems/OWNERS

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		# include OWNERS from the authoritative android-mainline branch
		include kernel/common:android-mainline:/Documentation/filesystems/OWNERS

OWNERS

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		# include OWNERS from the authoritative android-mainline branch
		include kernel/common:android-mainline:/OWNERS

android/GKI_VERSION

+1 −1

Original line number	Diff line number	Diff line
		LTS_5.4.86_884688fe0cd4
		LTS_5.4.86_ccdcd307cf7e

android/OWNERS

+0 −1

Original line number	Diff line number	Diff line
		# If we ever add another OWNERS above this directory, it's likely to be
		# more permissive, so don't inherit from it
		set noparent
		gki-abi-approvers@google.com
		adelva@google.com
		maennich@google.com
		saravanak@google.com

android/abi_gki_aarch64.xml

+1804 −1810

File changed.

Preview size limit exceeded, changes collapsed.