summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY2
-rw-r--r--gitrev2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec22
-rw-r--r--sources2
10 files changed, 29 insertions, 11 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
diff --git a/gitrev b/gitrev
index d21f16c4d..90ddb6a2e 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-6f70eb2b00eb416146247c65003d31f4df983ce0
+97ace515f01439d4cf6e898b4094040dc12d36e7
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 669f9c222..5f9cc007f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 3
# The git snapshot level
-%define gitrev 1
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1326,6 +1326,16 @@ BuildKernel() {
cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
if [ -f tools/objtool/objtool ]; then
cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || :
+ # these are a few files associated with objtool
+ cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/scripts/utilities.mak $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ # also more than necessary but it's not that many more files
+ cp -a --parents tools/objtool/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/lib/str_error_r.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/lib/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/lib/subcmd/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
fi
if [ -d arch/$Arch/scripts ]; then
cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
@@ -1371,7 +1381,9 @@ BuildKernel() {
cp -a --parents arch/x86/tools/relocs.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/tools/relocs_common.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/tools/relocs.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
- cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ # Yes this is more includes than we probably need. Feel free to sort out
+ # dependencies if you so choose.
+ cp -a --parents tools/include/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/purgatory/purgatory.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/purgatory/sha256.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/purgatory/sha256.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
@@ -1854,6 +1866,12 @@ fi
#
#
%changelog
+* Thu Mar 01 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git3.1
+- Linux v4.16-rc3-167-g97ace515f014
+
+* 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
diff --git a/sources b/sources
index d6550350f..a20051c08 100644
--- a/sources
+++ b/sources
@@ -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-git3.xz) = 3e1b29da83a651144bc3876dc94f59641e0d66a7b7ee2feca71c7e05a7e2687659bdda3b95abe2120004b735094ce9ca9c0e7ea69092f2aa7243a9b7647018cc
generated by cgit (git 2.34.1) at 2024-06-11 18:23:11 +0000