rpms/kernel/devel patch-2.6.22-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.649, 1.650 config-generic, 1.3, 1.4 config-x86-generic, 1.1, 1.2 kernel.spec, 1.4, 1.5 linux-2.6-execshield.patch, 1.59, 1.60 linux-2.6-modsign-ksign.patch, 1.5, 1.6 linux-2.6-modsign-mpilib.patch, 1.3, 1.4 linux-2.6-silence-noise.patch, 1.8, 1.9 linux-2.6-utrace-tracehook.patch, 1.1, 1.2 sources, 1.613, 1.614 upstream, 1.535, 1.536 linux-2.6-debug-sysfs-crash-debugging.patch, 1.8, NONE linux-2.6-dmi-based-module-autoloading.patch, 1.1, NONE linux-2.6-ondemand-timer.patch, 1.7, NONE linux-2.6-x86-vga-vidfail.patch, 1.1, NONE patch-2.6.22-git2.bz2.sign, 1.1, NONE

Dave Jones (davej) fedora-extras-commits at redhat.com
Fri Jul 13 19:58:37 UTC 2007


Author: davej

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

Modified Files:
	.cvsignore config-generic config-x86-generic kernel.spec 
	linux-2.6-execshield.patch linux-2.6-modsign-ksign.patch 
	linux-2.6-modsign-mpilib.patch linux-2.6-silence-noise.patch 
	linux-2.6-utrace-tracehook.patch sources upstream 
Added Files:
	patch-2.6.22-git4.bz2.sign 
Removed Files:
	linux-2.6-debug-sysfs-crash-debugging.patch 
	linux-2.6-dmi-based-module-autoloading.patch 
	linux-2.6-ondemand-timer.patch linux-2.6-x86-vga-vidfail.patch 
	patch-2.6.22-git2.bz2.sign 
Log Message:
* Fri Jul 13 2007 Dave Jones <davej at redhat.com>
- 2.6.22-git4



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

iD8DBQBGl8xsyGugalF9Dw4RAuskAJ94bjszAn6jIlx5m5znVvFaz6AHywCffCNo
e/Vwn2W9Jaan4pFYiLborDU=
=8qvM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -r1.649 -r1.650
--- .cvsignore	12 Jul 2007 16:47:05 -0000	1.649
+++ .cvsignore	13 Jul 2007 19:58:04 -0000	1.650
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22-git2.bz2
+patch-2.6.22-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-generic	13 Jul 2007 19:34:32 -0000	1.3
+++ config-generic	13 Jul 2007 19:58:04 -0000	1.4
@@ -493,6 +493,7 @@
 CONFIG_PATA_HPT37X=m
 CONFIG_PATA_HPT3X2N=m
 CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
 CONFIG_PATA_IT8213=m
@@ -585,6 +586,7 @@
 CONFIG_DM_MIRROR=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_RDAC=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_ZERO=m
 
@@ -728,6 +730,7 @@
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -749,9 +752,10 @@
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
@@ -926,6 +930,7 @@
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_TCINDEX=m
@@ -964,6 +969,7 @@
 CONFIG_NET_PKTGEN=m
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 
 #
 # ARCnet devices
@@ -996,6 +1002,7 @@
 CONFIG_ATM_FORE200E_MAYBE=m
 CONFIG_ATM_HE=m
 CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
 CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_IA is not set
 # CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1215,13 +1222,12 @@
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_LIBERTAS is not set
+
 # FIXME: Move to x86[64]-generic
 CONFIG_IWLWIFI=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
-CONFIG_LIBERTAS_USB=m
-# CONFIG_LIBERTAS_USB_DEBUG is not set
 # CONFIG_NL80211 is not set
 CONFIG_NORTEL_HERMES=m
 CONFIG_P54_COMMON=m
@@ -1667,39 +1673,39 @@
 # I2C Hardware Bus support
 #
 
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PASEMI=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_I2C_VOODOO3=m
+CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD756_S4882 is not set
 # CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+CONFIG_I2C_NFORCE2=m
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PASEMI=m
+CONFIG_I2C_PCA_ISA=m
 # CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
 CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_TINY_USB is not set
-
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_PCA_ISA=m
 CONFIG_I2C_STUB=m
-# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_VOODOO3=m
 
 #
 # I2C Hardware Sensors Chip support
@@ -1719,6 +1725,7 @@
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_DS1337=m
 CONFIG_SENSORS_DS1374=m
+# CONFIG_DS1682 is not set
 CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
@@ -1750,6 +1757,7 @@
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
@@ -2315,9 +2323,12 @@
 # USB support
 #
 CONFIG_USB=y
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_DEVICE_CLASS is not set
 
+# CONFIG_USB_PERSIST is not set
+
 #
 # Miscellaneous USB options
 #
@@ -2335,7 +2346,8 @@
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_SL811_CS=m
+# CONFIG_USB_SL811_CS is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -2490,6 +2502,7 @@
 CONFIG_USB_SERIAL_MOS7840=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OPTION=y
+CONFIG_USB_SERIAL_OTI6858=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-x86-generic	12 Jul 2007 19:15:37 -0000	1.1
+++ config-x86-generic	13 Jul 2007 19:58:04 -0000	1.2
@@ -171,6 +171,7 @@
 # CONFIG_X86_POWERNOW_K6 is not set
 CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_POWERNOW_K8_ACPI=y
 # CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel.spec	13 Jul 2007 19:34:32 -0000	1.4
+++ kernel.spec	13 Jul 2007 19:58:04 -0000	1.5
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -536,7 +536,6 @@
 Patch40: nouveau-drm.patch
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
-Patch50: linux-2.6-x86-vga-vidfail.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch71: linux-2.6-x86_64-vdso.patch
 Patch95: linux-2.6-kvm-suspend.patch
@@ -562,7 +561,6 @@
 Patch320: linux-2.6-debug-must_check.patch
 Patch330: linux-2.6-debug-no-quiet.patch
 Patch340: linux-2.6-debug-boot-delay.patch
-Patch340: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch350: linux-2.6-devmem.patch
 Patch370: linux-2.6-crash-driver.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
@@ -592,8 +590,6 @@
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
-Patch1000: linux-2.6-dmi-based-module-autoloading.patch
-Patch1010: linux-2.6-ondemand-timer.patch
 Patch1100: linux-2.6-elf-core-sysctl.patch
 
 %endif
@@ -1082,8 +1078,6 @@
 # setuid /proc/self/maps fix. (dependent on utrace)
 ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
-ApplyPatch linux-2.6-ondemand-timer.patch
-
 # Nouveau DRM
 #ApplyPatch nouveau-drm.patch
 
@@ -1094,12 +1088,6 @@
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
 ApplyPatch linux-2.6-x86-tune-generic.patch
-# add vidfail capability;
-# without this patch specifying a framebuffer on the kernel prompt would
-# make the boot stop if there's no supported framebuffer device; this is bad
-# for the installer cd that wants to automatically fall back to textmode
-# in that case
-ApplyPatch linux-2.6-x86-vga-vidfail.patch
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu
@@ -1154,7 +1142,6 @@
 ApplyPatch linux-2.6-debug-must_check.patch
 ApplyPatch linux-2.6-debug-no-quiet.patch
 ApplyPatch linux-2.6-debug-boot-delay.patch
-ApplyPatch linux-2.6-debug-sysfs-crash-debugging.patch
 
 #
 # Make /dev/mem a need-to-know function
@@ -1218,9 +1205,9 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # Add the wireless stack updates and drivers from wireless-dev
-ApplyPatch git-wireless-dev.patch
+#ApplyPatch git-wireless-dev.patch
 # Add iwlwifi from intellinuxwireless.org
-ApplyPatch git-iwlwifi.patch
+#ApplyPatch git-iwlwifi.patch
 # add patch from markmc so that e1000 supports ICH9
 ApplyPatch linux-2.6-e1000-ich9.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
@@ -1240,9 +1227,6 @@
 #
 #ApplyPatch linux-2.6-compile-fixes.patch
 
-# DMI based module autoloading.
-ApplyPatch linux-2.6-dmi-based-module-autoloading.patch
-
 # core dump enhancement
 ApplyPatch linux-2.6-elf-core-sysctl.patch
 
@@ -2173,6 +2157,9 @@
 
 %changelog
 * Fri Jul 13 2007 Dave Jones <davej at redhat.com>
+- 2.6.22-git4
+
+* Fri Jul 13 2007 Dave Jones <davej at redhat.com>
 - Disable CONFIG_NETLABEL, it's broken right now.
 
 * Thu Jul 12 2007 Jarod Wilson <jwilson at redhat.com>

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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- linux-2.6-execshield.patch	11 Jul 2007 03:52:50 -0000	1.59
+++ linux-2.6-execshield.patch	13 Jul 2007 19:58:04 -0000	1.60
@@ -1608,11 +1608,9 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
  	else
-Index: linux-2.6/mm/mremap.c
-===================================================================
---- linux-2.6.orig/mm/mremap.c
-+++ linux-2.6/mm/mremap.c
-@@ -389,8 +389,8 @@ unsigned long do_mremap(unsigned long ad
+--- linux-2.6.22.noarch/mm/mremap.c~	2007-07-13 15:40:07.000000000 -0400
++++ linux-2.6.22.noarch/mm/mremap.c	2007-07-13 15:41:04.000000000 -0400
+@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long ad
  			if (vma->vm_flags & VM_MAYSHARE)
  				map_flags |= MAP_SHARED;
  
@@ -1620,8 +1618,8 @@
 -						vma->vm_pgoff, map_flags);
 +			new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
 +				vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC);
- 			ret = new_addr;
- 			if (new_addr & ~PAGE_MASK)
+ 			if (new_addr & ~PAGE_MASK) {
+ 				ret = new_addr;
  				goto out;
 --- linux-2.6.21.noarch/mm/mmap.c~	2007-06-06 17:50:39.000000000 -0400
 +++ linux-2.6.21.noarch/mm/mmap.c	2007-06-06 17:52:12.000000000 -0400

linux-2.6-modsign-ksign.patch:

Index: linux-2.6-modsign-ksign.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-modsign-ksign.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-modsign-ksign.patch	13 Feb 2007 19:36:12 -0000	1.5
+++ linux-2.6-modsign-ksign.patch	13 Jul 2007 19:58:04 -0000	1.6
@@ -45,15 +45,16 @@
  source "drivers/crypto/Kconfig"
  
  endif	# if CRYPTO
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 36a6211..309a806 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -47,3 +47,4 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+--- linux-2.6.22.noarch/crypto/Makefile~	2007-07-13 15:43:18.000000000 -0400
++++ linux-2.6.22.noarch/crypto/Makefile	2007-07-13 15:43:22.000000000 -0400
+@@ -52,6 +52,7 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
  obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
  
  obj-$(CONFIG_CRYPTO_MPILIB) += mpi/
 +obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/
+ 
+ #
+ # generic algorithms and the async_tx api
 diff --git a/crypto/signature/Makefile b/crypto/signature/Makefile
 new file mode 100644
 index 0000000..4d1042e

linux-2.6-modsign-mpilib.patch:

Index: linux-2.6-modsign-mpilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-modsign-mpilib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-modsign-mpilib.patch	13 Feb 2007 19:36:12 -0000	1.3
+++ linux-2.6-modsign-mpilib.patch	13 Jul 2007 19:58:04 -0000	1.4
@@ -63,16 +63,17 @@
  source "drivers/crypto/Kconfig"
  
  endif	# if CRYPTO
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 60e3d24..36a6211 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -45,3 +45,5 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich
- obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+--- linux-2.6.22.noarch/crypto/Makefile~	2007-07-13 15:42:17.000000000 -0400
++++ linux-2.6.22.noarch/crypto/Makefile	2007-07-13 15:42:27.000000000 -0400
+@@ -51,6 +51,8 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
  
  obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
-+
+ 
 +obj-$(CONFIG_CRYPTO_MPILIB) += mpi/
++
+ #
+ # generic algorithms and the async_tx api
+ #
 diff --git a/crypto/mpi/Makefile b/crypto/mpi/Makefile
 new file mode 100644
 index 0000000..e96597d

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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-silence-noise.patch	16 Apr 2007 22:16:22 -0000	1.8
+++ linux-2.6-silence-noise.patch	13 Jul 2007 19:58:04 -0000	1.9
@@ -52,28 +52,7 @@
  						"resource region %d "
  						"of device %s\n",
  						idx, pci_name(dev));
---- linux-2.6.20.noarch/drivers/base/power/main.c~	2007-04-12 15:29:10.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/base/power/main.c	2007-04-12 15:29:34.000000000 -0400
-@@ -53,9 +53,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));
- 	down(&dpm_list_sem);
- 	list_add_tail(&dev->power.entry, &dpm_active);
- 	device_pm_set_parent(dev, dev->parent);
-@@ -67,9 +64,6 @@ int 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));
- 	down(&dpm_list_sem);
- 	dpm_sysfs_remove(dev);
- 	put_device(dev->power.pm_parent);
+
 Remove noisy PM printk.
 This has served its purpose.
 
@@ -97,3 +76,27 @@
  	}
  	pci_restore_pcix_state(dev);
  	pci_restore_msi_state(dev);
+
+
+--- linux-2.6.22.noarch/drivers/base/power/main.c~	2007-07-13 15:44:37.000000000 -0400
++++ linux-2.6.22.noarch/drivers/base/power/main.c	2007-07-13 15:44:44.000000000 -0400
+@@ -37,9 +37,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);
+ 	error = dpm_sysfs_add(dev);
+@@ -51,9 +48,6 @@ int 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-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-utrace-tracehook.patch	12 Jul 2007 19:40:19 -0000	1.1
+++ linux-2.6-utrace-tracehook.patch	13 Jul 2007 19:58:04 -0000	1.2
@@ -354,7 +354,7 @@
  }
  
  static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
-@@ -1850,12 +1844,24 @@ static void selinux_bprm_apply_creds(str
+@@ -1851,12 +1845,24 @@ 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)) {
@@ -385,7 +385,7 @@
  			}
  		}
  		tsec->sid = sid;
-@@ -2749,11 +2755,6 @@ static int selinux_task_alloc_security(s
+@@ -2754,11 +2760,6 @@ static int selinux_task_alloc_security(s
  	tsec2->keycreate_sid = tsec1->keycreate_sid;
  	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
  
@@ -397,7 +397,7 @@
  	return 0;
  }
  
-@@ -4535,6 +4536,7 @@ static int selinux_setprocattr(struct ta
+@@ -4541,6 +4542,7 @@ static int selinux_setprocattr(struct ta
  			       char *name, void *value, size_t size)
  {
  	struct task_security_struct *tsec;
@@ -405,7 +405,7 @@
  	u32 sid = 0;
  	int error;
  	char *str = value;
-@@ -4623,18 +4625,24 @@ static int selinux_setprocattr(struct ta
+@@ -4629,18 +4631,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);
@@ -419,7 +419,7 @@
 +			rcu_read_unlock();
 +			error = avc_has_perm_noaudit(ptsid, sid,
  						     SECCLASS_PROCESS,
- 						     PROCESS__PTRACE, &avd);
+ 						     PROCESS__PTRACE, 0, &avd);
  			if (!error)
  				tsec->sid = sid;
  			task_unlock(p);
@@ -1730,7 +1730,7 @@
  	DEFINE(THREAD_VR0, offsetof(struct thread_struct, vr[0]));
 --- linux-2.6/arch/ia64/kernel/mca.c
 +++ linux-2.6/arch/ia64/kernel/mca.c
-@@ -1698,7 +1698,7 @@ format_mca_init_stack(void *mca_data, un
+@@ -1744,7 +1744,7 @@ format_mca_init_stack(void *mca_data, un
  	p->state = TASK_UNINTERRUPTIBLE;
  	cpu_set(cpu, p->cpus_allowed);
  	INIT_LIST_HEAD(&p->tasks);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- sources	12 Jul 2007 16:47:05 -0000	1.613
+++ sources	13 Jul 2007 19:58:04 -0000	1.614
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-92cd4b5907f204f2539f876907a6fa8b  patch-2.6.22-git2.bz2
+977dd3bcb33076618e4aa4052d6af0ec  patch-2.6.22-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- upstream	12 Jul 2007 16:47:05 -0000	1.535
+++ upstream	13 Jul 2007 19:58:04 -0000	1.536
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22-git2.bz2
+patch-2.6.22-git4.bz2


--- linux-2.6-debug-sysfs-crash-debugging.patch DELETED ---


--- linux-2.6-dmi-based-module-autoloading.patch DELETED ---


--- linux-2.6-ondemand-timer.patch DELETED ---


--- linux-2.6-x86-vga-vidfail.patch DELETED ---


--- patch-2.6.22-git2.bz2.sign DELETED ---




More information about the fedora-extras-commits mailing list