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

Sync up with android11-5.4 for the following commits:

9c7cbdf8b4 ANDROID: ABI: add symbols of drm_atomic_helper_setup_commit to unisoc
70f2e8159d ANDROID: ABI: update allowed list for galaxy
e7eb07515d UPSTREAM: HID: core: Correctly handle ReportSize being zero
bdf78f318d UPSTREAM: HID: core: Sanitize event code and type when mapping input
cd02993624 FROMLIST: scripts: merge_config: add strict mode to fail upon any redefinition
559c23e691 ANDROID: vmlinux.lds.h: merge compound literal sections

Change-Id: I7247d8946353c3925f824b890116c5dffa4faf9d

android/abi_gki_aarch64_galaxy

@@ -336,6 +336,7 @@
   cfg80211_scan_done
   cfg80211_sched_scan_results
   cfg80211_sched_scan_stopped
+  cfg80211_sched_scan_stopped_rtnl
   cfg80211_unlink_bss
   cfg80211_unregister_wdev
   cfg80211_vendor_cmd_reply
@@ -1386,6 +1387,7 @@
   krealloc
   kset_create_and_add
   kset_unregister
+  ksize
   kstat
   kstrdup
   kstrdup_quotable

android/abi_gki_aarch64_unisoc

@@ -168,6 +168,7 @@
   drm_atomic_helper_plane_destroy_state
   drm_atomic_helper_plane_duplicate_state
   drm_atomic_helper_plane_reset
+  drm_atomic_helper_setup_commit
   drm_compat_ioctl
   drm_dbg
   drm_dev_alloc
@@ -1049,6 +1050,7 @@
 
 # required by mmc_hsq.ko
   mmc_cqe_request_done
+  mmc_send_tuning
 
 # required by musb_hdrc.ko
   device_wakeup_enable
@@ -2493,11 +2495,13 @@
   __arm_smccc_smc
 
 # required by mali_gondul.ko
+  __arch_clear_user
   bpf_trace_run5
   ktime_get_raw
   of_machine_is_compatible
   _totalram_pages
   trace_output_call
+  __tracepoint_gpu_mem_total
   trace_print_array_seq
   trace_print_flags_seq
   vmf_insert_pfn_prot

include/asm-generic/vmlinux.lds.h

@@ -72,10 +72,10 @@
 #if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG)
 #define TEXT_MAIN .text .text.[0-9a-zA-Z_]*
 #define TEXT_CFI_MAIN .text.[0-9a-zA-Z_]*.cfi
-#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..LPBX*
+#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral*
 #define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*
-#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]*
-#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]*
+#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]* .rodata..L*
+#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..compoundliteral*
 #define SBSS_MAIN .sbss .sbss.[0-9a-zA-Z_]*
 #else
 #define TEXT_MAIN .text

scripts/kconfig/merge_config.sh

@@ -28,6 +28,7 @@ usage() {
 	echo "  -r    list redundant entries when merging fragments"
 	echo "  -y    make builtin have precedence over modules"
 	echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
+	echo "  -s    strict mode. Fail if the fragment redefines any value."
 	echo
 	echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
 }
@@ -37,6 +38,7 @@ ALLTARGET=alldefconfig
 WARNREDUN=false
 BUILTIN=false
 OUTPUT=.
+STRICT=false
 CONFIG_PREFIX=${CONFIG_-CONFIG_}
 
 while true; do
@@ -75,6 +77,11 @@ while true; do
 		shift 2
 		continue
 		;;
+	"-s")
+		STRICT=true
+		shift
+		continue
+		;;
 	*)
 		break
 		;;
@@ -141,6 +148,9 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
 			echo Previous  value: $PREV_VAL
 			echo New value:       $NEW_VAL
 			echo
+			if [ "$STRICT" = "true" ]; then
+				STRICT_MODE_VIOLATED=true
+			fi
 		elif [ "$WARNREDUN" = "true" ]; then
 			echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
 		fi
@@ -153,6 +163,11 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
 	cat $MERGE_FILE >> $TMP_FILE
 done
 
+if [ "$STRICT_MODE_VIOLATED" = "true" ]; then
+	echo "The fragment redefined a value and strict mode had been passed."
+	exit 1
+fi
+
 if [ "$RUNMAKE" = "false" ]; then
 	cp -T -- "$TMP_FILE" "$KCONFIG_CONFIG"
 	echo "#"