summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rw-r--r--kernel-ppc64le-debug-rhel.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-rhel.config16
-rw-r--r--kernel-x86_64-rhel.config16
-rwxr-xr-xkernel.spec20
-rw-r--r--patch-5.15-redhat.patch2
-rw-r--r--sources6
13 files changed, 42 insertions, 27 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index cbc71de3a..58625100d 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 42
+RHEL_RELEASE = 44
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index e2d008fc7..5dab60d3e 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4014,6 +4014,7 @@ CONFIG_NR_CPUS=4096
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 7fcbeba30..9496804e4 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3993,6 +3993,7 @@ CONFIG_NR_CPUS=4096
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 04d9f9fc5..17f591a27 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -3823,6 +3823,7 @@ CONFIG_NR_IRQS=512
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index b8677fded..86ad97ac9 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -3805,6 +3805,7 @@ CONFIG_NR_IRQS=512
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index f36ce220f..47a0c2c7c 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -3802,6 +3802,7 @@ CONFIG_NR_CPUS=512
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index cecc88693..00270221f 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -3784,6 +3784,7 @@ CONFIG_NR_CPUS=512
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 4efed297f..dc4cbe1bf 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3806,6 +3806,7 @@ CONFIG_NR_CPUS=32
# CONFIG_NTB_IDT is not set
# CONFIG_NTB_INTEL is not set
# CONFIG_NTB is not set
+# CONFIG_NTB_NETDEV is not set
# CONFIG_NTB_PERF is not set
# CONFIG_NTB_PINGPONG is not set
# CONFIG_NTB_SWITCHTEC is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 99ab98971..837cde781 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4003,17 +4003,19 @@ CONFIG_NOUVEAU_DEBUG_PUSH=y
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOZOMI=m
CONFIG_NR_CPUS=8192
-# CONFIG_NTB_AMD is not set
+CONFIG_NTB_AMD=m
# CONFIG_NTB_EPF is not set
# CONFIG_NTB_IDT is not set
-# CONFIG_NTB_INTEL is not set
+CONFIG_NTB_INTEL=m
CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-# CONFIG_NTB_PERF is not set
-# CONFIG_NTB_PINGPONG is not set
+CONFIG_NTB_MSI_TEST=m
+CONFIG_NTB_MSI=y
+# CONFIG_NTB_NETDEV is not set
+CONFIG_NTB_PERF=m
+CONFIG_NTB_PINGPONG=m
# CONFIG_NTB_SWITCHTEC is not set
-# CONFIG_NTB_TOOL is not set
-# CONFIG_NTB_TRANSPORT is not set
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_TRANSPORT=m
# CONFIG_NTFS3_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_NULL_TTY is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 50ba7714a..0beeca5c0 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -3983,17 +3983,19 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOZOMI=m
CONFIG_NR_CPUS=8192
-# CONFIG_NTB_AMD is not set
+CONFIG_NTB_AMD=m
# CONFIG_NTB_EPF is not set
# CONFIG_NTB_IDT is not set
-# CONFIG_NTB_INTEL is not set
+CONFIG_NTB_INTEL=m
CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-# CONFIG_NTB_PERF is not set
-# CONFIG_NTB_PINGPONG is not set
+CONFIG_NTB_MSI_TEST=m
+CONFIG_NTB_MSI=y
+# CONFIG_NTB_NETDEV is not set
+CONFIG_NTB_PERF=m
+CONFIG_NTB_PINGPONG=m
# CONFIG_NTB_SWITCHTEC is not set
-# CONFIG_NTB_TOOL is not set
-# CONFIG_NTB_TRANSPORT is not set
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_TRANSPORT=m
# CONFIG_NTFS3_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_NULL_TTY is not set
diff --git a/kernel.spec b/kernel.spec
index 4a3f38594..39bea2177 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc5.20211013gitf4d0cc426f77.42
+%global distro_build 0.rc5.20211015gitec681c53f8d2.44
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -130,13 +130,13 @@ Summary: The Linux kernel
%define rpmversion 5.15.0
%define patchversion 5.15
-%define pkgrelease 0.rc5.20211013gitf4d0cc426f77.42
+%define pkgrelease 0.rc5.20211015gitec681c53f8d2.44
# This is needed to do merge window version magic
%define patchlevel 15
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20211013gitf4d0cc426f77.42%{?buildid}%{?dist}
+%define specrelease 0.rc5.20211015gitec681c53f8d2.44%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -679,7 +679,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc5-39-gf4d0cc426f77.tar.xz
+Source0: linux-5.15-rc5-126-gec681c53f8d2.tar.xz
Source1: Makefile.rhelver
@@ -1370,8 +1370,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15-rc5-39-gf4d0cc426f77 -c
-mv linux-5.15-rc5-39-gf4d0cc426f77 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc5-126-gec681c53f8d2 -c
+mv linux-5.15-rc5-126-gec681c53f8d2 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2970,10 +2970,14 @@ fi
#
#
%changelog
-* Wed Oct 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211013gitf4d0cc426f77.42]
-- Add kfence_test to mod-internal.list (Justin M. Forbes)
+* Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.44]
- Temporarily turn off selftests for bpf on ppc (Justin M. Forbes)
+* Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.43]
+- Fix dist-srpm-gcov (Don Zickus)
+- redhat: configs: add CONFIG_NTB and related items (John W. Linville)
+- Add kfence_test to mod-internal.list (Justin M. Forbes)
+
* Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.40]
- Enable KUNIT tests for redhat kernel-modules-internal (Nico Pache)
- redhat: add *-matched meta packages to rpminspect emptyrpm config (Herton R. Krzesinski)
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 185f7c674..a49166367 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -2720,7 +2720,7 @@ index 4e50c0bfdb7d..f4e32c61ec18 100644
IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0;
diff --git a/kernel/module.c b/kernel/module.c
-index 40ec9a030eec..2d50fb4c9862 100644
+index 5c26a76e800b..25c4108ac627 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -743,6 +743,7 @@ static struct module_attribute modinfo_##field = { \
diff --git a/sources b/sources
index 00950270b..d2dee48b1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc5-39-gf4d0cc426f77.tar.xz) = 8756ae3e9d0ebab8b9224e3e08e4a67f9bb1c04abeb76aa018d9b3a229bff6d690fa15925c4e799691b6110f2268f4edf02269da4baed93523e8424ddb44bb17
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.20211013gitf4d0cc426f77.42.tar.bz2) = 4046dd6edff476308e03b6c9a4a811fca67fc9d7427b17bf67ef3be10b385ee8f1a622c549612921fa68402642d0702d6ddf1bd76a0750032405c15980559134
-SHA512 (kernel-kabi-dw-5.15.0-0.rc5.20211013gitf4d0cc426f77.42.tar.bz2) = 6329bb435b8572caba50cb4a5b8fc435637ef1eff69bdac8e99b4cc7e1cc6f46d5da48fa1282ee43118db4d0c3372dd738787acf690496ccb7a4f5058755e6ce
+SHA512 (linux-5.15-rc5-126-gec681c53f8d2.tar.xz) = 808025df6120bec8b9dfb2148c0e1b43088763270d8404e2e14661b540c37c0d7943f55cd68e67f3761bcfe07c53960cc6753b1ce40347583be43d5a7a5630fb
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.20211015gitec681c53f8d2.44.tar.bz2) = 7f4c092751f8e1dd8a942c1a6dc55ef6d4c4655b37bbb79066133fc1ad7475502cb13c3e201b0c10966aa53a2cdeca9dee25b23b653e60388301955f334ed007
+SHA512 (kernel-kabi-dw-5.15.0-0.rc5.20211015gitec681c53f8d2.44.tar.bz2) = 27f426e9471f33e0ce85bc1890f320ff32e1767a2024f4d5a2994e1627fd8b60c3b238b2bfdaccb79d15e23d507515986bd305579d1d785fd22b390177abb605
generated by cgit (git 2.34.1) at 2024-11-16 04:25:06 +0000