Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/lib/Makefile
Simple merge

diff --cc arch/arm64/lib/Makefile
Simple merge

diff --cc arch/powerpc/lib/Makefile
Simple merge

diff --cc arch/powerpc/lib/crc-t10dif.c
Simple merge

diff --cc arch/powerpc/lib/crc32.c
Simple merge

diff --cc arch/s390/lib/Makefile
Simple merge

diff --cc arch/sparc/lib/Makefile
Simple merge

diff --cc arch/x86/lib/Makefile
Simple merge

diff --cc crypto/Makefile
index 0b4641c5bbe1fecb7eda0c558b433dfebda3e73e,186f968baa39efae66c1c7834931029937733136..017df3a2e4bb3174edbf0ed7c8876c02511dc203
--- 1/crypto/Makefile
--- 2/crypto/Makefile
+++ b/crypto/Makefile
@@@ -148,14 -148,16 +148,16 @@@ obj-$(CONFIG_CRYPTO_KHAZAD) += khazad.
  obj-$(CONFIG_CRYPTO_ANUBIS) += anubis.o
  obj-$(CONFIG_CRYPTO_SEED) += seed.o
  obj-$(CONFIG_CRYPTO_ARIA) += aria_generic.o
 -obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o
 -obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o
 +obj-$(CONFIG_CRYPTO_CHACHA20) += chacha.o
 +CFLAGS_chacha.o += -DARCH=$(ARCH)
  obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
  obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
- obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o
- obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o
- CFLAGS_crc32c_generic.o += -DARCH=$(ARCH)
- CFLAGS_crc32_generic.o += -DARCH=$(ARCH)
+ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c-cryptoapi.o
+ crc32c-cryptoapi-y := crc32c.o
+ CFLAGS_crc32c.o += -DARCH=$(ARCH)
+ obj-$(CONFIG_CRYPTO_CRC32) += crc32-cryptoapi.o
+ crc32-cryptoapi-y := crc32.o
+ CFLAGS_crc32.o += -DARCH=$(ARCH)
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
  obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o

diff --cc crypto/crc32.c
Simple merge

diff --cc crypto/crc32c.c
Simple merge