From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 2 Apr 2020 14:27:18 +0000 (+0200)
Subject: update queue-4.14/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
X-Git-Tag: v4.14.175~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02c1adf0bc7c2d6cb4135112485a600703a76d0b;p=thirdparty%2Fkernel%2Fstable-queue.git

update queue-4.14/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
---

diff --git a/queue-4.14/scripts-dtc-remove-redundant-yyloc-global-declaration.patch b/queue-4.14/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
index 55dbb87370e..adce8c5c06d 100644
--- a/queue-4.14/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
+++ b/queue-4.14/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
@@ -34,11 +34,15 @@ Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
 [robh: cherry-pick from upstream]
 Cc: stable@vger.kernel.org
 Signed-off-by: Rob Herring <robh@kernel.org>
+[nc: Also apply to dtc-lexer.lex.c_shipped due to a lack of
+     e039139be8c2, where dtc-lexer.l started being used]
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- scripts/dtc/dtc-lexer.l |    1 -
- 1 file changed, 1 deletion(-)
+ scripts/dtc/dtc-lexer.l             |    1 -
+ scripts/dtc/dtc-lexer.lex.c_shipped |    1 -
+ 2 files changed, 2 deletions(-)
 
 --- a/scripts/dtc/dtc-lexer.l
 +++ b/scripts/dtc/dtc-lexer.l
@@ -50,3 +54,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  extern bool treesource_error;
  
  /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped
++++ b/scripts/dtc/dtc-lexer.lex.c_shipped
+@@ -631,7 +631,6 @@ char *yytext;
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */