From 24ef14817baf484f34d3f67911ca919a5a328e1a Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 26 Nov 2018 21:51:40 +0100 Subject: [PATCH] riscv: remove obsolete patch (upstreamed) Signed-off-by: David Abdurachmanov --- kernel.spec | 8 ++------ riscv64-fixes.patch | 24 ------------------------ 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 riscv64-fixes.patch diff --git a/kernel.spec b/kernel.spec index c9c580933..6eecb5d15 100644 --- a/kernel.spec +++ b/kernel.spec @@ -142,7 +142,7 @@ Summary: The Linux kernel # pkg_release is what we'll fill in for the rpm Release: field %if 0%{?released_kernel} -%define pkg_release %{fedora_build}%{?buildid}.1.riscv64%{?dist} +%define pkg_release %{fedora_build}%{?buildid}.0.riscv64%{?dist} %else @@ -157,7 +157,7 @@ Summary: The Linux kernel %else %define gittag .git0 %endif -%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.1.riscv64%{?dist} +%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.0.riscv64%{?dist} %endif @@ -624,10 +624,6 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1526312 (accelerometer part of the bug), patches pending upstream Patch504: iio-accel-kxcjk1013-Add-more-hardware-ids.patch -# 600 - RISC-V - -Patch600: riscv64-fixes.patch - # END OF PATCH DEFINITIONS %endif diff --git a/riscv64-fixes.patch b/riscv64-fixes.patch deleted file mode 100644 index a6d56673d..000000000 --- a/riscv64-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From df3ef2456c91506d044565d10e98fc020ddc8d92 Mon Sep 17 00:00:00 2001 -From: Fedora Kernel Team -Date: Tue, 20 Nov 2018 08:40:42 +0000 -Subject: [PATCH] riscv64 fixes - ---- - arch/riscv/include/asm/module.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/riscv/include/asm/module.h b/arch/riscv/include/asm/module.h -index 349df33..cd2af4b 100644 ---- a/arch/riscv/include/asm/module.h -+++ b/arch/riscv/include/asm/module.h -@@ -8,6 +8,7 @@ - - #define MODULE_ARCH_VERMAGIC "riscv" - -+struct module; - u64 module_emit_got_entry(struct module *mod, u64 val); - u64 module_emit_plt_entry(struct module *mod, u64 val); - --- -2.19.1 -