diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
| commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
| tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | |
| parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
| parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
| download | kernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33.tar.gz kernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33.tar.xz kernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
Diffstat (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch')
| -rw-r--r-- | 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch index cc1374b5d..de2a541be 100644 --- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch @@ -38,10 +38,10 @@ index 733a26bd887a..effb81d04bfd 100644 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 b6f5510f3d91..0fd824c4162d 100644 +index 19d57bfc12f9..e677bb144835 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1366,7 +1366,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1372,7 +1372,7 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -64,7 +64,7 @@ index 8588bb62e74c..b372b2daae7f 100644 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 e62be9e51064..b1010f42dd18 100644 +index 281e1abbe3b2..8da4dd1bafe0 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,7 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ |