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

Sync up with android11-5.4 for the following commits:

ea5b4af6 ANDROID: Update the KMI_GENERATION after KMI changes on October 31
40799f06 ANDROID: Input: bump SW_MAX up to 0x3f
d1f4f132 ANDROID: GKI: ABI update for Oct 31 KABI break
95dc5661 ANDROID: GKI: add Android ABI padding to struct nf_conn
07093411 ANDROID: GKI: add vendor padding variable in struct skb_shared_info
01435b2e ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle
0bc7257c ANDROID: GKI: add vendor padding variable in struct nf_conn
20dd4979 ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle
b3d5bbd8 ANDROID: GKI: add vendor padding variable in struct sock
24ab59f6 ANDROID: fuse: Add support for d_canonical_path
854f3806 ANDROID: vfs: add d_canonical_path for stacked filesystem support
aa445f97 ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
d2a52d0e Revert "ANDROID: GKI: fix ABI breakage in module.h"
a273b843 ANDROID: ABI: update allowed list for galaxy
6ca1e28c FROMLIST: char: misc: increase DYNAMIC_MINORS value

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