From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Aug 2026 14:00:26 +0000 (-0700)
Subject: Merge tag 'm68k-for-v7.2-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... 
X-Git-Tag: v7.2~30
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=64dc3ba55effbf8afcc0099162dfb4138009ad48;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'm68k-for-v7.2-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k fix from Geert Uytterhoeven:
 "Define NR_CPUS to 1.

  This fixes a long-standing but never critical before oddity on m68k,
  that turned into a serious configuration issue after a recent erofs
  change"

* tag 'm68k-for-v7.2-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Define NR_CPUS to 1
---

64dc3ba55effbf8afcc0099162dfb4138009ad48