diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch | |
parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
download | kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.gz kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.xz kernel-38d5c149cae32d286308f7962e1d561e7939072f.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31
Diffstat (limited to '0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch')
-rw-r--r-- | 0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch b/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch index 22cbf3472..757f66b28 100644 --- a/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch +++ b/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch @@ -27,10 +27,10 @@ Signed-off-by: Laura Abbott <labbott@redhat.com> create mode 100644 Kconfig.redhat diff --git a/Kconfig b/Kconfig -index e10b3ee084d4..01c0df787518 100644 +index 745bc773f567..f57ff40109d7 100644 --- a/Kconfig +++ b/Kconfig -@@ -32,3 +32,5 @@ source "lib/Kconfig" +@@ -30,3 +30,5 @@ source "lib/Kconfig" source "lib/Kconfig.debug" source "Documentation/Kconfig" |