From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2022 17:32:06 +0000 (-0700)
Subject: Merge tag 'm68k-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~794
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a82c58cf1a5560988d8b9b8abcd982e90a5fdaa4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'm68k-for-v5.20-tag1' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - Use RNG seed from bootinfo block on virt platform

 - defconfig updates

 - Minor fixes and improvements

* tag 'm68k-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v5.19-rc1
  m68k: Add common forward declaration for show_registers()
  m68k: mac: Remove forward declaration for mac_nmi_handler()
  m68k: virt: Fix missing platform_device_unregister() on error in virt_platform_init()
  m68k: virt: Use RNG seed from bootinfo block
  m68k: bitops: Change __fls to return and accept unsigned long
  m68k: Kconfig.machine: Add endif comment
  m68k: Kconfig.debug: Replace single quotes
  m68k: Kconfig.cpu: Fix indentation and add endif comments
  m68k: q40: Align '*' in comments
  m68k: sun3: Use __func__ to get function's name in an output message
  m68k: mac: Fix typos in comments
  m68k: virt: Kconfig minor fixes
---

a82c58cf1a5560988d8b9b8abcd982e90a5fdaa4