diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-05 10:03:27 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-05 10:03:27 -0600 |
commit | 3422e04a2e31dba3e17af206f160d4fc409f4250 (patch) | |
tree | ef03b0b60e236af96331d0ddb83208bb40bcf9f0 /configs/merge.pl | |
parent | 7a64d107da5cd0ea8bad9200ebcd37146324361f (diff) | |
download | kernel-3422e04a2e31dba3e17af206f160d4fc409f4250.tar.gz kernel-3422e04a2e31dba3e17af206f160d4fc409f4250.tar.xz kernel-3422e04a2e31dba3e17af206f160d4fc409f4250.zip |
kernel-5.11.3-50
* Fri Mar 05 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-50]
- PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar)
- Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson)
- forgot to push this one earlier (Justin M. Forbes)
- Reference the patch as version.patchlevel to more easily see diffs between stable releases (Justin M. Forbes)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'configs/merge.pl')
-rwxr-xr-x | configs/merge.pl | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/configs/merge.pl b/configs/merge.pl deleted file mode 100755 index 8c318156a..000000000 --- a/configs/merge.pl +++ /dev/null @@ -1,66 +0,0 @@ -#! /usr/bin/perl - -my @args=@ARGV; -my %configvalues; -my @configoptions; -my $configcounter = 0; - -# optionally print out the architecture as the first line of our output -my $arch = $args[2]; -if (defined $arch) { - print "# $arch\n"; -} - -# first, read the override file - -open (FILE,"$args[0]") || die "Could not open $args[0]"; -while (<FILE>) { - my $str = $_; - my $configname; - - if (/\# ([\w]+) is not set/) { - $configname = $1; - } elsif (/([\w]+)=/) { - $configname = $1; - } - - if (defined($configname) && !exists($configvalues{$configname})) { - $configvalues{$configname} = $str; - $configoptions[$configcounter] = $configname; - $configcounter ++; - } -}; - -# now, read and output the entire configfile, except for the overridden -# parts... for those the new value is printed. - -open (FILE2,"$args[1]") || die "Could not open $args[1]"; -while (<FILE2>) { - my $configname; - - if (/\# ([\w]+) is not set/) { - $configname = $1; - } elsif (/([\w]+)=/) { - $configname = $1; - } - - if (defined($configname) && exists($configvalues{$configname})) { - print "$configvalues{$configname}"; - delete($configvalues{$configname}); - } else { - print "$_"; - } -} - -# now print the new values from the overridden configfile -my $counter = 0; - -while ($counter < $configcounter) { - my $configname = $configoptions[$counter]; - if (exists($configvalues{$configname})) { - print "$configvalues{$configname}"; - } - $counter++; -} - -1; |