Fri May 16 21:07:36 UTC 2008

Author: davej

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

Modified Files:
	.cvsignore Makefile config-debug config-generic 
	config-ia64-generic config-nodebug config-powerpc32-generic 
	config-powerpc64 config-s390x config-sparc64-generic 
	config-x86-generic config-x86_64-generic config-xen-generic 
	kernel.spec linux-2.6-acpi-eeepc-hotkey.patch 
	linux-2.6-alsa-kill-annoying-messages.patch 
	linux-2.6-e1000-ich9.patch linux-2.6-execshield.patch 
	linux-2.6-silence-noise.patch linux-2.6-utrace.patch sources 
	upstream 
Added Files:
	patch-2.6.26-rc2-git5.bz2.sign 
Removed Files:
	linux-2.6-devmem.patch linux-2.6-ext34-xattr-fix.patch 
	linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch 
	linux-2.6-libata-ata_piix-check-sidpr.patch 
	linux-2.6-rt2x00-configure_filter.patch 
	linux-2.6-smp-boot-delay.patch 
	linux-2.6-windfarm-pm121-fix.patch 
	linux-2.6-windfarm-pm121.patch 
	linux-2.6.25-sparc64-semctl.patch 
Log Message:
Put the 'raw' back into rawhide.
2.6.26-rc2-git5.
Lots of stuff temporarily disabled.  Execshield may need more love.

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

iD8DBQBILTIlyGugalF9Dw4RAlO7AJ0beWUbLlLJbBecdYxt9OP7qVRjrgCgjoii
Trv852JttA0v4haOMk/MqzE=
=FdZq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- .cvsignore	12 May 2008 15:11:04 -0000	1.812
+++ .cvsignore	16 May 2008 21:06:38 -0000	1.813
@@ -5,3 +5,5 @@
 kernel-2.6.25
 linux-2.6.25.tar.bz2
 patch-2.6.25.3.bz2
+patch-2.6.26-rc2.bz2
+patch-2.6.26-rc2-git5.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Makefile	10 Apr 2008 15:24:50 -0000	1.70
+++ Makefile	16 May 2008 21:06:38 -0000	1.71
@@ -59,6 +59,11 @@
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_USB_DEBUG is not set/CONFIG_USB_DEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_WRITECOUNT is not set/CONFIG_DEBUG_WRITECOUNT=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS is not set/CONFIG_DEBUG_OBJECTS=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_FREE is not set/CONFIG_DEBUG_OBJECTS_FREE=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 
@@ -86,13 +91,18 @@
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_USB_DEBUG=y/# CONFIG_USB_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_WRITECOUNT=y/# CONFIG_DEBUG_WRITECOUNT is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS=y/# CONFIG_DEBUG_OBJECTS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_FREE=y/# CONFIG_DEBUG_OBJECTS_FREE is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.25" make -f Makefile.config configs
+	@VERSION="2.6.26" make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 # since i386 isn't a target...


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-debug	27 Mar 2008 20:25:45 -0000	1.10
+++ config-debug	16 May 2008 21:06:38 -0000	1.11
@@ -32,3 +32,11 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_USB_DEBUG=y
+
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+
+CONFIG_X86_PTDUMP=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- config-generic	18 Apr 2008 18:59:32 -0000	1.98
+++ config-generic	16 May 2008 21:06:38 -0000	1.99
@@ -61,6 +61,7 @@
 #
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 CONFIG_MODULE_SRCVERSION_ALL=y
@@ -155,6 +156,7 @@
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_AR7_PARTS=m
 CONFIG_MTD_CONCAT=m
 CONFIG_MTD_CMDLINE_PARTS=y
 #
@@ -487,13 +489,16 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
+CONFIG_ATA_SFF=y
 CONFIG_ATA_PIIX=m
+CONFIG_ATA_ACPI=y
 CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
+CONFIG_SATA_PMP=y
 CONFIG_SATA_PROMISE=m
 CONFIG_SATA_QSTOR=m
 CONFIG_SATA_SIL=m
@@ -547,6 +552,7 @@
 # CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SCH=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_SIS=m
 CONFIG_PATA_TRIFLEX=m
@@ -555,7 +561,7 @@
 
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_FLASHPOINT=y
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_EATA_PIO is not set
@@ -747,6 +753,8 @@
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_PIMSM_V2=y
 
 CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
@@ -834,6 +842,7 @@
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_SCTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -891,25 +900,26 @@
 # Bridge: Netfilter Configuration
 #
 CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_DNAT=m
 CONFIG_BRIDGE_EBT_IP=m
 CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
 CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_XFRM=y
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_SUB_POLICY=y
@@ -1190,6 +1200,7 @@
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
+CONFIG_SFC=m
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1277,6 +1288,7 @@
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_DEBUG=y
+# CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
@@ -1300,11 +1312,12 @@
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_DEBUG=y
-CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLCORE_RFKILL=y
-CONFIG_IWL4965=m
+CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_RFKILL=y
+CONFIG_IWL4965=m
 CONFIG_IWL4965_SENSITIVITY=y
 CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y
 CONFIG_IWL4965_QOS=y
@@ -1682,6 +1695,7 @@
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_ZHENHUA=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -1693,6 +1707,7 @@
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
@@ -1806,6 +1821,7 @@
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PIIX4 is not set
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
@@ -2047,7 +2063,7 @@
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_ALLOW_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_VIVI is not set
@@ -2063,6 +2079,7 @@
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
@@ -2080,6 +2097,7 @@
 CONFIG_VIDEO_CX25840=m
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_CX18=m
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_ALSA=m
@@ -2088,6 +2106,7 @@
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_IVTV=m
@@ -2097,6 +2116,7 @@
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y
 CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y
 CONFIG_VIDEO_SAA5246A=m
@@ -2150,6 +2170,8 @@
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 
+CONFIG_MEDIA_ATTACH=y
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 
 #
 # Digital Video Broadcasting Devices
@@ -2163,11 +2185,13 @@
 #
 # Supported Frontend Modules
 #
+CONFIG_DVB_AU8522=m
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_CX24110=m
+CONFIG_DVB_ISL6405=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_MT312=m
@@ -2265,6 +2289,7 @@
 
 CONFIG_FB=y
 CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_ACCEL=y
 # CONFIG_FB_ARC is not set
@@ -2408,6 +2433,7 @@
 CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
@@ -2531,6 +2557,7 @@
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_ISD200=y
@@ -2558,6 +2585,7 @@
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
@@ -2674,6 +2702,7 @@
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_OTI6858=m
@@ -2682,6 +2711,7 @@
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=y
+CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -2706,6 +2736,7 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_CXACRU=m
+# CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_EMI26=m
 CONFIG_USB_ETH=m
@@ -2717,7 +2748,8 @@
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_ISP116X_HCD=m
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
@@ -2793,6 +2825,7 @@
 CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 CONFIG_XFS_FS=m
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_XFS_RT is not set
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -2924,6 +2957,8 @@
 CONFIG_OCFS2_FS=m
 # CONFIG_OCFS2_DEBUG_FS is not set
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
@@ -3009,6 +3044,7 @@
 # Kernel hacking
 #
 CONFIG_DEBUG_KERNEL=y
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_INFO=y
 CONFIG_FRAME_POINTER=y
@@ -3023,6 +3059,11 @@
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=m
+CONFIG_KGDB_TESTS=y
+
+# CONFIG_KGDB_TESTS_ON_BOOT is not set
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value
 # from getting out-of-tree modules fixed is worth the trade-off.
@@ -3080,6 +3121,7 @@
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
@@ -3159,6 +3201,7 @@
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_DEVICE=y
 CONFIG_PROC_PID_CPUSET=y
 
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -3362,6 +3405,7 @@
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 CONFIG_DMA_ENGINE=y
 CONFIG_NET_DMA=y
@@ -3400,6 +3444,7 @@
 
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
+CONFIG_UIO_SMX=m
 
 CONFIG_INSTRUMENTATION=y
 CONFIG_MARKERS=y
@@ -3471,3 +3516,13 @@
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+# CONFIG_HTC_PASIC3 is not set
+
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9V022=m
+# MT9V022_PCA9536_SWITCH is not set
+


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-ia64-generic	21 Jan 2008 23:42:51 -0000	1.10
+++ config-ia64-generic	16 May 2008 21:06:38 -0000	1.11
@@ -193,3 +193,11 @@
 CONFIG_SENSORS_I5K_AMB=m
 
 CONFIG_SPARSEMEM_VMEMMAP=y
+
+CONFIG_FRAME_WARN=2048
+
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SGI_XP=m
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-nodebug	8 Apr 2008 02:46:08 -0000	1.12
+++ config-nodebug	16 May 2008 21:06:38 -0000	1.13
@@ -3,31 +3,39 @@
 CONFIG_SND_DEBUG_DETECT=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_IGNORE_QUIET is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
+CONFIG_DEBUG_IGNORE_QUIET=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SPINLOCK=y
+
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 
-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG_ON=y
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
 # CONFIG_ACPI_DEBUG is not set
 
-# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_SG=y
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEBUG=y
+
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+
+CONFIG_X86_PTDUMP=y


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-powerpc32-generic	20 Mar 2008 19:46:01 -0000	1.8
+++ config-powerpc32-generic	16 May 2008 21:06:38 -0000	1.9
@@ -82,6 +82,7 @@
 CONFIG_FEC_MPC52xx=m
 #CHECK: This may later become a tristate.
 CONFIG_FEC_MPC52xx_MDIO=y
+CONFIG_PPC_MPC5200_GPIO=y
 
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_DEBUG_STACKOVERFLOW=y
@@ -103,3 +104,14 @@
 CONFIG_PPC_BESTCOMM_FEC=m
 CONFIG_PPC_BESTCOMM_GEN_BD=m
 
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_PAGE_OFFSET_BOOL is not set
+CONFIG_BLK_DEV_HD_ONLY=y
+# CONFIG_FB_FSL_DIU is not set
+CONFIG_IRQSTACKS=y
+CONFIG_VIRTUALIZATION=y
+
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_HTC_EGPIO is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-powerpc64	23 Mar 2008 12:35:07 -0000	1.13
+++ config-powerpc64	16 May 2008 21:06:38 -0000	1.14
@@ -155,3 +155,10 @@
 CONFIG_SPU_TRACE=m
 CONFIG_MTD_NAND_PASEMI=m
 CONFIG_EDAC_CELL=m
+CONFIG_FRAME_WARN=2048
+
+CONFIG_PHYP_DUMP=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_BLK_DEV_HD_ONLY=y
+CONFIG_VIRTUALIZATION=y
+


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-s390x	12 Feb 2008 06:18:04 -0000	1.4
+++ config-s390x	16 May 2008 21:06:38 -0000	1.5
@@ -198,3 +198,15 @@
 
 # CONFIG_THERMAL is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PAGE_STATES=y
+CONFIG_CTCM=m
+CONFIG_QETH_L2=m
+CONFIG_QETH_L3=m
+CONFIG_CRYPTO_SHA512_S390=m
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_S390_GUEST=y
+


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-sparc64-generic	25 Mar 2008 02:39:31 -0000	1.15
+++ config-sparc64-generic	16 May 2008 21:06:38 -0000	1.16
@@ -183,3 +183,8 @@
 CONFIG_SPARSEMEM_VMEMMAP=y
 
 # CONFIG_THERMAL is not set
+
+CONFIG_FRAME_WARN=2048
+
+CONFIG_NUMA=y
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-x86-generic	1 Apr 2008 17:10:37 -0000	1.32
+++ config-x86-generic	16 May 2008 21:06:38 -0000	1.33
@@ -67,17 +67,20 @@
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
+CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
 
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -327,6 +330,9 @@
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+CONFIG_KVM_TRACE=y
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -347,6 +353,8 @@
 CONFIG_MACINTOSH_DRIVERS=y
 
 CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
 
 CONFIG_VIRTUALIZATION=y
 CONFIG_PARAVIRT_GUEST=y
@@ -365,3 +373,10 @@
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 
 CONFIG_HP_WATCHDOG=m
+
+CONFIG_OLPC=y
+CONFIG_BATTERY_OLPC=m
+
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_NONPROMISC_DEVMEM=y
+


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-x86_64-generic	23 Apr 2008 01:00:01 -0000	1.31
+++ config-x86_64-generic	16 May 2008 21:06:38 -0000	1.32
@@ -25,6 +25,7 @@
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_DMAR=y
@@ -224,6 +225,7 @@
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_KVM_TRACE=y
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -236,6 +238,9 @@
 CONFIG_PROC_VMCORE=y
 
 CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
 
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -257,3 +262,18 @@
 # CONFIG_CPA_DEBUG is not set
 
 CONFIG_HP_WATCHDOG=m
+
+CONFIG_FRAME_WARN=2048
+
+CONFIG_MEMTEST_BOOTPARAM=y
+CONFIG_MEMTEST_BOOTPARAM_VALUE=0
+CONFIG_NODES_SHIFT=9
+CONFIG_X86_PAT=y
+# FIXME: These should be 32bit only
+# CONFIG_EEEPC_LAPTOP is not set
+# CONFIG_FB_N411 is not set
+CONFIG_SND_PCSP=m
+CONFIG_NONPROMISC_DEVMEM=y
+
+CONFIG_DIRECT_GBPAGES=y
+


Index: config-xen-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-xen-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-generic	21 Jan 2008 23:42:51 -0000	1.2
+++ config-xen-generic	16 May 2008 21:06:38 -0000	1.3
@@ -67,3 +67,8 @@
 # CONFIG_KVM_INTEL is not set
 # CONFIG_KVM_AMD is not set
 
+
+CONFIG_XEN_KBDDEV_FRONTEND=m
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_SND_PCSP=m
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- kernel.spec	15 May 2008 21:21:31 -0000	1.633
+++ kernel.spec	16 May 2008 21:06:38 -0000	1.634
@@ -3,7 +3,7 @@
 # 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.
-%define released_kernel 1
+%define released_kernel 0
 
 # Versions of various parts
 
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -103,7 +103,7 @@
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -561,7 +561,7 @@
 
 # we also need compile fixes for -vanilla
 Patch07: linux-2.6-compile-fixes.patch
-Patch08: linux-2.6-compile-fix-gcc-43.patch
+#Patch08: linux-2.6-compile-fix-gcc-43.patch
 
 %if !%{nopatches}
 
@@ -572,7 +572,6 @@
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch75: linux-2.6-x86-debug-boot.patch
-Patch80: linux-2.6-smp-boot-delay.patch
 
 Patch123: linux-2.6-ppc-rtc.patch
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -580,14 +579,10 @@
 Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
-Patch145: linux-2.6-windfarm-pm121.patch
-Patch146: linux-2.6-windfarm-pm121-fix.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
 Patch148: linux-2.6-powerpc-zImage-32MiB.patch
 Patch149: linux-2.6-efika-not-chrp.patch
 
-Patch150: linux-2.6.25-sparc64-semctl.patch
-
 Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
@@ -595,7 +590,6 @@
 Patch280: linux-2.6-debug-spinlock-taint.patch
 Patch330: linux-2.6-debug-no-quiet.patch
 Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
-Patch350: linux-2.6-devmem.patch
 Patch370: linux-2.6-crash-driver.patch
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
@@ -611,11 +605,9 @@
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-libata-force-hardreset-in-sleep-mode.patch
-Patch672: linux-2.6-libata-ata_piix-check-sidpr.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
-Patch683: linux-2.6-rt2x00-configure_filter.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -649,13 +641,6 @@
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
 
-# ext[34] patches
-Patch2100: linux-2.6-ext34-xattr-fix.patch
-
-# linux1394 git patches
-Patch2200: linux-2.6-firewire-git-update.patch
-Patch2201: linux-2.6-firewire-git-pending.patch
-
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 # Fix HID usage descriptor on MS wireless desktop receiver
@@ -1002,7 +987,7 @@
 fi
 
 # build with gcc43
-ApplyPatch linux-2.6-compile-fix-gcc-43.patch
+#ApplyPatch linux-2.6-compile-fix-gcc-43.patch
 
 %if !%{nopatches}
 
@@ -1010,7 +995,7 @@
 
 # Roland's utrace ptrace replacement.
 %ifnarch ia64
-ApplyPatch linux-2.6-utrace.patch
+#ApplyPatch linux-2.6-utrace.patch
 %endif
 
 # enable sysrq-c on all kernels, not only kexec
@@ -1020,44 +1005,37 @@
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
 ApplyPatch linux-2.6-x86-tune-generic.patch
-# Delay longer during boot on x86 while waiting for secondary processors
-ApplyPatch linux-2.6-smp-boot-delay.patch
 
 #
 # PowerPC
 #
-###  UPSTREAM PATCHES FROM 2.6.26 (we think):
 # RTC class driver for ppc_md rtc functions
 ApplyPatch linux-2.6-ppc-rtc.patch
 ### NOT (YET) UPSTREAM:
 # The EHCI ISO patch isn't yet upstream but is needed to fix reboot
-ApplyPatch linux-2.6-ps3-ehci-iso.patch
+#ApplyPatch linux-2.6-ps3-ehci-iso.patch
 # Fixes some wireless optical mice
-ApplyPatch linux-2.6-ms-wireless-receiver.patch
+#ApplyPatch linux-2.6-ms-wireless-receiver.patch
 # The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
 # module name to work on upgrades. Otherwise, I believe mkinitrd will fail
 # to pull the module in,
 ApplyPatch linux-2.6-ps3-storage-alias.patch
 # Support booting from Sony's original released 2.6.16-based kboot
-ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
+#ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
 # Alleviate G5 thermal shutdown problems
 ApplyPatch linux-2.6-g5-therm-shutdown.patch
 # Provide modalias in sysfs for vio devices
 ApplyPatch linux-2.6-vio-modalias.patch
-# Fan support on iMac G5 iSight
-ApplyPatch linux-2.6-windfarm-pm121.patch
-ApplyPatch linux-2.6-windfarm-pm121-fix.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
 # Link zImage at 32MiB (for POWER machines, Efika)
 ApplyPatch linux-2.6-powerpc-zImage-32MiB.patch
 # Don't show 'CHRP' in /proc/cpuinfo on Efika
-ApplyPatch linux-2.6-efika-not-chrp.patch
+#ApplyPatch linux-2.6-efika-not-chrp.patch
 
 #
 # SPARC64
 #
-ApplyPatch linux-2.6.25-sparc64-semctl.patch
 
 #
 # Exec shield
@@ -1086,11 +1064,6 @@
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 
 #
-# Make /dev/mem a need-to-know function
-#
-ApplyPatch linux-2.6-devmem.patch
-
-#
 # /dev/crash driver for the crashdump analysis tool
 #
 ApplyPatch linux-2.6-crash-driver.patch
@@ -1143,26 +1116,22 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # wake up links that have been put to sleep by BIOS (#436099)
 ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch
-# fix broken drive detection on some macbooks (#439398)
-ApplyPatch linux-2.6-libata-ata_piix-check-sidpr.patch
 
 # Allow selinux to defer validation of contexts, aka: rpm can write illegal labels
-ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch
-ApplyPatch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch
-ApplyPatch linux-2.6-selinux-generic-ioctl.patch
+#ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch
+#ApplyPatch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch
+#ApplyPatch linux-2.6-selinux-generic-ioctl.patch
 
 # wireless patches headed for 2.6.26
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.27
 #ApplyPatch linux-2.6-wireless-pending.patch
-# rt2x00 configure_filter fix to avoid endless loop on insert for USB devices
-ApplyPatch linux-2.6-rt2x00-configure_filter.patch
 
 # Add misc wireless bits from upstream wireless tree
-ApplyPatch linux-2.6-at76.patch
+#ApplyPatch linux-2.6-at76.patch
 
 # implement smarter atime updates support.
-ApplyPatch linux-2.6-smarter-relatime.patch
+#ApplyPatch linux-2.6-smarter-relatime.patch
 
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
@@ -1177,38 +1146,34 @@
 
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 
-ApplyPatch linux-2.6-netdev-atl2.patch
-
-# ext[34] fixes
-ApplyPatch linux-2.6-ext34-xattr-fix.patch
+#ApplyPatch linux-2.6-netdev-atl2.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch linux-2.6-drm-git-mm.patch
-ApplyPatch nouveau-drm.patch
-ApplyPatch nouveau-drm-update.patch
-ApplyPatch linux-2.6-drm-i915-modeset.patch
-ApplyPatch linux-2.6-drm-radeon-fix-oops.patch
-ApplyPatch linux-2.6-drm-radeon-fix-oops2.patch
-ApplyPatch linux-2.6-drm-modesetting-oops-fixes.patch
-ApplyPatch linux-2.6-drm-fix-master-perm.patch
+#ApplyPatch linux-2.6-drm-git-mm.patch
+#ApplyPatch nouveau-drm.patch
+#ApplyPatch nouveau-drm-update.patch
+#ApplyPatch linux-2.6-drm-i915-modeset.patch
+#ApplyPatch linux-2.6-drm-radeon-fix-oops.patch
+#ApplyPatch linux-2.6-drm-radeon-fix-oops2.patch
+#ApplyPatch linux-2.6-drm-modesetting-oops-fixes.patch
+#ApplyPatch linux-2.6-drm-fix-master-perm.patch
 
 # ext4dev stable patch queue, slated for 2.6.25
 #ApplyPatch linux-2.6-ext4-stable-queue.patch
 
 # linux1394 git patches
-ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-firewire-git-pending.patch
-fi
+#C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
+#if [ "$C" -gt 10 ]; then
+#ApplyPatch linux-2.6-firewire-git-pending.patch
+#fi
 
 # usb video
-ApplyPatch linux-2.6-uvcvideo.patch
+#ApplyPatch linux-2.6-uvcvideo.patch
 
 ApplyPatch linux-2.6-ppc-use-libgcc.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
-ApplyPatch linux-2.6-merge-efifb-imacfb.patch
+#ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
 
@@ -1803,6 +1768,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri May 16 2008 Dave Jones <davej at redhat.com>
+- 2.6.26-rc2-git5
+
 * Thu May 15 2008 Eric Sandeen <esandeen at redhat.com>
 - ext3/4: fix uninitialized bs in ext3/4_xattr_set_handle()
 

linux-2.6-acpi-eeepc-hotkey.patch:

Index: linux-2.6-acpi-eeepc-hotkey.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-acpi-eeepc-hotkey.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-acpi-eeepc-hotkey.patch	12 Feb 2008 06:18:04 -0000	1.2
+++ linux-2.6-acpi-eeepc-hotkey.patch	16 May 2008 21:06:38 -0000	1.3
@@ -7,34 +7,31 @@
  3 files changed, 458 insertions(+), 0 deletions(-)
  create mode 100644 drivers/misc/eeepc.c
 
-diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index b1f9a40..8fd1ccb 100644
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -251,4 +251,14 @@ config ATMEL_SSC
- 	  driver (SCSI/ATA) which supports enclosures
- 	  or a SCSI enclosure device (SES) to use these services.
+--- linux-2.6.25.noarch/drivers/misc/Kconfig~	2008-05-16 10:23:32.000000000 -0400
++++ linux-2.6.25.noarch/drivers/misc/Kconfig	2008-05-16 10:24:07.000000000 -0400
+@@ -391,4 +391,14 @@ config SGI_XP
+ 	  this feature will allow for direct communication between SSIs
+ 	  based on a network adapter and DMA messaging.
  
 +config EEEPC
-+        tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
-+        depends on X86
-+        depends on ACPI
++	tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
++	depends on X86
++	depends on ACPI
 +	depends on EXPERIMENTAL && !ACPI_ASUS
-+        ---help---
++	---help---
 +	  This driver supports the Fn-Fx keys on Eee PC laptops.
 +
 +	  If you have an Eee PC laptop, say Y or M here.
 +
  endif # MISC_DEVICES
-diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index 87f2685..699b35c 100644
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o
- obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
- obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o
+--- linux-2.6.25.noarch/drivers/misc/Makefile~	2008-05-16 10:24:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/misc/Makefile	2008-05-16 10:24:22.000000000 -0400
+@@ -26,3 +26,5 @@ obj-$(CONFIG_INTEL_MENLOW)	+= intel_menl
  obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
+ obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o
+ obj-$(CONFIG_SGI_XP)		+= sgi-xp/
 +obj-$(CONFIG_EEEPC)		+= eeepc.o
++
 diff --git a/drivers/misc/eeepc.c b/drivers/misc/eeepc.c
 new file mode 100644
 index 0000000..2e33117

linux-2.6-alsa-kill-annoying-messages.patch:

Index: linux-2.6-alsa-kill-annoying-messages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-alsa-kill-annoying-messages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-alsa-kill-annoying-messages.patch	12 Mar 2008 19:18:33 -0000	1.1
+++ linux-2.6-alsa-kill-annoying-messages.patch	16 May 2008 21:06:38 -0000	1.2
@@ -42,16 +42,14 @@
  	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,
  			    (stream_tag << 4) | channel_id);
  	msleep(1);
-diff -upNr linux-2.6.24.2.orign/sound/pci/hda/hda_intel.c linux-2.6.24.2/sound/pci/hda/hda_intel.c
---- linux-2.6.24.2.orign/sound/pci/hda/hda_intel.c    2008-02-11 06:51:11.000000000 +0100
-+++ linux-2.6.24.2/sound/pci/hda/hda_intel.c    2008-02-17 11:10:16.000000000 +0100
-@@ -1249,9 +1249,6 @@ static int azx_pcm_prepare(struct snd_pc
+--- linux-2.6.25.noarch/sound/pci/hda/hda_intel.c~	2008-05-16 10:25:32.000000000 -0400
++++ linux-2.6.25.noarch/sound/pci/hda/hda_intel.c	2008-05-16 10:25:57.000000000 -0400
+@@ -1314,8 +1314,6 @@ static int azx_pcm_prepare(struct snd_pc
  		return -EINVAL;
  	}
  
--	snd_printdd("azx_pcm_prepare: bufsize=0x%x, fragsize=0x%x, "
--		    "format=0x%x\n",
--		    azx_dev->bufsize, azx_dev->fragsize, azx_dev->format_val);
- 	azx_setup_periods(azx_dev);
+-	snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
+-		    azx_dev->bufsize, azx_dev->format_val);
+ 	if (azx_setup_periods(substream, azx_dev) < 0)
+ 		return -EINVAL;
  	azx_setup_controller(chip, azx_dev);
- 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

linux-2.6-e1000-ich9.patch:

Index: linux-2.6-e1000-ich9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-e1000-ich9.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-e1000-ich9.patch	26 Feb 2008 20:24:16 -0000	1.3
+++ linux-2.6-e1000-ich9.patch	16 May 2008 21:06:38 -0000	1.4
@@ -15,15 +15,13 @@
  	case IGP03E1000_E_PHY_ID:
  		phy->type = e1000_phy_igp_3;
  		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
-index 3031d6d..932b4d8 100644
---- a/drivers/net/e1000e/netdev.c
-+++ b/drivers/net/e1000e/netdev.c
-@@ -4095,6 +4095,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
+--- linux-2.6.25.noarch/drivers/net/e1000e/netdev.c~	2008-05-16 10:31:41.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/e1000e/netdev.c	2008-05-16 10:32:43.000000000 -0400
+@@ -4599,6 +4599,7 @@ static struct pci_device_id e1000_pci_tb
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
 +	{ PCI_VDEVICE(INTEL, 0x10be), board_ich9lan },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
  
- 	{ }	/* terminate list */
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },

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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- linux-2.6-execshield.patch	18 Feb 2008 19:55:06 -0000	1.87
+++ linux-2.6-execshield.patch	16 May 2008 21:06:38 -0000	1.88
@@ -1,8 +1,6 @@
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index f86a3c4..4c5f70d 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -478,6 +478,20 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+--- linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c~	2008-05-16 13:41:08.000000000 -0400
++++ linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c	2008-05-16 13:42:11.000000000 -0400
+@@ -479,6 +479,21 @@ void __cpuinit identify_cpu(struct cpuin
  	 * we do "generic changes."
  	 */
  
@@ -20,8 +18,9 @@
 +			clear_bit(X86_FEATURE_SEP, c->x86_capability);
 +	}
 +
++
  	/* If the model name is still unset, do table lookup. */
- 	if ( !c->x86_model_id[0] ) {
+ 	if (!c->x86_model_id[0]) {
  		char *p;
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
 index a7d50a5..83f7b4e 100644
@@ -81,70 +80,17 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
-diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
-index 309366f..8a940dc 100644
---- a/arch/x86/kernel/setup64.c
-+++ b/arch/x86/kernel/setup64.c
-@@ -45,46 +45,6 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask);
- 
- static int do_not_nx __cpuinitdata = 0;
+--- linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c~	2008-05-16 13:30:44.000000000 -0400
++++ linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c	2008-05-16 13:31:14.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <linux/cpu.h>
+ #include <linux/interrupt.h>
  
--/* noexec=on|off
--Control non executable mappings for 64bit processes.
--
--on	Enable(default)
--off	Disable
--*/ 
--static int __init nonx_setup(char *str)
--{
--	if (!str)
--		return -EINVAL;
--	if (!strncmp(str, "on", 2)) {
--                __supported_pte_mask |= _PAGE_NX; 
-- 		do_not_nx = 0; 
--	} else if (!strncmp(str, "off", 3)) {
--		do_not_nx = 1;
--		__supported_pte_mask &= ~_PAGE_NX;
--        }
--	return 0;
--} 
--early_param("noexec", nonx_setup);
--
--int force_personality32 = 0; 
--
--/* noexec32=on|off
--Control non executable heap for 32bit processes.
--To control the stack too use noexec=off
--
--on	PROT_READ does not imply PROT_EXEC for 32bit processes
--off	PROT_READ implies PROT_EXEC (default)
--*/
--static int __init nonx32_setup(char *str)
--{
--	if (!strcmp(str, "on"))
--		force_personality32 &= ~READ_IMPLIES_EXEC;
--	else if (!strcmp(str, "off"))
--		force_personality32 |= READ_IMPLIES_EXEC;
--	return 1;
--}
--__setup("noexec32=", nonx32_setup);
--
- /*
-  * Copy data used in early init routines from the initial arrays to the
-  * per cpu data areas.  These arrays then become expendable and the
-diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
-index dc0cde9..cca75b4 100644
---- a/arch/x86/kernel/smp_32.c
-+++ b/arch/x86/kernel/smp_32.c
-@@ -22,6 +22,7 @@
- 
- #include <asm/mtrr.h>
- #include <asm/tlbflush.h>
 +#include <asm/desc.h>
- #include <asm/mmu_context.h>
- #include <mach_apic.h>
+ #include <asm/tlbflush.h>
  
-@@ -316,6 +317,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+ DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
+@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -153,15 +99,13 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
-index b22c01e..7e196e4 100644
---- a/arch/x86/kernel/traps_32.c
-+++ b/arch/x86/kernel/traps_32.c
-@@ -592,7 +592,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
+--- linux-2.6.25.noarch/arch/x86/kernel/traps_32.c~	2008-05-16 13:43:36.000000000 -0400
++++ linux-2.6.25.noarch/arch/x86/kernel/traps_32.c	2008-05-16 13:48:08.000000000 -0400
+@@ -602,13 +602,97 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
  DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
--DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
+-DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
 +
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
@@ -236,35 +180,33 @@
 +	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
 +	put_cpu();
 +	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
-+	    error_code, 32, SIGSEGV) != NOTIFY_STOP) {
-+		siginfo_t info;
-+		info.si_signo = SIGSEGV;
-+		info.si_errno = 0;
-+		info.si_code = ILL_BADSTK;
-+		info.si_addr = 0;
-+		do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
-+			&info);
++		error_code, 32, SIGSEGV) != NOTIFY_STOP) {
++			siginfo_t info;
++			info.si_signo = SIGSEGV;
++			info.si_errno = 0;
++			info.si_code = ILL_BADSTK;
++			info.si_addr = 0;
++			do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
++				&info);
 +	}
 +}
-+
  
- void __kprobes do_general_protection(struct pt_regs * regs,
- 					      long error_code)
-@@ -600,6 +684,7 @@ void __kprobes do_general_protection(struct pt_regs * regs,
- 	int cpu = get_cpu();
- 	struct tss_struct *tss = &per_cpu(init_tss, cpu);
- 	struct thread_struct *thread = &current->thread;
+ void __kprobes do_general_protection(struct pt_regs *regs, long error_code)
+ {
+ 	struct thread_struct *thread;
+ 	struct tss_struct *tss;
+ 	int cpu;
 +	int ok;
  
- 	/*
- 	 * Perform the lazy TSS's I/O bitmap copy. If the TSS has an
-@@ -626,7 +711,6 @@ void __kprobes do_general_protection(struct pt_regs * regs,
- 		put_cpu();
+ 	cpu = get_cpu();
+ 	tss = &per_cpu(init_tss, cpu);
+@@ -641,7 +725,6 @@ void __kprobes do_general_protection(str
+ 
  		return;
  	}
 -	put_cpu();
  
- 	if (regs->flags & VM_MASK)
+ 	if (regs->flags & X86_VM_MASK)
  		goto gp_in_vm86;
 @@ -634,6 +718,22 @@ void __kprobes do_general_protection(struct pt_regs * regs,
  	if (!user_mode(regs))
@@ -407,7 +349,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -728,6 +735,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -721,6 +721,15 @@ static int load_elf_binary(struct linux_
  	if (retval)
  		goto out_free_dentry;
  
@@ -420,9 +362,9 @@
 +		arch_add_exec_range(current->mm, -1);
 +#endif
 +
- 	/* Discard our unneeded old files struct */
- 	if (files) {
- 		put_files_struct(files);
+ 	/* OK, This is the point of no return */
+ 	current->flags &= ~PF_FORKNOEXEC;
+ 	current->mm->def_flags = def_flags;
 @@ -741,7 +757,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
@@ -442,13 +384,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
-diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 07d6c48..46adc3b 100644
---- a/fs/proc/array.c
-+++ b/fs/proc/array.c
-@@ -471,8 +471,12 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+--- linux-2.6.25.noarch/fs/proc/array.c~	2008-05-16 13:51:04.000000000 -0400
++++ linux-2.6.25.noarch/fs/proc/array.c	2008-05-16 13:53:24.000000000 -0400
+@@ -473,8 +473,13 @@ static int do_task_stat(struct seq_file 
+ 		unlock_task_sighand(task, &flags);
  	}
- 	rcu_read_unlock();
  
 -	if (!whole || num_threads < 2)
 -		wchan = get_wchan(task);
@@ -458,6 +398,7 @@
 +			capable(CAP_SYS_NICE))
 +				wchan = get_wchan(task);
 +	}
++
  	if (!whole) {
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
@@ -552,10 +493,11 @@
 index 5b6a05d..7ad80b9 100644
 --- a/include/asm-x86/desc.h
 +++ b/include/asm-x86/desc.h
-@@ -353,6 +353,22 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
+@@ -353,6 +353,26 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
++#ifdef CONFIG_X86_32
 +static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
 +{
 +	limit = (limit - 1) / PAGE_SIZE;
@@ -566,35 +508,18 @@
 +#define load_user_cs_desc(cpu, mm) \
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
 +
-+#ifdef CONFIG_X86_32
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_flush_exec_range(struct mm_struct *mm);
++#else
++#define arch_add_exec_range(mm, limit)		do { ; } while (0)
++#define arch_flush_exec_range(mm)		do { ; } while (0)
++#define arch_remove_exec_range(mm, limit)	do { ; } while (0)
 +#endif /* CONFIG_X86_32 */
 +
  #else
  /*
   * GET_DESC_BASE reads the descriptor base of the specified segment.
-diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
-index fb62f99..516a9da 100644
---- a/include/asm-x86/elf.h
-+++ b/include/asm-x86/elf.h
-@@ -185,7 +185,6 @@ static inline void elf_common_init(struct thread_struct *t,
- 			clear_thread_flag(TIF_ABI_PENDING);	\
- 		else						\
- 			set_thread_flag(TIF_ABI_PENDING);	\
--		current->personality |= force_personality32;	\
- 	} while (0)
- #define COMPAT_ELF_PLATFORM			("i686")
- 
-@@ -230,7 +229,6 @@ static inline void elf_common_init(struct thread_struct *t,
- #define ELF_PLATFORM       ("x86_64")
- extern void set_personality_64bit(void);
- extern unsigned int sysctl_vsyscall32;
--extern int force_personality32;
- 
- #endif /* !CONFIG_X86_32 */
- 
 diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
 index efa962c..db9b109 100644
 --- a/include/asm-x86/mmu.h
@@ -606,7 +531,7 @@
 + * exec_limit is used to track the range PROT_EXEC
 + * mappings span.
   */
- typedef struct { 
+ typedef struct {
  	void *ldt;
 @@ -18,6 +20,10 @@ typedef struct {
  	int size;
@@ -619,48 +544,31 @@
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff --git a/include/asm-x86/pgalloc_64.h b/include/asm-x86/pgalloc_64.h
-index 8d67223..982e1cb 100644
---- a/include/asm-x86/pgalloc_64.h
-+++ b/include/asm-x86/pgalloc_64.h
-@@ -5,6 +5,13 @@
- #include <linux/threads.h>
- #include <linux/mm.h>
+--- linux-2.6.25.noarch/include/asm-x86/processor.h~	2008-05-16 15:56:21.000000000 -0400
++++ linux-2.6.25.noarch/include/asm-x86/processor.h	2008-05-16 16:02:44.000000000 -0400
+@@ -151,6 +151,9 @@ static inline int hlt_works(int cpu)
  
-+#define arch_add_exec_range(mm, limit) \
-+		do { (void)(mm), (void)(limit); } while (0)
-+#define arch_flush_exec_range(mm) \
-+		do { (void)(mm); } while (0)
-+#define arch_remove_exec_range(mm, limit) \
-+		do { (void)(mm), (void)(limit); } while (0)
-+
- #define pmd_populate_kernel(mm, pmd, pte) \
- 		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))
- #define pud_populate(mm, pud, pmd) \
-diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
-index 149920d..79c8ad8 100644
---- a/include/asm-x86/processor.h
-+++ b/include/asm-x86/processor.h
-@@ -679,6 +679,9 @@ extern int bootloader_type;
- extern char ignore_fpu_irq;
- #define cache_line_size() (boot_cpu_data.x86_cache_alignment)
+ #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
 +#define __HAVE_ARCH_ALIGN_STACK
 +extern unsigned long arch_align_stack(unsigned long sp);
 +
- #define HAVE_ARCH_PICK_MMAP_LAYOUT 1
- #define ARCH_HAS_PREFETCHW
- #define ARCH_HAS_SPINLOCK_PREFETCH
-@@ -756,6 +759,9 @@ static inline void prefetchw(const void *x)
- 	regs->cs = __USER_CS;					\
- 	regs->ip = new_eip;					\
- 	regs->sp = new_esp;					\
-+	preempt_disable();					\
-+	load_user_cs_desc(smp_processor_id(), current->mm);	\
-+	preempt_enable();					\
- } while (0)
- 
+ extern void cpu_detect(struct cpuinfo_x86 *c);
  
+ extern void identify_cpu(struct cpuinfo_x86 *);
+--- linux-2.6.25.noarch/arch/x86/kernel/process_32.c~	2008-05-16 16:02:50.000000000 -0400
++++ linux-2.6.25.noarch/arch/x86/kernel/process_32.c	2008-05-16 16:03:21.000000000 -0400
+@@ -411,6 +411,10 @@ start_thread(struct pt_regs *regs, unsig
+ 	regs->cs		= __USER_CS;
+ 	regs->ip		= new_ip;
+ 	regs->sp		= new_sp;
++	preempt_disable();
++	load_user_cs_desc(smp_processor_id(), current->mm);
++	preempt_enable();
++
+ 	/*
+ 	 * Free the old FP and other extended state
+ 	 */
 diff --git a/include/linux/mm.h b/include/linux/mm.h
 index e8abb38..1483fc7 100644
 --- a/include/linux/mm.h
@@ -992,8 +900,8 @@
 +#include <asm/desc.h>
 +#endif
  
- static void change_pte_range(struct mm_struct *mm, pmd_t *pmd,
- 		unsigned long addr, unsigned long end, pgprot_t newprot,
+ #ifndef pgprot_modify
+ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
 @@ -134,7 +138,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;

linux-2.6-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-silence-noise.patch	13 Apr 2008 00:08:40 -0000	1.14
+++ linux-2.6-silence-noise.patch	16 May 2008 21:06:38 -0000	1.15
@@ -76,57 +76,15 @@
  	}
  	pci_restore_pcix_state(dev);
  	pci_restore_msi_state(dev);
-
-
-diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index d887d5c..80be564 100644
---- a/drivers/base/power/main.c
-+++ b/drivers/base/power/main.c
-@@ -64,9 +64,6 @@ int (*platform_enable_wakeup)(struct device *dev, int is_on);
-  */
- void device_pm_add(struct device *dev)
+--- linux-2.6.25.noarch/drivers/base/power/main.c~	2008-05-16 10:26:38.000000000 -0400
++++ linux-2.6.25.noarch/drivers/base/power/main.c	2008-05-16 10:26:59.000000000 -0400
+@@ -64,9 +64,6 @@ int device_pm_add(struct device *dev)
  {
+ 	int error;
+ 
 -	pr_debug("PM: Adding info for %s:%s\n",
 -		 dev->bus ? dev->bus->name : "No Bus",
 -		 kobject_name(&dev->kobj));
  	mutex_lock(&dpm_list_mtx);
- 	list_add_tail(&dev->power.entry, &dpm_active);
- 	mutex_unlock(&dpm_list_mtx);
-@@ -80,9 +77,6 @@ void device_pm_add(struct device *dev)
-  */
- void device_pm_remove(struct device *dev)
- {
--	pr_debug("PM: Removing info for %s:%s\n",
--		 dev->bus ? dev->bus->name : "No Bus",
--		 kobject_name(&dev->kobj));
- 	mutex_lock(&dpm_list_mtx);
- 	dpm_sysfs_remove(dev);
- 	list_del_init(&dev->power.entry);
---- linux-2.6.24.noarch/arch/x86/pci/mmconfig-shared.c~	2008-04-12 20:04:01.000000000 -0400
-+++ linux-2.6.24.noarch/arch/x86/pci/mmconfig-shared.c	2008-04-12 20:05:35.000000000 -0400
-@@ -191,7 +191,7 @@ static void __init pci_mmcfg_reject_brok
- 	if (pci_mmcfg_config_num == 1 &&
- 	    cfg->pci_segment == 0 &&
- 	    (cfg->start_bus_number | cfg->end_bus_number) == 0) {
--		printk(KERN_ERR "PCI: start and end of bus number is 0. "
-+		printk(KERN_DEBUG "PCI: start and end of bus number is 0. "
- 		       "Rejected as broken MCFG.\n");
- 		goto reject;
- 	}
-@@ -203,14 +203,14 @@ static void __init pci_mmcfg_reject_brok
- 	if (type == 1 && !e820_all_mapped(cfg->address,
- 					  cfg->address + MMCONFIG_APER_MIN,
- 					  E820_RESERVED)) {
--		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
-+		printk(KERN_DEBUG "PCI: BIOS Bug: MCFG area at %Lx is not"
- 		       " E820-reserved\n", cfg->address);
- 		goto reject;
- 	}
- 	return;
- 
- reject:
--	printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
-+	printk(KERN_DEBUG "PCI: Not using MMCONFIG.\n");
- 	kfree(pci_mmcfg_config);
- 	pci_mmcfg_config = NULL;
- 	pci_mmcfg_config_num = 0;
+ 	if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
+ 		if (dev->parent->power.sleeping)

linux-2.6-utrace.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.77 -r 1.78 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- linux-2.6-utrace.patch	6 May 2008 01:25:18 -0000	1.77
+++ linux-2.6-utrace.patch	16 May 2008 21:06:38 -0000	1.78
@@ -1,64 +1,85 @@
  Documentation/DocBook/Makefile      |    2 +-
  Documentation/DocBook/utrace.tmpl   |   23 +
  Documentation/utrace.txt            |  579 +++++++++
+ arch/alpha/kernel/ptrace.c          |   15 +-
+ arch/arm/kernel/ptrace.c            |    5 +-
+ arch/avr32/kernel/ptrace.c          |    5 +-
+ arch/blackfin/kernel/ptrace.c       |    5 +-
+ arch/frv/kernel/ptrace.c            |    3 +-
+ arch/h8300/kernel/ptrace.c          |    3 +-
+ arch/ia64/kernel/process.c          |    2 +-
+ arch/ia64/kernel/ptrace.c           |   17 +-
+ arch/m32r/kernel/ptrace.c           |    7 +-
+ arch/m68k/kernel/ptrace.c           |    5 +-
+ arch/m68knommu/kernel/ptrace.c      |    3 +-
  arch/mips/kernel/irixelf.c          |    2 -
- arch/powerpc/kernel/asm-offsets.c   |    4 -
+ arch/mips/kernel/ptrace.c           |    5 +-
+ arch/mn10300/kernel/ptrace.c        |    3 +-
+ arch/parisc/kernel/ptrace.c         |    7 +-
+ arch/powerpc/kernel/entry_32.S      |    4 +-
  arch/powerpc/kernel/process.c       |    5 -
- arch/powerpc/kernel/ptrace.c        |   35 +-
- arch/powerpc/kernel/ptrace32.c      |    2 +-
- arch/powerpc/kernel/signal.c        |    8 +-
- arch/powerpc/kernel/signal_32.c     |   19 +-
+ arch/powerpc/kernel/ptrace.c        |   38 +-
+ arch/powerpc/kernel/ptrace32.c      |    8 +-
+ arch/powerpc/kernel/signal.c        |   20 +-
+ arch/powerpc/kernel/signal_32.c     |   21 +-
  arch/powerpc/kernel/sys_ppc32.c     |    5 -
+ arch/s390/kernel/entry.S            |   14 +-
+ arch/s390/kernel/entry64.S          |   12 +-
+ arch/sh/kernel/ptrace_32.c          |    5 +-
+ arch/sh/kernel/ptrace_64.c          |    5 +-
+ arch/sparc/kernel/ptrace.c          |    5 +-
  arch/sparc64/kernel/binfmt_aout32.c |    2 -
- arch/sparc64/kernel/process.c       |   23 +-
- arch/sparc64/kernel/ptrace.c        |   28 +-
- arch/sparc64/kernel/sys_sparc32.c   |   41 +-
+ arch/sparc64/kernel/ptrace.c        |   35 +-
+ arch/um/kernel/ptrace.c             |    3 +-
+ arch/v850/kernel/ptrace.c           |    3 +-
  arch/x86/ia32/ia32_aout.c           |    6 -
- arch/x86/ia32/ia32_signal.c         |   10 -
+ arch/x86/ia32/ia32_signal.c         |   12 +-
  arch/x86/ia32/ia32entry.S           |   14 +-
  arch/x86/ia32/sys_ia32.c            |    5 -
  arch/x86/kernel/entry_64.S          |    8 +-
- arch/x86/kernel/ptrace.c            |  157 +--
- arch/x86/kernel/signal_32.c         |   37 +-
- arch/x86/kernel/signal_64.c         |   33 +-
+ arch/x86/kernel/ptrace.c            |  159 +--
+ arch/x86/kernel/signal_32.c         |   56 +-
+ arch/x86/kernel/signal_64.c         |   49 +-
+ arch/x86/kernel/step.c              |   22 +-
  arch/x86/kernel/vm86_32.c           |    9 +-
+ arch/xtensa/kernel/ptrace.c         |    6 +-
  fs/binfmt_aout.c                    |    6 -
  fs/binfmt_elf.c                     |    6 -
  fs/binfmt_elf_fdpic.c               |    7 -
  fs/binfmt_flat.c                    |    3 -
  fs/binfmt_som.c                     |    2 -
- fs/compat.c                         |    6 +-
- fs/eventpoll.c                      |    3 +-
+ fs/compat.c                         |   14 +-
+ fs/eventpoll.c                      |    7 +-
  fs/exec.c                           |   12 +-
  fs/proc/array.c                     |    9 +-
  fs/proc/base.c                      |   43 +-
- fs/select.c                         |    4 +-
- include/asm-alpha/ptrace.h          |    1 +
- include/asm-ia64/ptrace.h           |    1 +
- include/asm-ia64/thread_info.h      |    2 +-
- include/asm-powerpc/ptrace.h        |    1 +
+ fs/select.c                         |   12 +-
+ include/asm-ia64/thread_info.h      |    5 +-
+ include/asm-powerpc/thread_info.h   |   17 +-
  include/asm-s390/thread_info.h      |    2 +-
- include/asm-sparc64/ptrace.h        |    2 +
  include/asm-x86/ptrace.h            |    2 +
+ include/asm-x86/thread_info_32.h    |   13 +-
+ include/asm-x86/thread_info_64.h    |   13 +-
+ include/linux/compat.h              |    5 +-
  include/linux/init_task.h           |    3 -
- include/linux/ptrace.h              |   71 +-
- include/linux/sched.h               |   46 +-
- include/linux/thread_info.h         |   10 +-
- include/linux/tracehook.h           |  493 ++++++++
+ include/linux/ptrace.h              |   70 +-
+ include/linux/sched.h               |   38 +-
+ include/linux/thread_info.h         |   27 +-
+ include/linux/tracehook.h           |  507 ++++++++
  include/linux/utrace.h              |  544 ++++++++
  init/Kconfig                        |   29 +
  kernel/Makefile                     |    1 +
  kernel/compat.c                     |    3 +-
- kernel/exit.c                       |  371 +++---
+ kernel/exit.c                       |  403 +++----
  kernel/fork.c                       |   72 +-
- kernel/ptrace.c                     | 2112 +++++++++++++++++++++++++-------
- kernel/signal.c                     |  288 +----
+ kernel/ptrace.c                     | 2129 +++++++++++++++++++++++++-------
+ kernel/signal.c                     |  285 +----
  kernel/sys_ni.c                     |    4 +
  kernel/utrace.c                     | 2377 +++++++++++++++++++++++++++++++++++
  mm/nommu.c                          |    4 +-
  security/selinux/hooks.c            |   59 +-
  security/selinux/include/objsec.h   |    1 -
- 58 files changed, 6306 insertions(+), 1287 deletions(-)
+ 81 files changed, 6535 insertions(+), 1421 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 300e170..7cf3afc 100644  
@@ -687,6 +708,274 @@
 +sure which event callbacks it will or won't see after utrace_set_flags
 +has returned.  By checking for errors, it can know whether to clean up
 +its data structures immediately or to let its callbacks do the work.
+diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
+index 1e9ad52..7dc30f5 100644  
+--- a/arch/alpha/kernel/ptrace.c
++++ b/arch/alpha/kernel/ptrace.c
+@@ -260,11 +260,12 @@ void ptrace_disable(struct task_struct *
+ 	ptrace_cancel_bpt(child);
+ }
+ 
+-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
++int arch_ptrace(struct task_struct *child, long request, long addr, long data,
++		long *retval)
+ {
+ 	unsigned long tmp;
+ 	size_t copied;
+-	long ret;
++	int ret;
+ 
+ 	switch (request) {
+ 	/* When I and D space are separate, these will need to be fixed.  */
+@@ -275,14 +276,14 @@ long arch_ptrace(struct task_struct *chi
+ 		if (copied != sizeof(tmp))
+ 			break;
+ 		
+-		force_successful_syscall_return();
+-		ret = tmp;
++		ret = 0;
++		*retval = tmp;
+ 		break;
+ 
+ 	/* Read register number ADDR. */
+ 	case PTRACE_PEEKUSR:
+-		force_successful_syscall_return();
+-		ret = get_reg(child, addr);
++		ret = 0;
++		*retval = get_reg(child, addr);
+ 		DBG(DBG_MEM, ("peek $%ld->%#lx\n", addr, ret));
+ 		break;
+ 
+@@ -343,7 +344,7 @@ long arch_ptrace(struct task_struct *chi
+ 		break;
+ 
+ 	default:
+-		ret = ptrace_request(child, request, addr, data);
++		ret = 1;
+ 		break;
+ 	}
+ 	return ret;
+diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
+index 4b05dc5..938be29 100644  
+--- a/arch/arm/kernel/ptrace.c
++++ b/arch/arm/kernel/ptrace.c
+@@ -655,7 +655,8 @@ static int ptrace_setcrunchregs(struct t
+ }
+ #endif
+ 
+-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
++int arch_ptrace(struct task_struct *child, long request, long addr, long data,
++		long *retval)
+ {
+ 	int ret;
+ 
+@@ -778,7 +779,7 @@ long arch_ptrace(struct task_struct *chi
+ #endif
+ 
+ 		default:
+-			ret = ptrace_request(child, request, addr, data);
++			ret = 1;
+ 			break;
+ 	}
+ 
+diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c
+index 1fed38f..5ce2ff7 100644  
+--- a/arch/avr32/kernel/ptrace.c
++++ b/arch/avr32/kernel/ptrace.c
[...3020 lines suppressed...]
++			ret = rc;
++		else
++			force_successful_syscall_return();
 +		put_task_struct(child);
-+	}
+ 	}
+ 
+-	ret = ptrace_check_attach(child, request == PTRACE_KILL);
+-	if (!ret)
+-		ret = compat_arch_ptrace(child, request, addr, data);
  
 - out_put_task_struct:
 -	put_task_struct(child);
@@ -6349,7 +7512,7 @@
  
  #endif	/* CONFIG_COMPAT */
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 6af1210..2fdb5fc 100644  
+index 6af1210..4ede33b 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -22,6 +22,7 @@
@@ -6667,7 +7830,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1780,44 +1647,24 @@ relock:
+@@ -1780,44 +1647,25 @@ relock:
  		    do_signal_stop(0))
  			goto relock;
  
@@ -6678,7 +7841,19 @@
 -
 -		if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
 -			ptrace_signal_deliver(regs, cookie);
--
++		/*
++		 * Tracing can induce an artifical signal and choose sigaction.
++		 * The return value in @signr determines the default action,
++		 * but @info->si_signo is the signal number we will report.
++		 */
++		signr = tracehook_get_signal(current, regs, info, return_ka);
++		if (unlikely(signr < 0))
++			goto relock;
++		if (unlikely(signr != 0))
++			ka = return_ka;
++		else {
++			signr = dequeue_signal(current, mask, info);
+ 
 -			/* Let the debugger run.  */
 -			ptrace_stop(signr, 0, info);
 -
@@ -6700,27 +7875,14 @@
 -				info->si_pid = task_pid_vnr(current->parent);
 -				info->si_uid = current->parent->uid;
 -			}
--
++			if (!signr)
++				break; /* will return 0 */
+ 
 -			/* If the (new) signal is now blocked, requeue it.  */
 -			if (sigismember(&current->blocked, signr)) {
 -				specific_send_sig_info(signr, info, current);
 -				continue;
 -			}
-+		/*
-+		 * Tracing can induce an artifical signal and choose sigaction.
-+		 * The return value in signr determines the default action,
-+		 * but info->si_signo is the signal number we will report.
-+		 */
-+		signr = tracehook_get_signal(current, regs, info, return_ka);
-+		if (unlikely(signr < 0))
-+			goto relock;
-+		if (unlikely(signr != 0))
-+			ka = return_ka;
-+		else {
-+			signr = dequeue_signal(current, mask, info);
-+
-+			if (!signr)
-+				break; /* will return 0 */
 +			ka = &current->sighand->action[signr-1];
  		}
  
@@ -6728,7 +7890,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1827,6 +1674,7 @@ relock:
+@@ -1827,6 +1675,7 @@ relock:
  			if (ka->sa.sa_flags & SA_ONESHOT)
  				ka->sa.sa_handler = SIG_DFL;
  
@@ -6736,7 +7898,7 @@
  			break; /* will return non-zero "signr" value */
  		}
  
-@@ -1864,7 +1712,7 @@ relock:
+@@ -1864,7 +1713,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -6745,7 +7907,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1882,9 +1730,10 @@ relock:
+@@ -1882,9 +1731,10 @@ relock:
  		 * Anything else is fatal, maybe with a core dump.
  		 */
  		current->flags |= PF_SIGNALED;
@@ -6758,7 +7920,7 @@
  			/*
  			 * If it was able to dump core, this kills all
  			 * other threads in the group and synchronizes with
-@@ -1893,13 +1742,13 @@ relock:
+@@ -1893,13 +1743,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -6774,7 +7936,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1953,7 +1802,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
+@@ -1953,7 +1803,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
  EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_proc);
@@ -6782,7 +7944,7 @@
  EXPORT_SYMBOL(send_sig);
  EXPORT_SYMBOL(send_sig_info);
  EXPORT_SYMBOL(sigprocmask);
-@@ -2610,7 +2458,7 @@ asmlinkage long sys_rt_sigsuspend(sigset
+@@ -2610,7 +2459,7 @@ asmlinkage long sys_rt_sigsuspend(sigset
  
  	current->state = TASK_INTERRUPTIBLE;
  	schedule();
@@ -9212,7 +10374,7 @@
  
  	return vm_flags;
 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 41a049f..44b756b 100644  
+index d39b59c..43cb7c3 100644  
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
 @@ -24,7 +24,7 @@
@@ -9233,7 +10395,7 @@
  	task->security = tsec;
  
  	return 0;
-@@ -1638,19 +1638,13 @@ static inline u32 file_to_av(struct file
+@@ -1645,19 +1645,13 @@ static inline u32 file_to_av(struct file
  
  static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
  {
@@ -9254,7 +10416,7 @@
  }
  
  static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
-@@ -2119,12 +2113,25 @@ static void selinux_bprm_apply_creds(str
+@@ -2126,12 +2120,25 @@ static void selinux_bprm_apply_creds(str
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and kill. */
  		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
@@ -9286,7 +10448,7 @@
  			}
  		}
  		tsec->sid = sid;
-@@ -2207,7 +2214,7 @@ static void selinux_bprm_post_apply_cred
+@@ -2214,7 +2221,7 @@ static void selinux_bprm_post_apply_cred
  
  	/* Wake up the parent if it is waiting so that it can
  	   recheck wait permission to the new task SID. */
@@ -9295,7 +10457,7 @@
  }
  
  /* superblock security operations */
-@@ -3080,11 +3087,6 @@ static int selinux_task_alloc_security(s
+@@ -3087,11 +3094,6 @@ static int selinux_task_alloc_security(s
  	tsec2->keycreate_sid = tsec1->keycreate_sid;
  	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
  
@@ -9307,7 +10469,7 @@
  	return 0;
  }
  
-@@ -5050,6 +5052,7 @@ static int selinux_setprocattr(struct ta
+@@ -5057,6 +5059,7 @@ static int selinux_setprocattr(struct ta
  			       char *name, void *value, size_t size)
  {
  	struct task_security_struct *tsec;
@@ -9315,7 +10477,7 @@
  	u32 sid = 0;
  	int error;
  	char *str = value;
-@@ -5138,18 +5141,24 @@ static int selinux_setprocattr(struct ta
+@@ -5145,18 +5148,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -r1.773 -r1.774
--- sources	12 May 2008 15:11:04 -0000	1.773
+++ sources	16 May 2008 21:06:38 -0000	1.774
@@ -1,2 +1,3 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
 49c56cf1394b2286033bb10c7cef7260  patch-2.6.25.3.bz2
+c46edaae7eeb62c644591d8e55f2b57f  patch-2.6.26-rc2-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- upstream	12 May 2008 15:11:04 -0000	1.692
+++ upstream	16 May 2008 21:06:38 -0000	1.693
@@ -1,2 +1,4 @@
 linux-2.6.25.tar.bz2
 patch-2.6.25.3.bz2
+patch-2.6.26-rc2.bz2
+patch-2.6.26-rc2-git5.bz2


--- linux-2.6-devmem.patch DELETED ---


--- linux-2.6-ext34-xattr-fix.patch DELETED ---


--- linux-2.6-firewire-git-pending.patch DELETED ---


--- linux-2.6-firewire-git-update.patch DELETED ---


--- linux-2.6-libata-ata_piix-check-sidpr.patch DELETED ---


--- linux-2.6-rt2x00-configure_filter.patch DELETED ---


--- linux-2.6-smp-boot-delay.patch DELETED ---


--- linux-2.6-windfarm-pm121-fix.patch DELETED ---


--- linux-2.6-windfarm-pm121.patch DELETED ---


--- linux-2.6.25-sparc64-semctl.patch DELETED ---


