Merge tag 'aspeed-5.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 23 Aug 2021 21:40:35 +0000 (23:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 23 Aug 2021 21:40:35 +0000 (23:40 +0200)
commit07e7e1c9969ffd033839a1be8ce7048da6819bec
tree453e8002960acf25090dfb859c01f53f601c061b
parentecdbda1746b5bf771cd86dfeb84c20d62f5bfc51
parenta4836d5ad127fe31fecb29878d81f2e9b4a5591c
Merge tag 'aspeed-5.15-defconfig' of git://git./linux/kernel/git/joel/bmc into arm/defconfig

ASPEED defconfig updates for 5.15

 - Enable new KCS SerIO driver

 - Enable SGPIO and EDAC for AST2400 now they are supported there

 - Switch to SLUB and enable SLAB_FREELIST_HARDENED

 - Regenerate defconfigs atop v5.14-rc2

* tag 'aspeed-5.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: config: aspeed: Regenerate defconfigs
  ARM: config: aspeed_g4: Enable EDAC and SPGIO
  ARM: config: aspeed: Enable KCS adapter for raw SerIO
  ARM: config: aspeed: Enable hardened allocator feature

Link: https://lore.kernel.org/r/CACPK8XdzKdnyrpjKukGWieBhLgQnBs+y=LuSr_weot=Ovy3+9A@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>