summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-07-07 17:15:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-07 17:15:09 -0700
commitbc81878c1d29a2756bcb6251430b3e4cd291523e (patch)
tree5cd8e98b6b5708a4986ab058b1061021618162b0
parenta34ad26998d864b800c354b63694f4113ffb29e8 (diff)
downloadstable-queue-bc81878c1d29a2756bcb6251430b3e4cd291523e.tar.gz
fix up things that 'quilt mail' hates :(
-rw-r--r--queue-2.6.39/arm-samsung-serial-fix-on-handling-of-one-clock-source.patch3
-rw-r--r--queue-2.6.39/ath5k-fix-memory-leak-when-fewer-than-n_pd_curves-are-in.patch3
-rw-r--r--queue-2.6.39/block-use-the-passed-in-bdev-when-claiming-if-partno-is.patch3
-rw-r--r--queue-2.6.39/connector-correctly-set-the-error-code-in-case-of-success.patch3
-rw-r--r--queue-2.6.39/debugobjects-fix-boot-crash-when-kmemleak-and-debugobjects.patch3
-rw-r--r--queue-2.6.39/drivers-base-platform.c-don-t-mark.patch3
-rw-r--r--queue-2.6.39/drivers-misc-lkdtm.c-fix-race-when-crashpoint-is-hit.patch3
-rw-r--r--queue-2.6.39/drivers-tty-serial-pch_uart.c-don-t-oops-if.patch3
-rw-r--r--queue-2.6.39/fix-cpu-spinlock-lockups-on-secondary-cpu-bringup.patch1
-rw-r--r--queue-2.6.39/ksm-fix-null-pointer-dereference-in.patch3
-rw-r--r--queue-2.6.39/md-avoid-endless-recovery-loop-when-waiting-for-fail-device.patch3
-rw-r--r--queue-2.6.39/mm-fix-negative-commitlimit-when-gigantic-hugepages-are.patch3
-rw-r--r--queue-2.6.39/mmc-tmio-fix-regression-in-tmio_mmc_wrprotect_disable.patch3
-rw-r--r--queue-2.6.39/oprofile-x86-fix-race-in-nmi-handler-while-starting.patch3
-rw-r--r--queue-2.6.39/uvcvideo-remove-buffers-from-the-queues-when.patch3
-rw-r--r--queue-2.6.39/xen-mmu-fix-for-linker-errors-when-config_smp-is-not.patch3
-rw-r--r--queue-2.6.39/xen-partially-revert-xen-set-max_pfn_mapped-to-the-last.patch3
-rw-r--r--queue-2.6.39/xen-pci-move-check-for-acpi_sci_override_gsi-to.patch3
-rw-r--r--queue-2.6.39/xen-pci-use-the-int_src_ovr-irq-instead-of-gsi-to-preset.patch3
-rw-r--r--queue-2.6.39/xhci-always-set-urb-status-to-zero-for-isoc-endpoints.patch2
20 files changed, 19 insertions, 38 deletions
diff --git a/queue-2.6.39/arm-samsung-serial-fix-on-handling-of-one-clock-source.patch b/queue-2.6.39/arm-samsung-serial-fix-on-handling-of-one-clock-source.patch
index d7c4dc1e83..88eee17a39 100644
--- a/queue-2.6.39/arm-samsung-serial-fix-on-handling-of-one-clock-source.patch
+++ b/queue-2.6.39/arm-samsung-serial-fix-on-handling-of-one-clock-source.patch
@@ -1,8 +1,7 @@
From 470f22975448a65a1084a6f0721fa5df15323f02 Mon Sep 17 00:00:00 2001
From: Boojin Kim <boojin.kim@samsung.com>
Date: Fri, 27 May 2011 19:04:03 -0700
-Subject: ARM: SAMSUNG: serial: Fix on handling of one clock source
- for UART
+Subject: ARM: SAMSUNG: serial: Fix on handling of one clock source for UART
From: Boojin Kim <boojin.kim@samsung.com>
diff --git a/queue-2.6.39/ath5k-fix-memory-leak-when-fewer-than-n_pd_curves-are-in.patch b/queue-2.6.39/ath5k-fix-memory-leak-when-fewer-than-n_pd_curves-are-in.patch
index f345c3380e..d315267de6 100644
--- a/queue-2.6.39/ath5k-fix-memory-leak-when-fewer-than-n_pd_curves-are-in.patch
+++ b/queue-2.6.39/ath5k-fix-memory-leak-when-fewer-than-n_pd_curves-are-in.patch
@@ -1,8 +1,7 @@
From a0b8de350be458b33248e48b2174d9af8a4c4798 Mon Sep 17 00:00:00 2001
From: "Eugene A. Shatokhin" <dame_eugene@mail.ru>
Date: Tue, 28 Jun 2011 23:04:51 -0400
-Subject: ath5k: fix memory leak when fewer than N_PD_CURVES are in
- use
+Subject: ath5k: fix memory leak when fewer than N_PD_CURVES are in use
From: "Eugene A. Shatokhin" <dame_eugene@mail.ru>
diff --git a/queue-2.6.39/block-use-the-passed-in-bdev-when-claiming-if-partno-is.patch b/queue-2.6.39/block-use-the-passed-in-bdev-when-claiming-if-partno-is.patch
index 8e8b914425..69e2000fc5 100644
--- a/queue-2.6.39/block-use-the-passed-in-bdev-when-claiming-if-partno-is.patch
+++ b/queue-2.6.39/block-use-the-passed-in-bdev-when-claiming-if-partno-is.patch
@@ -1,8 +1,7 @@
From d4c208b86b8be4254eba0e74071496e599f94639 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 13 Jun 2011 12:45:48 +0200
-Subject: block: use the passed in @bdev when claiming if partno is
- zero
+Subject: block: use the passed in @bdev when claiming if partno is zero
From: Tejun Heo <tj@kernel.org>
diff --git a/queue-2.6.39/connector-correctly-set-the-error-code-in-case-of-success.patch b/queue-2.6.39/connector-correctly-set-the-error-code-in-case-of-success.patch
index 99cad69716..2e8834cddb 100644
--- a/queue-2.6.39/connector-correctly-set-the-error-code-in-case-of-success.patch
+++ b/queue-2.6.39/connector-correctly-set-the-error-code-in-case-of-success.patch
@@ -1,8 +1,7 @@
From 663dd6dcaf7e95526e469e91f41972a9c0cca30c Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 17 May 2011 15:25:38 -0700
-Subject: Connector: Correctly set the error code in case of success
- when dispatching receive callbacks
+Subject: Connector: Correctly set the error code in case of success when dispatching receive callbacks
From: "K. Y. Srinivasan" <kys@microsoft.com>
diff --git a/queue-2.6.39/debugobjects-fix-boot-crash-when-kmemleak-and-debugobjects.patch b/queue-2.6.39/debugobjects-fix-boot-crash-when-kmemleak-and-debugobjects.patch
index 8953457f22..89e25b9374 100644
--- a/queue-2.6.39/debugobjects-fix-boot-crash-when-kmemleak-and-debugobjects.patch
+++ b/queue-2.6.39/debugobjects-fix-boot-crash-when-kmemleak-and-debugobjects.patch
@@ -1,8 +1,7 @@
From 161b6ae0e067e421b20bb35caf66bdb405c929ac Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sat, 28 May 2011 13:23:42 +0200
-Subject: debugobjects: Fix boot crash when kmemleak and debugobjects
- enabled
+Subject: debugobjects: Fix boot crash when kmemleak and debugobjects enabled
From: Marcin Slusarz <marcin.slusarz@gmail.com>
diff --git a/queue-2.6.39/drivers-base-platform.c-don-t-mark.patch b/queue-2.6.39/drivers-base-platform.c-don-t-mark.patch
index 57de2818cc..31c8c108ae 100644
--- a/queue-2.6.39/drivers-base-platform.c-don-t-mark.patch
+++ b/queue-2.6.39/drivers-base-platform.c-don-t-mark.patch
@@ -1,8 +1,7 @@
From bb2b43fefab723f4a0760146e7bed59d41a50e53 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 May 2011 14:44:19 -0700
-Subject: drivers/base/platform.c: don't mark
- platform_device_register_resndata() as __init_or_module
+Subject: drivers/base/platform.c: don't mark platform_device_register_resndata() as __init_or_module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/queue-2.6.39/drivers-misc-lkdtm.c-fix-race-when-crashpoint-is-hit.patch b/queue-2.6.39/drivers-misc-lkdtm.c-fix-race-when-crashpoint-is-hit.patch
index 3411862ba1..0cb475b73e 100644
--- a/queue-2.6.39/drivers-misc-lkdtm.c-fix-race-when-crashpoint-is-hit.patch
+++ b/queue-2.6.39/drivers-misc-lkdtm.c-fix-race-when-crashpoint-is-hit.patch
@@ -1,8 +1,7 @@
From aa2c96d6f329e66cc59352b0f12e8f04e6a9593b Mon Sep 17 00:00:00 2001
From: Josh Hunt <johunt@akamai.com>
Date: Mon, 27 Jun 2011 16:18:08 -0700
-Subject: drivers/misc/lkdtm.c: fix race when crashpoint is hit
- multiple times before checking count
+Subject: drivers/misc/lkdtm.c: fix race when crashpoint is hit multiple times before checking count
From: Josh Hunt <johunt@akamai.com>
diff --git a/queue-2.6.39/drivers-tty-serial-pch_uart.c-don-t-oops-if.patch b/queue-2.6.39/drivers-tty-serial-pch_uart.c-don-t-oops-if.patch
index 25a16b41ce..b249814123 100644
--- a/queue-2.6.39/drivers-tty-serial-pch_uart.c-don-t-oops-if.patch
+++ b/queue-2.6.39/drivers-tty-serial-pch_uart.c-don-t-oops-if.patch
@@ -1,8 +1,7 @@
From fb139dfeef9558a12ffdbf9e26951fd1a9304f3b Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@systec-electronic.com>
Date: Wed, 15 Jun 2011 15:08:55 -0700
-Subject: drivers/tty/serial/pch_uart.c: don't oops if
- dmi_get_system_info returns NULL
+Subject: drivers/tty/serial/pch_uart.c: don't oops if dmi_get_system_info returns NULL
From: Alexander Stein <alexander.stein@systec-electronic.com>
diff --git a/queue-2.6.39/fix-cpu-spinlock-lockups-on-secondary-cpu-bringup.patch b/queue-2.6.39/fix-cpu-spinlock-lockups-on-secondary-cpu-bringup.patch
index b3d32b585b..4dd75afdc9 100644
--- a/queue-2.6.39/fix-cpu-spinlock-lockups-on-secondary-cpu-bringup.patch
+++ b/queue-2.6.39/fix-cpu-spinlock-lockups-on-secondary-cpu-bringup.patch
@@ -34,7 +34,6 @@ completed all the calibration decisions.
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Cc: <stable@kernel.org> (2.6.39-stable)
--
Better solutions (such as omitting the calibration for secondary CPUs,
or arranging for calibrate_delay() to return the LPJ value and leave
diff --git a/queue-2.6.39/ksm-fix-null-pointer-dereference-in.patch b/queue-2.6.39/ksm-fix-null-pointer-dereference-in.patch
index 9aa22dda3a..d87c01c3a7 100644
--- a/queue-2.6.39/ksm-fix-null-pointer-dereference-in.patch
+++ b/queue-2.6.39/ksm-fix-null-pointer-dereference-in.patch
@@ -1,8 +1,7 @@
From 2b472611a32a72f4a118c069c2d62a1a3f087afd Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Wed, 15 Jun 2011 15:08:58 -0700
-Subject: ksm: fix NULL pointer dereference in
- scan_get_next_rmap_item()
+Subject: ksm: fix NULL pointer dereference in scan_get_next_rmap_item()
From: Hugh Dickins <hughd@google.com>
diff --git a/queue-2.6.39/md-avoid-endless-recovery-loop-when-waiting-for-fail-device.patch b/queue-2.6.39/md-avoid-endless-recovery-loop-when-waiting-for-fail-device.patch
index d9dbd9194e..c09cafd2ff 100644
--- a/queue-2.6.39/md-avoid-endless-recovery-loop-when-waiting-for-fail-device.patch
+++ b/queue-2.6.39/md-avoid-endless-recovery-loop-when-waiting-for-fail-device.patch
@@ -1,8 +1,7 @@
From 4274215d24633df7302069e51426659d4759c5ed Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 28 Jun 2011 16:59:42 +1000
-Subject: md: avoid endless recovery loop when waiting for fail device
- to complete.
+Subject: md: avoid endless recovery loop when waiting for fail device to complete.
From: NeilBrown <neilb@suse.de>
diff --git a/queue-2.6.39/mm-fix-negative-commitlimit-when-gigantic-hugepages-are.patch b/queue-2.6.39/mm-fix-negative-commitlimit-when-gigantic-hugepages-are.patch
index 68733bc57c..36bf645ec5 100644
--- a/queue-2.6.39/mm-fix-negative-commitlimit-when-gigantic-hugepages-are.patch
+++ b/queue-2.6.39/mm-fix-negative-commitlimit-when-gigantic-hugepages-are.patch
@@ -1,8 +1,7 @@
From b0320c7b7d1ac1bd5c2d9dff3258524ab39bad32 Mon Sep 17 00:00:00 2001
From: Rafael Aquini <aquini@linux.com>
Date: Wed, 15 Jun 2011 15:08:39 -0700
-Subject: mm: fix negative commitlimit when gigantic hugepages are
- allocated
+Subject: mm: fix negative commitlimit when gigantic hugepages are allocated
From: Rafael Aquini <aquini@linux.com>
diff --git a/queue-2.6.39/mmc-tmio-fix-regression-in-tmio_mmc_wrprotect_disable.patch b/queue-2.6.39/mmc-tmio-fix-regression-in-tmio_mmc_wrprotect_disable.patch
index 6da81edea0..745e2a9831 100644
--- a/queue-2.6.39/mmc-tmio-fix-regression-in-tmio_mmc_wrprotect_disable.patch
+++ b/queue-2.6.39/mmc-tmio-fix-regression-in-tmio_mmc_wrprotect_disable.patch
@@ -1,8 +1,7 @@
From 7d8b4c2a4b73da8e3632603691838ca5b2a8c26d Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 20 Jun 2011 16:51:10 +0200
-Subject: mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE
- handling
+Subject: mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
diff --git a/queue-2.6.39/oprofile-x86-fix-race-in-nmi-handler-while-starting.patch b/queue-2.6.39/oprofile-x86-fix-race-in-nmi-handler-while-starting.patch
index dc2d5693ba..31ee95cc32 100644
--- a/queue-2.6.39/oprofile-x86-fix-race-in-nmi-handler-while-starting.patch
+++ b/queue-2.6.39/oprofile-x86-fix-race-in-nmi-handler-while-starting.patch
@@ -1,8 +1,7 @@
From 8fe7e94eb71430cf63a742f3c19739d82a662758 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Wed, 1 Jun 2011 15:31:44 +0200
-Subject: oprofile, x86: Fix race in nmi handler while starting
- counters
+Subject: oprofile, x86: Fix race in nmi handler while starting counters
From: Robert Richter <robert.richter@amd.com>
diff --git a/queue-2.6.39/uvcvideo-remove-buffers-from-the-queues-when.patch b/queue-2.6.39/uvcvideo-remove-buffers-from-the-queues-when.patch
index f2e7e2c8d3..e43178547f 100644
--- a/queue-2.6.39/uvcvideo-remove-buffers-from-the-queues-when.patch
+++ b/queue-2.6.39/uvcvideo-remove-buffers-from-the-queues-when.patch
@@ -1,8 +1,7 @@
From 8ca2c80b170c47eeb55f0c2a0f2b8edf85f35d49 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue, 24 May 2011 12:22:03 -0300
-Subject: [media] uvcvideo: Remove buffers from the queues when
- freeing
+Subject: [media] uvcvideo: Remove buffers from the queues when freeing
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
diff --git a/queue-2.6.39/xen-mmu-fix-for-linker-errors-when-config_smp-is-not.patch b/queue-2.6.39/xen-mmu-fix-for-linker-errors-when-config_smp-is-not.patch
index 71d9c8a2c1..e67d163810 100644
--- a/queue-2.6.39/xen-mmu-fix-for-linker-errors-when-config_smp-is-not.patch
+++ b/queue-2.6.39/xen-mmu-fix-for-linker-errors-when-config_smp-is-not.patch
@@ -1,8 +1,7 @@
From 32dd11942aeb47f91209a446d6b10063c5b69389 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 30 Jun 2011 09:12:40 -0400
-Subject: xen/mmu: Fix for linker errors when CONFIG_SMP is not
- defined.
+Subject: xen/mmu: Fix for linker errors when CONFIG_SMP is not defined.
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
diff --git a/queue-2.6.39/xen-partially-revert-xen-set-max_pfn_mapped-to-the-last.patch b/queue-2.6.39/xen-partially-revert-xen-set-max_pfn_mapped-to-the-last.patch
index c97c994853..89fcc8439a 100644
--- a/queue-2.6.39/xen-partially-revert-xen-set-max_pfn_mapped-to-the-last.patch
+++ b/queue-2.6.39/xen-partially-revert-xen-set-max_pfn_mapped-to-the-last.patch
@@ -1,8 +1,7 @@
From a91d92875ee94e4703fd017ccaadb48cfb344994 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Fri, 3 Jun 2011 09:51:34 +0000
-Subject: xen: partially revert "xen: set max_pfn_mapped to the last
- pfn mapped"
+Subject: xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
diff --git a/queue-2.6.39/xen-pci-move-check-for-acpi_sci_override_gsi-to.patch b/queue-2.6.39/xen-pci-move-check-for-acpi_sci_override_gsi-to.patch
index 001a5d0018..8a1564d135 100644
--- a/queue-2.6.39/xen-pci-move-check-for-acpi_sci_override_gsi-to.patch
+++ b/queue-2.6.39/xen-pci-move-check-for-acpi_sci_override_gsi-to.patch
@@ -1,8 +1,7 @@
From ee339fe63ac408e4604c1c88b1f9a428f2511b70 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 6 Jul 2011 09:43:16 -0400
-Subject: xen/pci: Move check for acpi_sci_override_gsi to
- xen_setup_acpi_sci.
+Subject: xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci.
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
diff --git a/queue-2.6.39/xen-pci-use-the-int_src_ovr-irq-instead-of-gsi-to-preset.patch b/queue-2.6.39/xen-pci-use-the-int_src_ovr-irq-instead-of-gsi-to-preset.patch
index c630b5b2ee..caddffa74e 100644
--- a/queue-2.6.39/xen-pci-use-the-int_src_ovr-irq-instead-of-gsi-to-preset.patch
+++ b/queue-2.6.39/xen-pci-use-the-int_src_ovr-irq-instead-of-gsi-to-preset.patch
@@ -1,8 +1,7 @@
From 155a16f21923bc2f04161ac92acca986371ef27b Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 30 Jun 2011 09:18:27 -0400
-Subject: xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset
- the ACPI SCI IRQ.
+Subject: xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset the ACPI SCI IRQ.
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
diff --git a/queue-2.6.39/xhci-always-set-urb-status-to-zero-for-isoc-endpoints.patch b/queue-2.6.39/xhci-always-set-urb-status-to-zero-for-isoc-endpoints.patch
index 86a90b070a..638f412855 100644
--- a/queue-2.6.39/xhci-always-set-urb-status-to-zero-for-isoc-endpoints.patch
+++ b/queue-2.6.39/xhci-always-set-urb-status-to-zero-for-isoc-endpoints.patch
@@ -54,7 +54,7 @@ and always set urb->status to 0 for isochronous URBs.
This patch should be backported to kernels as old as 2.6.36
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Cc: "Xu, Andiry" <Andiry.Xu@amd.com>
+Cc: Andiry Xu <Andiry.Xu@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---