Merge tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 May 2024 19:05:40 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 May 2024 19:05:40 +0000 (12:05 -0700)
commit334e5639fc4e20752d46552abefc5311351e3bee
tree2f6874c268b9ca4f8fb616d416d5dea930047674
parent5499315668dae0e0935489075aadac4a91ff04ff
parenta5044ce7d1d94cd37be99e86964aa054f7e5564c
Merge tag 'm68knommu-for-v6.10' of git://git./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