From 341c2b7474ae9534963c9001cae5b8e6ecefe0f2 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Tue, 3 Nov 2020 17:22:33 +0100
Subject: kernel 5.8.17

---
 SOURCES/merge.pl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'SOURCES/merge.pl')

diff --git a/SOURCES/merge.pl b/SOURCES/merge.pl
index 8c31815..dbaf592 100755
--- a/SOURCES/merge.pl
+++ b/SOURCES/merge.pl
@@ -20,6 +20,9 @@ while (<FILE>) {
 
 	if (/\# ([\w]+) is not set/) {
 		$configname = $1;
+	} elsif (/^\#/) {
+		# fall through on comments like 'avoid CONFIG_FOO=y'
+		;
 	} elsif (/([\w]+)=/) {
 		$configname = $1;
 	}
@@ -40,6 +43,9 @@ while (<FILE2>) {
 
 	if (/\# ([\w]+) is not set/) {
 		$configname = $1;
+	} elsif (/^\#/) {
+		# fall through on comments like 'avoid CONFIG_FOO=y'
+		;
 	} elsif (/([\w]+)=/) {
 		$configname  = $1;
 	}
-- 
cgit v1.2.3