diff options
| -rw-r--r-- | 0001-RDMA-uverbs-Fix-compilation-error-on-s390-and-mips-p.patch | 41 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-aarch64.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 9 |
10 files changed, 58 insertions, 4 deletions
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 new file mode 100644 index 000000000..ef6a7241e --- /dev/null +++ b/0001-RDMA-uverbs-Fix-compilation-error-on-s390-and-mips-p.patch @@ -0,0 +1,41 @@ +From d79a26b99f5f40db6863b1973750fd1d134d99b4 Mon Sep 17 00:00:00 2001 +From: Leon Romanovsky <leonro@mellanox.com> +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 <geert@linux-m68k.org> +Cc: Doug Ledford <dledford@redhat.com> +Cc: Jason Gunthorpe <jgg@mellanox.com> +Fixes: 67f269b37f9b ("RDMA/ucontext: Fix regression with disassociate") +Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> +Signed-off-by: Leon Romanovsky <leonro@mellanox.com> +Signed-off-by: Doug Ledford <dledford@redhat.com> +--- + 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/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY b/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY new file mode 100644 index 000000000..3e207e298 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY @@ -0,0 +1 @@ +CONFIG_KEYBOARD_SNVS_PWRKEY=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER b/configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER new file mode 100644 index 000000000..6750cd8d3 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER @@ -0,0 +1 @@ +# CONFIG_FUNCTION_GRAPH_TRACER is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 792652a71..054f37de6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2884,6 +2884,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m CONFIG_KEYBOARD_QT1070=m # CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_SAMSUNG is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=m # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUN4I_LRADC is not set # CONFIG_KEYBOARD_SUNKBD is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 561f7593b..61d4f270b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2866,6 +2866,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m CONFIG_KEYBOARD_QT1070=m # CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_SAMSUNG is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=m # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUN4I_LRADC is not set # CONFIG_KEYBOARD_SUNKBD is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index c5b40f970..5ba96e019 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1905,7 +1905,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set -CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index b270f66a5..0a3fc504f 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1835,7 +1835,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set -CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2d0971e8e..9461c7a3c 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1820,7 +1820,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set -CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index f3f5e6800..42d395266 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1890,7 +1890,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set -CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=m diff --git a/kernel.spec b/kernel.spec index a36dcd60e..8e6b50d6e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -598,6 +598,9 @@ 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 + # END OF PATCH DEFINITIONS %endif @@ -1839,6 +1842,12 @@ fi # # %changelog +* Mon Apr 29 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc7.git0.1 +- Linux v5.1-rc7 + +* Mon Apr 29 2019 Jeremy Cline <jcline@redhat.com> +- Disable debugging options. + * Fri Apr 26 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc6.git4.1 - Linux v5.1-rc6-72-g8113a85f8720 |