From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Feb 2020 08:13:23 +0000 (+0000)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v5.6-rc1~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b21115414f5b5220e7ab3ca7f5d2c1396f11854;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:
 "A couple of changes:

   - remove old CONFIG options from the m68knommu defconfig files

   - fix a warning in the m68k non-MMU get_user() macro"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix memcpy() out of bounds warning in get_user()
  m68k: configs: Cleanup old Kconfig IO scheduler options
---

5b21115414f5b5220e7ab3ca7f5d2c1396f11854