Fri Jul 2 00:57:47 UTC 2010

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15395

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	linux-2.6-usb-wwan-update.patch sources upstream 
Added Files:
	patch-2.6.33.6-rc1.bz2.sign 
Removed Files:
	btrfs-should-add-permission-check-for-setfacl.patch 
	iwlwifi-recalculate-average-tpt-if-not-current.patch 
	iwlwifi-reset-card-during-probe.patch 
	keys-find-keyring-by-name-can-gain-access-to-the-freed-keyring.patch 
	l2tp-fix-oops-in-pppol2tp_xmit.patch 
Log Message:
Linux 2.6.33.6-rc1
Drop patches merged upstream:
    btrfs-should-add-permission-check-for-setfacl.patch (CVE-2010-2071)
    iwlwifi-reset-card-during-probe.patch
    iwlwifi-recalculate-average-tpt-if-not-current.patch
    keys-find-keyring-by-name-can-gain-access-to-the-freed-keyring.patch
    l2tp-fix-oops-in-pppol2tp_xmit.patch
Revert DRM patches we already have:
    drm-edid-fix-1024x768-85hz.patch
    drm-i915-fix-82854-pci-id-and-treat-it-like-other-85x.patch
Fix up usb-wwan-update.patch for upstream additions.

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

iD8DBQBMLNK3yGugalF9Dw4RArw3AJ4mjuwg+/+SREfPLntjd6HIR+GfggCePfY7
0T1B2UK+xgx+h3OmH0zfraA=
=GFvJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/.cvsignore,v
retrieving revision 1.1178
retrieving revision 1.1179
diff -u -p -r1.1178 -r1.1179
--- .cvsignore	27 May 2010 01:37:50 -0000	1.1178
+++ .cvsignore	2 Jul 2010 00:57:46 -0000	1.1179
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.33
 linux-2.6.33.tar.bz2
 patch-2.6.33.5.bz2
+patch-2.6.33.6-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2077
retrieving revision 1.2078
diff -u -p -r1.2077 -r1.2078
--- kernel.spec	2 Jul 2010 00:28:29 -0000	1.2077
+++ kernel.spec	2 Jul 2010 00:57:47 -0000	1.2078
@@ -61,9 +61,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -779,7 +779,6 @@ Patch2907: linux-2.6-v4l-dvb-add-kworld-
 
 # fs fixes
 Patch3000: linux-2.6-btrfs-update.patch
-Patch3001: btrfs-should-add-permission-check-for-setfacl.patch
 Patch3002: btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch
 
 Patch3010: writeback-fix-wb-sync-none-writeback-from-umount.patch
@@ -809,9 +808,6 @@ Patch12019: linux-2.6-umh-refactor.patch
 # rhbz#533746
 Patch12021: ssb_check_for_sprom.patch
 
-# backport iwlwifi fixes (thanks, sgruszka!) -- drop when stable catches-up
-Patch12100: iwlwifi-reset-card-during-probe.patch
-
 # make p54pci usable on slower hardware
 Patch12103: linux-2.6-p54pci.patch
 
@@ -840,9 +836,6 @@ Patch12820: ibmvscsi-fix-DMA-API-misuse.
 
 Patch12830: disable-i8042-check-on-apple-mac.patch
 
-# iwlwifi: recalculate average tpt if not current
-Patch12840: iwlwifi-recalculate-average-tpt-if-not-current.patch
-
 Patch12850: crypto-aesni-kill-module_alias.patch
 
 # automatically mount debugfs when perf needs it
@@ -860,18 +853,12 @@ Patch12914: mac80211-do-not-wipe-out-old
 Patch12915: mac80211-explicitly-disable-enable-QoS.patch
 Patch12916: mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
 
-# CVE-2010-1437
-Patch13000: keys-find-keyring-by-name-can-gain-access-to-the-freed-keyring.patch
-
 # Disable rt20xx and rt35xx chipset support in rt2800pci and rt2800usb
 Patch13010: rt2x00-rt2800-Make-rt30xx-and-rt35xx-chipsets-configurable.patch
 
 # iwlwifi: cancel scan watchdog in iwl_bg_abort_scan
 Patch13020: iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
 
-# l2tp: fix oops in pppol2tp_xmit (#607054)
-Patch13030: l2tp-fix-oops-in-pppol2tp_xmit.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1334,8 +1321,6 @@ ApplyPatch linux-2.6-execshield.patch
 # btrfs
 ApplyPatch linux-2.6-btrfs-update.patch
 
-# CVE-2010-2071
-ApplyPatch btrfs-should-add-permission-check-for-setfacl.patch
 ApplyPatch btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch
 
 
@@ -1531,9 +1516,6 @@ ApplyPatch alsa-usbmixer-add-possibility
 # rhbz#533746
 ApplyPatch ssb_check_for_sprom.patch
 
-# backport iwlwifi fixes (thanks, sgruszka!) -- drop when stable catches-up
-ApplyPatch iwlwifi-reset-card-during-probe.patch
-
 # make p54pci usable on slower hardware
 ApplyPatch linux-2.6-p54pci.patch
 
@@ -1558,9 +1540,6 @@ ApplyPatch ibmvscsi-fix-DMA-API-misuse.p
 
 ApplyPatch disable-i8042-check-on-apple-mac.patch
 
-# iwlwifi: recalculate average tpt if not current
-ApplyPatch iwlwifi-recalculate-average-tpt-if-not-current.patch
-
 ApplyPatch crypto-aesni-kill-module_alias.patch
 
 # automagically mount debugfs for perf
@@ -1579,18 +1558,12 @@ ApplyPatch iwlwifi-manage-QoS-by-mac-sta
 ApplyPatch mac80211-do-not-wipe-out-old-supported-rates.patch
 ApplyPatch mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
 
-# CVE-2010-1437
-ApplyPatch keys-find-keyring-by-name-can-gain-access-to-the-freed-keyring.patch
-
 # Disable rt20xx and rt35xx chipset support in rt2800pci and rt2800usb
 ApplyPatch rt2x00-rt2800-Make-rt30xx-and-rt35xx-chipsets-configurable.patch
 
 # iwlwifi: cancel scan watchdog in iwl_bg_abort_scan
 ApplyPatch iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
 
-# l2tp: fix oops in pppol2tp_xmit (#607054)
-ApplyPatch l2tp-fix-oops-in-pppol2tp_xmit.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2241,6 +2214,19 @@ fi
 # and build.
 
 %changelog
+* Fri Jul 02 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33.6-141.rc1
+- Linux 2.6.33.6-rc1
+- Drop patches merged upstream:
+    btrfs-should-add-permission-check-for-setfacl.patch (CVE-2010-2071)
+    iwlwifi-reset-card-during-probe.patch
+    iwlwifi-recalculate-average-tpt-if-not-current.patch
+    keys-find-keyring-by-name-can-gain-access-to-the-freed-keyring.patch
+    l2tp-fix-oops-in-pppol2tp_xmit.patch
+- Revert DRM patches we already have:
+    drm-edid-fix-1024x768-85hz.patch
+    drm-i915-fix-82854-pci-id-and-treat-it-like-other-85x.patch
+- Fix up usb-wwan-update.patch for upstream additions.
+
 * Fri Jul 02 2010 Dave Airlie <airlied at redhat.com> 2.6.33.5-140
 - attempt to fix hibernate on Intel GPUs (kernel.org #13811)
 

linux-2.6-upstream-reverts.patch:
 b/drivers/pci/pci.c                    |   43 ++++-----
 drivers/gpu/drm/drm_crtc_helper.c      |    1 
 drivers/gpu/drm/drm_edid.c             |   13 --
 drivers/gpu/drm/drm_fops.c             |   16 +--
 drivers/gpu/drm/i915/i915_debugfs.c    |    2 
 drivers/gpu/drm/i915/i915_dma.c        |   16 ++-
 drivers/gpu/drm/i915/i915_drv.c        |    9 +
 drivers/gpu/drm/i915/i915_drv.h        |   33 ++++++-
 drivers/gpu/drm/i915/i915_gem.c        |  155 ++++++++++++++++++++++++++++++---
 drivers/gpu/drm/i915/i915_gem_tiling.c |   24 ++---
 drivers/gpu/drm/i915/i915_irq.c        |   26 ++---
 drivers/gpu/drm/i915/i915_reg.h        |   13 ++
 drivers/gpu/drm/i915/intel_bios.c      |    3 
 drivers/gpu/drm/i915/intel_crt.c       |   14 +-
 drivers/gpu/drm/i915/intel_display.c   |   58 ++++++------
 drivers/gpu/drm/i915/intel_lvds.c      |    2 
 drivers/gpu/drm/i915/intel_overlay.c   |    2 
 drivers/gpu/drm/radeon/rs600.c         |    2 
 drivers/media/video/gspca/mr97310a.c   |    6 +
 drivers/usb/serial/qcserial.c          |   29 ++++++
 include/drm/drm_pciids.h               |    1 
 21 files changed, 334 insertions(+), 134 deletions(-)

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- linux-2.6-upstream-reverts.patch	27 May 2010 01:37:53 -0000	1.11
+++ linux-2.6-upstream-reverts.patch	2 Jul 2010 00:57:47 -0000	1.12
@@ -1,3 +1,95 @@
+From 5ce8ba7c9279a63f99e1f131602580472b8af968 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 15 Apr 2010 14:03:30 -0400
+Subject: drm/i915: Fix 82854 PCI ID, and treat it like other 85X
+
+From: Adam Jackson <ajax at redhat.com>
+
+commit 5ce8ba7c9279a63f99e1f131602580472b8af968 upstream.
+
+pci.ids and the datasheet both say it's 358e, not 35e8.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+Signed-off-by: Eric Anholt <eric at anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/i915/i915_drv.c |    5 +++--
+ drivers/gpu/drm/i915/i915_drv.h |    3 ++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -68,7 +68,8 @@ const static struct intel_device_info in
+ };
+ 
+ const static struct intel_device_info intel_i85x_info = {
+-	.is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1,
++	.is_i8xx = 1, .is_i85x = 1, .is_mobile = 1,
++	.cursor_needs_physical = 1,
+ };
+ 
+ const static struct intel_device_info intel_i865g_info = {
+@@ -140,7 +141,7 @@ const static struct pci_device_id pciidl
+ 	INTEL_VGA_DEVICE(0x3577, &intel_i830_info),
+ 	INTEL_VGA_DEVICE(0x2562, &intel_845g_info),
+ 	INTEL_VGA_DEVICE(0x3582, &intel_i85x_info),
+-	INTEL_VGA_DEVICE(0x35e8, &intel_i85x_info),
++	INTEL_VGA_DEVICE(0x358e, &intel_i85x_info),
+ 	INTEL_VGA_DEVICE(0x2572, &intel_i865g_info),
+ 	INTEL_VGA_DEVICE(0x2582, &intel_i915g_info),
+ 	INTEL_VGA_DEVICE(0x258a, &intel_i915g_info),
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -175,6 +175,7 @@ struct intel_overlay;
+ struct intel_device_info {
+ 	u8 is_mobile : 1;
+ 	u8 is_i8xx : 1;
++	u8 is_i85x : 1;
+ 	u8 is_i915g : 1;
+ 	u8 is_i9xx : 1;
+ 	u8 is_i945gm : 1;
+@@ -1027,7 +1028,7 @@ extern int i915_wait_ring(struct drm_dev
+ 
+ #define IS_I830(dev)		((dev)->pci_device == 0x3577)
+ #define IS_845G(dev)		((dev)->pci_device == 0x2562)
+-#define IS_I85X(dev)		((dev)->pci_device == 0x3582)
++#define IS_I85X(dev)		(INTEL_INFO(dev)->is_i85x)
+ #define IS_I865G(dev)		((dev)->pci_device == 0x2572)
+ #define IS_GEN2(dev)		(INTEL_INFO(dev)->is_i8xx)
+ #define IS_I915G(dev)		(INTEL_INFO(dev)->is_i915g)
+From 61dd98fad58f945ed720ba132681acb58fcee015 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 13 May 2010 14:55:28 -0400
+Subject: drm/edid: Fix 1024x768 at 85Hz
+
+From: Adam Jackson <ajax at redhat.com>
+
+commit 61dd98fad58f945ed720ba132681acb58fcee015 upstream.
+
+Having hsync both start and end on pixel 1072 ain't gonna work very
+well.  Matches the X server's list.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+Tested-By: Michael Tokarev <mjt at tls.msk.ru>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/drm_edid.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -334,7 +334,7 @@ static struct drm_display_mode drm_dmt_m
+ 		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+ 	/* 1024x768 at 85Hz */
+ 	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 94500, 1024, 1072,
+-		   1072, 1376, 0, 768, 769, 772, 808, 0,
++		   1168, 1376, 0, 768, 769, 772, 808, 0,
+ 		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+ 	/* 1152x864 at 75Hz */
+ 	{ DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216,
 From 8d06a1e1e9c69244f08beb7d17146483f9dcd120 Mon Sep 17 00:00:00 2001
 From: Robert Hooker <sarvatt at ubuntu.com>
 Date: Fri, 19 Mar 2010 15:13:27 -0400

linux-2.6-usb-wwan-update.patch:
 Kconfig    |    4 
 Makefile   |    1 
 option.c   |  648 +----------------------------------------------------------
 qcserial.c |   94 ++++++--
 usb-wwan.h |   66 ++++++
 usb_wwan.c |  665 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 831 insertions(+), 647 deletions(-)

Index: linux-2.6-usb-wwan-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/linux-2.6-usb-wwan-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-usb-wwan-update.patch	1 Apr 2010 16:49:56 -0000	1.1
+++ linux-2.6-usb-wwan-update.patch	2 Jul 2010 00:57:47 -0000	1.2
@@ -116,18 +116,25 @@ diff -up linux-2.6.33.noarch/drivers/usb
  struct option_port_private {
  	/* Input endpoints and buffer for this port */
  	struct urb *in_urbs[N_IN_URB];
-@@ -767,209 +740,21 @@ module_exit(option_exit);
+@@ -767,216 +740,28 @@ module_exit(option_exit);
  static int option_probe(struct usb_serial *serial,
  			const struct usb_device_id *id)
  {
 -	struct option_intf_private *data;
 +	struct usb_wwan_intf_private *data;
+ 
  	/* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */
  	if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&
  		serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
  		serial->interface->cur_altsetting->desc.bInterfaceClass == 0x8)
  		return -ENODEV;
  
+ 	/* Bandrich modem and AT command interface is 0xff */
+ 	if ((serial->dev->descriptor.idVendor == BANDRICH_VENDOR_ID ||
+ 		serial->dev->descriptor.idVendor == PIRELLI_VENDOR_ID) &&
+ 		serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)
+ 		return -ENODEV;
+ 
 -	data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL);
 +	data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
  	if (!data)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/sources,v
retrieving revision 1.1137
retrieving revision 1.1138
diff -u -p -r1.1137 -r1.1138
--- sources	27 May 2010 01:37:57 -0000	1.1137
+++ sources	2 Jul 2010 00:57:47 -0000	1.1138
@@ -1,2 +1,3 @@
 c3883760b18d50e8d78819c54d579b00  linux-2.6.33.tar.bz2
 9711dce3141d9fd38e15bceadc20f9f4  patch-2.6.33.5.bz2
+374671313ef9098df2ae00f0313ad49d  patch-2.6.33.6-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/upstream,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -p -r1.1050 -r1.1051
--- upstream	27 May 2010 01:37:57 -0000	1.1050
+++ upstream	2 Jul 2010 00:57:47 -0000	1.1051
@@ -1,2 +1,3 @@
 linux-2.6.33.tar.bz2
 patch-2.6.33.5.bz2
+patch-2.6.33.6-rc1.bz2


--- btrfs-should-add-permission-check-for-setfacl.patch DELETED ---


--- iwlwifi-recalculate-average-tpt-if-not-current.patch DELETED ---


--- iwlwifi-reset-card-during-probe.patch DELETED ---


--- keys-find-keyring-by-name-can-gain-access-to-the-freed-keyring.patch DELETED ---


--- l2tp-fix-oops-in-pppol2tp_xmit.patch DELETED ---

