summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-01 08:09:30 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-01 08:09:30 +0200
commit09914d5820771a28e0f7088127cd3f79700d61df (patch)
tree0a614dbd10fcf5785d9f4a3ca8b2c80b0e48c8cb
parent81a483ee7a830b72ed37f36eb56fa581c80b54c3 (diff)
parent9e5bb46146bb87601ccec5eea950ffc57e5b7c05 (diff)
downloadkernel-09914d5820771a28e0f7088127cd3f79700d61df.zip
kernel-09914d5820771a28e0f7088127cd3f79700d61df.tar.gz
kernel-09914d5820771a28e0f7088127cd3f79700d61df.tar.xz
Merge commit '9e5bb46146bb87601ccec5eea950ffc57e5b7c05' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-60.vanilla.1.fc36kernel-5.14.0-60.vanilla.1.fc35kernel-5.14.0-60.vanilla.1.fc34kernel-5.14.0-60.vanilla.1.fc33
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog3
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rwxr-xr-xkernel.spec23
-rw-r--r--patch-5.14-redhat.patch (renamed from patch-5.14.0-redhat.patch)6
-rw-r--r--sources6
7 files changed, 27 insertions, 15 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index f2cf71d..cd0ec12 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 = 57
+RHEL_RELEASE = 60
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 7b89634..95738ab 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/12be5095f2feb2c686f6c9fb31de5513355fe31a
+ 12be5095f2feb2c686f6c9fb31de5513355fe31a arm64: use common CONFIG_MAX_ZONEORDER for arm kernel
+
https://gitlab.com/cki-project/kernel-ark/-/commit/4cee6f338b9edaeab1c45c6b2a8ecf80c8711186
4cee6f338b9edaeab1c45c6b2a8ecf80c8711186 Revert "IB/rxe: Mark Soft-RoCE Transport driver as tech-preview"
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index fc89a1f..29d7e46 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1733,6 +1733,7 @@ CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
# CONFIG_FONTS is not set
CONFIG_FONT_SUPPORT=y
+CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_FORTIFY_SOURCE=y
# CONFIG_FPGA is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 2e1bf34..ab75889 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1717,6 +1717,7 @@ CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
# CONFIG_FONTS is not set
CONFIG_FONT_SUPPORT=y
+CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_FORTIFY_SOURCE=y
# CONFIG_FPGA is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
diff --git a/kernel.spec b/kernel.spec
index 3905cbc..80c8ab9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc7.20210827git77dd11439b86.57
+%global distro_build 60
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -126,13 +126,14 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc7.20210827git77dd11439b86.57
+%define patchversion 5.14
+%define pkgrelease 60
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20210827git77dd11439b86.57%{?buildid}%{?dist}
+%define specrelease 60%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -673,7 +674,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc7-89-g77dd11439b86.tar.xz
+Source0: linux-5.14.tar.xz
Source1: Makefile.rhelver
@@ -829,7 +830,7 @@ Source4002: gating.yaml
%if !%{nopatches}
-Patch1: patch-%{rpmversion}-redhat.patch
+Patch1: patch-%{patchversion}-redhat.patch
%endif
# empty final patch to facilitate testing of kernel patches
@@ -1359,15 +1360,15 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14-rc7-89-g77dd11439b86 -c
-mv linux-5.14-rc7-89-g77dd11439b86 linux-%{KVERREL}
+%setup -q -n kernel-5.14 -c
+mv linux-5.14 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
%if !%{nopatches}
-ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch patch-%{patchversion}-redhat.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch
@@ -2963,6 +2964,12 @@ fi
#
#
%changelog
+* Mon Aug 30 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14-60]
+- arm64: use common CONFIG_MAX_ZONEORDER for arm kernel (Mark Salter)
+
+* Sat Aug 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14-0.rc7.20210828git64b4fc45bea6.58]
+- Create Makefile.variables for a single point of configuration change (Justin M. Forbes)
+
* Fri Aug 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc7.20210827git77dd11439b86.57]
- rpmspec: drop traceevent files instead of just excluding them from files list (Herton R. Krzesinski) [1967640]
- Revert "redhat/configs: Enable genet and brcmfmac wlan" (Íñigo Huguet)
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14-redhat.patch
index 39bba4d..8524890 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14-redhat.patch
@@ -141,7 +141,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 80aa85170d6b..3b0fcfb382a3 100644
+index 61741e9d9c6e..093ecf99677f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -187,7 +187,7 @@ index 2fb7012c3246..47718b4f2f75 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 62c3c1d2190f..121b5eb1e329 100644
+index 62c3c1d2190f..9ef6bb1d5b0c 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -915,7 +915,7 @@ endchoice
@@ -203,7 +203,7 @@ index 62c3c1d2190f..121b5eb1e329 100644
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
-+ default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES && !RHEL_DIFFERENCES)
++ default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES)
default "12" if ARM64_16K_PAGES
default "11"
help
diff --git a/sources b/sources
index e4d12e9..c246aad 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14-rc7-89-g77dd11439b86.tar.xz) = e538386555b64b82a04a6f93fb19d103415e0cb4b4ce47795404d89e7b6edd0fd40bb07cd53cd17cdcd8fccf939c5f7e4dd27be332fce49c286666efa1b21124
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc7.20210827git77dd11439b86.57.tar.bz2) = b2afa6962215f3c9774abab0c5d90805581002e8f1a2c3b3eae6ba32d6e65a198144d0673e5a823c1f0d10588a8dc1ee7243c0f0698bf21b64da1dab66a2af82
-SHA512 (kernel-kabi-dw-5.14.0-0.rc7.20210827git77dd11439b86.57.tar.bz2) = 67d673b15130a97dc5d9f2550aaa328a59df1d5a84d52589e0b74295ad7b4ac452efe48f960da771af128a995a7d0de1219fd9f4d3396737aeb82ffee75fbd69
+SHA512 (linux-5.14.tar.xz) = 88f9313c421ecb42ba75b22b30113b7801fa448d4cf53f86160d422c630c5bbd1c69736c714294c6fc2b17fdace6a786f98076bee960dedf6783d524fd6abb11
+SHA512 (kernel-abi-stablelists-5.14.0-60.tar.bz2) = 9888fe44d4bf6395bac7a930e7063b66c65ac5483b17f7fa2408a52ce6cfb4f825aeb8115344eb3980334a1e1be87fdade434f8ebc21a883d5be55c2244c19cc
+SHA512 (kernel-kabi-dw-5.14.0-60.tar.bz2) = d231a72517da1f73bfe66888e67836bbaf580bbc038aceba698cfd126d23da697256b80f58267a2b3dcdfb39a731638dd485efa29ff9d67da1a15061fad896f2