diff options
| author | Jan200101 <sentrycraft123@gmail.com> | 2020-11-03 17:22:33 +0100 |
|---|---|---|
| committer | Jan200101 <sentrycraft123@gmail.com> | 2020-12-05 19:40:07 +0100 |
| commit | 341c2b7474ae9534963c9001cae5b8e6ecefe0f2 (patch) | |
| tree | de02864eb15585e56915d9e9c987c3675fa4f4ff /SOURCES/merge.pl | |
| parent | 7fa28673e01cd07016a83be8169a0bd46ba63a04 (diff) | |
| download | kernel-fsync-341c2b7474ae9534963c9001cae5b8e6ecefe0f2.tar.gz kernel-fsync-341c2b7474ae9534963c9001cae5b8e6ecefe0f2.zip | |
kernel 5.8.17
Diffstat (limited to 'SOURCES/merge.pl')
| -rwxr-xr-x | SOURCES/merge.pl | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |