Merge 5.10.81 into android12-5.10-lts

Changes in 5.10.81
	fortify: Explicitly disable Clang support
	block: Add a helper to validate the block size
	loop: Use blk_validate_block_size() to validate block size
	bootconfig: init: Fix memblock leak in xbc_make_cmdline()
	net: stmmac: add clocks management for gmac driver
	net: stmmac: platform: fix build error with !CONFIG_PM_SLEEP
	net: stmmac: fix missing unlock on error in stmmac_suspend()
	net: stmmac: fix system hang if change mac address after interface ifdown
	net: stmmac: fix issue where clk is being unprepared twice
	net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings
	x86/iopl: Fake iopl(3) CLI/STI usage
	parisc/entry: fix trace test in syscall exit path
	PCI/MSI: Destroy sysfs before freeing entries
	PCI/MSI: Deal with devices lying about their MSI mask capability
	PCI: Add MSI masking quirk for Nvidia ION AHCI
	erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
	erofs: fix unsafe pagevec reuse of hooked pclusters
	scripts/lld-version.sh: Rewrite based on upstream ld-version.sh
	perf/core: Avoid put_page() when GUP fails
	thermal: Fix NULL pointer dereferences in of_thermal_ functions
	selftests/x86/iopl: Adjust to the faked iopl CLI/STI usage
	Linux 5.10.81

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

scripts/lld-version.sh

@@ -6,15 +6,32 @@
 # Print the linker version of `ld.lld' in a 5 or 6-digit form
 # such as `100001' for ld.lld 10.0.1 etc.
 
-linker_string="$($* --version)"
+set -e
 
-if ! ( echo $linker_string | grep -q LLD ); then
+# Convert the version string x.y.z to a canonical 5 or 6-digit form.
+get_canonical_version()
+{
+	IFS=.
+	set -- $1
+
+	# If the 2nd or 3rd field is missing, fill it with a zero.
+	echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
+}
+
+# Get the first line of the --version output.
+IFS='
+'
+set -- $(LC_ALL=C "$@" --version)
+
+# Split the line on spaces.
+IFS=' '
+set -- $1
+
+while [ $# -gt 1 -a "$1" != "LLD" ]; do
+	shift
+done
+if [ "$1" = LLD ]; then
+	echo $(get_canonical_version ${2%-*})
+else
 	echo 0
-	exit 1
 fi
-
-VERSION=$(echo $linker_string | cut -d ' ' -f 2)
-MAJOR=$(echo $VERSION | cut -d . -f 1)
-MINOR=$(echo $VERSION | cut -d . -f 2)
-PATCHLEVEL=$(echo $VERSION | cut -d . -f 3)
-printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL