From 3bd701d47cb76e552a3378900699b76ad4900df0 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 13 Oct 2021 11:02:37 +0100 Subject: [PATCH] kernel: bump 5.10 to 5.10.73 Patches automatically refreshed. Signed-off-by: Rui Salvaterra --- include/kernel-version.mk | 4 ++-- ...pc_ich-Enable-GPIO-driver-for-DH89xxCC.patch | 6 +----- ...m-x86-add-meraki-mx100-platform-driver.patch | 17 ++++------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b0fa8263c08..e6c5e195032 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .155 -LINUX_VERSION-5.10 = .72 +LINUX_VERSION-5.10 = .73 LINUX_KERNEL_HASH-5.4.155 = cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038 -LINUX_KERNEL_HASH-5.10.72 = b4d635afe7646ac6a6617c738e747ba0a6006675cd9735d18f672f8b1fba4c7c +LINUX_KERNEL_HASH-5.10.73 = edb228032b23efa14077a68d968bc5b0d4026c1d1ef8bb958547a87ccb030e76 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/x86/patches-5.10/101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch b/target/linux/x86/patches-5.10/101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch index 0f0a3958da7..b4881bf1d3a 100644 --- a/target/linux/x86/patches-5.10/101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch +++ b/target/linux/x86/patches-5.10/101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch @@ -16,11 +16,9 @@ Signed-off-by: Lee Jones drivers/mfd/lpc_ich.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c -index 3bbb29a7e7a57..f10e53187f67a 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c -@@ -489,6 +489,7 @@ static struct lpc_ich_info lpc_chipset_info[] = { +@@ -489,6 +489,7 @@ static struct lpc_ich_info lpc_chipset_i [LPC_DH89XXCC] = { .name = "DH89xxCC", .iTCO_version = 2, @@ -28,5 +26,3 @@ index 3bbb29a7e7a57..f10e53187f67a 100644 }, [LPC_PPT] = { .name = "Panther Point", --- -cgit 1.2.3-1.el7 diff --git a/target/linux/x86/patches-5.10/102-v5.15-platform-x86-add-meraki-mx100-platform-driver.patch b/target/linux/x86/patches-5.10/102-v5.15-platform-x86-add-meraki-mx100-platform-driver.patch index c05b61a9945..0babc73b06f 100644 --- a/target/linux/x86/patches-5.10/102-v5.15-platform-x86-add-meraki-mx100-platform-driver.patch +++ b/target/linux/x86/patches-5.10/102-v5.15-platform-x86-add-meraki-mx100-platform-driver.patch @@ -22,11 +22,9 @@ Signed-off-by: Hans de Goede 3 files changed, 246 insertions(+) create mode 100644 drivers/platform/x86/meraki-mx100.c -diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig -index 6ad35158ae4ef..432d72170b003 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig -@@ -302,6 +302,19 @@ config ASUS_NB_WMI +@@ -267,6 +267,19 @@ config ASUS_NB_WMI If you have an ACPI-WMI compatible Asus Notebook, say Y or M here. @@ -46,11 +44,9 @@ index 6ad35158ae4ef..432d72170b003 100644 config EEEPC_LAPTOP tristate "Eee PC Hotkey Driver" depends on ACPI -diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile -index 5edfdc2ea7f29..9bb3c3f773864 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile -@@ -39,6 +39,9 @@ obj-$(CONFIG_ASUS_NB_WMI) += asus-nb-wmi.o +@@ -33,6 +33,9 @@ obj-$(CONFIG_ASUS_NB_WMI) += asus-nb-wmi obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o @@ -58,11 +54,8 @@ index 5edfdc2ea7f29..9bb3c3f773864 100644 +obj-$(CONFIG_MERAKI_MX100) += meraki-mx100.o + # Dell - obj-$(CONFIG_X86_PLATFORM_DRIVERS_DELL) += dell/ - -diff --git a/drivers/platform/x86/meraki-mx100.c b/drivers/platform/x86/meraki-mx100.c -new file mode 100644 -index 0000000000000..3751ed36a980a + obj-$(CONFIG_DCDBAS) += dcdbas.o + obj-$(CONFIG_DELL_SMBIOS) += dell-smbios.o --- /dev/null +++ b/drivers/platform/x86/meraki-mx100.c @@ -0,0 +1,230 @@ @@ -296,5 +289,3 @@ index 0000000000000..3751ed36a980a +MODULE_DESCRIPTION("Cisco Meraki MX100 Platform Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:meraki-mx100"); --- -cgit 1.2.3-1.el7 -- 2.30.2