diff --git a/0001-RDMA-uverbs-Fix-compilation-error-on-s390-and-mips-p.patch b/0001-RDMA-uverbs-Fix-compilation-error-on-s390-and-mips-p.patch deleted file mode 100644 index ef6a7241e..000000000 --- a/0001-RDMA-uverbs-Fix-compilation-error-on-s390-and-mips-p.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d79a26b99f5f40db6863b1973750fd1d134d99b4 Mon Sep 17 00:00:00 2001 -From: Leon Romanovsky -Date: Mon, 29 Apr 2019 13:00:14 +0300 -Subject: [PATCH] RDMA/uverbs: Fix compilation error on s390 and mips platforms - -Most platforms ignore parameter provided to ZERO_PAGE macro, -hence wrong parameter was used and missed. This caused to compilation -error like presented below. - -drivers/infiniband/core/uverbs_main.c: In function 'rdma_umap_fault': -drivers/infiniband/core/uverbs_main.c:898:28: error: 'struct vm_fault' has no member named 'vm_start' - vmf->page = ZERO_PAGE(vmf->vm_start); - ^~ -Cc: stable@vger.kernel.org -Cc: Geert Uytterhoeven -Cc: Doug Ledford -Cc: Jason Gunthorpe -Fixes: 67f269b37f9b ("RDMA/ucontext: Fix regression with disassociate") -Signed-off-by: Heiko Carstens -Signed-off-by: Leon Romanovsky -Signed-off-by: Doug Ledford ---- - drivers/infiniband/core/uverbs_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c -index db20b6e0f253..d6408bbe94ed 100644 ---- a/drivers/infiniband/core/uverbs_main.c -+++ b/drivers/infiniband/core/uverbs_main.c -@@ -895,7 +895,7 @@ static vm_fault_t rdma_umap_fault(struct vm_fault *vmf) - - /* Read only pages can just use the system zero page. */ - if (!(vmf->vma->vm_flags & (VM_WRITE | VM_MAYWRITE))) { -- vmf->page = ZERO_PAGE(vmf->vm_start); -+ vmf->page = ZERO_PAGE(vmf->vma->vm_start); - get_page(vmf->page); - return 0; - } --- -2.20.1 - diff --git a/gitrev b/gitrev index 35f4c353c..8c9d4b25f 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -8113a85f872003a9f5c58f9f143054b0d8ec73a5 +83a50840e72a5a964b4704fcdc2fbb2d771015ab diff --git a/kernel.spec b/kernel.spec index 30506bda8..5e9950061 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -581,9 +581,6 @@ Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch # CVE-2019-3900 rhbz 1698757 1702940 Patch524: net-vhost_net-fix-possible-infinite-loop.patch -# S390x build failure fix -Patch525: 0001-RDMA-uverbs-Fix-compilation-error-on-s390-and-mips-p.patch - # Fix wifi on various ideapad models not working (rhbz#1703338) Patch526: 0001-platform-x86-ideapad-laptop-Remove-no_hw_rfkill_list.patch @@ -1825,6 +1822,9 @@ fi # # %changelog +* Tue Apr 30 2019 Jeremy Cline - 5.1.0-0.rc7.git1.1 +- Linux v5.1-rc7-5-g83a50840e72a + * Tue Apr 30 2019 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index 66a1cb8e0..93949cd6c 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc7.xz) = 8e2c0f9843f08c9911ca14dedaed48ee1995bb12aec9b1e718d3f4cc23d8a0e8d21c368d40f78a43dcdea628e617a190344f0b6c63a4311a36d906da84d98702 +SHA512 (patch-5.1-rc7-git1.xz) = 069dc86021b0493ff0d4443add1110ad795e673ea5fc4b0a34bd89384c3f608e27b339dc27154dd3b0c2c91d696f2b2bd52fb769c0d83ae63303d86dfdb08316