kernel: bump 5.10 to 5.10.133 (#9845)

This commit is contained in:
lovehackintosh 2022-07-27 23:51:57 +08:00 committed by GitHub
parent d677e6a664
commit 7ad9516bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 9 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .131 LINUX_VERSION-5.10 = .133
LINUX_KERNEL_HASH-5.10.131 = 8bc441442c16c330a7148fe3cca9edcd98bc0fc9f68304633c7eb641770d21ce LINUX_KERNEL_HASH-5.10.133 = 3b5c4c7d5bca720c11f1024c9aa00ac04397b6c7de37fd4170444077c723280e

View File

@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -929,6 +929,17 @@ config LEDS_ACER_A500 @@ -931,6 +931,17 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of
Acer Iconia Tab A500. source "drivers/leds/blink/Kconfig"
+config LEDS_RESET +config LEDS_RESET
+ tristate "LED support for reset-controller API" + tristate "LED support for reset-controller API"

View File

@ -1162,7 +1162,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
@@ -444,7 +444,7 @@ static int dwc_eth_dwmac_probe(struct pl @@ -445,7 +445,7 @@ static int dwc_eth_dwmac_probe(struct pl
if (IS_ERR(stmmac_res.addr)) if (IS_ERR(stmmac_res.addr))
return PTR_ERR(stmmac_res.addr); return PTR_ERR(stmmac_res.addr);

View File

@ -115,7 +115,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.previous .previous
--- a/scripts/Makefile.build --- a/scripts/Makefile.build
+++ b/scripts/Makefile.build +++ b/scripts/Makefile.build
@@ -367,7 +367,7 @@ targets += $(lib-y) $(always-y) $(MAKECM @@ -373,7 +373,7 @@ targets += $(lib-y) $(always-y) $(MAKECM
# Linker scripts preprocessor (.lds.S -> .lds) # Linker scripts preprocessor (.lds.S -> .lds)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@ quiet_cmd_cpp_lds_S = LDS $@

View File

@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} }
--- a/scripts/link-vmlinux.sh --- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh
@@ -186,6 +186,10 @@ kallsyms() @@ -192,6 +192,10 @@ kallsyms()
kallsymopt="${kallsymopt} --base-relative" kallsymopt="${kallsymopt} --base-relative"
fi fi

View File

@ -36,7 +36,7 @@ David
--- a/drivers/tty/serial/8250/8250_core.c --- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c
@@ -133,6 +133,38 @@ static irqreturn_t serial8250_interrupt( @@ -134,6 +134,38 @@ static irqreturn_t serial8250_interrupt(
if (l == i->head && pass_counter++ > PASS_LIMIT) if (l == i->head && pass_counter++ > PASS_LIMIT)
break; break;

View File

@ -81,6 +81,9 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_IBPB_ENTRY=y
CONFIG_CPU_IBRS_ENTRY=y
# CONFIG_SLS is not set
CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_RMAP=y CONFIG_CPU_RMAP=y
@ -92,11 +95,13 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y CONFIG_CPU_SUP_UMC_32=y
CONFIG_CPU_SUP_ZHAOXIN=y CONFIG_CPU_SUP_ZHAOXIN=y
CONFIG_CPU_UNRET_ENTRY=y
CONFIG_CRASH_CORE=y CONFIG_CRASH_CORE=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CRC32_PCLMUL is not set # CONFIG_CRYPTO_CRC32_PCLMUL is not set
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_NULL2=y
@ -402,6 +407,7 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y CONFIG_RD_GZIP=y
CONFIG_RELOCATABLE=y CONFIG_RELOCATABLE=y
# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_ATTACK_MITIGATION is not set
CONFIG_RETHUNK=y
CONFIG_RETPOLINE=y CONFIG_RETPOLINE=y
CONFIG_RFS_ACCEL=y CONFIG_RFS_ACCEL=y
CONFIG_RPS=y CONFIG_RPS=y