Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0

Conflicts:
	kernel.spec

.gitignore

@@ -3,6 +3,7 @@ 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-git5.bz2
+/patch-2.6.37-rc2-git7.bz2
+/patch-2.6.37-rc3.bz2

Makefile

@@ -102,6 +102,8 @@ debug:
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 	@perl -pi -e 's/^%define rawhide_skip_docs 0/%define rawhide_skip_docs 1/' kernel.spec
 
+nodebuginfo:
+	@perl -pi -e 's/^%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 1\}/%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 0\}/' kernel.spec
 nodebug: release
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 release:

config-s390x

@@ -231,3 +231,5 @@ CONFIG_ZFCP_DIF=y
 
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_BOOK=y
+
+CONFIG_STRICT_DEVMEM=y

kernel.spec

@@ -83,7 +83,7 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 2
+%define rcrev 3
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -176,7 +176,7 @@ Summary: The Linux kernel
 %else
 %define gittag .git0
 %endif
-%define pkg_release 0.%{fedora_build}%{?rctag}%{?gittag}%{?buildid}%{?dist}
+%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}%{?dist}
 
 %endif
 
@@ -1858,7 +1858,7 @@ fi
 %{expand:%%files %{?2}}\
 %defattr(-,root,root)\
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
-/boot/System.map-%{KVERREL}%{?2:.%{2}}\
+%attr(600,root,root) /boot/System.map-%{KVERREL}%{?2:.%{2}}\
 /boot/config-%{KVERREL}%{?2:.%{2}}\
 %dir /lib/modules/%{KVERREL}%{?2:.%{2}}\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel\
@@ -1916,6 +1916,30 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon Nov 22 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc3.git0.1
+- Linux 2.6.37-rc3
+
+* Sat Nov 20 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc2.git7.1
+- Linux 2.6.37-rc2-git7
+
+* Fri Nov 19 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc2.git5.1
+- Linux 2.6.37-rc2-git5
+
+* Thu Nov 18 2010 Kyle McMartin <kyle@redhat.com>
+- Move %{fedora_build} in the un-released (ie: -git/-rc) kernel case for
+  a variety of reasons, principally so that:
+  1: Bumping %baserelease isn't needed if we're just updating snapshots.
+  2: %buildid will sort as newer so we don't need to bump baserelease when
+     building bugzilla fixes.
+
+* Wed Nov 17 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc2.git2
+- Linux 2.6.37-rc2-git2
+- enable STRICT_DEVMEM on s390x.
+
+* Wed Nov 17 2010 Kyle McMartin <kyle@redhat.com>
+- Make vmlinuz/System.map root read-write only by default. You can just
+  chmod 644 them later if you (unlikely) need them without root.
+
 * Tue Nov 16 2010 Michael Young <m.a.young@durham.ac.uk>
 - Update the xen/next-2.6.37 and xen-pcifront-fixes patches
 

linux-2.6-i386-nx-emulation.patch

@@ -384,7 +384,7 @@
  void __init x86_report_nx(void)
  {
  	if (!cpu_has_nx) {
-+		if (disable_nx)
++		if (!disable_nx)
 +			printk(KERN_INFO "Using x86 segment limits to approximate NX protection\n");
 +		else
 +

sources

@@ -1,4 +1,5 @@
 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
+7645b1df8d5741e87c32a9994a14c336  patch-2.6.37-rc2-git5.bz2
+5b9f94c8cdc478788fdcdf4eb16cbbcb  patch-2.6.37-rc2-git7.bz2
+9a487f01d20f9ee6917395a4c3de8ea7  patch-2.6.37-rc3.bz2