aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-22 11:58:33 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commitf2f03545d4d9f4df44300b95edfd340db1474501 (patch)
tree47c9aa7ac35b02f91510dee8872a00a7b6156a78 /target/linux/generic/hack-5.10
parent50db012243c107e69210341ba07ba6091e32106c (diff)
downloadupstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.gz
upstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.bz2
upstream-f2f03545d4d9f4df44300b95edfd340db1474501.zip
kernel: bump 5.10 to 5.10.124
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 9e5d743422edc4036cda7d96b96ba62705f382de)
Diffstat (limited to 'target/linux/generic/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/251-kconfig.patch12
-rw-r--r--target/linux/generic/hack-5.10/253-ksmbd-config.patch2
-rw-r--r--target/linux/generic/hack-5.10/260-crypto_test_dependencies.patch2
-rw-r--r--target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch2
4 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/hack-5.10/251-kconfig.patch b/target/linux/generic/hack-5.10/251-kconfig.patch
index 4ada399fbf..30b8ee23ea 100644
--- a/target/linux/generic/hack-5.10/251-kconfig.patch
+++ b/target/linux/generic/hack-5.10/251-kconfig.patch
@@ -16,7 +16,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -33,7 +33,7 @@ config CRYPTO_FIPS
+@@ -34,7 +34,7 @@ config CRYPTO_FIPS
this is.
config CRYPTO_ALGAPI
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_ALGAPI2
help
This option provides the API for cryptographic algorithms.
-@@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2
+@@ -43,7 +43,7 @@ config CRYPTO_ALGAPI2
tristate
config CRYPTO_AEAD
@@ -34,7 +34,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_AEAD2
select CRYPTO_ALGAPI
-@@ -53,7 +53,7 @@ config CRYPTO_AEAD2
+@@ -54,7 +54,7 @@ config CRYPTO_AEAD2
select CRYPTO_RNG2
config CRYPTO_SKCIPHER
@@ -43,7 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_SKCIPHER2
select CRYPTO_ALGAPI
-@@ -63,7 +63,7 @@ config CRYPTO_SKCIPHER2
+@@ -64,7 +64,7 @@ config CRYPTO_SKCIPHER2
select CRYPTO_RNG2
config CRYPTO_HASH
@@ -52,7 +52,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_HASH2
select CRYPTO_ALGAPI
-@@ -72,7 +72,7 @@ config CRYPTO_HASH2
+@@ -73,7 +73,7 @@ config CRYPTO_HASH2
select CRYPTO_ALGAPI2
config CRYPTO_RNG
@@ -92,7 +92,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
bool
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -420,16 +420,16 @@ config BCH_CONST_T
+@@ -423,16 +423,16 @@ config BCH_CONST_T
# Textsearch support is select'ed if needed
#
config TEXTSEARCH
diff --git a/target/linux/generic/hack-5.10/253-ksmbd-config.patch b/target/linux/generic/hack-5.10/253-ksmbd-config.patch
index 3e51aa60be..4d07c1c00e 100644
--- a/target/linux/generic/hack-5.10/253-ksmbd-config.patch
+++ b/target/linux/generic/hack-5.10/253-ksmbd-config.patch
@@ -11,7 +11,7 @@
that can be interpreted by the ASN.1 stream decoder and used to
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -591,7 +591,7 @@ config LIBFDT
+@@ -594,7 +594,7 @@ config LIBFDT
bool
config OID_REGISTRY
diff --git a/target/linux/generic/hack-5.10/260-crypto_test_dependencies.patch b/target/linux/generic/hack-5.10/260-crypto_test_dependencies.patch
index 1eab709c46..3ccf67b23e 100644
--- a/target/linux/generic/hack-5.10/260-crypto_test_dependencies.patch
+++ b/target/linux/generic/hack-5.10/260-crypto_test_dependencies.patch
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -120,13 +120,13 @@ config CRYPTO_MANAGER
+@@ -121,13 +121,13 @@ config CRYPTO_MANAGER
cbc(aes).
config CRYPTO_MANAGER2
diff --git a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
index e55f2c0086..bdbab68ee1 100644
--- a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
@@ -19,7 +19,7 @@
#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
-@@ -1129,6 +1131,11 @@ static const struct usb_device_id option
+@@ -1131,6 +1133,11 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },