summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-01 17:53:01 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-01 17:53:01 +0200
commit8ee69c26cdd146e09227fb693ba9bcdaa8b686d9 (patch)
treea57a4788bab20c470b65102629e2a322a144ce38
parente517cff56760523ef3417f8332ae7c48e3993014 (diff)
parent1427a1b472eaa6f9131d0d122fbea8b2383b9edb (diff)
downloadkernel-8ee69c26cdd146e09227fb693ba9bcdaa8b686d9.tar.gz
kernel-8ee69c26cdd146e09227fb693ba9bcdaa8b686d9.tar.xz
kernel-8ee69c26cdd146e09227fb693ba9bcdaa8b686d9.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rw-r--r--0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch29
-rw-r--r--kernel.spec6
2 files changed, 35 insertions, 0 deletions
diff --git a/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch b/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
new file mode 100644
index 000000000..93b1e9be0
--- /dev/null
+++ b/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
@@ -0,0 +1,29 @@
+From 90750a5b1205a7dcc002224738585b861779cdae Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Thu, 30 Jul 2020 10:26:11 -0500
+Subject: [PATCH] Work around for gcc bug
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
+
+Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
+---
+ crypto/aegis128-neon-inner.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/aegis128-neon-inner.c b/crypto/aegis128-neon-inner.c
+index 2a660ac1bc3a..fa87ff6a2a71 100644
+--- a/crypto/aegis128-neon-inner.c
++++ b/crypto/aegis128-neon-inner.c
+@@ -148,8 +148,8 @@ void crypto_aegis128_init_neon(void *state, const void *key, const void *iv)
+ kiv,
+ vld1q_u8(const1),
+ vld1q_u8(const0),
+- k ^ vld1q_u8(const0),
+- k ^ vld1q_u8(const1),
++ (uint8x16_t) (k ^ vld1q_u8(const0)),
++ (uint8x16_t) (k ^ vld1q_u8(const1)),
+ }};
+ int i;
+
+--
+2.26.2
+
diff --git a/kernel.spec b/kernel.spec
index 07733263f..7dae44ba2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -905,6 +905,9 @@ Patch124: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch
# rhbz 1857101
Patch125: 0001-ALSA-hda-Workaround-for-spurious-wakeups-on-some-Int.patch
+# Work around a bug in gcc https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
+Patch126: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -3012,6 +3015,9 @@ fi
#
#
%changelog
+* Sat Aug 01 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.12-200
+- Linux v5.7.12
+
* Wed Jul 29 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.11-200
- Linux v5.7.11
- Fix rhbz 1857101