Merge tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Oct 2021 19:30:42 +0000 (21:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 Oct 2021 19:30:56 +0000 (21:30 +0200)
commit6fc04eacf1bad0ee052b27c328ec7919a7086ddf
treefc1bd973de6ecff8217d2f5e97f381cc1fb6601f
parent48fe205ada2d6c6bc6a08154c1b797c7c237dd2d
parent52a490e0efac02f236295cf43e136a1cb3a786f7
Merge tag 'aspeed-5.16-defconfig' of git://git./linux/kernel/git/joel/bmc into arm/defconfigs

ASPEED defconfig updates for 5.16

 - Add options that are enabled in the common OpenBMC kernel

 - Re-enable DRM_FBDEV_EMULATION

 - Turn on the various sensor drivers that are used in BMC systems,
 so we can boot test where they are modelled in Qemu

* tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  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: configs: aspeed_g5: Reneable DRM_FBDEV_EMULATION

Link: https://lore.kernel.org/r/CACPK8Xd0mVn2Cy7d=VBTDMpU=WHrftsiihwH224ekFSDGKAbyA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>