From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Nov 2021 00:07:02 +0000 (-0700)
Subject: Merge tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v6.1-rc5~2732
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce840177930f591a181f55515fc6ac9e1f56b84a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'defconfig-5.16' of git://git./linux/kernel/git/soc/soc

Pull ARM defconfig updates from Arnd Bergmann:
 "These are the usual changes to enable newly added driver by default,
  and to do some housekeeping around changing Kconfig symbols"

* tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (33 commits)
  arm64: defconfig: Enable Qualcomm LMH driver
  arm64: defconfig: Enable Qualcomm prima/pronto drivers
  arm64: defconfig: Enable Sleep stats driver
  arm64: defconfig: Visconti: Enable PCIe host controller
  ARM: configs: aspeed: Remove unused USB gadget devices
  ARM: config: aspeed: Enable Network Block Device
  ARM: configs: aspeed: Enable pstore and lockup detectors
  ARM: configs: aspeed: Enable commonly used drivers
  ARM: configs: aspeed: Disable IPV6 SIT device
  ARM: imx_v6_v7_defconfig: Enable HID I2C
  arm64: defconfig: Enable QTI SC7280 pinctrl, gcc and interconnect
  arm64: defconfig: Disable firmware sysfs fallback
  ARM: mvebu_v7_defconfig: rebuild default configuration
  ARM: mvebu_v7_defconfig: enable mtd physmap
  arm64: defconfig: Enable few Tegra210 based AHUB drivers
  arm64: defconfig: drop obsolete ARCH_* configs
  ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf
  ARM: imx_v6_v7_defconfig: build imx sdma driver as module
  ARM: imx_v6_v7_defconfig: rebuild default configuration
  ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant
  ...
---

ce840177930f591a181f55515fc6ac9e1f56b84a
diff --cc arch/arm64/configs/defconfig
index 6c10438,d06f8aa..f2e2b9bd
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -243,8 -242,8 +242,7 @@@ CONFIG_PCI_EPF_TEST=
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_FW_LOADER_USER_HELPER=y
- CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
  CONFIG_HISILICON_LPC=y
 -CONFIG_SIMPLE_PM_BUS=y
  CONFIG_FSL_MC_BUS=y
  CONFIG_TEGRA_ACONNECT=m
  CONFIG_GNSS=m