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

This catches the android11-5.4-lts branch up with recent changes made in
the android11-5.4 branch.  Changes included in here are:

* 564901bd ANDROID: 16K: Only check basename of linker context
* 73b793dd UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* ff29a6cf ANDROID: ABI fixup for abi break in struct dst_ops
* 8b6880fc BACKPORT: net: fix __dst_negative_advice() race

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