From 6c2cc50051831fa502a8b082a312ca90e7039f3f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 26 Apr 2020 21:15:20 -0500 Subject: kernel-5.7.0-0.rc3.1 * Sun Apr 26 2020 CKI@GitLab [5.7.0-0.rc3.1] - v5.7-rc3 rebase - Add cec to the filter overrides ("Justin M. Forbes") - Add overrides to filter-modules.sh ("Justin M. Forbes") - Adjust the changelog update script to not push anything (Jeremy Cline) - Drop --target noarch from the rh-rpms make target (Jeremy Cline) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- ...e-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch') diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch index 82190bed9..d1100df75 100644 --- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch @@ -1,4 +1,4 @@ -From 23e82748e63abb1ca113fa0a1a4129da49e7b623 Mon Sep 17 00:00:00 2001 +From d222c5b8a56ad22b1587320881aadcb286805504 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Tue, 3 Mar 2020 09:35:28 -0500 Subject: [PATCH] Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES @@ -29,9 +29,9 @@ 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" @@ -44,20 +44,20 @@ index b6f5510f3d91..0fd824c4162d 100644 @@ -1366,7 +1366,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 8588bb62e74c..b372b2daae7f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -1049,7 +1049,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); @@ -70,12 +70,12 @@ index e62be9e51064..b1010f42dd18 100644 @@ -12,7 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o smpboot.o ucount.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.26.0 +2.26.2 -- cgit