From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 2 Feb 2017 21:55:51 +0000 (+0100)
Subject: more 3.18 fixes
X-Git-Tag: v4.9.8~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d11b56166ae76e6bac186d44f2a7692b4a62c88;p=thirdparty%2Fkernel%2Fstable-queue.git

more 3.18 fixes
---

diff --git a/queue-3.18/drm-i915-cleanup-some-indenting.patch b/queue-3.18/drm-i915-cleanup-some-indenting.patch
new file mode 100644
index 00000000000..4be94cdd039
--- /dev/null
+++ b/queue-3.18/drm-i915-cleanup-some-indenting.patch
@@ -0,0 +1,50 @@
+From ba0635ffb7665d76715b43ae8144e014a90c1e63 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Wed, 25 Feb 2015 16:17:48 +0300
+Subject: drm/i915: cleanup some indenting
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit ba0635ffb7665d76715b43ae8144e014a90c1e63 upstream.
+
+Static checkers complain that we should probably add curly braces
+because, from the indenting, it looks like seq_printf() should be inside
+the list_for_each_entry() loop.  But the code is actually correct, it's
+just the indenting which is off.
+
+Besides fixing the indenting on seq_printf(), I did add curly braces,
+because generally mult-line indents should have curly braces to make
+them more readable.
+
+The unintended indent was left behind and not unindented in
+
+commit d7f46fc4e7323887494db13f063a8e59861fefb0
+Author: Ben Widawsky <benjamin.widawsky@intel.com>
+Date:   Fri Dec 6 14:10:55 2013 -0800
+
+    drm/i915: Make pin count per VMA
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_debugfs.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_debugfs.c
++++ b/drivers/gpu/drm/i915/i915_debugfs.c
+@@ -141,10 +141,11 @@ describe_obj(struct seq_file *m, struct
+ 		   obj->madv == I915_MADV_DONTNEED ? " purgeable" : "");
+ 	if (obj->base.name)
+ 		seq_printf(m, " (name: %d)", obj->base.name);
+-	list_for_each_entry(vma, &obj->vma_list, vma_link)
++	list_for_each_entry(vma, &obj->vma_list, vma_link) {
+ 		if (vma->pin_count > 0)
+ 			pin_count++;
+-		seq_printf(m, " (pinned x %d)", pin_count);
++	}
++	seq_printf(m, " (pinned x %d)", pin_count);
+ 	if (obj->pin_display)
+ 		seq_printf(m, " (display)");
+ 	if (obj->fence_reg != I915_FENCE_REG_NONE)
diff --git a/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch b/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch
new file mode 100644
index 00000000000..c107a69444b
--- /dev/null
+++ b/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch
@@ -0,0 +1,44 @@
+From foo@baz Thu Feb  2 22:54:08 CET 2017
+Date: Thu, 02 Feb 2017 22:54:08 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Fix "crypto: algif_hash - Require setkey before accept(2)"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Fix up commit cec8983e6d2cf52e60cd59583ae30f81f923f563 which was commit
+6de62f15b581f920ade22d758f4c338311c2f0d4 upstream.
+
+The function prototypes were wrong.  Someone was ignoring compiler
+warnings :(
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ crypto/algif_hash.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/crypto/algif_hash.c
++++ b/crypto/algif_hash.c
+@@ -283,8 +283,8 @@ unlock_child:
+ 	return err;
+ }
+ 
+-static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg,
+-			      size_t size)
++static int hash_sendmsg_nokey(struct kiocb *unused, struct socket *sock,
++			      struct msghdr *msg, size_t size)
+ {
+ 	int err;
+ 
+@@ -307,8 +307,8 @@ static ssize_t hash_sendpage_nokey(struc
+ 	return hash_sendpage(sock, page, offset, size, flags);
+ }
+ 
+-static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg,
+-			      size_t ignored, int flags)
++static int hash_recvmsg_nokey(struct kiocb *unused, struct socket *sock,
++			      struct msghdr *msg, size_t ignored, int flags)
+ {
+ 	int err;
+ 
diff --git a/queue-3.18/series b/queue-3.18/series
index 99c38869db4..69d3c6eb0f0 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -28,3 +28,5 @@ x86-boot-add-config_paravirt_spinlocks-quirk-to-arch-x86-boot-compressed-misc.h.
 spi-dw-mid-refactor-to-use-helpers.patch
 blk-rq_data_dir-should-not-return-a-boolean.patch
 net-add-sysctl_max_skb_frags.patch
+drm-i915-cleanup-some-indenting.patch
+fix-crypto-algif_hash-require-setkey-before-accept-2.patch