From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 May 2025 03:40:36 +0000 (-0700)
Subject: Merge tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.16-rc1~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c35328632ed89efeb616603e7fa151ac730fafe4;p=thirdparty%2Flinux.git

Merge tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - One more strscpy() conversion

 - Fix detection of real Mac II

 - defconfig updates

* tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.15-rc1
  m68k: mac: Fix macintosh_config for Mac II
  m68k: Replace strcpy() with strscpy() in hardware_proc_show()
---

c35328632ed89efeb616603e7fa151ac730fafe4