From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Nov 2021 22:22:05 +0000 (-0800)
Subject: Merge tag 'm68knommu-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: baikal/mips/sdk6.1~7081
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=ce7817a938648c99b5089993156e1a0aab09d89a;p=kernel.git

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

Pull m68knommu updates from Greg Ungerer:
 "Only two changes.

  One removes the now unused CONFIG_MCPU32 symbol. The other sets a
  default for the CONFIG_MEMORY_RESERVE config symbol (this aids
  scripting and other automation) so you don't interactively get asked
  for a value at configure time.

  Summary:

   - remove unused CONFIG_MCPU32 symbol

   - default CONFIG_MEMORY_RESERVE value (for scripting)"

* tag 'm68knommu-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Remove MCPU32 config symbol
  m68k: set a default value for MEMORY_RESERVE
---

ce7817a938648c99b5089993156e1a0aab09d89a