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

Sync up with android11-5.4 for the following commits:

05137329 ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC
55cb12f0 ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure
59d82646 ANDROID: f2fs: fix potential deadlock by android ftrace
dc8c919c ANDROID: GKI: Update FCNT KMI symbol list No new symbols added that are not already in the .xml file.
e3f12f42 ANDROID: GKI : Update symbols to symbol list
47c8de47 BACKPORT: crypto: arch - conditionalize crypto api in arch glue for lib code
514e31d6 BACKPORT: crypto: arch/lib - limit simd usage to 4k chunks
568c0c89 UPSTREAM: crypto: arm/blake2s - fix for big endian
ce6e6983 ANDROID: gki_defconfig: enable BLAKE2b support
40501f73 BACKPORT: crypto: arm/blake2b - add NEON-accelerated BLAKE2b
47700006 BACKPORT: crypto: blake2b - update file comment
c5816192 BACKPORT: crypto: blake2b - sync with blake2s implementation
be7d8de4 UPSTREAM: crypto: arm/blake2s - add ARM scalar optimized BLAKE2s
d63d7c1e UPSTREAM: crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h>
b8de6b8e UPSTREAM: crypto: blake2s - adjust include guard naming
609d9425 UPSTREAM: crypto: blake2s - add comment for blake2s_state fields
32ac79b0 UPSTREAM: crypto: blake2s - optimize blake2s initialization
74c75891 BACKPORT: crypto: blake2s - share the "shash" API boilerplate code
8a14e1d8 UPSTREAM: crypto: blake2s - move update and final logic to internal/blake2s.h
4c7a6f46 UPSTREAM: crypto: blake2s - remove unneeded includes
7537c648 UPSTREAM: crypto: x86/blake2s - define shash_alg structs using macros
b54930b3 UPSTREAM: crypto: blake2s - define shash_alg structs using macros
05e10b45 UPSTREAM: crypto: lib/blake2s - Move selftest prototype into header file
29ab2a57 UPSTREAM: crypto: blake2b - Fix clang optimization for ARMv7-M
27c00daf UPSTREAM: crypto: blake2b - rename tfm context and _setkey callback
196f7b51 UPSTREAM: crypto: blake2b - merge _update to api callback
a6233627 UPSTREAM: crypto: blake2b - open code set last block helper
00e77739 UPSTREAM: crypto: blake2b - delete unused structs or members
f03f8096 UPSTREAM: crypto: blake2b - simplify key init
fdb0b246 UPSTREAM: crypto: blake2b - merge blake2 init to api callback
75973ecd UPSTREAM: crypto: blake2b - merge _final implementation to callback
fbbe069b BACKPORT: crypto: testmgr - add test vectors for blake2b
9cd85693 BACKPORT: crypto: blake2b - add blake2b generic implementation
3e82f8af UPSTREAM: crypto: blake2s - x86_64 SIMD implementation
22bff7a3 UPSTREAM: crypto: blake2s - implement generic shash driver
43ec9b95 UPSTREAM: crypto: testmgr - add test cases for Blake2s
192edcb3 UPSTREAM: crypto: blake2s - generic C library implementation and selftest
078cebb3 UPSTREAM: crypto: lib - tidy up lib/crypto Kconfig and Makefile
160ab931 ANDROID: ion heap: init ion heaps in subsys_initcall

Change-Id: I3a9e13098b73ae21ea76d95c75572c124bd91cfd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>