summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-03-09 11:58:30 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-03-09 11:58:30 +0100
commitd8670325528971b2aa116015e4c853f53574d131 (patch)
treec1d30cd8eeb44aefa6d5be0fc56c836adfd3ee58
parentfb72952d5b63e40f63bfa1e3a5bce2262c424197 (diff)
parentec33e5d539ad6a99b3d62dd82262030aee3d6298 (diff)
downloadkernel-d8670325528971b2aa116015e4c853f53574d131.zip
kernel-d8670325528971b2aa116015e4c853f53574d131.tar.gz
kernel-d8670325528971b2aa116015e4c853f53574d131.tar.xz
merge origin/stabilization
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rwxr-xr-xkernel.spec3
-rw-r--r--patch-5.11-redhat.patch2
-rw-r--r--sources7
18 files changed, 21 insertions, 21 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 8393830..6fa6276 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 = 5
+RHEL_RELEASE = 6
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8928ffb..49fa569 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6437,7 +6437,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
# CONFIG_SND_KIRKWOOD_SOC is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index ac72b5b..d90f2ab 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6414,7 +6414,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
# CONFIG_SND_KIRKWOOD_SOC is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index a78c80c..18a5abb 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -6596,7 +6596,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 4ae4968..1c03372 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -6574,7 +6574,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index d34ca6c..b9e2cd8 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -6401,7 +6401,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 7765d06..9cbd851 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -6379,7 +6379,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index ce83971..824dc0a 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -5807,7 +5807,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 4c1e00f..edf1039 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5785,7 +5785,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 8bef364..5af23c1 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -5475,7 +5475,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 6cdf889..7557f70 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -5452,7 +5452,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 4119f4f..930b37d 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -5418,7 +5418,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index c92ff43..8feb5f0 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -5395,7 +5395,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 87345f9..9141c18 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5851,7 +5851,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index d7ff3aa..6603327 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5829,7 +5829,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
-# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m
diff --git a/kernel.spec b/kernel.spec
index f2acf86..5af3d4d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -107,7 +107,6 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.11.4
-
%define stableversion 5.11
%define pkgrelease 125
@@ -2762,7 +2761,7 @@ fi
#
#
%changelog
-* Fri Mar 05 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-50]
+* Sun Mar 07 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.4-6]
- PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar)
- Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson)
- forgot to push this one earlier (Justin M. Forbes)
diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch
index ce3b004..98ee173 100644
--- a/patch-5.11-redhat.patch
+++ b/patch-5.11-redhat.patch
@@ -129,7 +129,7 @@ index 000000000000..b27bcf11198f
+
+...
diff --git a/Makefile b/Makefile
-index a8c1162de3a0..e38dd6eddec8 100644
+index cb9a8e823951..2b1b03c782b7 100644
--- a/Makefile
+++ b/Makefile
@@ -494,6 +494,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index 329d4cd..e308ec7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-SHA512 (linux-5.11.3.tar.xz) = a383c2502fea39806d545fa8e04d82cc450edefab7d9ba39395d4b3a13809649c9fb771d325a9f68fa566a06077e25fe86938bc9cf452b74d62aede27f4b5646
-SHA512 (kernel-abi-whitelists-5.11.3-50.tar.bz2) = 06d90ff4880a06a6497651f7468ef1075c1e76b0641002634307b0ebf1389bfb48b46eaec31ba612881f1725109bab15392e477fac9a11c5f3d4643897bc494e
-SHA512 (kernel-kabi-dw-5.11.3-50.tar.bz2) = 31e98aa95db0484fdf7a50db2c4dd5075ecebe5ab2613267e70268e0ec68aae6209b7d4b8db03163c11f7452a10b659eede5d894f6dc3e7d04ea272aa7d731ac
+SHA512 (patch-5.10.6.xz) = 54e74994a27b6a753717c778e5a550fd5db0f4acd24095f9b6e6d7cbb5c914be2f914d34865c9453d85a37873f0575fc5af54374ea1fe6e6d313d978e739d58f
+SHA512 (linux-5.11.4.tar.xz) = a92f0d6359ad0237422a9d3331e4b9b0d9f17e51f5d297b34f3ebcec33218b32a9452d50ba084871d56f52df50830d8a4da1c045f8cfceb2c27512c2f7398858
+SHA512 (kernel-abi-whitelists-5.11.4-50.tar.bz2) = 45ee25fb63cd1afff261c2a0770193c00657897f8b85be305e507892b516dc1ec5e69c7e9b139bf80fc2d454feebd0015f393f37ae260313f9a723fe28df7912
+SHA512 (kernel-kabi-dw-5.11.4-50.tar.bz2) = 8785a9550722e081e6155edaa275dec9018fd9f7d0d5585daef3f4793f6246846b28553f0fa8ea35005262b550689292c6d4c314fb6b1f4c31afc64f27829c1d