From 387998e1c2012b65775ef0699363bf6e0f932ed3 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 23 Jun 2021 10:51:04 -0500 Subject: kernel-5.12.11-0 * Wed Jun 16 2021 Justin M. Forbes [5.12.11-0] - Bluetooth: btqca: Don't modify firmware contents in-place (Connor Abbott) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 8 ++++---- patch-5.12-redhat.patch | 12 ++++++------ sources | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel.spec b/kernel.spec index 53f1ff893..b3b0bcf57 100755 --- a/kernel.spec +++ b/kernel.spec @@ -106,7 +106,7 @@ Summary: The Linux kernel %define primary_target rhel %endif -%define rpmversion 5.12.12 +%define rpmversion 5.12.13 %define stableversion 5.12 %define pkgrelease 300 @@ -623,7 +623,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12.12.tar.xz +Source0: linux-5.12.13.tar.xz Source1: Makefile.rhelver @@ -1277,8 +1277,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12.12 -c -mv linux-5.12.12 linux-%{KVERREL} +%setup -q -n kernel-5.12.13 -c +mv linux-5.12.13 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch index b1d94684a..1b712c1d1 100644 --- a/patch-5.12-redhat.patch +++ b/patch-5.12-redhat.patch @@ -66,7 +66,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index e0a252b64463..b47c61143e46 100644 +index d2fe36db78ae..0fb6443bd3a7 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1220,10 +1220,10 @@ index 0e94190ca4e8..dfc5d6772e64 100644 +#endif /* CONFIG_PCIE_TEGRA194 */ + diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 653660e3ba9e..98851d00dc4d 100644 +index 7bf76bca888d..804c0bc8bb4d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4143,6 +4143,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4230,6 +4230,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -1289,10 +1289,10 @@ index c30f6047410f..3d4c311bf87c 100644 PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_DELL, 0x1fe0) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 13fe37fbbd2c..77c57e075b0e 100644 +index 6ebb8bd92e9d..bf06d4a8b2ec 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5532,6 +5532,13 @@ static void hub_event(struct work_struct *work) +@@ -5534,6 +5534,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1452,7 +1452,7 @@ index 8aeebd6646dc..7737a5d71168 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/kernel/crash_core.c b/kernel/crash_core.c -index 825284baaf46..0b2b3f510b16 100644 +index 684a6061a13a..220579c0e963 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -7,6 +7,7 @@ diff --git a/sources b/sources index 89cb34434..6897612b9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.12.tar.xz) = ad404db9050475f5d02613f04ea592964ed72e2b4f3da43b37ec02405edcd8e88070cb61516c352b16aa9aab6f5dc258e8c8b63734edcc12989735ef01e60a71 -SHA512 (kernel-abi-whitelists-5.12.12-300.tar.bz2) = eb361af6051909f6777a738ef2f2d9ba73005aaeea70dfef40e608cf1a9c7a58607ef3ef8f0629c3089d4c148f85cc5bb821c0da76d91cc6326205f10981a4fd -SHA512 (kernel-kabi-dw-5.12.12-300.tar.bz2) = 4ea3aa5aa8640f4f7ec070dde9c9e3a6f8a3b0f97598036092ad0e32beb1bbeec1274a0d5263d31bf366bc6bab3f1394fef339148234fcb362c04592280557dc +SHA512 (linux-5.12.13.tar.xz) = 3ef6475eefadd9e929750517f74129ecdcfb266c8e855ec0a4988260d699fea4c779201cc00335a3d52a855a7d69ab2791c735e9d4c1c4574b71ce077b9f6828 +SHA512 (kernel-abi-whitelists-5.12.13-300.tar.bz2) = af2f69a8dd2a4506f2696ab293e7ce968dd0045c82f64fcb3c058457b303aeffcfc5275484948dd14c573b6e331a67cb9a9437aa3d0af3f5f0870a26a8ac7cee +SHA512 (kernel-kabi-dw-5.12.13-300.tar.bz2) = f6d3a3143201ba025be24c4c6cb28497b4f55eba987373183766eac3d783b8732489cf42d6bed523593ca637b1f8d836941cf185eca78b8f73da436298ff7044 -- cgit