Merge commit '7a5fd2ec18f0e398ad50f306b4e816473e4b17a5'

* commit '7a5fd2ec18f0e398ad50f306b4e816473e4b17a5':
  arm64: dts: rockchip: rk3576-vehicle-evb: change rk3576 sai1 to master
  kbuild: xz_wrap: do not include include/config/auto.conf
  fiq_debugger: arm: Fix compile error on !THREAD_INFO

Change-Id: I73895f1fa73b85ff7243cb280a805c196ce83ceb

arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi

@@ -131,14 +131,12 @@
 		simple-audio-card,name = "rockchip,car-rk3308-sound";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,bitclock-master = <&codec_master>;
-		simple-audio-card,frame-master = <&codec_master>;
 		simple-audio-card,cpu {
 			sound-dai = <&sai1>;
 			dai-tdm-slot-num = <8>;
 			dai-tdm-slot-width = <32>;
 		};
-		codec_master: simple-audio-card,codec {
+		simple-audio-card,codec {
 			sound-dai = <&dummy_codec>;
 		};
 	};

drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c

@@ -238,12 +238,16 @@ void fiq_debugger_dump_stacktrace(struct fiq_debugger_output *output,
 		const struct pt_regs *regs, unsigned int depth, void *ssp)
 {
 	struct frame_tail *tail;
+#ifdef THREAD_INFO
 	struct thread_info *real_thread_info = THREAD_INFO(ssp);
+#endif
 	struct stacktrace_state sts;
 
 	sts.depth = depth;
 	sts.output = output;
+#ifdef THREAD_INFO
 	*current_thread_info() = *real_thread_info;
+#endif
 
 	if (!current)
 		output->printf(output, "current NULL\n");

scripts/xz_wrap.sh

@@ -9,8 +9,6 @@
 # You can do whatever you want with this file.
 #
 
-. include/config/auto.conf
-
 BCJ=
 LZMA2OPTS=
 
@@ -22,7 +20,7 @@ case $SRCARCH in
 	sparc)          BCJ=--sparc ;;
 esac
 
-if [ -n "${CONFIG_THUMB2_KERNEL}" ]; then
+if grep -q "^CONFIG_THUMB2_KERNEL=y" include/config/auto.conf; then
 	BCJ=--armthumb
 fi