AlmaLinux changes

.gitignore

@@ -1,5 +1,5 @@
-SOURCES/kernel-abi-stablelists-5.14.0-39.tar.bz2
-SOURCES/kernel-kabi-dw-5.14.0-39.tar.bz2
-SOURCES/linux-5.14.0-39.el9.tar.xz
+SOURCES/kernel-abi-stablelists-5.14.0-63.tar.bz2
+SOURCES/kernel-kabi-dw-5.14.0-63.tar.bz2
+SOURCES/linux-5.14.0-63.el9.tar.xz
 SOURCES/rheldup3.x509
 SOURCES/rhelkpatch1.x509

.kernel.metadata

@@ -1,3 +1,11 @@
+<<<<<<< HEAD
 09dbba13ccf0d7f607d3ce0bd6a295826599284e SOURCES/kernel-abi-stablelists-5.14.0-39.tar.bz2
 fe98419a9f6e59f47dc9c1716b7dafa71c029393 SOURCES/kernel-kabi-dw-5.14.0-39.tar.bz2
 4e8464f56136e8d504ff681ed35676da5f0e5eb6 SOURCES/linux-5.14.0-39.el9.tar.xz
+=======
+c54ecb47ae889ce9c1d41db755358d3489c29bbc SOURCES/kernel-abi-stablelists-5.14.0-63.tar.bz2
+c6ae7661300e7655c9e983b6f71f5341867bfe79 SOURCES/kernel-kabi-dw-5.14.0-63.tar.bz2
+4c11e487316d1236e2d00ff5d0ef68472634ccb8 SOURCES/linux-5.14.0-63.el9.tar.xz
+95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
+d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
+>>>>>>> c9-beta

SOURCES/Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 39
+RHEL_RELEASE = 63
 
 #
 # Early y+1 numbering

SOURCES/generate_crashkernel_default.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-kernelver=$1 && shift
-arch=$1 && shift
-rootfs=$1 && shift
-
-output="${rootfs}/lib/modules/${kernelver}/crashkernel.default"
-
-case $arch in
-x86_64|s390*)
-	ck_cmdline="crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M"
-	;;
-arm64|aarch64)
-	ck_cmdline="crashkernel=2G-:448M"
-	;;
-powerpc|ppc64*)
-	ck_cmdline="crashkernel=2G-4G:384M,4G-16G:512M,16G-64G:1G,64G-128G:2G,128G-:4G"
-	;;
-*)
-	ck_cmdline=""
-	;;
-esac
-
-cat > "$output" <<EOF
-$ck_cmdline
-EOF

SOURCES/mod-internal.list

@@ -1,4 +1,28 @@
 dmatest
+kunit
+kunit-test
+ext4-inode-test
+list-test
+sysctl-test
+mptcp_crypto_test
+mptcp_token_test
+bitfield_kunit
+cmdline_kunit
+property-entry-test
+qos-test
+resource_kunit
+soc-topology-test
+string-stream-test
+test_linear_ranges
+test_bits
+test_kasan
+time_test
+fat_test
+lib_test
+rational-test
+test_list_sort
+slub_kunit
+memcpy_kunit
 locktorture
 mac80211_hwsim
 netdevsim
@@ -6,6 +30,7 @@ pktgen
 rcutorture
 rocker
 scftorture
+test_bpf
 test_klp_atomic_replace
 test_klp_callbacks_demo
 test_klp_callbacks_demo2

SOURCES/rpminspect.yaml

@@ -1,6 +1,14 @@
 # additional rpminspect configuration for this branch
 
 ---
+inspections:
+    upstream: off
+
+badfuncs:
+    ignore:
+        - /usr/libexec/ksamples/*
+        - /usr/libexec/kselftests/*
+
 emptyrpm:
     expected_empty:
         - kernel