kernel-5.11.4-6
* 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) - Reference the patch as version.patchlevel to more easily see diffs between stable releases (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
3422e04a2e
commit
ec33e5d539
18 changed files with 24 additions and 24 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
10
kernel.spec
10
kernel.spec
|
|
@ -104,7 +104,7 @@ Summary: The Linux kernel
|
|||
%define primary_target rhel
|
||||
%endif
|
||||
|
||||
%define rpmversion 5.11.3
|
||||
%define rpmversion 5.11.4
|
||||
%define stableversion 5.11
|
||||
%define pkgrelease 50
|
||||
|
||||
|
|
@ -603,7 +603,7 @@ BuildRequires: asciidoc
|
|||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.11.3.tar.xz
|
||||
Source0: linux-5.11.4.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
|
|
@ -1251,8 +1251,8 @@ ApplyOptionalPatch()
|
|||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.11.3 -c
|
||||
mv linux-5.11.3 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.11.4 -c
|
||||
mv linux-5.11.4 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
|
|
@ -2763,7 +2763,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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,4 +1,4 @@
|
|||
SHA512 (patch-5.10.6.xz) = 54e74994a27b6a753717c778e5a550fd5db0f4acd24095f9b6e6d7cbb5c914be2f914d34865c9453d85a37873f0575fc5af54374ea1fe6e6d313d978e739d58f
|
||||
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 (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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue