diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-29 08:13:59 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-29 08:13:59 +0200 |
| commit | d21bdcce263c4f6d7b3e9b2d30fb232042721cba (patch) | |
| tree | f4822ec10a31e5bc14320a290caf47211dfa9dbc | |
| parent | 5a3e0ec0d5713de1ff552ddb0f5d36101a3fa7be (diff) | |
| parent | 0e8aa233244c05a10db8b6c4c60db52793bcf775 (diff) | |
| download | kernel-d21bdcce263c4f6d7b3e9b2d30fb232042721cba.tar.gz kernel-d21bdcce263c4f6d7b3e9b2d30fb232042721cba.tar.xz kernel-d21bdcce263c4f6d7b3e9b2d30fb232042721cba.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | configs/fedora/generic/x86/i686/CONFIG_X86_PPRO_FENCE | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/x86/i686PAE/CONFIG_X86_PPRO_FENCE | 1 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 1 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 1 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 1 | ||||
| -rw-r--r-- | kernel-i686.config | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/configs/fedora/generic/x86/i686/CONFIG_X86_PPRO_FENCE b/configs/fedora/generic/x86/i686/CONFIG_X86_PPRO_FENCE deleted file mode 100644 index 373382804..000000000 --- a/configs/fedora/generic/x86/i686/CONFIG_X86_PPRO_FENCE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_X86_PPRO_FENCE is not set diff --git a/configs/fedora/generic/x86/i686PAE/CONFIG_X86_PPRO_FENCE b/configs/fedora/generic/x86/i686PAE/CONFIG_X86_PPRO_FENCE deleted file mode 100644 index 373382804..000000000 --- a/configs/fedora/generic/x86/i686PAE/CONFIG_X86_PPRO_FENCE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_X86_PPRO_FENCE is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index c513757d9..42bd23802 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -6230,7 +6230,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_PPRO_FENCE is not set # CONFIG_X86_PTDUMP is not set # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 5e00edecd..8b67565b6 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -6253,7 +6253,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_PPRO_FENCE is not set CONFIG_X86_PTDUMP=y # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 35e3a899e..975534b18 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6253,7 +6253,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_PPRO_FENCE is not set CONFIG_X86_PTDUMP=y # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set diff --git a/kernel-i686.config b/kernel-i686.config index 5a9f9a9dc..a4d14fba5 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6230,7 +6230,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_PPRO_FENCE is not set # CONFIG_X86_PTDUMP is not set # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set |