From: Clark Williams <williams@xxxxxxxxxx>
redhat: update self-test data for addition of RT variant
Signed-off-by: Clark Williams <williams@xxxxxxxxxx>
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.6.test
+BASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
-DISTBASEVERSION=5.16.0-0.rc5.6.test.el7
-DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.el7
+DISTBASEVERSION=5.16.0-0.rc5.f31531e55495.6.test.el7
+DISTRELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test.el7
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
-MARKER=v5.16-rc5
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -66,16 +67,17 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SNAPSHOT=0
+SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc5.6.test
+SPECBUILD=0.rc5.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-0.rc5.6.test.el7
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.f31531e55495.6.test.el7
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.16.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.el7
+SPECTARFILE_RELEASE=5.16.0-0.rc5.f31531e55495.6.test.el7
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.f31531e55495.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.el7.tar.xz
-TARFILE=linux-5.16.0-0.rc5.6.test.el7.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.xz
+TARFILE=linux-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD=0.rc5.f31531e55495.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-rc5
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.6.test
+%define pkgrelease 0.rc5.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.6.test.el7
+%define tarfile_release 5.16.0-0.rc5.f31531e55495.6.test.el7
%define patchlevel 16
-%define specrelease 0.rc5.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.6.test.el7
+%define specrelease 0.rc5.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.f31531e55495.6.test.el7
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.6.test
+BASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
-DISTBASEVERSION=5.16.0-0.rc5.6.test.fc25
-DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.fc25
+DISTBASEVERSION=5.16.0-0.rc5.f31531e55495.6.test.fc25
+DISTRELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test.fc25
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
-MARKER=v5.16-rc5
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -66,16 +67,17 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SNAPSHOT=0
+SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc5.6.test
+SPECBUILD=0.rc5.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.f31531e55495.6.test.fc25
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.16.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.fc25
+SPECTARFILE_RELEASE=5.16.0-0.rc5.f31531e55495.6.test.fc25
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.f31531e55495.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.fc25.tar.xz
-TARFILE=linux-5.16.0-0.rc5.6.test.fc25.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.xz
+TARFILE=linux-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD=0.rc5.f31531e55495.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-rc5
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.6.test
+%define pkgrelease 0.rc5.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.6.test.fc25
+%define tarfile_release 5.16.0-0.rc5.f31531e55495.6.test.fc25
%define patchlevel 16
-%define specrelease 0.rc5.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.6.test.fc25
+%define specrelease 0.rc5.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.f31531e55495.6.test.fc25
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BASEVERSION=5.17.0-0.rc0.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
-DISTBASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
-DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+DISTBASEVERSION=5.17.0-0.rc0.f31531e55495.6.test.el7
+DISTRELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test.el7
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
-MARKER=78e36f3b0dae
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -69,13 +70,14 @@ RPMBUILD=rpmbuild
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECBUILD=0.rc0.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.f31531e55495.6.test.el7
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.17.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+SPECTARFILE_RELEASE=5.17.0-0.rc0.f31531e55495.6.test.el7
SPECVERSION=5.17.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.f31531e55495.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz
+TARBALL=../redhat/linux-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.xz
+TARFILE=linux-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc0.78e36f3b0dae.
+UPSTREAMBUILD=0.rc0.f31531e55495.
UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.17.0
%define specversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+%define tarfile_release 5.17.0-0.rc0.f31531e55495.6.test.el7
%define patchlevel 17
-%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+%define specrelease 0.rc0.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.17.0-0.rc0.f31531e55495.6.test.el7
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BASEVERSION=5.17.0-0.rc0.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
-DISTBASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
-DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+DISTBASEVERSION=5.17.0-0.rc0.f31531e55495.6.test.fc25
+DISTRELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test.fc25
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
-MARKER=78e36f3b0dae
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -69,13 +70,14 @@ RPMBUILD=rpmbuild
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECBUILD=0.rc0.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.f31531e55495.6.test.fc25
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.17.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+SPECTARFILE_RELEASE=5.17.0-0.rc0.f31531e55495.6.test.fc25
SPECVERSION=5.17.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.f31531e55495.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz
+TARBALL=../redhat/linux-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.xz
+TARFILE=linux-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc0.78e36f3b0dae.
+UPSTREAMBUILD=0.rc0.f31531e55495.
UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.17.0
%define specversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+%define tarfile_release 5.17.0-0.rc0.f31531e55495.6.test.fc25
%define patchlevel 17
-%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+%define specrelease 0.rc0.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.17.0-0.rc0.f31531e55495.6.test.fc25
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-6.test
+BASEVERSION=5.17.0-0.rc0.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
-DISTBASEVERSION=5.16.0-6.test.el7
-DISTRELEASETAG=kernel-5.16.0-6.test.el7
+DISTBASEVERSION=5.17.0-0.rc0.f31531e55495.6.test.el7
+DISTRELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test.el7
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.el7.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
-MARKER=v5.16
-MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-6.test
+RELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -66,40 +67,41 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SNAPSHOT=0
+SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=6.test
+SPECBUILD=0.rc0.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-6.test.el7
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.f31531e55495.6.test.el7
SPECKEXTRAVERSION=
-SPECKPATCHLEVEL=16
+SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
SPECRPATCHLEVEL=1
-SPECRPMVERSION=5.16.0
+SPECRPMVERSION=5.17.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-6.test.el7
-SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm
+SPECTARFILE_RELEASE=5.17.0-0.rc0.f31531e55495.6.test.el7
+SPECVERSION=5.17.0
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.f31531e55495.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-6.test.el7.tar.xz
-TARFILE=linux-5.16.0-6.test.el7.tar.xz
+TARBALL=../redhat/linux-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.xz
+TARFILE=linux-5.17.0-0.rc0.f31531e55495.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD=0.rc0.f31531e55495.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
-%define specrpmversion 5.16.0
-%define specversion 5.16.0
-%define patchversion 5.16
-%define pkgrelease 6.test
+%define specrpmversion 5.17.0
+%define specversion 5.17.0
+%define patchversion 5.17
+%define pkgrelease 0.rc0.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16.0-6.test.el7
-%define patchlevel 16
-%define specrelease 6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-6.test.el7
+%define tarfile_release 5.17.0-0.rc0.f31531e55495.6.test.el7
+%define patchlevel 17
+%define specrelease 0.rc0.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.17.0-0.rc0.f31531e55495.6.test.el7
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-6.test
+BASEVERSION=5.17.0-0.rc0.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
-DISTBASEVERSION=5.16.0-6.test.fc25
-DISTRELEASETAG=kernel-5.16.0-6.test.fc25
+DISTBASEVERSION=5.17.0-0.rc0.f31531e55495.6.test.fc25
+DISTRELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test.fc25
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.fc25.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.fc25.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
-MARKER=v5.16
-MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-6.test
+RELEASETAG=kernel-5.17.0-0.rc0.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -66,40 +67,41 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SNAPSHOT=0
+SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=6.test
+SPECBUILD=0.rc0.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-6.test.fc25
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.f31531e55495.6.test.fc25
SPECKEXTRAVERSION=
-SPECKPATCHLEVEL=16
+SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
SPECRPATCHLEVEL=1
-SPECRPMVERSION=5.16.0
+SPECRPMVERSION=5.17.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-6.test.fc25
-SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm
+SPECTARFILE_RELEASE=5.17.0-0.rc0.f31531e55495.6.test.fc25
+SPECVERSION=5.17.0
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.f31531e55495.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-6.test.fc25.tar.xz
-TARFILE=linux-5.16.0-6.test.fc25.tar.xz
+TARBALL=../redhat/linux-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.xz
+TARFILE=linux-5.17.0-0.rc0.f31531e55495.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD=0.rc0.f31531e55495.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
-%define specrpmversion 5.16.0
-%define specversion 5.16.0
-%define patchversion 5.16
-%define pkgrelease 6.test
+%define specrpmversion 5.17.0
+%define specversion 5.17.0
+%define patchversion 5.17
+%define pkgrelease 0.rc0.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16.0-6.test.fc25
-%define patchlevel 16
-%define specrelease 6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-6.test.fc25
+%define tarfile_release 5.17.0-0.rc0.f31531e55495.6.test.fc25
+%define patchlevel 17
+%define specrelease 0.rc0.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.17.0-0.rc0.f31531e55495.6.test.fc25
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+BASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
-DISTBASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
-DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+DISTBASEVERSION=5.16.0-0.rc5.f31531e55495.6.test.el7
+DISTRELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test.el7
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
-MARKER=fce15c45d3fb
-MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -69,13 +70,14 @@ RPMBUILD=rpmbuild
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc5.fce15c45d3fb.6.test
+SPECBUILD=0.rc5.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.f31531e55495.6.test.el7
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.16.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+SPECTARFILE_RELEASE=5.16.0-0.rc5.f31531e55495.6.test.el7
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.f31531e55495.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.xz
+TARFILE=linux-5.16.0-0.rc5.f31531e55495.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.fce15c45d3fb.
+UPSTREAMBUILD=0.rc5.f31531e55495.
UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5-1-gfce15c45d3fb
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fb.6.test
+%define pkgrelease 0.rc5.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+%define tarfile_release 5.16.0-0.rc5.f31531e55495.6.test.el7
%define patchlevel 16
-%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+%define specrelease 0.rc5.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.f31531e55495.6.test.el7
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.fce15c45d3fb.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.f31531e55495.6.test]
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+BASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
-DISTBASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
-DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+DISTBASEVERSION=5.16.0-0.rc5.f31531e55495.6.test.fc25
+DISTRELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test.fc25
DISTRO=centos
DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
@@ -33,27 +33,28 @@ GNUMAKEFLAGS=
HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
-MARKER=fce15c45d3fb
-MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL=none
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
RHDISTGIT_BRANCH=c9s
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -69,13 +70,14 @@ RPMBUILD=rpmbuild
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc5.fce15c45d3fb.6.test
+SPECBUILD=0.rc5.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.f31531e55495.6.test.fc25
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.16.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+SPECTARFILE_RELEASE=5.16.0-0.rc5.f31531e55495.6.test.fc25
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.f31531e55495.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.xz
+TARFILE=linux-5.16.0-0.rc5.f31531e55495.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.fce15c45d3fb.
+UPSTREAMBUILD=0.rc5.f31531e55495.
UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5-1-gfce15c45d3fb
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fb.6.test
+%define pkgrelease 0.rc5.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+%define tarfile_release 5.16.0-0.rc5.f31531e55495.6.test.fc25
%define patchlevel 16
-%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+%define specrelease 0.rc5.f31531e55495.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.f31531e55495.6.test.fc25
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.fce15c45d3fb.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.f31531e55495.6.test]
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.6.test
+BASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
-DISTBASEVERSION=5.16.0-0.rc5.6.test
-DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test
+DISTBASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
+DISTRELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
DISTRO=fedora
DISTRO_USERDEF=fedora
DIST_BRANCH="os-build"
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
@@ -45,15 +46,15 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
-MARKER=v5.16-rc5
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -66,15 +67,16 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SNAPSHOT=0
+SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc5.6.test
+SPECBUILD=0.rc5.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.16.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16-rc5
+SPECTARFILE_RELEASE=5.15-rc7-156-gf31531e55495
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.f31531e55495.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16-rc5.tar.xz
-TARFILE=linux-5.16-rc5.tar.xz
+TARBALL=../redhat/linux-5.15-rc7-156-gf31531e55495.tar.xz
+TARFILE=linux-5.15-rc7-156-gf31531e55495.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD=0.rc5.f31531e55495.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-rc5
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 1
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.6.test
+%define pkgrelease 0.rc5.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16-rc5
+%define tarfile_release 5.15-rc7-156-gf31531e55495
%define patchlevel 16
-%define specrelease 0.rc5.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.f31531e55495.6%{?buildid}%{?dist}
%define kabiversion 5.16.0
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.f31531e55495.6.test]
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -3,7 +3,7 @@
ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.6.test
+BASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
@@ -17,8 +17,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
-DISTBASEVERSION=5.16.0-0.rc5.6.test
-DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test
+DISTBASEVERSION=5.16.0-0.rc5.f31531e55495.6.test
+DISTRELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
DISTRO=fedora
DISTRO_USERDEF=fedora
DIST_BRANCH="os-build"
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
@@ -45,15 +46,15 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
-MARKER=v5.16-rc5
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+MARKER=f31531e55495
+MERGE_BASE=f31531e55495ca3746fb895ffdf73586be8259fa
NO_CONFIGCHECKS=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.f31531e55495.6.test
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_CACHE=
RHDISTGIT_TMP=/tmp
@@ -66,15 +67,16 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-SNAPSHOT=0
+SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECBPFTOOLVERSION=7.2.0
-SPECBUILD=0.rc5.6.test
+SPECBUILD=0.rc5.f31531e55495.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
@@ -86,20 +88,20 @@ SPECRPATCHLEVEL=1
SPECRPMVERSION=5.16.0
SPECRVERSION=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16-rc5
+SPECTARFILE_RELEASE=5.15-rc7-156-gf31531e55495
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.f31531e55495.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16-rc5.tar.xz
-TARFILE=linux-5.16-rc5.tar.xz
+TARBALL=../redhat/linux-5.15-rc7-156-gf31531e55495.tar.xz
+TARFILE=linux-5.15-rc7-156-gf31531e55495.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD=0.rc5.f31531e55495.
+UPSTREAMBUILD_GIT_ONLY=1
UPSTREAM_BRANCH=master
-UPSTREAM_TARBALL_NAME=5.16-rc5
+UPSTREAM_TARBALL_NAME=5.15-rc7-156-gf31531e55495
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5
+_TAG=v5.15-rc7-156-gf31531e55495
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -2,18 +2,19 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 1
%global released_kernel 0
%define buildid .test
%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.6.test
+%define pkgrelease 0.rc5.f31531e55495.6.test
%define kversion 5
-%define tarfile_release 5.16-rc5
+%define tarfile_release 5.15-rc7-156-gf31531e55495
%define patchlevel 16
-%define specrelease 0.rc5.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.f31531e55495.6%{?buildid}%{?dist}
%define kabiversion 5.16.0
%define selftests_must_build 0
%define bpftoolversion 7.2.0
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.f31531e55495.6.test]
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
