Sat May 9 03:38:12 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18974

Modified Files:
	.cvsignore kernel.spec linux-2.6-execshield.patch 
	linux-2.6-iommu-fixes.patch linux-2.6-utrace.patch sources 
	upstream 
Added Files:
	patch-2.6.29.3.bz2.sign 
Removed Files:
	linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch 
	linux-2.6-forcedeth-fix-resume-from-hibernate.patch 
	linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch 
	patch-2.6.29.2.bz2.sign 
Log Message:
Linux 2.6.29.3
Dropped patches, merged upstream:
    linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
    linux-2.6-forcedeth-fix-resume-from-hibernate.patch
    linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
Removed three patches from iommu-fixes.patch, merged upstream:
    intel-iommu: Avoid panic() for DRHD at address zero
    intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges
    intel-iommu: Fix oops in device_to_iommu() when devices not found

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

iD8DBQBKBL7GyGugalF9Dw4RArL7AJ9qZ0fGGvgIgKug0w7AgSicwrMLhgCcD/K5
Ns+6f893VlNMJBHqPDNO74E=
=QM5o
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -p -r1.1005 -r1.1006
--- .cvsignore	27 Apr 2009 18:59:24 -0000	1.1005
+++ .cvsignore	9 May 2009 03:37:40 -0000	1.1006
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29.2.bz2
+patch-2.6.29.3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1358
retrieving revision 1.1359
diff -u -p -r1.1358 -r1.1359
--- kernel.spec	9 May 2009 03:08:07 -0000	1.1358
+++ kernel.spec	9 May 2009 03:37:40 -0000	1.1359
@@ -36,7 +36,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -651,7 +651,6 @@ Patch682: linux-2.6-ipw2x00-age-scan-res
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
-Patch686: linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -700,10 +699,6 @@ Patch3000: linux-2.6-btrfs-experimental-
 
 Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
-# patches headed for -stable
-# make RLIMIT_CPU work again
-Patch7010: linux-2.6-forcedeth-fix-resume-from-hibernate.patch
-
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
 
@@ -724,9 +719,6 @@ Patch9500: linux-2.6-x86-hpet-provide-se
 Patch9501: linux-2.6-x86-hpet-stop-counter-when-programming.patch
 Patch9502: linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch
 
-# FPU state can become corrupt
-Patch9510: linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
-
 # fix some broken bluetooth dongles
 Patch9600: linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch
 
@@ -1298,9 +1290,6 @@ ApplyPatch linux-2.6-iwlagn-fix-hw-rfkil
 # back-port mac80211: fix beacon loss detection after scan
 ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
 
-# back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling
-ApplyPatch linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1328,9 +1317,6 @@ ApplyOptionalPatch linux-2.6-firewire-gi
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
-# patches headed for -stable
-ApplyPatch linux-2.6-forcedeth-fix-resume-from-hibernate.patch
-
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
 ApplyPatch squashfs-fixups.patch
@@ -1357,8 +1343,6 @@ ApplyPatch linux-2.6-x86-hpet-provide-se
 ApplyPatch linux-2.6-x86-hpet-stop-counter-when-programming.patch
 ApplyPatch linux-2.6-x86-hpet-fix-periodic-mode-on-amd-81xx.patch
 
-ApplyPatch linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
-
 ApplyPatch linux-2.6-bluetooth-submit-bulk-urbs-with-interrupt-urbs.patch
 
 # Reduce the memory usage of ftrace if you don't use it.
@@ -1940,6 +1924,17 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri May 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.3-59
+- Linux 2.6.29.3
+- Dropped patches, merged upstream:
+    linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
+    linux-2.6-forcedeth-fix-resume-from-hibernate.patch
+    linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
+- Removed three patches from iommu-fixes.patch, merged upstream:
+    intel-iommu: Avoid panic() for DRHD at address zero
+    intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges
+    intel-iommu: Fix oops in device_to_iommu() when devices not found
+
 * Fri May 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-58
 - ALSA: Avoid jiffies check for devices with BATCH flag
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- linux-2.6-execshield.patch	11 Mar 2009 16:35:27 -0000	1.101
+++ linux-2.6-execshield.patch	9 May 2009 03:37:41 -0000	1.102
@@ -597,9 +597,9 @@ index 7e4877d..0c368c1 100644
  		unlock_task_sighand(task, &flags);
  	}
  
--	if (!whole || num_threads < 2)
+-	if (permitted && (!whole || num_threads < 2))
 -		wchan = get_wchan(task);
-+	if (!whole || num_threads < 2) {
++	if (permitted && (!whole || num_threads < 2)) {
 +		const struct cred *cred;
 +
 +		wchan = 0;

linux-2.6-iommu-fixes.patch:

Index: linux-2.6-iommu-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-iommu-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-iommu-fixes.patch	13 Apr 2009 16:08:34 -0000	1.1
+++ linux-2.6-iommu-fixes.patch	9 May 2009 03:37:41 -0000	1.2
@@ -1,52 +1,3 @@
-commit c065567f392e05f0fda406369e1c8969c4411c68
-Author: David Woodhouse <David.Woodhouse at intel.com>
-Date:   Fri Apr 10 22:27:48 2009 -0700
-
-    intel-iommu: Avoid panic() for DRHD at address zero.
-    
-    If the BIOS does something obviously stupid, like claiming that the
-    registers for the IOMMU are at physical address zero, then print a nasty
-    message and abort, rather than trying to set up the IOMMU and then later
-    panicking.
-    
-    It's becoming more and more obvious that trusting this stuff to the BIOS
-    was a mistake.
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-    (cherry picked from commit e523b38e2f568af58baa13120a994cbf24e6dee0)
-
-commit 1d748e6cec8936af4c7044bdb51593a3f3904239
-Author: David Woodhouse <David.Woodhouse at intel.com>
-Date:   Mon Apr 6 13:30:01 2009 -0700
-
-    intel-iommu: Fix oops in device_to_iommu() when devices not found.
-    
-    It's possible for a device in the drhd->devices[] array to be NULL if
-    it wasn't found at boot time, which means we have to check for that
-    case.
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-    (cherry picked from commit 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e)
-
-commit 3bf17fdaaadea04d4d82be5930dff93ec737aeed
-Author: David Woodhouse <David.Woodhouse at intel.com>
-Date:   Sat Apr 4 00:39:25 2009 +0100
-
-    intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
-    
-    When the DMAR table identifies that a PCI-PCI bridge belongs to a given
-    IOMMU, that means that the bridge and all devices behind it should be
-    associated with the IOMMU. Not just the bridge itself.
-    
-    This fixes the device_to_iommu() function accordingly.
-    
-    (It's broken if you have the same PCI bus numbers in multiple domains,
-    but this function was always broken in that way; I'll be dealing with
-    that later).
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-    (cherry picked from commit 924b6231edfaf1e764ffb4f97ea382bf4facff58)
-
 commit 948852c81654aa8572a2bac1d2dfb1abfcc76ab2
 Author: Linus Torvalds <torvalds at linux-foundation.org>
 Date:   Tue Apr 7 07:59:41 2009 -0700
@@ -174,29 +125,6 @@ index 26c536b..e095037 100644
  
  #undef PREFIX
  #define PREFIX "DMAR:"
-@@ -170,12 +172,21 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
- 	struct dmar_drhd_unit *dmaru;
- 	int ret = 0;
- 
-+	drhd = (struct acpi_dmar_hardware_unit *)header;
-+	if (!drhd->address) {
-+		/* Promote an attitude of violence to a BIOS engineer today */
-+		WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
-+		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
-+		     dmi_get_system_info(DMI_BIOS_VENDOR),
-+		     dmi_get_system_info(DMI_BIOS_VERSION),
-+		     dmi_get_system_info(DMI_PRODUCT_VERSION));
-+		return -ENODEV;
-+	}
- 	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
- 	if (!dmaru)
- 		return -ENOMEM;
- 
- 	dmaru->hdr = header;
--	drhd = (struct acpi_dmar_hardware_unit *)header;
- 	dmaru->reg_base_addr = drhd->address;
- 	dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */
- 
 @@ -748,14 +759,77 @@ int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
  }
  
@@ -518,25 +446,6 @@ index f3f6865..8e4ac13 100644
  #include <asm/cacheflush.h>
  #include <asm/iommu.h>
  #include "pci.h"
-@@ -447,11 +448,17 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn)
- 		if (drhd->ignored)
- 			continue;
- 
--		for (i = 0; i < drhd->devices_cnt; i++)
-+		for (i = 0; i < drhd->devices_cnt; i++) {
- 			if (drhd->devices[i] &&
- 			    drhd->devices[i]->bus->number == bus &&
- 			    drhd->devices[i]->devfn == devfn)
- 				return drhd->iommu;
-+			if (drhd->devices[i] &&
-+			    drhd->devices[i]->subordinate &&
-+			    drhd->devices[i]->subordinate->number <= bus &&
-+			    drhd->devices[i]->subordinate->subordinate >= bus)
-+				return drhd->iommu;
-+		}
- 
- 		if (drhd->include_all)
- 			return drhd->iommu;
 @@ -1004,194 +1011,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
  	return 0;
  }

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- linux-2.6-utrace.patch	23 Mar 2009 03:29:47 -0000	1.108
+++ linux-2.6-utrace.patch	9 May 2009 03:37:41 -0000	1.109
@@ -634,8 +634,8 @@ index 7e4877d..0c683ed 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
- #include <linux/seq_file.h>
  #include <linux/pid_namespace.h>
+ #include <linux/ptrace.h>
  #include <linux/tracehook.h>
 +#include <linux/utrace.h>
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.966
retrieving revision 1.967
diff -u -p -r1.966 -r1.967
--- sources	27 Apr 2009 18:59:24 -0000	1.966
+++ sources	9 May 2009 03:37:41 -0000	1.967
@@ -1,2 +1,2 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-a3e79545ef18ff2a172f82fffef92deb  patch-2.6.29.2.bz2
+4e16a087ca4455f5e95c5890c4ac23f6  patch-2.6.29.3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -p -r1.877 -r1.878
--- upstream	27 Apr 2009 18:59:25 -0000	1.877
+++ upstream	9 May 2009 03:37:41 -0000	1.878
@@ -1,2 +1,2 @@
 linux-2.6.29.tar.bz2
-patch-2.6.29.2.bz2
+patch-2.6.29.3.bz2


--- linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch DELETED ---


--- linux-2.6-forcedeth-fix-resume-from-hibernate.patch DELETED ---


--- linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch DELETED ---


--- patch-2.6.29.2.bz2.sign DELETED ---


