4.5-stable patches

added patches:
	staging-wilc1000-remove-extraneous-variable.patch

diff --git a/queue-4.5/series b/queue-4.5/series
index bd1c6050822a7fa7e7e8cd5ddf184017e5346323..54eebb714b97812f33c936a2b88906cbcb5e026a 100644 (file)
--- a/queue-4.5/series
+++ b/queue-4.5/series
@@ -1,3 +1,4 @@
+staging-wilc1000-remove-extraneous-variable.patch
 decnet-do-not-build-routes-to-devices-without-decnet-private-data.patch
 route-do-not-cache-fib-route-info-on-local-routes-with-oif.patch
 packet-fix-heap-info-leak-in-packet_diag_mclist-sock_diag-interface.patch

diff --git a/queue-4.5/staging-wilc1000-remove-extraneous-variable.patch b/queue-4.5/staging-wilc1000-remove-extraneous-variable.patch
new file mode 100644 (file)
index 0000000..2aa0dac
--- /dev/null
+++ b/queue-4.5/staging-wilc1000-remove-extraneous-variable.patch
@@ -0,0 +1,40 @@
+From ce7b516f3f9e11fe4ee06fad0d7e853bb6e8f160 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 13 Jan 2016 15:36:17 +0100
+Subject: staging: wilc1000: remove extraneous variable
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit ce7b516f3f9e11fe4ee06fad0d7e853bb6e8f160 upstream.
+
+Building wilc1000 with clang currently fails in the staging-next branch:
+
+drivers/staging/wilc1000/wilc_spi.c:123:34: warning: tentative definition of variable with internal linkage has incomplete non-array type 'const struct wilc1000_ops' [-Wtentative-definition-incomplete-type]
+static const struct wilc1000_ops wilc1000_spi_ops;
+
+The reason is that wilc1000_ops was left behind after a recent cleanup,
+and is completely unused and also uninitialized and const and has an
+incomplete type.
+
+Removing the variable is obviously correct, and gets rid of the warning.
+No idea why gcc does not complain about it though.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/wilc1000/wilc_spi.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/staging/wilc1000/wilc_spi.c
++++ b/drivers/staging/wilc1000/wilc_spi.c
+@@ -120,8 +120,6 @@ static u8 crc7(u8 crc, const u8 *buffer,
+ 
+ #define USE_SPI_DMA     0
+ 
+-static const struct wilc1000_ops wilc1000_spi_ops;
+-
+ static int wilc_bus_probe(struct spi_device *spi)
+ {
+       int ret, gpio;