summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-05-02 11:36:25 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-05-02 11:36:25 +0200
commit8a6bc28f55b2b196dcbf1080290a41f5acb53bd4 (patch)
treea468b080a90e52906a553edc499594e8dd69fe01
parentfa9c4ad22fe53404e8ce47f208b3e6942acabe08 (diff)
parent3f7121590a187dbdf4e5f17b87fe56d713171bb8 (diff)
downloadkernel-8a6bc28f55b2b196dcbf1080290a41f5acb53bd4.zip
kernel-8a6bc28f55b2b196dcbf1080290a41f5acb53bd4.tar.gz
kernel-8a6bc28f55b2b196dcbf1080290a41f5acb53bd4.tar.xz
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec3
-rw-r--r--patch-5.11-redhat.patch2
-rw-r--r--sources6
3 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index a019022..a570e76 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2771,6 +2771,9 @@ fi
#
#
%changelog
+* Wed Apr 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.17-0]
+- Fedora: ARMv7: build for 16 CPUs. (Peter Robinson)
+
* Wed Apr 21 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.16-0]
- Turn off ADI_AXI_ADC and AD9467 which now require CONFIG_OF (Justin M. Forbes)
diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch
index d42fa4f..d0b8f02 100644
--- a/patch-5.11-redhat.patch
+++ b/patch-5.11-redhat.patch
@@ -292,7 +292,7 @@ index 000000000000..c33a71263d9e
+ 2. Add the new profile name, along with a clear description of the
+ expected behaviour, to the sysfs-platform_profile ABI documentation.
diff --git a/Makefile b/Makefile
-index 124d8e200776..17d54943a569 100644
+index d8367e193232..d0621367191f 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index fc21e03..e3d9477 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.11.16.tar.xz) = 95829118a094a018f200b8ef1f4bec7e3a90918702c488218581d4793dbff49767ec3d321c786ffa6c87c0015a3e1b22c02fe48707d8ccdc1203eb142ee91196
-SHA512 (kernel-abi-whitelists-5.11.16-100.tar.bz2) = f6512a6214ab5963d74279131c74b167fffe3e265ec872398af390554d215f4715cc8c2d8fc9a740dd1fe6dbd2c4221ff09dc1d9c8cdda512985ed3845e23212
-SHA512 (kernel-kabi-dw-5.11.16-100.tar.bz2) = 357f62efb26425ede36f59ad7eb8a6594a71c354edd7efd0f168349fa6435f5eae4f46a4a876f42990e75a6f6779320c33c12e427fde994f84abb39c05801e45
+SHA512 (linux-5.11.17.tar.xz) = 4909bdf3479821ba4e4970d20bcd84c2b689bb69f318021288ad3b78f92f051a02354cfc32beb80334385d485dab652610a4dd698a25abc303df04a543dca3dd
+SHA512 (kernel-abi-whitelists-5.11.17-100.tar.bz2) = 6b5abedf89c5d3f204f87b2ec6cee4b2a6acc1faa67bdfb433bf28f1813ddf7c27506c57b1cb9ac618ddfe096a0b13ce8b5395ebb17e7c43a2f3fdd2fc6c2d37
+SHA512 (kernel-kabi-dw-5.11.17-100.tar.bz2) = 6e70d6aec94dbe333e1e4b35415a8fd307277fbe5c5c1fb652f96be5c2fb77146e4a00420f0e6a5bc723a2b201573e2ba9081b894593f2c10a0959428556ea79