Mon Oct 22 05:47:21 UTC 2007

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30001

Modified Files:
	.cvsignore config-generic config-x86-generic 
	config-x86_64-generic kernel.spec 
	linux-2.6-debug-spinlock-taint.patch linux-2.6-devmem.patch 
	linux-2.6-execshield.patch sources upstream 
Added Files:
	patch-2.6.23-git17.bz2.sign 
Removed Files:
	linux-2.6-acpi-git-ec-init-fixes.patch 
	linux-2.6-pmtrace-time-fix.patch 
	linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch 
	patch-2.6.23-git12.bz2.sign 
Log Message:
* Mon Oct 22 2007 Dave Jones <davej at redhat.com>
- 2.6.23-git17

--- NEW FILE patch-2.6.23-git17.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBHG6L5yGugalF9Dw4RAm0xAJwJYr/rSAkEU8hM3IDQEKQhEJrOJACfXoYT
DRsSeoouqtiS/uBoSs4EsNQ=
=W4Es
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -r1.708 -r1.709
--- .cvsignore	17 Oct 2007 23:00:27 -0000	1.708
+++ .cvsignore	22 Oct 2007 05:46:46 -0000	1.709
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.23
 linux-2.6.23.tar.bz2
-patch-2.6.23-git12.bz2
+patch-2.6.23-git17.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-generic	17 Oct 2007 23:00:27 -0000	1.32
+++ config-generic	22 Oct 2007 05:46:46 -0000	1.33
@@ -604,8 +604,10 @@
 CONFIG_DM_MIRROR=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_HP=m
 CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_UEVENT=y
 CONFIG_DM_ZERO=m
 
 #
@@ -736,6 +738,7 @@
 
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
+CONFIG_NET_9P_FD=m
 
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
@@ -3055,6 +3058,12 @@
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 
 CONFIG_CPUSETS=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_PROC_PID_CPUSET=y
+
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 # CONFIG_PRINTK_TIME is not set
@@ -3302,6 +3311,7 @@
 CONFIG_UIO_CIF=m
 
 CONFIG_INSTRUMENTATION=y
+CONFIG_MARKERS=y
 # CONFIG_CRC7 is not set
 
 CONFIG_DEFAULT_RELATIME=y
@@ -3325,3 +3335,5 @@
 CONFIG_LIRC_STREAMZAP=m
 CONFIG_LIRC_TTUSBIR=m
 
+# CONFIG_SAMPLES is not set
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-x86-generic	17 Oct 2007 23:00:27 -0000	1.15
+++ config-x86-generic	22 Oct 2007 05:46:46 -0000	1.16
@@ -61,7 +61,6 @@
 CONFIG_X86_MCE_P4THERMAL=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
-CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_MICROCODE=m
@@ -149,7 +148,6 @@
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_PNPACPI=y
 
-CONFIG_ASUS_LAPTOP=m
 
 #
 # CPUFreq processor drivers
@@ -304,7 +302,11 @@
 # CONFIG_COMPAT_VDSO is not set
 
 # CONFIG_SGI_IOC4 is not set
+
+CONFIG_ASUS_LAPTOP=m
+CONFIG_FUJITSU_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-x86_64-generic	17 Oct 2007 23:00:27 -0000	1.12
+++ config-x86_64-generic	22 Oct 2007 05:46:46 -0000	1.13
@@ -86,6 +86,7 @@
 CONFIG_ACPI_PROC_EVENT=y
 
 CONFIG_ASUS_LAPTOP=m
+CONFIG_FUJITSU_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- kernel.spec	19 Oct 2007 01:46:04 -0000	1.224
+++ kernel.spec	22 Oct 2007 05:46:46 -0000	1.225
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 12
+%define gitrev 17
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -574,7 +574,6 @@
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch131: linux-2.6-pmac-zilog.patch
 Patch135: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
-Patch136: linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
 Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 
@@ -613,8 +612,6 @@
 Patch692: linux-2.6-zd1211rw-mac80211.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
-Patch750: linux-2.6-acpi-git-ec-init-fixes.patch
-Patch770: linux-2.6-pmtrace-time-fix.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
 Patch1100: linux-2.6-add-mmf_dump_elf_headers.patch
@@ -989,7 +986,6 @@
 #ApplyPatch linux-2.6-powerpc-spu-vicinity.patch
 # Suspend through /sys/power/state
 ApplyPatch linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
-ApplyPatch linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 
@@ -1074,7 +1070,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # wireless patches headed for 2.6.24
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.25
 ApplyPatch linux-2.6-rt2x00-updates.patch
 ApplyPatch linux-2.6-wireless-round_jiffies_relative.patch
@@ -1090,12 +1086,6 @@
 # debug the SSB driver
 ApplyPatch linux-2.6-drivers-ssb-debug-revision.patch
 
-# ACPI/PM patches
-# fix EC init
-ApplyPatch linux-2.6-acpi-git-ec-init-fixes.patch
-# fix date/time display when using PM_TRACE
-ApplyPatch linux-2.6-pmtrace-time-fix.patch
-
 ApplyPatch linux-2.6-wakeups.patch
 
 # implement smarter atime updates support.
@@ -1684,8 +1674,20 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
-
+#                    ____ _____ ___  ____  _ 
+#                   / ___|_   _/ _ \|  _ \| |
+#                   \___ \ | || | | | |_) | |
+#                    ___) || || |_| |  __/|_|
+#                   |____/ |_| \___/|_|   (_)
+#                           
+# Builds to rawhide aren't happening yet, so if you're committing here,
+# you're probably committing to the wrong place.
+# Checkout F-8/ and commit there.
+#
 %changelog
+* Mon Oct 22 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-git17
+
 * Thu Oct 18 2007 John W. Linville <linville at redhat.com>
 - Latest wireless updates from upstream
 - Update rt2x00 to 2.0.11

linux-2.6-debug-spinlock-taint.patch:

Index: linux-2.6-debug-spinlock-taint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-debug-spinlock-taint.patch	28 May 2007 03:29:08 -0000	1.7
+++ linux-2.6-debug-spinlock-taint.patch	22 Oct 2007 05:46:46 -0000	1.8
@@ -1,14 +1,14 @@
---- linux-2.6.17.noarch/lib/spinlock_debug.c~	2006-07-04 16:23:43.000000000 -0400
-+++ linux-2.6.17.noarch/lib/spinlock_debug.c	2006-07-04 16:24:45.000000000 -0400
-@@ -57,9 +57,9 @@ static void spin_bug(spinlock_t *lock, c
+--- linux-2.6.23.noarch/lib/spinlock_debug.c~	2007-10-22 01:15:04.000000000 -0400
++++ linux-2.6.23.noarch/lib/spinlock_debug.c	2007-10-22 01:17:03.000000000 -0400
+@@ -58,9 +58,9 @@ static void spin_bug(spinlock_t *lock, c
  
  	if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
  		owner = lock->owner;
 -	printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
 +	printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
  		msg, raw_smp_processor_id(),
--		current->comm, current->pid);
-+		current->comm, current->pid, print_tainted());
+-		current->comm, task_pid_nr(current));
++		current->comm, task_pid_nr(current), print_tainted());
  	printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
  			".owner_cpu: %d\n",
  		lock, lock->magic,
@@ -17,22 +17,22 @@
  			print_once = 0;
  			printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
 -					"%s/%d, %p\n",
-+					"%s/%d, %p [%s]\n",
++					"%s/%d, %p (%s)\n",
  				raw_smp_processor_id(), current->comm,
--				current->pid, lock);
-+				current->pid, lock, print_tainted());
+-				task_pid_nr(current), lock);
++				task_pid_nr(current), lock, print_tainted());
  			dump_stack();
  #ifdef CONFIG_SMP
  			trigger_all_cpu_backtrace();
-@@ -154,9 +154,9 @@ static void rwlock_bug(rwlock_t *lock, c
+@@ -159,9 +159,9 @@ static void rwlock_bug(rwlock_t *lock, c
  	if (!debug_locks_off())
  		return;
  
 -	printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
 +	printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n",
  		msg, raw_smp_processor_id(), current->comm,
--		current->pid, lock);
-+		current->pid, lock, print_tainted());
+-		task_pid_nr(current), lock);
++		task_pid_nr(current), lock, print_tainted());
  	dump_stack();
  }
  

linux-2.6-devmem.patch:

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-devmem.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-devmem.patch	15 Oct 2007 18:36:20 -0000	1.19
+++ linux-2.6-devmem.patch	22 Oct 2007 05:46:46 -0000	1.20
@@ -628,18 +628,22 @@
  }
  
  static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
---- linux-2.6.20.noarch/arch/x86/kernel/machine_kexec_64.c.orig	2007-06-04 15:50:52.000000000 -0400
-+++ linux-2.6.20.noarch/arch/x86/kernel/machine_kexec_64.c	2007-06-04 15:52:14.000000000 -0400
-@@ -236,10 +236,12 @@
-  * Useful for holding code to do something appropriate
-  * after a kernel panic.
-  */
+--- linux-2.6.23.noarch/arch/x86/kernel/setup_32.c~	2007-10-22 01:29:17.000000000 -0400
++++ linux-2.6.23.noarch/arch/x86/kernel/setup_32.c	2007-10-22 01:29:41.000000000 -0400
+@@ -391,12 +391,16 @@ static inline unsigned long long get_tot
+ }
+ 
+ #ifdef CONFIG_KEXEC
 +extern int allow_kcore_access;
- static int __init setup_crashkernel(char *arg)
++
+ static void __init reserve_crashkernel(void)
  {
- 	unsigned long size, base;
- 	char *p;
-+	allow_kcore_access = 1; /*enable ability to read /proc/kcore*/
- 	if (!arg)
- 		return -EINVAL;
- 	size = memparse(arg, &p);
+ 	unsigned long long total_mem;
+ 	unsigned long long crash_size, crash_base;
+ 	int ret;
+ 
++	allow_kcore_access = 1;	/*enable ability to read /proc/kcore*/
++
+ 	total_mem = get_total_mem();
+ 
+ 	ret = parse_crashkernel(boot_command_line, total_mem,

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- linux-2.6-execshield.patch	17 Oct 2007 23:00:27 -0000	1.75
+++ linux-2.6-execshield.patch	22 Oct 2007 05:46:46 -0000	1.76
@@ -598,15 +598,15 @@
 ===================================================================
 --- linux-2.6.orig/arch/x86/ia32/ia32_binfmt.c
 +++ linux-2.6/arch/x86/ia32/ia32_binfmt.c
-@@ -251,8 +251,6 @@ elf_core_copy_task_xfpregs(struct task_s
+@@ -167,8 +167,6 @@ elf32_core_copy_task_xfpregs(struct task
  #define elf_check_arch(x) \
  	((x)->e_machine == EM_386)
  
 -extern int force_personality32;
 -
- #define ELF_EXEC_PAGESIZE PAGE_SIZE
- #define ELF_HWCAP (boot_cpu_data.x86_capability[0])
- #define ELF_PLATFORM  ("i686")
+ #undef	ELF_EXEC_PAGESIZE
+ #undef	ELF_HWCAP
+ #undef	ELF_PLATFORM
 @@ -266,8 +264,6 @@ do {							\
  		set_thread_flag(TIF_ABI_PENDING);		\
  	else							\
@@ -1093,10 +1093,8 @@
 +extern void randomize_brk(unsigned long old_brk);
 +
  #endif
-Index: linux-2.6/include/asm-i386/mmu.h
-===================================================================
---- linux-2.6.orig/include/asm-x86/mmu_32.h
-+++ linux-2.6/include/asm-x86/mmu_32.h
+--- linux-2.6.23.noarch/include/asm-x86/mmu_32.h~	2007-10-18 21:51:29.000000000 -0400
++++ linux-2.6.23.noarch/include/asm-x86/mmu_32.h	2007-10-18 21:51:55.000000000 -0400
 @@ -7,11 +7,15 @@
   * we put the segment information here.
   *
@@ -1106,7 +1104,7 @@
   */
  typedef struct { 
  	int size;
- 	struct semaphore sem;
+ 	struct mutex lock;
  	void *ldt;
 +	struct desc_struct user_cs;
 +	unsigned long exec_limit;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -r1.669 -r1.670
--- sources	17 Oct 2007 23:00:27 -0000	1.669
+++ sources	22 Oct 2007 05:46:46 -0000	1.670
@@ -1,2 +1,2 @@
 2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
-f24e83307823598652be5016850bb059  patch-2.6.23-git12.bz2
+aacd986e421cd3bafb8250da959946d1  patch-2.6.23-git17.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.591
retrieving revision 1.592
diff -u -r1.591 -r1.592
--- upstream	17 Oct 2007 23:00:27 -0000	1.591
+++ upstream	22 Oct 2007 05:46:46 -0000	1.592
@@ -1,2 +1,2 @@
 linux-2.6.23.tar.bz2
-patch-2.6.23-git12.bz2
+patch-2.6.23-git17.bz2


--- linux-2.6-acpi-git-ec-init-fixes.patch DELETED ---


--- linux-2.6-pmtrace-time-fix.patch DELETED ---


--- linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch DELETED ---


--- patch-2.6.23-git12.bz2.sign DELETED ---


