--- /dev/null
+From eeb4bcb4771679d7b3446c0293334faee11b090a Mon Sep 17 00:00:00 2001
+From: Kamal Mostafa <kamal@canonical.com>
+Date: Sat, 1 May 2010 12:09:49 -0700
+Subject: ACPI: video: fix acpi_backlight=video
+
+From: Kamal Mostafa <kamal@canonical.com>
+
+commit eeb4bcb4771679d7b3446c0293334faee11b090a upstream.
+
+Make "acpi_backlight=video" param enable ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO
+as intended, instead of incorrectly enabling video output switching.
+
+BugLink: http://bugs.launchpad.net/bugs/573120
+
+Signed-off-by: Kamal Mostafa <kamal@canonical.com>
+Acked-by: Zhang Rui <rui.zhang@intel.com>
+Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
+Cc: Jiri Kosina <jkosina@suse.cz>
+Acked-by: Thomas Renninger <trenn@suse.de>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/video_detect.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/acpi/video_detect.c
++++ b/drivers/acpi/video_detect.c
+@@ -250,7 +250,7 @@ static int __init acpi_backlight(char *s
+ ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR;
+ if (!strcmp("video", str))
+ acpi_video_support |=
+- ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
++ ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO;
+ }
+ return 1;
+ }
--- /dev/null
+From 66668b6fb6861fad7f6bfef6646ac84693474c9a Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Sun, 23 May 2010 20:47:45 -0400
+Subject: ALSA: hda: Fix model quirk for Dell M1730
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 66668b6fb6861fad7f6bfef6646ac84693474c9a upstream.
+
+BugLink: https://launchpad.net/bugs/576160
+
+Symptom: Currently (2.6.32.12) the Dell M1730 uses the 3stack model
+quirk. Unfortunately this means that capture is not functional out-
+of-the-box despite ensuring that capture settings are unmuted and
+raised fully.
+
+Test case: boot from Ubuntu 10.04 LTS live cd; capture does not
+work.
+
+Resolution: Correct the model quirk for Dell M1730 to rely on the
+BIOS configuration.
+
+This patch also trivially sorts the quirk into the correct section
+based on the comments.
+
+Reported-and-Tested-By: <picdragon99@msn.com>
+Tested-By: Daren Hayward
+Tested-By: Tobias Krais
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_sigmatel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -2070,12 +2070,12 @@ static struct snd_pci_quirk stac927x_cfg
+ SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,
+ "Intel D965", STAC_D965_3ST),
+ /* Dell 3 stack systems */
+- SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f7, "Dell XPS M1730", STAC_DELL_3ST),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ed, "Dell ", STAC_DELL_3ST),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f4, "Dell ", STAC_DELL_3ST),
+ /* Dell 3 stack systems with verb table in BIOS */
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f3, "Dell Inspiron 1420", STAC_DELL_BIOS),
++ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f7, "Dell XPS M1730", STAC_DELL_BIOS),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0227, "Dell Vostro 1400 ", STAC_DELL_BIOS),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x022e, "Dell ", STAC_DELL_BIOS),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x022f, "Dell Inspiron 1525", STAC_DELL_BIOS),
--- /dev/null
+From 61bb42c37dfa9016dcacc86bcd41362ab2457d4a Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Sat, 29 May 2010 11:04:11 -0400
+Subject: ALSA: hda: Use LPIB for a Shuttle device
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 61bb42c37dfa9016dcacc86bcd41362ab2457d4a upstream.
+
+BugLink: https://launchpad.net/bugs/551949
+
+Symptom: On the reporter's Shuttle device, using PulseAudio in Ubuntu
+10.04 LTS results in "popping clicking" audio with the PA crashing
+shortly thereafter.
+
+Test case: Using Ubuntu 10.04 LTS (Linux 2.6.32.12), Linux 2.6.33, or
+Linux 2.6.34, adjust the HDA device's volume with PulseAudio.
+
+Resolution: add SSID for this machine to the position_fix quirk table,
+explicitly specifying the LPIB method.
+
+Reported-and-Tested-By: Christian Mehlis <mehlis@inf.fu-berlin.de>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2272,6 +2272,7 @@ static struct snd_pci_quirk position_fix
+ SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
++ SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
--- /dev/null
+From 7a68be94e22e7643038726ebc14360752a91800b Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Sat, 22 May 2010 12:05:41 -0400
+Subject: ALSA: hda: Use LPIB for Acer Aspire 5110
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 7a68be94e22e7643038726ebc14360752a91800b upstream.
+
+BugLink: https://launchpad.net/bugs/583983
+
+Symptom: on a significant number of hardware, booting from a live cd
+results in capture working correctly, but once the distribution is
+installed, booting from the install results in capture not working.
+
+Test case: boot from Ubuntu 10.04 LTS live cd; capture works correctly.
+Install to HD and reboot; capture does not work. Reproduced with 2.6.32
+mainline build (vanilla kernel.org compile).
+
+Resolution: add SSID for Acer Aspire 5110 to the position_fix quirk
+table, explicitly specifying the LPIB method.
+
+I'll be sending additional patches for these SSIDs as bug reports are
+confirmed.
+
+Reported-and-Tested-By: Leo
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2263,6 +2263,7 @@ static int azx_dev_free(struct snd_devic
+ * white/black-listing for position_fix
+ */
+ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
++ SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
--- /dev/null
+From e96d3127760a2fc509bca6bf7e61e8bc61497aeb Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Thu, 27 May 2010 18:32:18 -0400
+Subject: ALSA: hda: Use LPIB for Sony VPCS11V9E
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit e96d3127760a2fc509bca6bf7e61e8bc61497aeb upstream.
+
+BugLink: https://launchpad.net/bugs/586347
+
+Symptom: On the Sony VPCS11V9E, using GStreamer-based applications with
+PulseAudio in Ubuntu 10.04 LTS results in stuttering audio. It appears
+to worsen with increased I/O.
+
+Test case: use Rhythmbox under increased I/O pressure. This symptom is
+reproducible in the current daily stable alsa-driver snapshots (at least
+up until 21 May 2010; later snapshots fail to build from source due to
+missing preprocessor directives when compiled against 2.6.32).
+
+Resolution: add SSID for this machine to the position_fix quirk table,
+explicitly specifying the LPIB method.
+
+Reported-and-Tested-By: Lauri Kainulainen <lauri@sokkelo.net>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2269,6 +2269,7 @@ static struct snd_pci_quirk position_fix
+ SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
++ SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
--- /dev/null
+From 4e0938dba7fccf37a4aecba4d937da7f312b5d55 Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Sat, 22 May 2010 13:12:22 -0400
+Subject: ALSA: hda: Use LPIB for Toshiba A100-259
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 4e0938dba7fccf37a4aecba4d937da7f312b5d55 upstream.
+
+BugLink: https://launchpad.net/bugs/549560
+
+Symptom: on a significant number of hardware, booting from a live cd
+results in capture working correctly, but once the distribution is
+installed, booting from the install results in capture not working.
+
+Test case: boot from Ubuntu 10.04 LTS live cd; capture works correctly.
+Install to HD and reboot; capture does not work. Reproduced with 2.6.32
+mainline build (vanilla kernel.org compile)
+
+Resolution: add SSID for Toshiba A100-259 to the position_fix quirk
+table, explicitly specifying the LPIB method.
+
+I'll be sending additional patches for these SSIDs as bug reports are
+confirmed.
+
+This patch also trivially sorts the quirk table in ascending order by
+subsystem vendor.
+
+Reported-and-Tested-by: <davide.molteni@gmail.com>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2267,8 +2267,9 @@ static struct snd_pci_quirk position_fix
+ SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
+- SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
++ SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
++ SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
--- /dev/null
+From e7971c80a8e0299f91272ad8e8ac4167623e1862 Mon Sep 17 00:00:00 2001
+From: Andreas Bombe <aeb@debian.org>
+Date: Mon, 17 May 2010 23:12:46 -0700
+Subject: ARCNET: Limit com20020 PCI ID matches for SOHARD cards
+
+From: Andreas Bombe <aeb@debian.org>
+
+commit e7971c80a8e0299f91272ad8e8ac4167623e1862 upstream.
+
+The SH SOHARD ARCNET cards are implemented using generic PLX Technology
+PCI<->IOBus bridges. Subvendor and subdevice IDs were not specified,
+causing the driver to attach to any such bridge and likely crash the
+system by attempting to initialize an unrelated device.
+
+Fix by specifying subvendor and subdevice according to the values found
+in the PCI-ID Repository at http://pci-ids.ucw.cz/ .
+
+Signed-off-by: Andreas Bombe <aeb@debian.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/arcnet/com20020-pci.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/arcnet/com20020-pci.c
++++ b/drivers/net/arcnet/com20020-pci.c
+@@ -165,8 +165,8 @@ static struct pci_device_id com20020pci_
+ { 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+ { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+ { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+- { 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+- { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
++ { 0x10B5, 0x9030, 0x10B5, 0x2978, 0, 0, ARC_CAN_10MBIT },
++ { 0x10B5, 0x9050, 0x10B5, 0x2273, 0, 0, ARC_CAN_10MBIT },
+ { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+ { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+ {0,}
--- /dev/null
+From fa9dc265ace9774e62f0e31108e5f47911124bda Mon Sep 17 00:00:00 2001
+From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
+Date: Wed, 19 May 2010 09:37:41 +0900
+Subject: cpumask: fix compat getaffinity
+
+From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
+
+commit fa9dc265ace9774e62f0e31108e5f47911124bda upstream.
+
+Commit a45185d2d "cpumask: convert kernel/compat.c" broke libnuma, which
+abuses sched_getaffinity to find out NR_CPUS in order to parse
+/sys/devices/system/node/node*/cpumap.
+
+On NUMA systems with less than 32 possibly CPUs, the current
+compat_sys_sched_getaffinity now returns '4' instead of the actual
+NR_CPUS/8, which makes libnuma bail out when parsing the cpumap.
+
+The libnuma call sched_getaffinity(0, bitmap, 4096) at first. It mean
+the libnuma expect the return value of sched_getaffinity() is either len
+argument or NR_CPUS. But it doesn't expect to return nr_cpu_ids.
+
+Strictly speaking, userland requirement are
+
+1) Glibc assume the return value mean the lengh of initialized
+ of mask argument. E.g. if sched_getaffinity(1024) return 128,
+ glibc make zero fill rest 896 byte.
+2) Libnuma assume the return value can be used to guess NR_CPUS
+ in kernel. It assume len-arg<NR_CPUS makes -EINVAL. But
+ it try len=4096 at first and 4096 is always bigger than
+ NR_CPUS. Then, if we remove strange min_length normalization,
+ we never hit -EINVAL case.
+
+sched_getaffinity() already solved this issue. This patch adapts
+compat_sys_sched_getaffinity() to match the non-compat case.
+
+Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
+Acked-by: Rusty Russell <rusty@rustcorp.com.au>
+Acked-by: Arnd Bergmann <arnd@arndb.de>
+Reported-by: Ken Werner <ken.werner@web.de>
+Cc: Andi Kleen <andi@firstfloor.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ kernel/compat.c | 25 +++++++++++--------------
+ 1 file changed, 11 insertions(+), 14 deletions(-)
+
+--- a/kernel/compat.c
++++ b/kernel/compat.c
+@@ -494,29 +494,26 @@ asmlinkage long compat_sys_sched_getaffi
+ {
+ int ret;
+ cpumask_var_t mask;
+- unsigned long *k;
+- unsigned int min_length = cpumask_size();
+
+- if (nr_cpu_ids <= BITS_PER_COMPAT_LONG)
+- min_length = sizeof(compat_ulong_t);
+-
+- if (len < min_length)
++ if ((len * BITS_PER_BYTE) < nr_cpu_ids)
++ return -EINVAL;
++ if (len & (sizeof(compat_ulong_t)-1))
+ return -EINVAL;
+
+ if (!alloc_cpumask_var(&mask, GFP_KERNEL))
+ return -ENOMEM;
+
+ ret = sched_getaffinity(pid, mask);
+- if (ret < 0)
+- goto out;
++ if (ret == 0) {
++ size_t retlen = min_t(size_t, len, cpumask_size());
+
+- k = cpumask_bits(mask);
+- ret = compat_put_bitmap(user_mask_ptr, k, min_length * 8);
+- if (ret == 0)
+- ret = min_length;
+-
+-out:
++ if (compat_put_bitmap(user_mask_ptr, cpumask_bits(mask), retlen * 8))
++ ret = -EFAULT;
++ else
++ ret = retlen;
++ }
+ free_cpumask_var(mask);
++
+ return ret;
+ }
+
--- /dev/null
+From fd6be105b883244127a734ac9f14ae94a022dcc0 Mon Sep 17 00:00:00 2001
+From: Tony Breeds <tony@bakeyournoodle.com>
+Date: Wed, 19 May 2010 15:46:36 +1000
+Subject: mutex: Fix optimistic spinning vs. BKL
+
+From: Tony Breeds <tony@bakeyournoodle.com>
+
+commit fd6be105b883244127a734ac9f14ae94a022dcc0 upstream.
+
+Currently, we can hit a nasty case with optimistic
+spinning on mutexes:
+
+ CPU A tries to take a mutex, while holding the BKL
+
+ CPU B tried to take the BLK while holding the mutex
+
+This looks like a AB-BA scenario but in practice, is
+allowed and happens due to the auto-release on
+schedule() nature of the BKL.
+
+In that case, the optimistic spinning code can get us
+into a situation where instead of going to sleep, A
+will spin waiting for B who is spinning waiting for
+A, and the only way out of that loop is the
+need_resched() test in mutex_spin_on_owner().
+
+This patch fixes it by completely disabling spinning
+if we own the BKL. This adds one more detail to the
+extensive list of reasons why it's a bad idea for
+kernel code to be holding the BKL.
+
+Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
+Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
+Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+LKML-Reference: <20100519054636.GC12389@ozlabs.org>
+[ added an unlikely() attribute to the branch ]
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ kernel/mutex.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/kernel/mutex.c
++++ b/kernel/mutex.c
+@@ -172,6 +172,13 @@ __mutex_lock_common(struct mutex *lock,
+ struct thread_info *owner;
+
+ /*
++ * If we own the BKL, then don't spin. The owner of
++ * the mutex might be waiting on us to release the BKL.
++ */
++ if (unlikely(current->lock_depth >= 0))
++ break;
++
++ /*
+ * If there's an owner, wait for it to either
+ * release the lock or go to sleep.
+ */
--- /dev/null
+From 15ddb4aec54422ead137b03ea4e9b3f5db3f7cc2 Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul@openvz.org>
+Date: Fri, 14 May 2010 15:33:36 +0400
+Subject: NFSD: don't report compiled-out versions as present
+
+From: Pavel Emelyanov <xemul@openvz.org>
+
+commit 15ddb4aec54422ead137b03ea4e9b3f5db3f7cc2 upstream.
+
+The /proc/fs/nfsd/versions file calls nfsd_vers() to check whether
+the particular nfsd version is present/available. The problem is
+that once I turn off e.g. NFSD-V4 this call returns -1 which is
+true from the callers POV which is wrong.
+
+The proposal is to report false in that case.
+
+The bug has existed since 6658d3a7bbfd1768 "[PATCH] knfsd: remove
+nfsd_versbits as intermediate storage for desired versions".
+
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+Acked-by: NeilBrown <neilb@suse.de>
+Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/nfsd/nfssvc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/nfsd/nfssvc.c
++++ b/fs/nfsd/nfssvc.c
+@@ -120,7 +120,7 @@ u32 nfsd_supported_minorversion;
+ int nfsd_vers(int vers, enum vers_op change)
+ {
+ if (vers < NFSD_MINVERS || vers >= NFSD_NRVERS)
+- return -1;
++ return 0;
+ switch(change) {
+ case NFSD_SET:
+ nfsd_versions[vers] = nfsd_version[vers];
--- /dev/null
+From d989ff7cf8d14f1b523f63ba0bf2ec1a9b7c25bc Mon Sep 17 00:00:00 2001
+From: John W. Linville <linville@tuxdriver.com>
+Date: Wed, 28 Apr 2010 19:14:42 -0400
+Subject: rtl8180: fix tx status reporting
+
+From: John W. Linville <linville@tuxdriver.com>
+
+commit d989ff7cf8d14f1b523f63ba0bf2ec1a9b7c25bc upstream.
+
+When reporting Tx status, indicate that only one rate was used.
+Otherwise, the rate is frozen at rate index 0 (i.e. 1Mb/s).
+
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
+@@ -189,6 +189,7 @@ static void rtl8180_handle_tx(struct iee
+ info->flags |= IEEE80211_TX_STAT_ACK;
+
+ info->status.rates[0].count = (flags & 0xFF) + 1;
++ info->status.rates[1].idx = -1;
+
+ ieee80211_tx_status_irqsafe(dev, skb);
+ if (ring->entries - skb_queue_len(&ring->queue) == 2)
--- /dev/null
+From 95cc2c70c139936a2142bcd583da8af6f9d88efb Mon Sep 17 00:00:00 2001
+From: Tejun Heo <tj@kernel.org>
+Date: Fri, 14 May 2010 11:48:50 +0200
+Subject: sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()
+
+From: Tejun Heo <tj@kernel.org>
+
+commit 95cc2c70c139936a2142bcd583da8af6f9d88efb upstream.
+
+sata_nv was incorrectly using ata_host_activate() instead of
+ata_pci_sff_activate_host() leading to IRQ assignment failure in
+legacy mode. Fix it.
+
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Cc: Robert Hancock <hancockr@shaw.ca>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/ata/sata_nv.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/ata/sata_nv.c
++++ b/drivers/ata/sata_nv.c
+@@ -2478,8 +2478,7 @@ static int nv_init_one(struct pci_dev *p
+ }
+
+ pci_set_master(pdev);
+- return ata_host_activate(host, pdev->irq, ipriv->irq_handler,
+- IRQF_SHARED, ipriv->sht);
++ return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht);
+ }
+
+ #ifdef CONFIG_PM
libata-don-t-flush-dcache-on-slab-pages.patch
oprofile-x86-fix-uninitialized-counter-usage-during-cpu-hotplug.patch
oprofile-remove-double-ring-buffering.patch
+cpumask-fix-compat-getaffinity.patch
+nfsd-don-t-report-compiled-out-versions-as-present.patch
+sata_nv-use-ata_pci_sff_activate_host-instead-of-ata_host_activate.patch
+arcnet-limit-com20020-pci-id-matches-for-sohard-cards.patch
+rtl8180-fix-tx-status-reporting.patch
+staging-add-add-sitecom-wl-349-to-rtl8192su.patch
+staging-vt6655-fix-kernel-bug-on-driver-wpa-initialization.patch
+staging-rt2870-add-device-id-of-melco.-inc.-wli-uc-g301n.patch
+mutex-fix-optimistic-spinning-vs.-bkl.patch
+alsa-hda-fix-model-quirk-for-dell-m1730.patch
+alsa-hda-use-lpib-for-toshiba-a100-259.patch
+alsa-hda-use-lpib-for-acer-aspire-5110.patch
+alsa-hda-use-lpib-for-sony-vpcs11v9e.patch
+alsa-hda-use-lpib-for-a-shuttle-device.patch
+acpi-video-fix-acpi_backlight-video.patch
--- /dev/null
+From 64a5a09218626464be35e0229d85b2ab0fcf03fd Mon Sep 17 00:00:00 2001
+From: Rodrigo Linfati <rodrigo@linfati.cl>
+Date: Wed, 28 Apr 2010 22:32:13 +0200
+Subject: Staging: add Add Sitecom WL-349 to rtl8192su
+
+From: Rodrigo Linfati <rodrigo@linfati.cl>
+
+commit 64a5a09218626464be35e0229d85b2ab0fcf03fd upstream.
+
+Add usb id of Sitecom WL-349 to rtl8192su
+
+Signed-off-by: Rodrigo Linfati <rodrigo@linfati.cl>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/staging/rtl8192su/r8192U_core.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/rtl8192su/r8192U_core.c
++++ b/drivers/staging/rtl8192su/r8192U_core.c
+@@ -120,6 +120,7 @@ static struct usb_device_id rtl8192_usb_
+ {USB_DEVICE(0x050d, 0x805E)},
+ /* Sitecom */
+ {USB_DEVICE(0x0df6, 0x0031)},
++ {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 */
+ /* EnGenius */
+ {USB_DEVICE(0x1740, 0x9201)},
+ /* Dlink */
--- /dev/null
+From de37cd49b5a54facef174cf34496919857436e8f Mon Sep 17 00:00:00 2001
+From: Nobuhiro KUSUNO <n-kusuno@fc4.so-net.ne.jp>
+Date: Thu, 6 May 2010 05:23:28 +0900
+Subject: Staging: rt2870: add device ID of MelCo.,Inc. WLI-UC-G301N
+
+From: Nobuhiro KUSUNO <n-kusuno@fc4.so-net.ne.jp>
+
+commit de37cd49b5a54facef174cf34496919857436e8f upstream.
+
+My wireless LAN module 'MelCo.,Inc. WLI-UC-G301N' works fine,
+if the following line is added into 2870_main_dev.c.
+
+Signed-off-by: Nobhiro KUSUNO <n-kusuno@fc4.so-net.ne.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/staging/rt2860/usb_main_dev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/rt2860/usb_main_dev.c
++++ b/drivers/staging/rt2860/usb_main_dev.c
+@@ -97,6 +97,7 @@ struct usb_device_id rtusb_usb_id[] = {
+ {USB_DEVICE(0x5A57, 0x0282)}, /* Zinwell */
+ {USB_DEVICE(0x7392, 0x7718)},
+ {USB_DEVICE(0x7392, 0x7717)},
++ {USB_DEVICE(0x0411, 0x016f)}, /* MelCo.,Inc. WLI-UC-G301N */
+ {USB_DEVICE(0x1737, 0x0070)}, /* Linksys WUSB100 */
+ {USB_DEVICE(0x1737, 0x0071)}, /* Linksys WUSB600N */
+ {USB_DEVICE(0x0411, 0x00e8)}, /* Buffalo WLI-UC-G300N */
--- /dev/null
+From f65515275ea3e45fdcd0fb78455f542d6fdca086 Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger@lwfinger.net>
+Date: Sun, 9 May 2010 22:10:02 -0500
+Subject: staging: vt6655: Fix kernel BUG on driver wpa initialization
+
+From: Larry Finger <Larry.Finger@lwfinger.net>
+
+commit f65515275ea3e45fdcd0fb78455f542d6fdca086 upstream.
+
+In http://bugzilla.novell.com/show_bug.cgi?id=597299, the vt6655 driver
+generates a kernel BUG on a NULL pointer dereference at NULL. This problem
+has been traced to a failure in the wpa_set_wpadev() routine. As the vt6656
+driver does not call this routine, the vt6655 code is similarly set to skip
+the call.
+
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+Tested-by: Richard Meek <osl2008@googlemail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/staging/vt6655/device_main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/staging/vt6655/device_main.c
++++ b/drivers/staging/vt6655/device_main.c
+@@ -1089,11 +1089,13 @@ device_found1(struct pci_dev *pcid, cons
+ }
+ //2008-07-21-01<Add>by MikeLiu
+ //register wpadev
++#if 0
+ if(wpa_set_wpadev(pDevice, 1)!=0) {
+ printk("Fail to Register WPADEV?\n");
+ unregister_netdev(pDevice->dev);
+ free_netdev(dev);
+ }
++#endif
+ device_print_info(pDevice);
+ pci_set_drvdata(pcid, pDevice);
+ return 0;
projects / thirdparty / kernel / stable-queue.git / commitdiff
