kernel-6.2.0-0.rc6.20230202git9f266ccaa2f5.46

* Thu Feb 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc6.9f266ccaa2f5.46]
- redhat/configs: Enable CONFIG_SENSORS_LM90 for RHEL (Mark Salter)
- Fix up SQUASHFS decompression configs (Justin M. Forbes)
- redhat/configs: enable CONFIG_OCTEON_EP as a module in ARK (Michal Schmidt) [2041990]
- redhat: ignore rpminspect runpath report on urandom_read selftest binaries (Herton R. Krzesinski)
- kernel.spec: add llvm-devel build requirement (Scott Weaver)
- Update self-test data to not expect debugbuildsenabled 0 (Justin M. Forbes)
- Turn off forced debug builds (Justin M. Forbes)
- Turn on debug builds for aarch64 Fedora (Justin M. Forbes)
- redhat/configs:  modify merge.py to match old overrides input (Clark Williams)
- redhat:  fixup pylint complaints (Clark Williams)
- redhat: remove merge.pl and references to it (Clark Williams)
- redhat: update merge.py to handle merge.pl corner cases (Clark Williams)
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
- Linux v6.2.0-0.rc6.9f266ccaa2f5
Resolves: rhbz#2041990

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

1 files changed, 0 insertions, 72 deletions

diff --git a/merge.pl b/merge.pl
deleted file mode 100755
index dbaf5927b..000000000
--- a/merge.pl
+++ /dev/null
@@ -1,72 +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 (/^\#/) {
-		# fall through on comments like 'avoid CONFIG_FOO=y'
-		;
-	} 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 (/^\#/) {
-		# fall through on comments like 'avoid CONFIG_FOO=y'
-		;
-	} 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;