[kernel/rawhide/user/kyle/kernel-git] Linux 2.6.37-git13

Kyle McMartin kyle at fedoraproject.org
Sat Jan 15 17:43:57 UTC 2011


commit 126cc8b40c71d8f67f7cab6e9e3e5bbb5af986ed
Author: Kyle McMartin <kyle at redhat.com>
Date:   Sat Jan 15 12:43:39 2011 -0500

    Linux 2.6.37-git13

 config-generic                             |    5 +++++
 kernel.spec                                |   10 +++++-----
 sources                                    |    2 +-
 xen_export-arbitrary_virt_to_machine.patch |   25 -------------------------
 4 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/config-generic b/config-generic
index 67483c6..d707e3b 100644
--- a/config-generic
+++ b/config-generic
@@ -4485,3 +4485,8 @@ CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 
 CONFIG_NFC_DEVICES=y
 CONFIG_PN544_NFC=m
+
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
diff --git a/kernel.spec b/kernel.spec
index d0fba01..e593404 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 12
+%define gitrev 13
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -732,8 +732,6 @@ Patch12401: debug-tty-print-dev-name.patch
 
 Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
 
-Patch12422: xen_export-arbitrary_virt_to_machine.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1346,8 +1344,6 @@ ApplyPatch debug-tty-print-dev-name.patch
 # rhbz#662344,600690
 ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
 
-ApplyPatch xen_export-arbitrary_virt_to_machine.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1960,6 +1956,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Jan 15 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git13.1
+- Linux 2.6.37-git13
+- Drop xen_export-arbitrary_virt_to_machine.patch, upstream.
+
 * Fri Jan 14 2011 Kyle McMartin <kmcmartin at redhat.com>
 - xen_export-arbitrary_virt_to_machine.patch: pull patch from upstream
   to fix build error.
diff --git a/sources b/sources
index 9bfdb36..9e3d37a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 c8ee37b4fdccdb651e0603d35350b434  linux-2.6.37.tar.bz2
-2aa8806680f37b62479cead4c7034b90  patch-2.6.37-git12.bz2
+347731580c0e5cd2719c268f39100261  patch-2.6.37-git13.bz2


More information about the scm-commits mailing list