summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-06-23 10:56:39 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-06-23 10:56:39 -0500
commit4de13ae7a31ed22a932cace44f3e09ab627dd407 (patch)
treed7a23f1251b5c5f91a01687b123163d72f410788
parent0ff92564ea1f11dee71b6b966797a8963c50b571 (diff)
downloadkernel-4de13ae7a31ed22a932cace44f3e09ab627dd407.tar.gz
kernel-4de13ae7a31ed22a932cace44f3e09ab627dd407.tar.xz
kernel-4de13ae7a31ed22a932cace44f3e09ab627dd407.zip
kernel-5.12.11-0
* Wed Jun 16 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.11-0] - Bluetooth: btqca: Don't modify firmware contents in-place (Connor Abbott) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rwxr-xr-xkernel.spec8
-rw-r--r--patch-5.12-redhat.patch12
-rw-r--r--sources6
3 files changed, 13 insertions, 13 deletions
diff --git a/kernel.spec b/kernel.spec
index 60641360c..02e058be1 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 200
@@ -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 5dd5b66fb..008e95675 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.12.tar.xz) = ad404db9050475f5d02613f04ea592964ed72e2b4f3da43b37ec02405edcd8e88070cb61516c352b16aa9aab6f5dc258e8c8b63734edcc12989735ef01e60a71
-SHA512 (kernel-abi-whitelists-5.12.12-200.tar.bz2) = 07acacf6cebc1f316cedbf2f40989311a78513cb0de1c7fbde02ba134c4ff07766a5d72ddc61859288a7462072727eb140b1d7069ce626c2cf9c25af4637ff62
-SHA512 (kernel-kabi-dw-5.12.12-200.tar.bz2) = 4ea3aa5aa8640f4f7ec070dde9c9e3a6f8a3b0f97598036092ad0e32beb1bbeec1274a0d5263d31bf366bc6bab3f1394fef339148234fcb362c04592280557dc
+SHA512 (linux-5.12.13.tar.xz) = 3ef6475eefadd9e929750517f74129ecdcfb266c8e855ec0a4988260d699fea4c779201cc00335a3d52a855a7d69ab2791c735e9d4c1c4574b71ce077b9f6828
+SHA512 (kernel-abi-whitelists-5.12.13-200.tar.bz2) = 9c4430cff40e7a07c8aa31a3cb022400a57319e6270cd0ea374185544ebe99a874ae60c5e6485a267a02f8fdff573749b4c24d78d977e494edbe069049ec5b43
+SHA512 (kernel-kabi-dw-5.12.13-200.tar.bz2) = f6d3a3143201ba025be24c4c6cb28497b4f55eba987373183766eac3d783b8732489cf42d6bed523593ca637b1f8d836941cf185eca78b8f73da436298ff7044