20 files changed, 38 insertions, 16 deletions
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index d2bc71a48..b827913db 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4633,6 +4633,7 @@ CONFIG_RETPOLINE=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index fcdeaefa0..fafa3cd5e 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4611,6 +4611,7 @@ CONFIG_RETPOLINE=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 269ba9df1..b01254f5d 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -5209,6 +5209,7 @@ CONFIG_RETPOLINE=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+# CONFIG_RH_DISABLE_DEPRECATED is not set
 # CONFIG_RHEL_DIFFERENCES is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 2ee0f9ae9..83e43e917 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5186,6 +5186,7 @@ CONFIG_RETPOLINE=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+# CONFIG_RH_DISABLE_DEPRECATED is not set
 # CONFIG_RHEL_DIFFERENCES is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index e7be7dd01..861031695 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4421,6 +4421,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 719a13f8f..89a0d178f 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4403,6 +4403,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 8d22f7e51..6fa1db5a2 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4360,6 +4360,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 6dfb994f5..4410b5585 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4342,6 +4342,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 4ae4981f6..022df1cec 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4365,6 +4365,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 # CONFIG_RFKILL is not set
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index b55c998f6..79ae482b5 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5255,6 +5255,7 @@ CONFIG_RETPOLINE=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+# CONFIG_RH_DISABLE_DEPRECATED is not set
 # CONFIG_RHEL_DIFFERENCES is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 9d8b05660..013f6ab0a 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4598,6 +4598,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fc34bc21b..f2fc8d1b7 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1248,7 +1248,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-CONFIG_DEBUG_INFO_BTF=y
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 2111e1d8b..fe2e0c945 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4577,6 +4577,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
diff --git a/kernel.spec b/kernel.spec
index fd8b5f601..d8870c043 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,7 +75,7 @@ Summary: The Linux kernel
 #  kernel release. (This includes prepatch or "rc" releases.)
 # Set released_kernel to 0 when the upstream source tarball contains an
 #  unreleased kernel development snapshot.
-%global released_kernel 0
+%global released_kernel 1
 
 # Set debugbuildsenabled to 1 to build separate base and debug kernels
 #  (on supported architectures). The kernel-debug-* subpackages will
@@ -117,6 +117,8 @@ Summary: The Linux kernel
 %endif
 
 # define buildid .local
+%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories
+%define buildid .vanilla.1
 
 
 %if 0%{?fedora}
@@ -124,19 +126,21 @@ Summary: The Linux kernel
 %else
 %define primary_target rhel
 %endif
+%define fedorabase 5.15.0
+
 
 # The kernel tarball/base version
 %define kversion 5.15
 
-%define rpmversion 5.15.0
+%define rpmversion 5.15.1
 %define patchversion 5.15
-%define pkgrelease 60
+%define pkgrelease 60.1
 
 # This is needed to do merge window version magic
 %define patchlevel 15
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 60%{?buildid}%{?dist}
+%define specrelease 60.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -153,7 +157,7 @@ Summary: The Linux kernel
 # kernel PAE (only valid for ARM (lpae))
 %define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
 # kernel-debug
-%define with_debug     %{?_without_debug:     0} %{?!_without_debug:     1}
+%define with_debug     %{?_with_debug:        1} %{?!_with_debug:        0}
 # kernel-zfcpdump (s390 specific kernel for zfcpdump)
 %define with_zfcpdump  %{?_without_zfcpdump:  0} %{?!_without_zfcpdump:  1}
 # kernel-doc
@@ -204,7 +208,7 @@ Summary: The Linux kernel
 %define with_cross    %{?_with_cross:         1} %{?!_with_cross:        0}
 #
 # build a release kernel on rawhide
-%define with_release   %{?_with_release:      1} %{?!_with_release:      0}
+%define with_release   %{?_without_release:   0} %{?!_without_release:   1}
 
 # verbose build, i.e. no silent rules and V=1
 %define with_verbose %{?_with_verbose:        1} %{?!_with_verbose:      0}
@@ -222,7 +226,7 @@ Summary: The Linux kernel
 %define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1}
 
 # Want to build a vanilla kernel build without any non-upstream patches?
-%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
+%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
 
 %if 0%{?fedora}
 # Kernel headers are being split out into a separate package
@@ -636,7 +640,7 @@ BuildConflicts: dwarves < 1.13
 %undefine _debugsource_packages
 %undefine _debuginfo_subpackages
 %global _find_debuginfo_opts -r
-%global _missing_build_ids_terminate_build 1
+%global _missing_build_ids_terminate_build 0
 %global _no_recompute_build_ids 1
 %endif
 %if %{with_kabidwchk} || %{with_kabidw_base}
@@ -682,7 +686,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15.tar.xz
+Source0: linux-5.15.1.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -821,8 +825,8 @@ Source211: Module.kabi_dup_ppc64le
 Source212: Module.kabi_dup_s390x
 Source213: Module.kabi_dup_x86_64
 
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{fedorabase}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{fedorabase}-%{distro_build}.tar.bz2
 
 # Sources for kernel-tools
 Source2000: cpupower.service
@@ -1374,11 +1378,11 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.15 -c
-mv linux-5.15 linux-%{KVERREL}
+%setup -q -n kernel-5.15.1 -c
+mv linux-5.15.1 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
-cp -a %{SOURCE1} .
+# cp -a %{SOURCE1} .
 
 %if !%{nopatches}
 
@@ -1389,6 +1393,8 @@ ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
 
+head Makefile
+
 # Any further pre-build tree manipulations happen here.
 
 chmod +x scripts/checkpatch.pl
@@ -2101,7 +2107,11 @@ BuildKernel() {
 
 %ifnarch armv7hl
     # Generate vmlinux.h and put it to kernel-devel path
-    bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
+
+    # tmp disabled for vanilla builds, as it fails on x86_64 with
+    # "Error: failed to load BTF from vmlinux: No such file or directory"
+    # (and yes, the file exists)
+    # bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
 %endif
 
     # prune junk from kernel-devel
diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer
new file mode 100644
index 000000000..20e660479
--- /dev/null
+++ b/redhatsecureboot301.cer
diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer
new file mode 100644
index 000000000..dfa7afb46
--- /dev/null
+++ b/redhatsecureboot501.cer
diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer
new file mode 100644
index 000000000..b2354007b
--- /dev/null
+++ b/redhatsecurebootca1.cer
diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer
new file mode 100644
index 000000000..dfb028495
--- /dev/null
+++ b/redhatsecurebootca5.cer
diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer
new file mode 100644
index 000000000..2c0087dbc
--- /dev/null
+++ b/secureboot_ppc.cer
diff --git a/secureboot_s390.cer b/secureboot_s390.cer
new file mode 100644
index 000000000..137d3858f
--- /dev/null
+++ b/secureboot_s390.cer