testing/linux-edge: upgrade to 5.11.3

enable ARCH_MESON (Amlogic SoCs) on aarch64

7 files changed, 103 insertions, 22 deletions

diff --git a/testing/linux-edge/APKBUILD b/testing/linux-edge/APKBUILD
index bec3bf5eaf2..53ec96074b7 100644
--- a/testing/linux-edge/APKBUILD
+++ b/testing/linux-edge/APKBUILD
@@ -4,7 +4,7 @@ _flavor=edge
 pkgname=linux-${_flavor}
 # NOTE: this kernel is intended for testing
 # please resist urge to upgrade it blindly
-pkgver=5.11.2
+pkgver=5.11.3
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -219,10 +219,10 @@ _dev() {
 }
 
 sha512sums="a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330  linux-5.11.tar.xz
-32a89fc1b755249c30a263193d638983c83808a7481380567ff08a0b84df01465501f4c664b8dd5b6f1cb2525a089a0a6f5cf2fb994ee5e250210aa9cda57ced  patch-5.11.2.xz
-4401f3f337e1190d2f02abcbaf2a534dd3616bc1e6406711e51fe74c7aae382f633fe858c4404911c608ebe3acb275ea13454e2bfc408c54db2d3a28e6c76594  config-edge.aarch64
-cdc4799b116451c2cd7afa7ba0ff24d2950d4a6701e846a5eed44cffc1dc601c1a16fb78834be9635efc94be6a1706363349f3b828a0d3e847a55869f268f3df  config-edge.armv7
-3053e9e10be6cf50e9e912191f2ea285411c135f1443e04f4f1603456de00ebda059870ec08a08238be60cf415a6eb7491e3f2a4bece2d4f50a2ed4c6788c07b  config-edge.x86_64
-031f0fde850bebd427214460141c531a9bb183d6a19dfd71de35baf74b812cac6536ad81d58c3c0c0b516c7025ac94698d6b4bc3a2b440058052b1c6843eea4b  config-edge-virt.aarch64
-7fed34a3b0804f2f20c09bd1d7542549c922282dba0072357cfb9f0b64980b7a7f1b22e361b3cf38861ce47f5c4c299ec018bbf8a8318975d199be650564d3b1  config-edge-virt.armv7
-a6da45f4ca4d07f9a2366a954ac4e03bc3913438a3ca60595a40b213c2432bb4e3f7de33b385b4306ab88f882f98fdbd865df2f61cfc4288fa479ba2c43f9a8f  config-edge-virt.x86_64"
+e92e510af4e4b6dfaea48525b9198f95d2a6ceb1a6e45d54eb367f300fe8c091dd8a55ee310cfed791dec49787972694aa37ea33be2c38d2d862ec818574b36e  patch-5.11.3.xz
+68acd470ad8f381e7163ee0ba6e2b1ea3b85d02a39732be375d91a058ebf965996c2b4d6dd4ae9069cfc33ded0ec1c831d7ca3a23ad44c5551567920198659bb  config-edge.aarch64
+205a7378a94e6a90e109bcfffe80532570213fe650ca8aa0810046e7c6e6cbf71b0e6e647e8f91d16a78e8d40f1a32fb733ea00f0a1086e08e7728874b5f95c5  config-edge.armv7
+1dc6cf4c501e7d9146ff4f6676eb61e757e6bda177009f719521ddb83f812710d7c9c881943dbd47e41c19f0ee3e30ce804b8cfb7c229ed10ee3e45188a55cbc  config-edge.x86_64
+96d48caae4258b33ac6907b4852c8e833af708c4fe64437767f0ddb254db2402ec49f9cd15f448c9b4a1fe87ae2f7fa2ccc9e07cfc073ba11c9b48aae6609ada  config-edge-virt.aarch64
+6ff3e41fa5137adc8c26cc3211dc57de4737268b90c4f11c518e0eb3bfb92bd6dba442b018342ac78752da6568a0ea56c7dddb955eee69cebc335c1cee15195f  config-edge-virt.armv7
+0d78f215e600386fb166d3f1d15602e38677bedf766b8996725c0238f17b6ddaa17a8d33c96afcb01914dfcc05989162c19f23c2c5b893a031b01957e28d3994  config-edge-virt.x86_64"
diff --git a/testing/linux-edge/config-edge-virt.aarch64 b/testing/linux-edge/config-edge-virt.aarch64
index b794616f317..b102eaa6ba2 100644
--- a/testing/linux-edge/config-edge-virt.aarch64
+++ b/testing/linux-edge/config-edge-virt.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.2 Kernel Configuration
+# Linux/arm64 5.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -209,6 +209,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 # CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -3981,7 +3982,6 @@ CONFIG_PARTITION_PERCPU=y
 #
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_XGENE is not set
-# CONFIG_USB_LGM_PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
diff --git a/testing/linux-edge/config-edge-virt.armv7 b/testing/linux-edge/config-edge-virt.armv7
index 011617bc7eb..e079cf966d0 100644
--- a/testing/linux-edge/config-edge-virt.armv7
+++ b/testing/linux-edge/config-edge-virt.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.11.2 Kernel Configuration
+# Linux/arm 5.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -214,6 +214,7 @@ CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -3553,7 +3554,6 @@ CONFIG_RESET_CONTROLLER=y
 # PHY Subsystem
 #
 # CONFIG_GENERIC_PHY is not set
-# CONFIG_USB_LGM_PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
diff --git a/testing/linux-edge/config-edge-virt.x86_64 b/testing/linux-edge/config-edge-virt.x86_64
index 2c6aebda742..69fd5ecfc4b 100644
--- a/testing/linux-edge/config-edge-virt.x86_64
+++ b/testing/linux-edge/config-edge-virt.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.11.2 Kernel Configuration
+# Linux/x86_64 5.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -233,6 +233,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 # CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
diff --git a/testing/linux-edge/config-edge.aarch64 b/testing/linux-edge/config-edge.aarch64
index e098ce30240..52096c0aca2 100644
--- a/testing/linux-edge/config-edge.aarch64
+++ b/testing/linux-edge/config-edge.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.2 Kernel Configuration
+# Linux/arm64 5.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -211,6 +211,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_USERMODE_DRIVER=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -286,7 +287,7 @@ CONFIG_ARCH_LAYERSCAPE=y
 CONFIG_ARCH_HISI=y
 # CONFIG_ARCH_KEEMBAY is not set
 CONFIG_ARCH_MEDIATEK=y
-# CONFIG_ARCH_MESON is not set
+CONFIG_ARCH_MESON=y
 CONFIG_ARCH_MVEBU=y
 # CONFIG_ARCH_MXC is not set
 CONFIG_ARCH_QCOM=y
@@ -601,6 +602,7 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 
 CONFIG_EFI_EARLYCON=y
 # CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
+CONFIG_MESON_SM=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
@@ -3032,6 +3034,7 @@ CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 # CONFIG_DWMAC_MEDIATEK is not set
+CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SOCFPGA=m
@@ -3084,6 +3087,7 @@ CONFIG_SFP=m
 # MII PHY device drivers
 #
 CONFIG_AMD_PHY=m
+# CONFIG_MESON_GXL_PHY is not set
 # CONFIG_ADIN_PHY is not set
 CONFIG_AQUANTIA_PHY=m
 # CONFIG_AX88796B_PHY is not set
@@ -3147,6 +3151,7 @@ CONFIG_MDIO_THUNDER=m
 # MDIO Multiplexers
 #
 CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -3826,6 +3831,7 @@ CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+# CONFIG_SERIAL_MESON is not set
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
@@ -3904,6 +3910,7 @@ CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_XGENE=m
+CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_CAVIUM=m
 CONFIG_HW_RANDOM_MTK=m
 # CONFIG_HW_RANDOM_EXYNOS is not set
@@ -4010,6 +4017,7 @@ CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 # CONFIG_I2C_IMX is not set
+# CONFIG_I2C_MESON is not set
 # CONFIG_I2C_MT65XX is not set
 CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_NOMADIK is not set
@@ -4082,6 +4090,8 @@ CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_MESON_SPICC is not set
+# CONFIG_SPI_MESON_SPIFC is not set
 # CONFIG_SPI_MT65XX is not set
 # CONFIG_SPI_MTK_NOR is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -4255,6 +4265,14 @@ CONFIG_PINCTRL_MT8192=y
 CONFIG_PINCTRL_MT8516=y
 # end of MediaTek pinctrl drivers
 
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON8_PMX=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_MESON_A1=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
@@ -4670,6 +4688,7 @@ CONFIG_HISI_THERMAL=y
 CONFIG_ROCKCHIP_THERMAL=m
 # CONFIG_ARMADA_THERMAL is not set
 CONFIG_MTK_THERMAL=y
+CONFIG_AMLOGIC_THERMAL=y
 
 #
 # Broadcom thermal drivers
@@ -4733,6 +4752,8 @@ CONFIG_MAX63XX_WATCHDOG=m
 # CONFIG_IMX2_WDT is not set
 # CONFIG_TEGRA_WATCHDOG is not set
 # CONFIG_QCOM_WDT is not set
+# CONFIG_MESON_GXBB_WATCHDOG is not set
+# CONFIG_MESON_WATCHDOG is not set
 # CONFIG_MEDIATEK_WATCHDOG is not set
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_SPRD_WATCHDOG is not set
@@ -4960,6 +4981,7 @@ CONFIG_IR_IMON_RAW=m
 CONFIG_IR_MCEUSB=m
 CONFIG_IR_ITE_CIR=m
 CONFIG_IR_FINTEK=m
+# CONFIG_IR_MESON is not set
 # CONFIG_IR_MTK is not set
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
@@ -5799,6 +5821,7 @@ CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_HISI_KIRIN=m
 # CONFIG_DRM_MEDIATEK is not set
 # CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_MESON is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_TINYDRM_HX8357D is not set
@@ -6183,6 +6206,25 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 # CONFIG_SND_SOC_MT8183 is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 # CONFIG_SND_SOC_MT8192 is not set
+
+#
+# ASoC support for Amlogic platforms
+#
+# CONFIG_SND_MESON_AIU is not set
+# CONFIG_SND_MESON_AXG_FRDDR is not set
+# CONFIG_SND_MESON_AXG_TODDR is not set
+# CONFIG_SND_MESON_AXG_TDMIN is not set
+# CONFIG_SND_MESON_AXG_TDMOUT is not set
+# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
+# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
+# CONFIG_SND_MESON_AXG_SPDIFIN is not set
+# CONFIG_SND_MESON_AXG_PDM is not set
+# CONFIG_SND_MESON_GX_SOUND_CARD is not set
+# CONFIG_SND_MESON_G12A_TOACODEC is not set
+# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+# CONFIG_SND_SOC_MESON_T9015 is not set
+# end of ASoC support for Amlogic platforms
+
 # CONFIG_SND_SOC_QCOM is not set
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
@@ -6651,6 +6693,7 @@ CONFIG_USB_DWC3_HOST=y
 CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_PCI=m
 CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_MESON_G12A=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
 CONFIG_USB_DWC3_QCOM=m
 CONFIG_USB_DWC2=m
@@ -6840,6 +6883,8 @@ CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MMC_SDHCI_F_SDH30=m
 # CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_IPROC=m
+# CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MESON_MX_SDIO is not set
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_TIFM_SD=m
 # CONFIG_MMC_SPI is not set
@@ -7141,6 +7186,7 @@ CONFIG_RTC_DRV_PCF50633=m
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_FSL_FTM_ALARM=y
+CONFIG_RTC_DRV_MESON_VRTC=m
 CONFIG_HAVE_S3C_RTC=y
 # CONFIG_RTC_DRV_S3C is not set
 # CONFIG_RTC_DRV_PL030 is not set
@@ -7541,6 +7587,23 @@ CONFIG_COMMON_CLK_MT8516=y
 # CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
 # end of Clock driver for MediaTek SoC
 
+#
+# Clock support for Amlogic platforms
+#
+CONFIG_COMMON_CLK_MESON_REGMAP=y
+CONFIG_COMMON_CLK_MESON_DUALDIV=y
+CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_COMMON_CLK_MESON_AO_CLKC=y
+CONFIG_COMMON_CLK_MESON_EE_CLKC=y
+CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
+CONFIG_COMMON_CLK_GXBB=y
+CONFIG_COMMON_CLK_AXG=y
+# CONFIG_COMMON_CLK_AXG_AUDIO is not set
+CONFIG_COMMON_CLK_G12A=y
+# end of Clock support for Amlogic platforms
+
 CONFIG_ARMADA_AP_CP_HELPER=y
 CONFIG_ARMADA_37XX_CLK=y
 CONFIG_ARMADA_AP806_SYSCON=y
@@ -7682,6 +7745,12 @@ CONFIG_SOUNDWIRE=y
 #
 # Amlogic SoC drivers
 #
+# CONFIG_MESON_CANVAS is not set
+CONFIG_MESON_CLK_MEASURE=y
+CONFIG_MESON_GX_SOCINFO=y
+CONFIG_MESON_GX_PM_DOMAINS=y
+CONFIG_MESON_EE_PM_DOMAINS=y
+CONFIG_MESON_SECURE_PM_DOMAINS=y
 # end of Amlogic SoC drivers
 
 #
@@ -7912,6 +7981,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_MEDIATEK_MT6577_AUXADC is not set
+CONFIG_MESON_SARADC=m
 # CONFIG_NAU7802 is not set
 CONFIG_ROCKCHIP_SARADC=m
 # CONFIG_SD_ADC_MODULATOR is not set
@@ -8300,6 +8370,7 @@ CONFIG_PWM_BCM2835=m
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
 # CONFIG_PWM_HIBVT is not set
+# CONFIG_PWM_MESON is not set
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_MEDIATEK=m
 CONFIG_PWM_PCA9685=m
@@ -8333,6 +8404,7 @@ CONFIG_LS_EXTIRQ=y
 CONFIG_LS_SCFG_MSI=y
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_QCOM_IRQ_COMBINER is not set
+CONFIG_MESON_IRQ_GPIO=y
 CONFIG_QCOM_PDC=y
 CONFIG_MST_IRQ=y
 # end of IRQ chip support
@@ -8343,6 +8415,8 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
 # CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_INTEL_GW is not set
+CONFIG_RESET_MESON=y
+# CONFIG_RESET_MESON_AUDIO_ARB is not set
 CONFIG_RESET_QCOM_AOSS=y
 # CONFIG_RESET_QCOM_PDC is not set
 CONFIG_RESET_RASPBERRYPI=m
@@ -8360,11 +8434,17 @@ CONFIG_RESET_TEGRA_BPMP=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=m
-# CONFIG_USB_LGM_PHY is not set
 # CONFIG_PHY_SUN4I_USB is not set
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 # CONFIG_PHY_SUN9I_USB is not set
 # CONFIG_PHY_SUN50I_USB3 is not set
+CONFIG_PHY_MESON8B_USB2=y
+CONFIG_PHY_MESON_GXL_USB2=y
+CONFIG_PHY_MESON_G12A_USB2=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_AXG_PCIE=y
+CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=y
+CONFIG_PHY_MESON_AXG_MIPI_DPHY=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
@@ -8452,6 +8532,8 @@ CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
 # CONFIG_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SUNXI_SID=m
+# CONFIG_MESON_EFUSE is not set
+# CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_ZYNQMP is not set
 # CONFIG_SPRD_EFUSE is not set
 
diff --git a/testing/linux-edge/config-edge.armv7 b/testing/linux-edge/config-edge.armv7
index c4ffc76fd43..96a8098974c 100644
--- a/testing/linux-edge/config-edge.armv7
+++ b/testing/linux-edge/config-edge.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.11.2 Kernel Configuration
+# Linux/arm 5.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -205,6 +205,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_USERMODE_DRIVER=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -7117,7 +7118,6 @@ CONFIG_RESET_ZYNQ=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-# CONFIG_USB_LGM_PHY is not set
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
diff --git a/testing/linux-edge/config-edge.x86_64 b/testing/linux-edge/config-edge.x86_64
index 04eee613a98..f346f4a22a0 100644
--- a/testing/linux-edge/config-edge.x86_64
+++ b/testing/linux-edge/config-edge.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.11.2 Kernel Configuration
+# Linux/x86_64 5.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -234,6 +234,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_USERMODE_DRIVER=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -7121,9 +7122,6 @@ CONFIG_MLX_PLATFORM=m
 # CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set
 CONFIG_INTEL_CHTDC_TI_PWRBTN=m
 CONFIG_INTEL_PMC_CORE=y
-# CONFIG_INTEL_PMT_CLASS is not set
-# CONFIG_INTEL_PMT_TELEMETRY is not set
-# CONFIG_INTEL_PMT_CRASHLOG is not set
 CONFIG_INTEL_PUNIT_IPC=m
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set