Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Feb 2020 08:13:23 +0000 (08:13 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Feb 2020 08:13:23 +0000 (08:13 +0000)
commit5b21115414f5b5220e7ab3ca7f5d2c1396f11854
tree3116bfdd64eb7474940ba89f2a4287ba51cc84e8
parent85e5529625f0e41beefe8939eb08baf33131f7d6
parent8044aad70a1fbd66376cdb2a13e536db9dd6c132
Merge branch 'for-next' of git://git./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