mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
kernel: bump 5.15 to 5.15.44
Delete the crypto-lib-blake2s kmod package, as BLAKE2s is now built-in. Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
This commit is contained in:
parent
1f20e70a5c
commit
79e7a2552e
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .43
|
LINUX_VERSION-5.15 = .44
|
||||||
LINUX_KERNEL_HASH-5.15.43 = 064b913a9d58773a85cafa62f2a2f9031aeee724d7e41b66631037d9a6571c12
|
LINUX_KERNEL_HASH-5.15.44 = 9bfabc38e56758bd0cfe22715a3f9a74cdf4a8870f3b150a03d2ffda29f832dc
|
||||||
|
@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
|
|||||||
|
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -17514,6 +17514,14 @@ T: git git://linuxtv.org/media_tree.git
|
@@ -17516,6 +17516,14 @@ T: git git://linuxtv.org/media_tree.git
|
||||||
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
|
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
|
||||||
F: drivers/media/i2c/imx412.c
|
F: drivers/media/i2c/imx412.c
|
||||||
|
|
||||||
|
@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
|
|||||||
+...
|
+...
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -17528,6 +17528,7 @@ M: Raspberry Pi Kernel Maintenance <kern
|
@@ -17530,6 +17530,7 @@ M: Raspberry Pi Kernel Maintenance <kern
|
||||||
L: linux-media@vger.kernel.org
|
L: linux-media@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git git://linuxtv.org/media_tree.git
|
T: git git://linuxtv.org/media_tree.git
|
||||||
|
@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com>
|
|||||||
+...
|
+...
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -17532,6 +17532,14 @@ F: Documentation/devicetree/bindings/med
|
@@ -17534,6 +17534,14 @@ F: Documentation/devicetree/bindings/med
|
||||||
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
|
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
|
||||||
F: drivers/media/i2c/imx477.c
|
F: drivers/media/i2c/imx477.c
|
||||||
|
|
||||||
|
@ -1177,7 +1177,6 @@ CONFIG_CRYPTO_KPP=y
|
|||||||
CONFIG_CRYPTO_KPP2=y
|
CONFIG_CRYPTO_KPP2=y
|
||||||
CONFIG_CRYPTO_LIB_AES=y
|
CONFIG_CRYPTO_LIB_AES=y
|
||||||
CONFIG_CRYPTO_LIB_ARC4=y
|
CONFIG_CRYPTO_LIB_ARC4=y
|
||||||
# CONFIG_CRYPTO_LIB_BLAKE2S is not set
|
|
||||||
# CONFIG_CRYPTO_LIB_CHACHA is not set
|
# CONFIG_CRYPTO_LIB_CHACHA is not set
|
||||||
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
|
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
|
||||||
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
|
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
|
||||||
|
@ -4,7 +4,7 @@ from backports.
|
|||||||
|
|
||||||
--- a/lib/crypto/Kconfig
|
--- a/lib/crypto/Kconfig
|
||||||
+++ b/lib/crypto/Kconfig
|
+++ b/lib/crypto/Kconfig
|
||||||
@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES
|
@@ -4,7 +4,7 @@ config CRYPTO_LIB_AES
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
config CRYPTO_LIB_ARC4
|
config CRYPTO_LIB_ARC4
|
||||||
@ -12,4 +12,4 @@ from backports.
|
|||||||
+ tristate "ARC4 cipher library"
|
+ tristate "ARC4 cipher library"
|
||||||
|
|
||||||
config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
|
config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
|
||||||
tristate
|
bool
|
||||||
|
@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/lib/vsprintf.c
|
--- a/lib/vsprintf.c
|
||||||
+++ b/lib/vsprintf.c
|
+++ b/lib/vsprintf.c
|
||||||
@@ -1001,8 +1001,10 @@ char *symbol_string(char *buf, char *end
|
@@ -1003,8 +1003,10 @@ char *symbol_string(char *buf, char *end
|
||||||
struct printf_spec spec, const char *fmt)
|
struct printf_spec spec, const char *fmt)
|
||||||
{
|
{
|
||||||
unsigned long value;
|
unsigned long value;
|
||||||
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (fmt[1] == 'R')
|
if (fmt[1] == 'R')
|
||||||
@@ -1023,8 +1025,14 @@ char *symbol_string(char *buf, char *end
|
@@ -1025,8 +1027,14 @@ char *symbol_string(char *buf, char *end
|
||||||
|
|
||||||
return string_nocheck(buf, end, sym, spec);
|
return string_nocheck(buf, end, sym, spec);
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user