From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 May 2025 09:55:16 +0000 (+1000)
Subject: Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8811138a92ef95e7ebde3163bf813679186a72e9;p=users%2Fhch%2Fmisc.git

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

8811138a92ef95e7ebde3163bf813679186a72e9
diff --cc crypto/Makefile
index 0b4641c5bbe1,186f968baa39..017df3a2e4bb
--- a/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