aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/patches-5.4
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-12-31 19:25:45 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-01-01 17:07:28 +0100
commit9b1b89229f0efef43a738f91875e0fd9fcc42277 (patch)
tree14d5481d6daa9852dd36554e26e10517651c141f /target/linux/ipq40xx/patches-5.4
parentc22b689cf89f5a17ed6e35c1fb92c19b4a7126ae (diff)
downloadupstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.tar.gz
upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.tar.bz2
upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.zip
kernel: bump 5.4 to 5.4.86
Removed upstreamed patches: pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch Manually merged: pending-5.4/611-netfilter_match_bypass_default_table.patch layerscape/302-dts-0112-arm64-dts-fsl-ls1028a-prepare-dts-for-overlay.patch Build-tested: ipq806x/R7800, bcm27xx/bcm2711, ath79/{generic,tiny}, ipq40xx, octeon, ramips/mt7621, realtek, x86/64 Run-tested: ipq806x/R7800, realtek Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Tested-by: John Audia <graysky@archlinux.us> Tested-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/ipq40xx/patches-5.4')
-rw-r--r--target/linux/ipq40xx/patches-5.4/0013-v5.6-crypto-qce-allow-building-only-hashes-ciphers.patch4
-rw-r--r--target/linux/ipq40xx/patches-5.4/0015-v5.7-crypto-qce-use-AES-fallback-for-small-requests.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ipq40xx/patches-5.4/0013-v5.6-crypto-qce-allow-building-only-hashes-ciphers.patch b/target/linux/ipq40xx/patches-5.4/0013-v5.6-crypto-qce-allow-building-only-hashes-ciphers.patch
index bcd5551f54..5b1372d08f 100644
--- a/target/linux/ipq40xx/patches-5.4/0013-v5.6-crypto-qce-allow-building-only-hashes-ciphers.patch
+++ b/target/linux/ipq40xx/patches-5.4/0013-v5.6-crypto-qce-allow-building-only-hashes-ciphers.patch
@@ -20,7 +20,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
-@@ -616,6 +616,14 @@ config CRYPTO_DEV_QCE
+@@ -617,6 +617,14 @@ config CRYPTO_DEV_QCE
tristate "Qualcomm crypto engine accelerator"
depends on ARCH_QCOM || COMPILE_TEST
depends on HAS_IOMEM
@@ -35,7 +35,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
select CRYPTO_AES
select CRYPTO_LIB_DES
select CRYPTO_ECB
-@@ -623,10 +631,57 @@ config CRYPTO_DEV_QCE
+@@ -624,10 +632,57 @@ config CRYPTO_DEV_QCE
select CRYPTO_XTS
select CRYPTO_CTR
select CRYPTO_BLKCIPHER
diff --git a/target/linux/ipq40xx/patches-5.4/0015-v5.7-crypto-qce-use-AES-fallback-for-small-requests.patch b/target/linux/ipq40xx/patches-5.4/0015-v5.7-crypto-qce-use-AES-fallback-for-small-requests.patch
index 55d15f56b5..0b5c8c6d66 100644
--- a/target/linux/ipq40xx/patches-5.4/0015-v5.7-crypto-qce-use-AES-fallback-for-small-requests.patch
+++ b/target/linux/ipq40xx/patches-5.4/0015-v5.7-crypto-qce-use-AES-fallback-for-small-requests.patch
@@ -28,7 +28,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
-@@ -683,6 +683,29 @@ choice
+@@ -684,6 +684,29 @@ choice
endchoice