]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
delete some patches.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2012 15:18:41 +0000 (08:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2012 15:18:41 +0000 (08:18 -0700)
batman-adv-fix-skb-data-assignment.patch was a duplicate
review-3.4/asoc-dapm-fix-locking-during-codec-shutdown.patch didn't build.

review-3.4/asoc-dapm-fix-locking-during-codec-shutdown.patch [deleted file]
review-3.4/batman-adv-fix-skb-data-assignment.patch [deleted file]
review-3.4/series
review-3.5/batman-adv-fix-skb-data-assignment.patch [deleted file]
review-3.5/series

diff --git a/review-3.4/asoc-dapm-fix-locking-during-codec-shutdown.patch b/review-3.4/asoc-dapm-fix-locking-during-codec-shutdown.patch
deleted file mode 100644 (file)
index 74428b8..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 01005a729a17ab419f61a366e22f3419e7a2c3fe Mon Sep 17 00:00:00 2001
-From: Liam Girdwood <lrg@ti.com>
-Date: Fri, 6 Jul 2012 16:57:05 +0100
-Subject: ASoC: dapm: Fix locking during codec shutdown
-
-From: Liam Girdwood <lrg@ti.com>
-
-commit 01005a729a17ab419f61a366e22f3419e7a2c3fe upstream.
-
-Codec shutdown performs a DAPM power sequence that might cause conflicts
-and/or race conditions if another stream power event is running simultaneously.
-Use card's dapm mutex to protect any potential race condition between them.
-
-Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-Signed-off-by: Liam Girdwood <lrg@ti.com>
-Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/soc-dapm.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/sound/soc/soc-dapm.c
-+++ b/sound/soc/soc-dapm.c
-@@ -3210,10 +3210,13 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_free);
- static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
- {
-+      struct snd_soc_card *card = dapm->card;
-       struct snd_soc_dapm_widget *w;
-       LIST_HEAD(down_list);
-       int powerdown = 0;
-+      mutex_lock(&card->dapm_mutex);
-+
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (w->dapm != dapm)
-                       continue;
-@@ -3236,6 +3239,8 @@ static void soc_dapm_shutdown_codec(stru
-                       snd_soc_dapm_set_bias_level(dapm,
-                                                   SND_SOC_BIAS_STANDBY);
-       }
-+
-+      mutex_unlock(&card->dapm_mutex);
- }
- /*
diff --git a/review-3.4/batman-adv-fix-skb-data-assignment.patch b/review-3.4/batman-adv-fix-skb-data-assignment.patch
deleted file mode 100644 (file)
index 24acc82..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From d2b6cc8e460494251442a877fcbc150faa175b4f Mon Sep 17 00:00:00 2001
-From: Antonio Quartulli <ordex@autistici.org>
-Date: Thu, 14 Jun 2012 22:21:28 +0200
-Subject: batman-adv: fix skb->data assignment
-
-From: Antonio Quartulli <ordex@autistici.org>
-
-commit d2b6cc8e460494251442a877fcbc150faa175b4f upstream.
-
-skb_linearize(skb) possibly rearranges the skb internal data and then changes
-the skb->data pointer value. For this reason any other pointer in the code that
-was assigned skb->data before invoking skb_linearise(skb) must be re-assigned.
-
-In the current tt_query message handling code this is not done and therefore, in
-case of skb linearization, the pointer used to handle the packet header ends up
-in pointing to poisoned memory. The packet is then dropped but the
-translation-table mechanism is corrupted.
-
-Signed-off-by: Antonio Quartulli <ordex@autistici.org>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/batman-adv/routing.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/batman-adv/routing.c
-+++ b/net/batman-adv/routing.c
-@@ -627,6 +627,8 @@ int recv_tt_query(struct sk_buff *skb, s
-                       if (unlikely(skb_headlen(skb) <
-                                    sizeof(struct tt_query_packet) + tt_len))
-                               goto out;
-+                      /* skb_linearize() possibly changed skb->data */
-+                      tt_query = (struct tt_query_packet *)skb->data;
-                       handle_tt_response(bat_priv, tt_query);
-               } else {
index 3aea191a6c06031b6ad0b433287dc8d01b9da6bb..840d55a1281d616d4a5b239985e2d41b94def9e4 100644 (file)
@@ -14,7 +14,6 @@ scsi-fix-device-removal-null-pointer-dereference.patch
 scsi-avoid-dangling-pointer-in-scsi_requeue_command.patch
 rt2800usb-2001-3c17-is-an-rt3370-device.patch
 arm-omap2-opp-fix-to-ensure-check-of-right-oppdef-after-bad-one.patch
-asoc-dapm-fix-locking-during-codec-shutdown.patch
 asoc-dapm-fix-_pre-and-_post-events-for-dapm-performance-improvements.patch
 asoc-wm8962-redo-early-init-of-the-part-on-resume.patch
 alsa-hda-add-support-for-realtek-alc282.patch
@@ -26,7 +25,6 @@ revert-usb-uas-make-sure-data-urb-is-gone-if-we-receive-status-before-that.patch
 alsa-hda-add-dock-support-for-thinkpad-x230-tablet.patch
 x86-mce-fix-siginfo_t-si_addr-value-for-non-recoverable-memory-faults.patch
 locks-fix-checking-of-fcntl_setlease-argument.patch
-batman-adv-fix-skb-data-assignment.patch
 ftrace-disable-function-tracing-during-suspend-resume-and-hibernation-again.patch
 pm-sleep-call-early-resume-handlers-when-suspend_noirq-fails.patch
 tpm-chip-disabled-state-erronously-being-reported-as-error.patch
diff --git a/review-3.5/batman-adv-fix-skb-data-assignment.patch b/review-3.5/batman-adv-fix-skb-data-assignment.patch
deleted file mode 100644 (file)
index b7d1ee5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From d2b6cc8e460494251442a877fcbc150faa175b4f Mon Sep 17 00:00:00 2001
-From: Antonio Quartulli <ordex@autistici.org>
-Date: Thu, 14 Jun 2012 22:21:28 +0200
-Subject: batman-adv: fix skb->data assignment
-
-From: Antonio Quartulli <ordex@autistici.org>
-
-commit d2b6cc8e460494251442a877fcbc150faa175b4f upstream.
-
-skb_linearize(skb) possibly rearranges the skb internal data and then changes
-the skb->data pointer value. For this reason any other pointer in the code that
-was assigned skb->data before invoking skb_linearise(skb) must be re-assigned.
-
-In the current tt_query message handling code this is not done and therefore, in
-case of skb linearization, the pointer used to handle the packet header ends up
-in pointing to poisoned memory. The packet is then dropped but the
-translation-table mechanism is corrupted.
-
-Signed-off-by: Antonio Quartulli <ordex@autistici.org>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/batman-adv/routing.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/batman-adv/routing.c
-+++ b/net/batman-adv/routing.c
-@@ -626,6 +626,8 @@ int recv_tt_query(struct sk_buff *skb, s
-                       if (unlikely(skb_headlen(skb) <
-                                    sizeof(struct tt_query_packet) + tt_len))
-                               goto out;
-+                      /* skb_linearize() possibly changed skb->data */
-+                      tt_query = (struct tt_query_packet *)skb->data;
-                       handle_tt_response(bat_priv, tt_query);
-               } else {
index e44c007e46ad64818d612614d31172e7eef9ff4c..5f22f7afb67e86601e770a08e3ac909e4746e675 100644 (file)
@@ -37,7 +37,6 @@ alsa-hda-add-dock-support-for-thinkpad-x230-tablet.patch
 x86-microcode-sanitize-per-cpu-microcode-reloading-interface.patch
 x86-mce-fix-siginfo_t-si_addr-value-for-non-recoverable-memory-faults.patch
 locks-fix-checking-of-fcntl_setlease-argument.patch
-batman-adv-fix-skb-data-assignment.patch
 ftrace-disable-function-tracing-during-suspend-resume-and-hibernation-again.patch
 pm-sleep-require-cap_block_suspend-to-use-wake_lock-wake_unlock.patch
 pm-sleep-call-early-resume-handlers-when-suspend_noirq-fails.patch