From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 Feb 2017 16:18:19 +0000 (+0100)
Subject: remove a patch to trigger some scripts...
X-Git-Tag: v3.18.48~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a84b3cbcfc3bff85decd19e6d36729f9f4fc0fc6;p=thirdparty%2Fkernel%2Fstable-queue.git

remove a patch to trigger some scripts...
---

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
deleted file mode 100644
index c107a69444b..00000000000
--- a/queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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 69d3c6eb0f0..c0dd374f5e6 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -29,4 +29,3 @@ 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