summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-08-18 16:24:39 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-08-18 16:24:39 -0500
commit3596b69021696dc9dc9a16ae72bf2c50b4a960b6 (patch)
tree7a89353f218dde6af28f04c3d898d57a0ebb83f0
parent6d4d829d315b0e31c191d1f2d74009491ab066ba (diff)
downloadkernel-3596b69021696dc9dc9a16ae72bf2c50b4a960b6.zip
kernel-3596b69021696dc9dc9a16ae72bf2c50b4a960b6.tar.gz
kernel-3596b69021696dc9dc9a16ae72bf2c50b4a960b6.tar.xz
kernel-5.14.0-0.rc6.20210818git614cb2751d31.48
* Wed Aug 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc6.20210818git614cb2751d31.48] - Filter updates for aarch64 (Justin M. Forbes) - increase CONFIG_NODES_SHIFT for aarch64 (Chris von Recklinghausen) [1890304] Resolves: rhbz#1890304 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--filter-aarch64.sh.fedora2
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-rhel.config2
-rwxr-xr-xkernel.spec16
-rw-r--r--sources6
6 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index a79f25a..3797e14 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 = 47
+RHEL_RELEASE = 48
#
# Early y+1 numbering
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
index c2b5b0c..6a5065c 100644
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco
drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq"
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 6811a70..acec0fb 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3935,7 +3935,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=3
+CONFIG_NODES_SHIFT=6
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 00fc05a..336da93 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3915,7 +3915,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=3
+CONFIG_NODES_SHIFT=6
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel.spec b/kernel.spec
index 0ed0e32..b1e4700 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc6.20210817git794c7931a242.47
+%global distro_build 0.rc6.20210818git614cb2751d31.48
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc6.20210817git794c7931a242.47
+%define pkgrelease 0.rc6.20210818git614cb2751d31.48
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20210817git794c7931a242.47%{?buildid}%{?dist}
+%define specrelease 0.rc6.20210818git614cb2751d31.48%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -671,7 +671,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc6-41-g794c7931a242.tar.xz
+Source0: linux-5.14-rc6-43-g614cb2751d31.tar.xz
Source1: Makefile.rhelver
@@ -1357,8 +1357,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14-rc6-41-g794c7931a242 -c
-mv linux-5.14-rc6-41-g794c7931a242 linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc6-43-g614cb2751d31 -c
+mv linux-5.14-rc6-43-g614cb2751d31 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2952,6 +2952,10 @@ fi
#
#
%changelog
+* Wed Aug 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc6.20210818git614cb2751d31.48]
+- Filter updates for aarch64 (Justin M. Forbes)
+- increase CONFIG_NODES_SHIFT for aarch64 (Chris von Recklinghausen) [1890304]
+
* Tue Aug 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc6.20210817git794c7931a242.47]
- Revert "redhat: ark: disable CONFIG_NET_SCH_MULTIQ" (Marcelo Ricardo Leitner)
- redhat: configs: Enable CONFIG_WIRELESS_HOTKEY (Hans de Goede)
diff --git a/sources b/sources
index e20f73d..1d27b02 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14-rc6-41-g794c7931a242.tar.xz) = 0771503f859baae754799a3664330046a695ce2be9888c3ec5be223cd7af3d0f6573f47ba7fdf2fa7bcdae8b2d881a89f3152c2a1321eab0c7ef07b70006a241
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc6.20210817git794c7931a242.47.tar.bz2) = 4f79ce3d2b70668d62a5d7bb76bd1c1b1a5102b3ff717571cc57bf5d60e0bc092c0e82d2ef89408b531301200e61e4bc150149151c4d6b32087b532453350d51
-SHA512 (kernel-kabi-dw-5.14.0-0.rc6.20210817git794c7931a242.47.tar.bz2) = 12f9f4fb1390743dd0548156bc740051ce4f5387a17219a3a849f5c71ca6c33fca4050824d4d00ee77f96357ff9be2234779b9f4b011d749dfc0c8bc410acf25
+SHA512 (linux-5.14-rc6-43-g614cb2751d31.tar.xz) = 528e1a58fd7ea38d27f167637e8cec9add05f3e8c55d16c588679179836ea8224c0aafa1c2e15ec5da7aec3050e1322b93f7e405039696dcef7f6ffb567ba9ec
+SHA512 (kernel-abi-stablelists-5.14.0-0.rc6.20210818git614cb2751d31.48.tar.bz2) = 74a32755b19b156f969897bb63969ff1e484a86dc8f7a19822070aa0bab06e24af45c922a94e469b5f04d9b55972adac352310d28ecf9fb8318bbecccdbf1d5e
+SHA512 (kernel-kabi-dw-5.14.0-0.rc6.20210818git614cb2751d31.48.tar.bz2) = 8d55ff8cdfecb81a9be9b3021fa2f6dad3cd2f4b655cc3ac11c546c1e23910e680b7e833e392e3ccbbece15eb98b6ae60ed00831283e9b9cb193fe203780e9a5