Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

a2114d2456 ANDROID: Update KMI_GENERATION after KMI change
9bb683349b ANDROID: GKI: update the .xml file with the October 15 ABI breakages
b7d30a3293 ANDROID: GKI: fs.h: add Android ABI padding to struct file
3b300ff4c5 ANDROID: vendor_hooks: Add a vendor data to file struct
e89b05984d ANDROID: vendor_hooks: Extend the vendor data array in task_struct
7ee8b58cc1 ANDROID: GKI: add fields required to enable CONFIG_TRANSPARENT_HUGEPAGE
0ce2100bcf ANDROID: Drop abi_gki_aarch64_workarounds
f0c4a768cf UPSTREAM: ehci-hcd: Move include to keep CRC stable
5427f8b72f ANDROID: GKI: update xiaomi symbol list
ecb88922f5 ANDROID: GKI: update Vivo symbol list
32b2423372 ANDROID: sysrq: add vendor hook for sysrq crash information

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia8ac3109c49a4866904c4419a17e2379156a8f77
This commit is contained in:
Greg Kroah-Hartman 2020-10-16 08:08:04 +02:00
commit cb547a4e01
24 changed files with 4351 additions and 5008 deletions

View file

@ -208,3 +208,11 @@ config GKI_HACKS_TO_FIX
Unless you are building a GKI kernel to be used with modules
built from a different config, say N here.
config GKI_OPT_FEATURES
bool "Optional GKI features"
help
Config option that should be enabled in GKI kernels to allow optional
GKI features be enabled or disabled without ABI breakage.
If you are not building a GKI kernel, say N here.