[PR PATCH] linux5.4: update to 5.4.7.

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

There is a new pull request by Hoshpak against master on the void-packages repository

https://github.com/Hoshpak/void-packages linux5.4.7
https://github.com/void-linux/void-packages/pull/17967

linux5.4: update to 5.4.7.
ppc64-be-kvm.patch has been applied upstream with this release.
[skip ci]

A patch file from https://github.com/void-linux/void-packages/pull/17967.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux5.4.7-17967.patch --]
[-- Type: text/x-diff, Size: 3194 bytes --]

From 308a1607af00f9779fb7a0eeb33fc2b0318a1815 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 1 Jan 2020 11:02:02 +0100
Subject: [PATCH] linux5.4: update to 5.4.7.

[skip ci]
---
 srcpkgs/linux5.4/patches/ppc64-be-elfv2.patch | 13 +++++-----
 srcpkgs/linux5.4/patches/ppc64-be-kvm.patch   | 26 -------------------
 srcpkgs/linux5.4/template                     |  4 +--
 3 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/linux5.4/patches/ppc64-be-kvm.patch

diff --git a/srcpkgs/linux5.4/patches/ppc64-be-elfv2.patch b/srcpkgs/linux5.4/patches/ppc64-be-elfv2.patch
index ec65b442bdb..cbf114278b9 100644
--- a/srcpkgs/linux5.4/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/linux5.4/patches/ppc64-be-elfv2.patch
@@ -51,17 +51,18 @@ Ping q66 if it does not apply.
  
  BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
  
---- a/drivers/crypto/vmx/Makefile
-+++ b/drivers/crypto/vmx/Makefile
-@@ -5,7 +5,7 @@ vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes
+--- a/drivers/crypto/vmx/Makefile	2020-01-01 10:56:10.560965046 +0100
++++ b/drivers/crypto/vmx/Makefile	2020-01-01 10:57:05.189968856 +0100
+@@ -5,7 +5,7 @@
  ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
- TARGET := linux-ppc64le
+ override flavour := linux-ppc64le
  else
--TARGET := linux-ppc64
-+TARGET := linux-ppc64v2
+-override flavour := linux-ppc64
++override flavour := linux-ppc64v2
  endif
  
  quiet_cmd_perl = PERL $@
+
 --- a/drivers/crypto/vmx/ppc-xlate.pl
 +++ b/drivers/crypto/vmx/ppc-xlate.pl
 @@ -40,7 +40,7 @@ my $globl = sub {
diff --git a/srcpkgs/linux5.4/patches/ppc64-be-kvm.patch b/srcpkgs/linux5.4/patches/ppc64-be-kvm.patch
deleted file mode 100644
index 0c6a70420c3..00000000000
--- a/srcpkgs/linux5.4/patches/ppc64-be-kvm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This fixes KVM crashes on big endian ppc64.
-
-Source: Marcus Comstedt <macrus@mc.pp.se>
-
-https://marc.info/?l=kvm-ppc&m=157588548604062&w=2
-
---- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
-+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
-@@ -1117,7 +1117,7 @@
- 	ld	r7, VCPU_GPR(R7)(r4)
- 	bne	ret_to_ultra
- 
--	lwz	r0, VCPU_CR(r4)
-+	ld	r0, VCPU_CR(r4)
- 	mtcr	r0
- 
- 	ld	r0, VCPU_GPR(R0)(r4)
-@@ -1137,7 +1137,7 @@
-  *   R3 = UV_RETURN
-  */
- ret_to_ultra:
--	lwz	r0, VCPU_CR(r4)
-+	ld	r0, VCPU_CR(r4)
- 	mtcr	r0
- 
- 	ld	r0, VCPU_GPR(R3)(r4)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index f51f9f0c5ea..c147c814343 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.6
+version=5.4.7
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8
+checksum=abc9b21d9146d95853dac35f4c4489a0199aff53ee6eee4b0563d1b37079fcc9
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually