From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 27 Jan 2016 17:20:51 +0000 (-0800)
Subject: 3.14-stable patches
X-Git-Tag: v3.10.96~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d7d34b62638f7b51526aca2b97bc2c354c8b60a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	openrisc-fix-config_uid16-setting.patch
---

diff --git a/queue-3.14/openrisc-fix-config_uid16-setting.patch b/queue-3.14/openrisc-fix-config_uid16-setting.patch
new file mode 100644
index 00000000000..9bdd195709d
--- /dev/null
+++ b/queue-3.14/openrisc-fix-config_uid16-setting.patch
@@ -0,0 +1,49 @@
+From 04ea1e91f85615318ea91ce8ab50cb6a01ee4005 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 17 Jul 2015 16:23:28 -0700
+Subject: openrisc: fix CONFIG_UID16 setting
+
+From: Andrew Morton <akpm@linux-foundation.org>
+
+commit 04ea1e91f85615318ea91ce8ab50cb6a01ee4005 upstream.
+
+openrisc-allnoconfig:
+
+  kernel/uid16.c: In function 'SYSC_setgroups16':
+  kernel/uid16.c:184:2: error: implicit declaration of function 'groups_alloc'
+  kernel/uid16.c:184:13: warning: assignment makes pointer from integer without a cast
+
+openrisc shouldn't be setting CONFIG_UID16 when CONFIG_MULTIUSER=n.
+
+Fixes: 2813893f8b197a1 ("kernel: conditionally support non-root users, groups and capabilities")
+Reported-by: Fengguang Wu <fengguang.wu@gmail.com>
+Cc: Iulia Manda <iulia.manda21@gmail.com>
+Cc: Josh Triplett <josh@joshtriplett.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/openrisc/Kconfig |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/arch/openrisc/Kconfig
++++ b/arch/openrisc/Kconfig
+@@ -16,6 +16,7 @@ config OPENRISC
+ 	select GENERIC_IRQ_SHOW
+ 	select GENERIC_IOMAP
+ 	select GENERIC_CPU_DEVICES
++	select HAVE_UID16
+ 	select GENERIC_ATOMIC64
+ 	select GENERIC_CLOCKEVENTS
+ 	select GENERIC_STRNCPY_FROM_USER
+@@ -29,9 +30,6 @@ config MMU
+ config HAVE_DMA_ATTRS
+ 	def_bool y
+ 
+-config UID16
+-	def_bool y
+-
+ config RWSEM_GENERIC_SPINLOCK
+ 	def_bool y
+ 
diff --git a/queue-3.14/series b/queue-3.14/series
index a1b86a43d75..361fe82125f 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -54,3 +54,4 @@ arm64-clear-out-any-singlestep-state-on-a-ptrace-detach-operation.patch
 arm64-mm-ensure-that-the-zero-page-is-visible-to-the-page-table-walker.patch
 parisc-iommu-fix-panic-due-to-trying-to-allocate-too-large-region.patch
 hid-core-avoid-uninitialized-buffer-access.patch
+openrisc-fix-config_uid16-setting.patch