summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-01-09 00:28:00 +0300
committerJakub Kicinski <kuba@kernel.org>2021-01-09 00:28:00 +0300
commit833d22f2f922bbee6430e558417af060db6bbe9c (patch)
tree8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b /arch/arm
parent58334e7537278793c86baa88b70c48b0d50b00ae (diff)
parent6279d812eab67a6df6b22fa495201db6f2305924 (diff)
downloadlinux-833d22f2f922bbee6430e558417af060db6bbe9c.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in CAN on file rename. Conflicts: drivers/net/can/m_can/tcan4x5x-core.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/crypto/chacha-glue.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c
index 7b5cf8430c6d..cdde8fd01f8f 100644
--- a/arch/arm/crypto/chacha-glue.c
+++ b/arch/arm/crypto/chacha-glue.c
@@ -60,6 +60,7 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
chacha_block_xor_neon(state, d, s, nrounds);
if (d != dst)
memcpy(dst, buf, bytes);
+ state[12]++;
}
}