From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 May 2024 19:05:40 +0000 (-0700)
Subject: Merge tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: ceph-for-6.10-rc8~290
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=334e5639fc4e20752d46552abefc5311351e3bee;p=ceph-client.git

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

Pull m68knommu update from Greg Ungerer:

 . remove use of kernel config option from uapi header

* tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: Avoid CONFIG_COLDFIRE switch in uapi header
---

334e5639fc4e20752d46552abefc5311351e3bee