From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Sep 2021 01:31:45 +0000 (-0700)
Subject: Merge tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: baikal/mips/sdk5.9~10216
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=f322c6003df9e59cf4f7cb51c5bba3f8ba61f83f;p=kernel.git

Merge tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:
 "A collection of fixes:

   -  flexcan platform support (for m5441x)

   -  fix CONFIG_ROMKERNEL linking

   -  fix compilation when CONFIG_ISA_DMA_API is set

   -  fix local ColdFire clk_enable() for NULL clk"

* tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch
  m68k: coldfire: return success for clk_enable(NULL)
  m68k: m5441x: add flexcan support
  m68k: stmark2: update board setup
  m68k/nommu: prevent setting ROMKERNEL when ROM is not set
---

f322c6003df9e59cf4f7cb51c5bba3f8ba61f83f