From fddecabe0049ffcad3ef1a54eb7eea88aef72bcd Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Wed, 17 Nov 2010 12:40:56 -0500 Subject: Linux 2.6.37-rc2-git2 --- .gitignore | 3 +-- config-s390x | 2 ++ kernel.spec | 6 +++++- sources | 3 +-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7ad8291ef..ad47da49b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ patch-*.bz2 clog *.rpm kernel-2.6.*/ -/patch-2.6.37-rc1.bz2 -/patch-2.6.37-rc1-git10.bz2 /patch-2.6.37-rc2.bz2 +/patch-2.6.37-rc2-git2.bz2 diff --git a/config-s390x b/config-s390x index 148ee5506..780fc9146 100644 --- a/config-s390x +++ b/config-s390x @@ -231,3 +231,5 @@ CONFIG_ZFCP_DIF=y CONFIG_SCHED_MC=y CONFIG_SCHED_BOOK=y + +CONFIG_STRICT_DEVMEM=y diff --git a/kernel.spec b/kernel.spec index 2850a528c..9552ec7fa 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1899,6 +1899,10 @@ fi # || || %changelog +* Wed Nov 17 2010 Kyle McMartin 2.6.37-0.1.rc2.git2 +- Linux 2.6.37-rc2-git2 +- enable STRICT_DEVMEM on s390x. + * Wed Nov 17 2010 Kyle McMartin - Make vmlinuz/System.map root read-write only by default. You can just chmod 644 them later if you (unlikely) need them without root. diff --git a/sources b/sources index cf373cdb4..535171430 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ 61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2 -7364d9629734c34d09ec9ebd351d40b9 patch-2.6.37-rc1.bz2 -99827f19411ac74a4789cb6395e4568d patch-2.6.37-rc1-git10.bz2 279da99f02bd89e85b1ae5f68f852c0e patch-2.6.37-rc2.bz2 +040ff765f6498268c2510640fc412ccd patch-2.6.37-rc2-git2.bz2 -- cgit