From: Linus Torvalds Date: Tue, 4 Feb 2020 11:58:07 +0000 (+0000) Subject: Merge tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze X-Git-Tag: baikal/aarch64/sdk6.1~10039 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=e9c08f3a035f2460a2d2e34871b9fca9cf8340de;p=kernel.git Merge tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze Pull Microblaze update from Michal Simek: - enable CMA - add support for MB v11 - defconfig updates - minor fixes * tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Add ID for Microblaze v11 microblaze: Prevent the overflow of the start microblaze: Wire CMA allocator asm-generic: Make dma-contiguous.h a mandatory include/asm header microblaze: Sync defconfig with latest Kconfig layout microblaze: defconfig: Disable EXT2 driver and Enable EXT3 & EXT4 drivers microblaze: Align comments with register usage --- e9c08f3a035f2460a2d2e34871b9fca9cf8340de