3.10-stable patches

added patches:
	revert-iio-bmg160-iio_buffer-and-iio_triggered_buffer-are-required.patch
	vfs-remove-incorrect-debugging-warn-in-prepend_path.patch

diff --git a/queue-3.10/revert-iio-bmg160-iio_buffer-and-iio_triggered_buffer-are-required.patch b/queue-3.10/revert-iio-bmg160-iio_buffer-and-iio_triggered_buffer-are-required.patch
new file mode 100644 (file)
index 0000000..2cbf449
--- /dev/null
+++ b/queue-3.10/revert-iio-bmg160-iio_buffer-and-iio_triggered_buffer-are-required.patch
@@ -0,0 +1,28 @@
+From 35c45e8bce3c92fb1ff94d376f1d4bfaae079d66 Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Wed, 29 Jul 2015 15:46:03 +0200
+Subject: Revert "iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required"
+
+This reverts commit 35c45e8bce3c92fb1ff94d376f1d4bfaae079d66 which was
+commit 06d2f6ca5a38abe92f1f3a132b331eee773868c3 upstream as it should
+not have been applied.
+
+
+Reported-by: Luis Henriques <luis.henriques@canonical.com>
+Cc: Markus Pargmann <mpa@pengutronix.de>
+Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+Cc: Jonathan Cameron <jic23@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+--- b/drivers/iio/gyro/Kconfig
++++ a/drivers/iio/gyro/Kconfig
+@@ -73,8 +73,7 @@
+ config ITG3200
+       tristate "InvenSense ITG3200 Digital 3-Axis Gyroscope I2C driver"
+       depends on I2C
++      select IIO_TRIGGERED_BUFFER if IIO_BUFFER
+-      select IIO_BUFFER
+-      select IIO_TRIGGERED_BUFFER
+       help
+         Say yes here to add support for the InvenSense ITG3200 digital
+         3-axis gyroscope sensor.

diff --git a/queue-3.10/series b/queue-3.10/series
index 9bc6579494f060ec96231cdea3b0f03699c8da01..6979bfe55fbe2cc30aafeda6a19c3c5b93c9c2b8 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -52,3 +52,5 @@ ipv6-fix-exthdrs-offload-registration-in-out_rt-path.patch
 net-ipv6-correct-pim6-mrt_lock-handling.patch
 sctp-fix-race-on-protocol-netns-initialization.patch
 fib_rules-fix-fib-rule-dumps-across-multiple-skbs.patch
+vfs-remove-incorrect-debugging-warn-in-prepend_path.patch
+revert-iio-bmg160-iio_buffer-and-iio_triggered_buffer-are-required.patch

diff --git a/queue-3.10/vfs-remove-incorrect-debugging-warn-in-prepend_path.patch b/queue-3.10/vfs-remove-incorrect-debugging-warn-in-prepend_path.patch
new file mode 100644 (file)
index 0000000..ba5e14f
--- /dev/null
+++ b/queue-3.10/vfs-remove-incorrect-debugging-warn-in-prepend_path.patch
@@ -0,0 +1,50 @@
+From 93e3bce6287e1fb3e60d3324ed08555b5bbafa89 Mon Sep 17 00:00:00 2001
+From: "Eric W. Biederman" <ebiederm@xmission.com>
+Date: Sun, 24 May 2015 09:25:00 -0500
+Subject: vfs: Remove incorrect debugging WARN in prepend_path
+
+From: "Eric W. Biederman" <ebiederm@xmission.com>
+
+commit 93e3bce6287e1fb3e60d3324ed08555b5bbafa89 upstream.
+
+The warning message in prepend_path is unclear and outdated.  It was
+added as a warning that the mechanism for generating names of pseudo
+files had been removed from prepend_path and d_dname should be used
+instead.  Unfortunately the warning reads like a general warning,
+making it unclear what to do with it.
+
+Remove the warning.  The transition it was added to warn about is long
+over, and I added code several years ago which in rare cases causes
+the warning to fire on legitimate code, and the warning is now firing
+and scaring people for no good reason.
+
+Reported-by: Ivan Delalande <colona@arista.com>
+Reported-by: Omar Sandoval <osandov@osandov.com>
+Fixes: f48cfddc6729e ("vfs: In d_path don't call d_dname on a mount point")
+Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
+[ vlee: Backported to 3.10. Adjusted context. ]
+Signed-off-by: Vinson Lee <vlee@twitter.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/dcache.c |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -2569,15 +2569,6 @@ static int prepend_path(const struct pat
+       return error;
+ 
+ global_root:
+-      /*
+-       * Filesystems needing to implement special "root names"
+-       * should do so with ->d_dname()
+-       */
+-      if (IS_ROOT(dentry) &&
+-          (dentry->d_name.len != 1 || dentry->d_name.name[0] != '/')) {
+-              WARN(1, "Root dentry has weird name <%.*s>\n",
+-                   (int) dentry->d_name.len, dentry->d_name.name);
+-      }
+       if (!slash)
+               error = prepend(buffer, buflen, "/", 1);
+       if (!error)