Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus

* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
  media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
  hexdump: avoid warning in test function
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  smp: Fix error case handling in smp_call_function_*()
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  Bluetooth: hidp: Fix regression with older userspace and flags validation
  config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
  perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
  ...

That solves several merge conflicts:
	Documentation/DocBook/media/v4l/subdev-formats.xml
	Documentation/devicetree/bindings/vendor-prefixes.txt
	drivers/staging/media/mn88473/mn88473.c
	include/linux/kconfig.h
	include/uapi/linux/media-bus-format.h

The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.

7 files changed, 382 insertions, 7 deletions

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 623a59c1ff5a..0ecb7688af71 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -137,7 +137,7 @@ struct crypto_template *crypto_lookup_template(const char *name);
 
 int crypto_register_instance(struct crypto_template *tmpl,
                              struct crypto_instance *inst);
-int crypto_unregister_instance(struct crypto_alg *alg);
+int crypto_unregister_instance(struct crypto_instance *inst);
 
 int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
                       struct crypto_instance *inst, u32 mask);
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 178525e5f430..018afb264ac2 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -58,8 +58,9 @@ struct af_alg_type {
 };
 
 struct af_alg_sgl {
-        struct scatterlist sg[ALG_MAX_PAGES];
+        struct scatterlist sg[ALG_MAX_PAGES + 1];
         struct page *pages[ALG_MAX_PAGES];
+        unsigned int npages;
 };
 
 int af_alg_register_type(const struct af_alg_type *type);
@@ -70,6 +71,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock);
 
 int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len);
 void af_alg_free_sg(struct af_alg_sgl *sgl);
+void af_alg_link_sg(struct af_alg_sgl *sgl_prev, struct af_alg_sgl *sgl_new);
 
 int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con);
 
diff --git a/include/crypto/rng.h b/include/crypto/rng.h
index a16fb10142bf..6e28ea5be9f1 100644
--- a/include/crypto/rng.h
+++ b/include/crypto/rng.h
@@ -103,8 +103,7 @@ static inline void crypto_free_rng(struct crypto_rng *tfm)
  * This function fills the caller-allocated buffer with random numbers using the
  * random number generator referenced by the cipher handle.
  *
- * Return: > 0 function was successful and returns the number of generated
- *         bytes; < 0 if an error occurred
+ * Return: 0 function was successful; < 0 if an error occurred
  */
 static inline int crypto_rng_get_bytes(struct crypto_rng *tfm,
                                        u8 *rdata, unsigned int dlen)
diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index 190f8a0e0242..dd7905a3c22e 100644
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -65,20 +65,20 @@
 #define SHA512_H7       0x5be0cd19137e2179ULL
 
 struct sha1_state {
-        u64 count;
         u32 state[SHA1_DIGEST_SIZE / 4];
+        u64 count;
         u8 buffer[SHA1_BLOCK_SIZE];
 };
 
 struct sha256_state {
-        u64 count;
         u32 state[SHA256_DIGEST_SIZE / 4];
+        u64 count;
         u8 buf[SHA256_BLOCK_SIZE];
 };
 
 struct sha512_state {
-        u64 count[2];
         u64 state[SHA512_DIGEST_SIZE / 8];
+        u64 count[2];
         u8 buf[SHA512_BLOCK_SIZE];
 };
 
@@ -87,9 +87,18 @@ struct shash_desc;
 extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len);
 
+extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
+                             unsigned int len, u8 *hash);
+
 extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len);
 
+extern int crypto_sha256_finup(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, u8 *hash);
+
 extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data,
                               unsigned int len);
+
+extern int crypto_sha512_finup(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, u8 *hash);
 #endif
diff --git a/include/crypto/sha1_base.h b/include/crypto/sha1_base.h
new file mode 100644
index 000000000000..d0df431f9a97
--- /dev/null
+++ b/include/crypto/sha1_base.h
@@ -0,0 +1,106 @@
+/*
+ * sha1_base.h - core logic for SHA-1 implementations
+ *
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <crypto/internal/hash.h>
+#include <crypto/sha.h>
+#include <linux/crypto.h>
+#include <linux/module.h>
+
+#include <asm/unaligned.h>
+
+typedef void (sha1_block_fn)(struct sha1_state *sst, u8 const *src, int blocks);
+
+static inline int sha1_base_init(struct shash_desc *desc)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA1_H0;
+        sctx->state[1] = SHA1_H1;
+        sctx->state[2] = SHA1_H2;
+        sctx->state[3] = SHA1_H3;
+        sctx->state[4] = SHA1_H4;
+        sctx->count = 0;
+
+        return 0;
+}
+
+static inline int sha1_base_do_update(struct shash_desc *desc,
+                                      const u8 *data,
+                                      unsigned int len,
+                                      sha1_block_fn *block_fn)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
+
+        sctx->count += len;
+
+        if (unlikely((partial + len) >= SHA1_BLOCK_SIZE)) {
+                int blocks;
+
+                if (partial) {
+                        int p = SHA1_BLOCK_SIZE - partial;
+
+                        memcpy(sctx->buffer + partial, data, p);
+                        data += p;
+                        len -= p;
+
+                        block_fn(sctx, sctx->buffer, 1);
+                }
+
+                blocks = len / SHA1_BLOCK_SIZE;
+                len %= SHA1_BLOCK_SIZE;
+
+                if (blocks) {
+                        block_fn(sctx, data, blocks);
+                        data += blocks * SHA1_BLOCK_SIZE;
+                }
+                partial = 0;
+        }
+        if (len)
+                memcpy(sctx->buffer + partial, data, len);
+
+        return 0;
+}
+
+static inline int sha1_base_do_finalize(struct shash_desc *desc,
+                                        sha1_block_fn *block_fn)
+{
+        const int bit_offset = SHA1_BLOCK_SIZE - sizeof(__be64);
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        __be64 *bits = (__be64 *)(sctx->buffer + bit_offset);
+        unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
+
+        sctx->buffer[partial++] = 0x80;
+        if (partial > bit_offset) {
+                memset(sctx->buffer + partial, 0x0, SHA1_BLOCK_SIZE - partial);
+                partial = 0;
+
+                block_fn(sctx, sctx->buffer, 1);
+        }
+
+        memset(sctx->buffer + partial, 0x0, bit_offset - partial);
+        *bits = cpu_to_be64(sctx->count << 3);
+        block_fn(sctx, sctx->buffer, 1);
+
+        return 0;
+}
+
+static inline int sha1_base_finish(struct shash_desc *desc, u8 *out)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        __be32 *digest = (__be32 *)out;
+        int i;
+
+        for (i = 0; i < SHA1_DIGEST_SIZE / sizeof(__be32); i++)
+                put_unaligned_be32(sctx->state[i], digest++);
+
+        *sctx = (struct sha1_state){};
+        return 0;
+}
diff --git a/include/crypto/sha256_base.h b/include/crypto/sha256_base.h
new file mode 100644
index 000000000000..d1f2195bb7de
--- /dev/null
+++ b/include/crypto/sha256_base.h
@@ -0,0 +1,128 @@
+/*
+ * sha256_base.h - core logic for SHA-256 implementations
+ *
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <crypto/internal/hash.h>
+#include <crypto/sha.h>
+#include <linux/crypto.h>
+#include <linux/module.h>
+
+#include <asm/unaligned.h>
+
+typedef void (sha256_block_fn)(struct sha256_state *sst, u8 const *src,
+                               int blocks);
+
+static inline int sha224_base_init(struct shash_desc *desc)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA224_H0;
+        sctx->state[1] = SHA224_H1;
+        sctx->state[2] = SHA224_H2;
+        sctx->state[3] = SHA224_H3;
+        sctx->state[4] = SHA224_H4;
+        sctx->state[5] = SHA224_H5;
+        sctx->state[6] = SHA224_H6;
+        sctx->state[7] = SHA224_H7;
+        sctx->count = 0;
+
+        return 0;
+}
+
+static inline int sha256_base_init(struct shash_desc *desc)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA256_H0;
+        sctx->state[1] = SHA256_H1;
+        sctx->state[2] = SHA256_H2;
+        sctx->state[3] = SHA256_H3;
+        sctx->state[4] = SHA256_H4;
+        sctx->state[5] = SHA256_H5;
+        sctx->state[6] = SHA256_H6;
+        sctx->state[7] = SHA256_H7;
+        sctx->count = 0;
+
+        return 0;
+}
+
+static inline int sha256_base_do_update(struct shash_desc *desc,
+                                        const u8 *data,
+                                        unsigned int len,
+                                        sha256_block_fn *block_fn)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count % SHA256_BLOCK_SIZE;
+
+        sctx->count += len;
+
+        if (unlikely((partial + len) >= SHA256_BLOCK_SIZE)) {
+                int blocks;
+
+                if (partial) {
+                        int p = SHA256_BLOCK_SIZE - partial;
+
+                        memcpy(sctx->buf + partial, data, p);
+                        data += p;
+                        len -= p;
+
+                        block_fn(sctx, sctx->buf, 1);
+                }
+
+                blocks = len / SHA256_BLOCK_SIZE;
+                len %= SHA256_BLOCK_SIZE;
+
+                if (blocks) {
+                        block_fn(sctx, data, blocks);
+                        data += blocks * SHA256_BLOCK_SIZE;
+                }
+                partial = 0;
+        }
+        if (len)
+                memcpy(sctx->buf + partial, data, len);
+
+        return 0;
+}
+
+static inline int sha256_base_do_finalize(struct shash_desc *desc,
+                                          sha256_block_fn *block_fn)
+{
+        const int bit_offset = SHA256_BLOCK_SIZE - sizeof(__be64);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        __be64 *bits = (__be64 *)(sctx->buf + bit_offset);
+        unsigned int partial = sctx->count % SHA256_BLOCK_SIZE;
+
+        sctx->buf[partial++] = 0x80;
+        if (partial > bit_offset) {
+                memset(sctx->buf + partial, 0x0, SHA256_BLOCK_SIZE - partial);
+                partial = 0;
+
+                block_fn(sctx, sctx->buf, 1);
+        }
+
+        memset(sctx->buf + partial, 0x0, bit_offset - partial);
+        *bits = cpu_to_be64(sctx->count << 3);
+        block_fn(sctx, sctx->buf, 1);
+
+        return 0;
+}
+
+static inline int sha256_base_finish(struct shash_desc *desc, u8 *out)
+{
+        unsigned int digest_size = crypto_shash_digestsize(desc->tfm);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        __be32 *digest = (__be32 *)out;
+        int i;
+
+        for (i = 0; digest_size > 0; i++, digest_size -= sizeof(__be32))
+                put_unaligned_be32(sctx->state[i], digest++);
+
+        *sctx = (struct sha256_state){};
+        return 0;
+}
diff --git a/include/crypto/sha512_base.h b/include/crypto/sha512_base.h
new file mode 100644
index 000000000000..6c5341e005ea
--- /dev/null
+++ b/include/crypto/sha512_base.h
@@ -0,0 +1,131 @@
+/*
+ * sha512_base.h - core logic for SHA-512 implementations
+ *
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <crypto/internal/hash.h>
+#include <crypto/sha.h>
+#include <linux/crypto.h>
+#include <linux/module.h>
+
+#include <asm/unaligned.h>
+
+typedef void (sha512_block_fn)(struct sha512_state *sst, u8 const *src,
+                               int blocks);
+
+static inline int sha384_base_init(struct shash_desc *desc)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA384_H0;
+        sctx->state[1] = SHA384_H1;
+        sctx->state[2] = SHA384_H2;
+        sctx->state[3] = SHA384_H3;
+        sctx->state[4] = SHA384_H4;
+        sctx->state[5] = SHA384_H5;
+        sctx->state[6] = SHA384_H6;
+        sctx->state[7] = SHA384_H7;
+        sctx->count[0] = sctx->count[1] = 0;
+
+        return 0;
+}
+
+static inline int sha512_base_init(struct shash_desc *desc)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA512_H0;
+        sctx->state[1] = SHA512_H1;
+        sctx->state[2] = SHA512_H2;
+        sctx->state[3] = SHA512_H3;
+        sctx->state[4] = SHA512_H4;
+        sctx->state[5] = SHA512_H5;
+        sctx->state[6] = SHA512_H6;
+        sctx->state[7] = SHA512_H7;
+        sctx->count[0] = sctx->count[1] = 0;
+
+        return 0;
+}
+
+static inline int sha512_base_do_update(struct shash_desc *desc,
+                                        const u8 *data,
+                                        unsigned int len,
+                                        sha512_block_fn *block_fn)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count[0] % SHA512_BLOCK_SIZE;
+
+        sctx->count[0] += len;
+        if (sctx->count[0] < len)
+                sctx->count[1]++;
+
+        if (unlikely((partial + len) >= SHA512_BLOCK_SIZE)) {
+                int blocks;
+
+                if (partial) {
+                        int p = SHA512_BLOCK_SIZE - partial;
+
+                        memcpy(sctx->buf + partial, data, p);
+                        data += p;
+                        len -= p;
+
+                        block_fn(sctx, sctx->buf, 1);
+                }
+
+                blocks = len / SHA512_BLOCK_SIZE;
+                len %= SHA512_BLOCK_SIZE;
+
+                if (blocks) {
+                        block_fn(sctx, data, blocks);
+                        data += blocks * SHA512_BLOCK_SIZE;
+                }
+                partial = 0;
+        }
+        if (len)
+                memcpy(sctx->buf + partial, data, len);
+
+        return 0;
+}
+
+static inline int sha512_base_do_finalize(struct shash_desc *desc,
+                                          sha512_block_fn *block_fn)
+{
+        const int bit_offset = SHA512_BLOCK_SIZE - sizeof(__be64[2]);
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        __be64 *bits = (__be64 *)(sctx->buf + bit_offset);
+        unsigned int partial = sctx->count[0] % SHA512_BLOCK_SIZE;
+
+        sctx->buf[partial++] = 0x80;
+        if (partial > bit_offset) {
+                memset(sctx->buf + partial, 0x0, SHA512_BLOCK_SIZE - partial);
+                partial = 0;
+
+                block_fn(sctx, sctx->buf, 1);
+        }
+
+        memset(sctx->buf + partial, 0x0, bit_offset - partial);
+        bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);
+        bits[1] = cpu_to_be64(sctx->count[0] << 3);
+        block_fn(sctx, sctx->buf, 1);
+
+        return 0;
+}
+
+static inline int sha512_base_finish(struct shash_desc *desc, u8 *out)
+{
+        unsigned int digest_size = crypto_shash_digestsize(desc->tfm);
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        __be64 *digest = (__be64 *)out;
+        int i;
+
+        for (i = 0; digest_size > 0; i++, digest_size -= sizeof(__be64))
+                put_unaligned_be64(sctx->state[i], digest++);
+
+        *sctx = (struct sha512_state){};
+        return 0;
+}