diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-30 10:30:24 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-06 19:20:28 +0200 |
| commit | 79e7a2552e89d762a1a2a9bcf327427738f5d238 (patch) | |
| tree | 0dbcfc5a1184fe1f5f1500c18a1243e3feb62d6c | |
| parent | 1f20e70a5cd26a41dbccea9401e2704632953ffe (diff) | |
| download | upstream-79e7a2552e89d762a1a2a9bcf327427738f5d238.tar.gz upstream-79e7a2552e89d762a1a2a9bcf327427738f5d238.tar.bz2 upstream-79e7a2552e89d762a1a2a9bcf327427738f5d238.zip | |
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>
7 files changed, 9 insertions, 10 deletions
diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 070bf0ddda..6692deaf3f 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .43 -LINUX_KERNEL_HASH-5.15.43 = 064b913a9d58773a85cafa62f2a2f9031aeee724d7e41b66631037d9a6571c12 +LINUX_VERSION-5.15 = .44 +LINUX_KERNEL_HASH-5.15.44 = 9bfabc38e56758bd0cfe22715a3f9a74cdf4a8870f3b150a03d2ffda29f832dc diff --git a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch index 499b48e69c..6a379a2c74 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- a/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: drivers/media/i2c/imx412.c diff --git a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch index 77c44cf13c..2848cb87c5 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch @@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com> +... --- a/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 S: Maintained T: git git://linuxtv.org/media_tree.git diff --git a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch index 8bbbfcb151..364895e2eb 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch @@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com> +... --- a/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: drivers/media/i2c/imx477.c diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index 8146161d08..3ddc7fbbf8 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -1177,7 +1177,6 @@ CONFIG_CRYPTO_KPP=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_LIB_ARC4=y -# CONFIG_CRYPTO_LIB_BLAKE2S is not set # CONFIG_CRYPTO_LIB_CHACHA is not set # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set # CONFIG_CRYPTO_LIB_CURVE25519 is not set diff --git a/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch b/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch index a7668acfad..dfba811f31 100644 --- a/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch +++ b/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch @@ -4,7 +4,7 @@ from backports. --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig -@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES +@@ -4,7 +4,7 @@ config CRYPTO_LIB_AES tristate config CRYPTO_LIB_ARC4 @@ -12,4 +12,4 @@ from backports. + tristate "ARC4 cipher library" config CRYPTO_ARCH_HAVE_LIB_BLAKE2S - tristate + bool diff --git a/target/linux/generic/pending-5.15/205-backtrace_module_info.patch b/target/linux/generic/pending-5.15/205-backtrace_module_info.patch index 84e4534143..6379ce071d 100644 --- a/target/linux/generic/pending-5.15/205-backtrace_module_info.patch +++ b/target/linux/generic/pending-5.15/205-backtrace_module_info.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/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) { unsigned long value; @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif 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); #else |