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

Sync up with android11-5.4 for the following commits:

0821bcfb48 UPSTREAM: mm/cma.c: remove redundant cma_mutex lock
2d5e3ef632 ANDROID: ABI: update allowed list for galaxy
e3e60153a4 BACKPORT: remoteproc: core: Remove casting to rproc_handle_resource_t
046c52c95b UPSTREAM: scsi: ufs: ufs-mediatek: Correct operator & -> &&
0475956802 UPSTREAM: kbuild: do not include include/config/auto.conf from adjust_autoksyms.sh
24797c44c3 UPSTREAM: udp: ipv4: manipulate network header of NATed UDP GRO fraglist
550b2c0dce UPSTREAM: net: fix use-after-free when UDP GRO with shared fraglist
e7e2f8329c UPSTREAM: scsi: ufs: Fix possible power drain during system suspend
2e09274b7c UPSTREAM: scsi: ufs: Re-enable WriteBooster after device reset
b55ed54016 UPSTREAM: driver: core: Fix list corruption after device_del()
d9d13f4b76 UPSTREAM: f2fs: fix double free of unicode map
be192b51bf UPSTREAM: sched/fair: Prefer prev cpu in asymmetric wakeup path
3f54d632a6 UPSTREAM: scsi: ufshcd: Fix missing destroy_workqueue()
e6d3c97bac UPSTREAM: xfrm/compat: Translate by copying XFRMA_UNSPEC attribute
957e971ed9 UPSTREAM: xfrm/compat: memset(0) 64-bit padding at right place
ee97d20c7e UPSTREAM: xfrm/compat: Don't allocate memory with __GFP_ZERO
a9cedd3032 BACKPORT: scsi: ufs: Fix missing brace warning for old compilers
dee5558ec9 UPSTREAM: net: xfrm: fix memory leak in xfrm_user_policy()
7db1c96c2d BACKPORT: net: ethtool: add missing NETIF_F_GSO_FRAGLIST feature string
305c5f5486 UPSTREAM: mac80211_hwsim: use GFP_ATOMIC under spin lock
48ffcbf0b9 FROMGIT: kbuild: update config_data.gz only when the content of .config is changed
c8cd528e75 ANDROID: ABI: add pm_system_cancel_wakeup symbol
ff320df3e0 ANDROID: power: export pm_system_cancel_wakeup
dd2e0a80f1 ANDROID: ABI: Update allowed list for QCOM
fad2655cb7 ANDROID: Incremental fs: Set credentials before reading/writing
a035201d12 Revert "ANDROID: Incremental fs: Fix memory leak on closing file"
dbee4e7bc4 Revert "ANDROID: Incremental fs: Set credentials before reading/writing"
b6221e3495 Revert "ANDROID: Incremental fs: Fix selinux issues"
0ade8c4105 ANDROID: ABI: update allowed list for QCOM
ccdcd307cf ANDROID: Update the KMI for virtual platform modules
b3f4130630 ANDROID: ABI: Update symbol list for imx
67e9dbddb5 ANDROID: clang: update to 12.0.5
91d8a13f43 FROMGIT: virt_wifi: Return micros for BSS TSF values

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

scripts/adjust_autoksyms.sh

@@ -34,9 +34,6 @@ case "$KBUILD_VERBOSE" in
 	;;
 esac
 
-# We need access to CONFIG_ symbols
-. include/config/auto.conf
-
 # Generate a new symbol list file
 $CONFIG_SHELL $srctree/scripts/gen_autoksyms.sh "$new_ksyms_file"