3.3-stable patches

added patches:
	linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
	perf-fix-build-breakage.patch

diff --git a/queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch b/queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
new file mode 100644 (file)
index 0000000..0968689
--- /dev/null
+++ b/queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
@@ -0,0 +1,23 @@
+From sfr@canb.auug.org.au  Mon Apr 23 09:25:57 2012
+From: Stephen Rothwell <sfr@canb.auug.org.au>
+Date: Mon, 23 Apr 2012 15:11:46 +1000
+Subject: linux-next: manual merge of the staging tree with the usb tree
+To: Greg KH <greg@kroah.com>
+Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masanari Iida <standby24x7@gmail.com>
+Message-ID: <20120423151146.8c5687c65c4eab16f063954c@canb.auug.org.au>
+
+
+Hi Greg,\r
+\r
+Today's linux-next merge of the staging tree got a conflict in\r
+drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3\r
+("USB: dt9812.c: remove err() usage") from the usb tree and commit\r
+73e2918990c0 ("staging: Fix typo in multiple files") from the staging\r
+tree.\r
+\r
+The former supercedes the latter, so I used that.\r
+-- \r
+Cheers,\r
+Stephen Rothwell                    sfr@canb.auug.org.au\r
+\r
+

diff --git a/queue-3.3/perf-fix-build-breakage.patch b/queue-3.3/perf-fix-build-breakage.patch
new file mode 100644 (file)
index 0000000..d1385dd
--- /dev/null
+++ b/queue-3.3/perf-fix-build-breakage.patch
@@ -0,0 +1,54 @@
+From zeev.tarantov@gmail.com Sun Apr 22 23:38:36 2012
+From: Zeev Tarantov <zeev.tarantov@gmail.com>
+Date: Mon, 23 Apr 2012 09:37:04 +0300
+Subject: Perf: fix build breakage
+To: "David S. Miller" <davem@davemloft.net>, Arnaldo Carvalho de Melo <acme@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+Message-ID: <20120423063704.GA3465@myhost>
+Content-Disposition: inline
+
+
+From: Zeev Tarantov <zeev.tarantov@gmail.com>
+
+[Patch not needed upstream as this is a backport build bugfix - gregkh
+
+gcc correctly complains:
+
+util/hist.c: In function ‘__hists__add_entry’:
+util/hist.c:240:27: error: invalid type argument of ‘->’ (have ‘struct hist_entry’)
+util/hist.c:241:23: error: invalid type argument of ‘->’ (have ‘struct hist_entry’)
+
+for this new code:
+
++                       if (he->ms.map != entry->ms.map) {
++                               he->ms.map = entry->ms.map;
++                               if (he->ms.map)
++                                       he->ms.map->referenced = true;
++                       }
+
+because "entry" is a "struct hist_entry", not a pointer to a struct.
+
+In mainline, "entry" is a pointer to struct passed as argument to the function.
+So this is broken during backporting. But obviously not compile tested.
+
+Signed-off-by: Zeev Tarantov <zeev.tarantov@gmail.com>
+Cc: Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/perf/util/hist.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/tools/perf/util/hist.c
++++ b/tools/perf/util/hist.c
+@@ -237,8 +237,8 @@ struct hist_entry *__hists__add_entry(st
+                        * mis-adjust symbol addresses when computing
+                        * the history counter to increment.
+                        */
+-                      if (he->ms.map != entry->ms.map) {
+-                              he->ms.map = entry->ms.map;
++                      if (he->ms.map != entry.ms.map) {
++                              he->ms.map = entry.ms.map;
+                               if (he->ms.map)
+                                       he->ms.map->referenced = true;
+                       }

diff --git a/queue-3.3/series b/queue-3.3/series
new file mode 100644 (file)
index 0000000..d884e46
--- /dev/null
+++ b/queue-3.3/series
@@ -0,0 +1,2 @@
+perf-fix-build-breakage.patch
+linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch