From: Olof Johansson Date: Sat, 12 Jun 2021 15:48:20 +0000 (-0700) Subject: Merge tag 'v5.13-next-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=65a40301234ea88076fceaf64fadafb606868552;p=linux.git Merge tag 'v5.13-next-defconfig' of https://git./linux/kernel/git/matthias.bgg/linux into arm/defconfig - Delete MTK_PMIC_WRAP added twice. - Set MMC_MTK as built-in to be able to boot from MMC device. * tag 'v5.13-next-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: arm64: defconfig: Allow Mediatek boards to boot from the mmc arm64: defconfig: Do not override the MTK_PMIC_WRAP symbol Link: https://lore.kernel.org/r/ad6f7f4e-7e4d-08b9-8781-71bd78444929@gmail.com Signed-off-by: Olof Johansson --- 65a40301234ea88076fceaf64fadafb606868552