diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
commit | f7a55ba381de17d8e5511a97441944b797aa62a5 (patch) | |
tree | df2cb85063e94e396b776ea25c0e4b5f9f286c39 /0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | |
parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
download | kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.gz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.xz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.zip |
kernel-5.9.0-0.rc8.20201007git7575fdda569b.29
* Wed Oct 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.20201007git7575fdda569b.29]
- Merge ark-patches
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch')
-rw-r--r-- | 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch deleted file mode 100644 index cb2475171..000000000 --- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Don Zickus <dzickus@redhat.com> -Date: Tue, 3 Mar 2020 09:35:28 -0500 -Subject: [PATCH] Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES - -The intent of RH_DISABLE_DEPRECATED was to provide Red Hat a -simple way to disable drivers it did not want to support in RHEL. - -As the config option was applied to more drivers and infra, it became -clear the option was being used for not only deprecating drivers (which -implied limited support) to disabling drivers (implying no support). - -Using the word 'deprecated' seemed confusing in the second scenario. -Rename the option to be more generic and useable across more parts -of the kernel tree. - -The new wording is RHEL_DIFFERENCES. - -Upstream Status: RHEL only ---- - Kconfig.redhat | 2 +- - arch/x86/kernel/setup.c | 2 +- - include/linux/kernel.h | 2 +- - kernel/Makefile | 1 + - 4 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Kconfig.redhat b/Kconfig.redhat -index 733a26bd887a..effb81d04bfd 100644 ---- a/Kconfig.redhat -+++ b/Kconfig.redhat -@@ -5,7 +5,7 @@ - - menu "Red Hat options" - --config RH_DISABLE_DEPRECATED -+config RHEL_DIFFERENCES - bool "Remove support for deprecated features" - help - Red Hat may choose to deprecate certain features in its kernels. -diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index a1a012702915..b57e6dd6d7ef 100644 ---- a/arch/x86/kernel/setup.c -+++ b/arch/x86/kernel/setup.c -@@ -1371,7 +1371,7 @@ void __init setup_arch(char **cmdline_p) - efi_apply_memmap_quirks(); - #endif - --#ifdef CONFIG_RH_DISABLE_DEPRECATED -+#ifdef CONFIG_RHEL_DIFFERENCES - rh_check_supported(); - #endif - -diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index f24819663517..3ab563aa9e64 100644 ---- a/include/linux/kernel.h -+++ b/include/linux/kernel.h -@@ -1059,7 +1059,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } - - struct module; - --#ifdef CONFIG_RH_DISABLE_DEPRECATED -+#ifdef CONFIG_RHEL_DIFFERENCES - void mark_hardware_unsupported(const char *msg); - void mark_hardware_deprecated(const char *msg); - void mark_tech_preview(const char *msg, struct module *mod); -diff --git a/kernel/Makefile b/kernel/Makefile -index d744b63c07dc..1916714ba4b6 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -14,6 +14,7 @@ obj-y = fork.o exec_domain.o panic.o \ - - obj-$(CONFIG_BPFILTER) += usermode_driver.o - obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o -+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o - obj-$(CONFIG_MODULES) += kmod.o - obj-$(CONFIG_MULTIUSER) += groups.o - --- -2.28.0 - |