diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-30 20:39:12 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-30 20:39:12 +0200 |
commit | d5f831500b4b36dba3f9bae6e8ac14266b495790 (patch) | |
tree | bf4d5aff702f10a1d42fb632ed99a7c982bc767b | |
parent | 1c236df71c72ab37b46eae8ed7a48c96866ce78d (diff) | |
parent | b303d37046fa46d3601382b22ada6ab3fea12962 (diff) | |
download | kernel-d5f831500b4b36dba3f9bae6e8ac14266b495790.tar.gz kernel-d5f831500b4b36dba3f9bae6e8ac14266b495790.tar.xz kernel-d5f831500b4b36dba3f9bae6e8ac14266b495790.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r-- | 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch | 29 | ||||
-rw-r--r-- | kernel.spec | 2 |
2 files changed, 31 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 f4655f6dc..016a3f1b9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -815,6 +815,7 @@ Patch95: 0001-drm-panel-st7703-Enter-sleep-after-display-off.patch Patch96: 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.patch Patch97: 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch Patch98: 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch +Patch99: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch %endif @@ -1415,6 +1416,7 @@ ApplyOptionalPatch 0001-drm-panel-st7703-Enter-sleep-after-display-off.patch ApplyOptionalPatch 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.patch ApplyOptionalPatch 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch ApplyOptionalPatch 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch +ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch %endif |