diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-01 07:21:26 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-01 07:21:26 +0100 |
commit | d61d1e934a975336831d7e2ef89227d369553378 (patch) | |
tree | d2b79457d4c19f7b3b5a5c0e6d59929652ef83d0 | |
parent | 5d19ee3ff991a88ac78dbdd8f910b6d6f6111071 (diff) | |
parent | 7072f5716fcbf2bd7d9bbc258baadbe92b4131d3 (diff) | |
download | kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc26.tar.gz kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc26.tar.xz kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc26.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc29kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc26
-rw-r--r-- | configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-i686-PAE.config | 2 | ||||
-rw-r--r-- | kernel-i686-PAEdebug.config | 2 | ||||
-rw-r--r-- | kernel-i686-debug.config | 2 | ||||
-rw-r--r-- | kernel-i686.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
-rw-r--r-- | kernel-x86_64.config | 2 | ||||
-rw-r--r-- | kernel.spec | 5 | ||||
-rw-r--r-- | sources | 2 |
10 files changed, 13 insertions, 10 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY b/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY index 3ac539aca..b93c1350f 100644 --- a/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY +++ b/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY @@ -1 +1 @@ -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m @@ -1 +1 @@ -6f70eb2b00eb416146247c65003d31f4df983ce0 +f3afe530d644488a074291da04a69a296ab63046 diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 4e3b941a3..bf503e125 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -6226,7 +6226,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 8472d4886..5a2e8c691 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -6249,7 +6249,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 4d9582fb6..487f2b76c 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6249,7 +6249,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-i686.config b/kernel-i686.config index ef61f09ce..6ebbf4120 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6226,7 +6226,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index ec08afc9d..926a0f27f 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6337,7 +6337,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_PTDUMP=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 953d0d99f..eeaf80507 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6314,7 +6314,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_PTDUMP is not set diff --git a/kernel.spec b/kernel.spec index 72c666269..d822361fd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1897,6 +1897,9 @@ fi # # %changelog +* Wed Feb 28 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git2.1 +- Linux v4.16-rc3-97-gf3afe530d644 + * Tue Feb 27 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git1.1 - Linux v4.16-rc3-88-g6f70eb2b00eb - Re-enable debugging options @@ -1,3 +1,3 @@ SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea SHA512 (patch-4.16-rc3.xz) = fd7bbfd9ca423b06341ed83c86417443978d371ddf35987edfc3fcd75b674f24198913a7cab27cb3ff832ade52ae1feba5f9bff303bf6af7fbb64d517e730bb1 -SHA512 (patch-4.16-rc3-git1.xz) = 9ba6a55980ca7c9c8afc893b9152face2e584634640dd3b12a0aab0bbcd5868db1be0b62ea5586db4509ca030525ada47b05d5845115a3df5ad0ef8bfc3d5547 +SHA512 (patch-4.16-rc3-git2.xz) = c294986dd340bab7ad67def844db467b68e9ecab3fb5d0e86097804e184f73190cdc9eef627bc0248160c521857c674608ee5ccf1c3ce41e0f1fddca42d32b7b |