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

Sync up with android11-5.4 for the following commits:

4417145c UPSTREAM: arm64: vdso: Avoid ISB after reading from cntvct_el0
d09f0a4e ANDROID: GKI: Disable X86_MCE drivers
aa64559e ANDROID: GKI: Add FCNT KMI symbol list
498eb678 ANDROID: fuse: Allocate zeroed memory for canonical path

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