[kernel/rawhide/user/kyle/kernel-git] start following git head again

Kyle McMartin kyle at fedoraproject.org
Fri Oct 22 16:25:06 UTC 2010


commit c22cea221f8de78ab36ce0f183b73c99031cc7dc
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Fri Oct 22 12:24:02 2010 -0400

    start following git head again

 Makefile                          |    4 +-
 config-arm                        |    5 +
 config-debug                      |    2 +-
 config-generic                    |    6 +
 config-nodebug                    |    2 +-
 config-s390x                      |    2 +
 config-x86-generic                |    5 +
 config-x86_64-generic             |    4 +
 kernel.spec                       |   15 ++--
 linux-2.6-i386-nx-emulation.patch |    2 +-
 linux-2.6-rcu-sched-warning.patch |  215 -------------------------------------
 linux-2.6-utrace.patch            |    4 +-
 12 files changed, 36 insertions(+), 230 deletions(-)
---
diff --git a/Makefile b/Makefile
index bb2c37b..2bba607 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DMADEVICES_DEBUG is not set/CONFIG_DMADEVICES_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DMADEVICES_VDEBUG is not set/CONFIG_DMADEVICES_VDEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_CEPH_FS_PRETTYDEBUG is not set/CONFIG_CEPH_FS_PRETTYDEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/CONFIG_CEPH_LIB_PRETTYDEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_QUOTA_DEBUG is not set/CONFIG_QUOTA_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_KGDB_KDB is not set/CONFIG_KGDB_KDB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_KDB_KEYBOARD is not set/CONFIG_KDB_KEYBOARD=y/' config-nodebug
@@ -154,7 +154,7 @@ release:
 	@perl -pi -e 's/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y/# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DMADEVICES_DEBUG=y/# CONFIG_DMADEVICES_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DMADEVICES_VDEBUG=y/# CONFIG_DMADEVICES_VDEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_CEPH_FS_PRETTYDEBUG=y/# CONFIG_CEPH_FS_PRETTYDEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_CEPH_LIB_PRETTYDEBUG=y/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_QUOTA_DEBUG=y/# CONFIG_QUOTA_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/' config-nodebug
 	#@perl -pi -e 's/CONFIG_KGDB_KDB=y/# CONFIG_KGDB_KDB is not set/' config-nodebug
diff --git a/config-arm b/config-arm
index 8d7e46a..b10eaf4 100644
--- a/config-arm
+++ b/config-arm
@@ -122,3 +122,8 @@ CONFIG_AUTO_ZRELADDR=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 
 # CONFIG_ARM_SP805_WATCHDOG is not set
+
+CONFIG_PM_OPP=y
+
+CONFIG_SECCOMP=y
+CONFIG_STRICT_DEVMEM=y
diff --git a/config-debug b/config-debug
index 4414453..4e580e2 100644
--- a/config-debug
+++ b/config-debug
@@ -84,7 +84,7 @@ CONFIG_DMADEVICES_VDEBUG=y
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-CONFIG_CEPH_FS_PRETTYDEBUG=y
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
 CONFIG_QUOTA_DEBUG=y
 
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
diff --git a/config-generic b/config-generic
index f834847..b975451 100644
--- a/config-generic
+++ b/config-generic
@@ -3348,6 +3348,8 @@ CONFIG_EXOFS_FS=m
 CONFIG_NILFS2_FS=m
 CONFIG_LOGFS=m
 CONFIG_CEPH_FS=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_CEPH_LIB=m
 
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
@@ -4334,3 +4336,7 @@ CONFIG_IR_STREAMZAP=m
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_TPS6586X is not set
+
+CONFIG_SPARSE_RCU_POINTER=y
+
+# CONFIG_PM_OPP is not set
diff --git a/config-nodebug b/config-nodebug
index d2288c5..c70de44 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -84,7 +84,7 @@ CONFIG_DMADEVICES_VDEBUG=y
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-CONFIG_CEPH_FS_PRETTYDEBUG=y
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
 CONFIG_QUOTA_DEBUG=y
 
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
diff --git a/config-s390x b/config-s390x
index d929402..729131a 100644
--- a/config-s390x
+++ b/config-s390x
@@ -228,3 +228,5 @@ CONFIG_SMSGIUCV_EVENT=m
 CONFIG_VMCP=y
 
 CONFIG_ZFCP_DIF=y
+
+CONFIG_SCHED_BOOK=y
diff --git a/config-x86-generic b/config-x86-generic
index ba39935..616fae9 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -507,3 +507,8 @@ CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_IDEAPAD_ACPI=m
 CONFIG_INTEL_IPS=m
 
+CONFIG_OLPC_XO1=m
+
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_X86_RESERVE_LOW=64
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 713c7ef..069aaf5 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -419,3 +419,7 @@ CONFIG_XEN_PLATFORM_PCI=m
 # CONFIG_ACPI_QUICKSTART is not set
 CONFIG_IDEAPAD_ACPI=m
 CONFIG_INTEL_IPS=m
+
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_X86_RESERVE_LOW=64
diff --git a/kernel.spec b/kernel.spec
index 3cfabdc..758ae52 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 # Save original buildid for later if it's defined
 %if 0%{?buildid:1}
@@ -82,9 +82,9 @@ 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 8
+%define rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -680,8 +680,6 @@ Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch
 #Patch2916: lirc-staging-2.6.36-fixes.patch
 Patch2917: hdpvr-ir-enable.patch
 
-Patch3000: linux-2.6-rcu-sched-warning.patch
-
 # fs fixes
 
 # NFSv4
@@ -1298,9 +1296,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
 
-# silence another rcu_reference warning
-ApplyPatch linux-2.6-rcu-sched-warning.patch
-
 # Patches headed upstream
 ApplyPatch disable-i8042-check-on-apple-mac.patch
 
@@ -1952,6 +1947,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Fri Oct 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc0.git2
+- Switch to tracking git snapshots of what will become 2.6.37.
+- Fix context rejects in utrace and a few other patches.
+
 * Wed Oct 20 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.36-1
 - Linux 2.6.36
 
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index e36bb5e..582ce62 100644
--- a/linux-2.6-i386-nx-emulation.patch
+++ b/linux-2.6-i386-nx-emulation.patch
@@ -394,8 +394,8 @@
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -6,6 +6,7 @@
- #include <linux/interrupt.h>
  #include <linux/module.h>
+ #include <linux/cpu.h>
  
 +#include <asm/desc.h>
  #include <asm/tlbflush.h>
diff --git a/linux-2.6-utrace.patch b/linux-2.6-utrace.patch
index a12357e..d9f81cd 100644
--- a/linux-2.6-utrace.patch
+++ b/linux-2.6-utrace.patch
@@ -1636,9 +1636,9 @@ index 2de5b1c..a283086 100644
 +	  kernel interface exported to kernel modules, to track events in
 +	  user threads, extract and change user thread state.
 +
- menu "RCU Subsystem"
+ source "kernel/irq/Kconfig"
  
- choice
+ menu "RCU Subsystem"
 diff --git a/kernel/Makefile b/kernel/Makefile
 index 0b72d1a..6004913 100644  
 --- a/kernel/Makefile


More information about the scm-commits mailing list