Start review

delete some patches and fix one to resolve a build problem.

8 files changed, 19 insertions, 103 deletions

diff --git a/queue-2.6.33/alsa-hda-create-mixers-on-alc887.patch b/queue-2.6.33/alsa-hda-create-mixers-on-alc887.patch
deleted file mode 100644
index 5a686ef..0000000
--- a/queue-2.6.33/alsa-hda-create-mixers-on-alc887.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 03b7a1ab557efe34e8f79b78660e514bd7374248 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Tue, 9 Nov 2010 14:35:30 +0100
-Subject: ALSA: HDA: Create mixers on ALC887
-
-From: David Henningsson <david.henningsson@canonical.com>
-
-commit 03b7a1ab557efe34e8f79b78660e514bd7374248 upstream.
-
-BugLink: http://launchpad.net/bugs/669092
-
-ALC887 does not have any volume control ability on the mixer NIDs,
-so put the volume controls on the dac NIDs instead. Without this
-patch, ALC887 users cannot use alsamixer at all.
-
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- sound/pci/hda/patch_realtek.c |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10007,6 +10007,9 @@ static int alc_auto_add_mic_boost(struct
- 	return 0;
- }
- 
-+static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
-+					     const struct auto_pin_cfg *cfg);
-+
- /* almost identical with ALC880 parser... */
- static int alc882_parse_auto_config(struct hda_codec *codec)
- {
-@@ -10024,7 +10027,10 @@ static int alc882_parse_auto_config(stru
- 	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
- 	if (err < 0)
- 		return err;
--	err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
-+	if (codec->vendor_id == 0x10ec0887)
-+		err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
-+	else
-+		err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
- 	if (err < 0)
- 		return err;
- 	err = alc880_auto_create_extra_out(spec,
-@@ -15646,7 +15652,7 @@ static void alc861vd_auto_init_analog_in
- #define alc861vd_idx_to_mixer_switch(nid)	((nid) + 0x0c)
- 
- /* add playback controls from the parsed DAC table */
--/* Based on ALC880 version. But ALC861VD has separate,
-+/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
-  * different NIDs for mute/unmute switch and volume control */
- static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
- 					     const struct auto_pin_cfg *cfg)
diff --git a/queue-2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch b/queue-2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
index d80c40f..16cdbb5 100644
--- a/queue-2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
+++ b/queue-2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
@@ -53,8 +53,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/sparc/include/asm/compat.h   |    2 +-
  arch/x86/include/asm/compat.h     |    2 +-
  include/linux/compat.h            |    2 ++
- kernel/compat.c                   |   21 +++++++++++++++++++++
- 9 files changed, 30 insertions(+), 7 deletions(-)
+ kernel/compat.c                   |   22 ++++++++++++++++++++++
+ 9 files changed, 31 insertions(+), 7 deletions(-)
 
 --- a/arch/ia64/include/asm/compat.h
 +++ b/arch/ia64/include/asm/compat.h
@@ -145,7 +145,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif /* _LINUX_COMPAT_H */
 --- a/kernel/compat.c
 +++ b/kernel/compat.c
-@@ -1136,3 +1136,24 @@ compat_sys_sysinfo(struct compat_sysinfo
+@@ -25,6 +25,7 @@
+ #include <linux/posix-timers.h>
+ #include <linux/times.h>
+ #include <linux/ptrace.h>
++#include <linux/module.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -1136,3 +1137,24 @@ compat_sys_sysinfo(struct compat_sysinfo
  
  	return 0;
  }
diff --git a/queue-2.6.33/firewire-ohci-fix-buffer-overflow-in-ar-split-packet-handling.patch b/queue-2.6.33/firewire-ohci-fix-buffer-overflow-in-ar-split-packet-handling.patch
index 460f413..4d3b992 100644
--- a/queue-2.6.33/firewire-ohci-fix-buffer-overflow-in-ar-split-packet-handling.patch
+++ b/queue-2.6.33/firewire-ohci-fix-buffer-overflow-in-ar-split-packet-handling.patch
@@ -23,7 +23,7 @@ using firewire-net.
 
 Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
 Tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
-Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (cast PAGE_SIZE to size_t)
+Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
diff --git a/queue-2.6.33/scsi-mptsas-fix-hangs-caused-by-ata-pass-through.patch b/queue-2.6.33/scsi-mptsas-fix-hangs-caused-by-ata-pass-through.patch
index 3ad8623..5b9afc0 100644
--- a/queue-2.6.33/scsi-mptsas-fix-hangs-caused-by-ata-pass-through.patch
+++ b/queue-2.6.33/scsi-mptsas-fix-hangs-caused-by-ata-pass-through.patch
@@ -56,7 +56,7 @@ bounces misaligned buffers (see block/blk-map.c line 57).  The following
 patch to 2.6.34-rc5 makes my symptoms go away.  I'm sure this is the wrong
 place for this code, but it gets my idea across.
 
-Acked-by: "Desai, Kashyap" <Kashyap.Desai@lsi.com>
+Acked-by: Kashyap Desai <Kashyap.Desai@lsi.com>
 Signed-off-by: James Bottomley <James.Bottomley@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index d0b5a5a..6dbf2c0 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -265,7 +265,6 @@ usb-prevent-buggy-hubs-from-crashing-the-usb-stack.patch
 staging-comedi-add-support-for-newer-jr3-1-channel-pci-board.patch
 staging-comedi-ni_labpc-use-shared-irq-for-pcmcia-card.patch
 staging-hv-fix-sysfs-symlink-on-hv-block-device.patch
-staging-hv-enable-sending-garp-packet-after-live-migration.patch
 hvc_iucv-allocate-memory-buffers-for-iucv-in-zone-dma.patch
 staging-rt3090-fix-rt3090-scan-ap-function.patch
 staging-rt2860-fix-previous-patch-error.patch
@@ -283,7 +282,6 @@ mpt2sas-kernel-panic-during-large-topology-discovery.patch
 mpt2sas-add-missing-initialization-of-scsih_cmds.patch
 radio-aimslab.c-fix-gcc-4.5-bug.patch
 em28xx-fix-audio-input-for-terratec-grabby.patch
-alsa-hda-create-mixers-on-alc887.patch
 alsa-au88x0-limit-number-of-channels-to-fix-oops-via-oss-emu.patch
 alsa-hda-fix-dmesg-output-of-hdmi-supported-bits.patch
 alsa-hda-fix-memory-leaks-in-conexant-jack-arrays.patch
diff --git a/queue-2.6.33/staging-hv-enable-sending-garp-packet-after-live-migration.patch b/queue-2.6.33/staging-hv-enable-sending-garp-packet-after-live-migration.patch
deleted file mode 100644
index f75ad04..0000000
--- a/queue-2.6.33/staging-hv-enable-sending-garp-packet-after-live-migration.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7c161d0b900ea9bd9fc5ea5d3fa9916e9eb0dd88 Mon Sep 17 00:00:00 2001
-From: Haiyang Zhang <haiyangz@microsoft.com>
-Date: Wed, 2 Feb 2011 13:42:58 -0800
-Subject: staging: hv: Enable sending GARP packet after live migration
-
-From: Haiyang Zhang <haiyangz@microsoft.com>
-
-commit 7c161d0b900ea9bd9fc5ea5d3fa9916e9eb0dd88 upstream.
-
-The hv_netvsc gets RNDIS_STATUS_MEDIA_CONNECT event after the VM
-is live migrated. Adding call to netif_notify_peers() for this event
-to send GARP (Gratuitous ARP) to notify network peers. Otherwise,
-the VM's network connection may stop after a live migration.
-
-This patch should also be applied to stable kernel 2.6.32 and later.
-
-Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
-Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/staging/hv/netvsc_drv.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/staging/hv/netvsc_drv.c
-+++ b/drivers/staging/hv/netvsc_drv.c
-@@ -296,6 +296,7 @@ static void netvsc_linkstatus_callback(s
- 	if (status == 1) {
- 		netif_carrier_on(net);
- 		netif_wake_queue(net);
-+		netif_notify_peers(net);
- 	} else {
- 		netif_carrier_off(net);
- 		netif_stop_queue(net);
diff --git a/queue-2.6.33/staging-rt2860-fix-previous-patch-error.patch b/queue-2.6.33/staging-rt2860-fix-previous-patch-error.patch
index 517b4e1..070ca47 100644
--- a/queue-2.6.33/staging-rt2860-fix-previous-patch-error.patch
+++ b/queue-2.6.33/staging-rt2860-fix-previous-patch-error.patch
@@ -1,5 +1,5 @@
 From 1f0613158ea14b399fd7a16470630a729ba9d0c3 Mon Sep 17 00:00:00 2001
-From: Chen, Chien-Chia <machen@novell.com>
+From: Chien-Chia Chen <machen@novell.com>
 Date: Thu, 9 Dec 2010 10:52:08 +0800
 Subject: Staging: rt2860: fix previous patch error
 
@@ -10,8 +10,8 @@ commit 1f0613158ea14b399fd7a16470630a729ba9d0c3 upstream.
 Somehow Greg messed up the last patch and missed a chunk.  This patch
 contains the missing chunk.
 
-Acked-by: Lee, Chun-Yi <jlee@novell.com>
-Signed-off-by: Chen, Chien-Chia <machen@novell.com>
+Acked-by: Chun-Yi Lee <jlee@novell.com>
+Signed-off-by: Chien-Chia Chen <machen@novell.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
diff --git a/queue-2.6.33/staging-rt3090-fix-rt3090-scan-ap-function.patch b/queue-2.6.33/staging-rt3090-fix-rt3090-scan-ap-function.patch
index ca72cb3..1c66512 100644
--- a/queue-2.6.33/staging-rt3090-fix-rt3090-scan-ap-function.patch
+++ b/queue-2.6.33/staging-rt3090-fix-rt3090-scan-ap-function.patch
@@ -1,5 +1,5 @@
 From 1226056d9608d241db4b558a0d88a347ad5c66ae Mon Sep 17 00:00:00 2001
-From: Chen, Chien-Chia <machen@novell.com>
+From: Chien-Chia Chen <machen@novell.com>
 Date: Wed, 8 Dec 2010 14:20:33 -0800
 Subject: Staging: rt3090: Fix RT3090 scan AP function
 
@@ -13,8 +13,8 @@ This patch fixes the rt3090 wireless module failed
 to scan AP around due to  Windows driver causing
 rt3090 module unable to scan AP in Linux.
 
-Acked-by: Lee, Chun-Yi <jlee@novell.com>
-Signed-off-by: Chen, Chien-Chia <machen@novell.com>
+Acked-by: Chun-Yi Lee <jlee@novell.com>
+Signed-off-by: Chien-Chia Chen <machen@novell.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---