From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2020 19:50:54 +0000 (-0700)
Subject: Merge tag 'm68knommu-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d3ea693439833b5ed9b932512e9a90b9381035c9;p=linux.git

Merge tag 'm68knommu-for-v5.8' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:

 - casting clean up in the user access macros

 - memory leak on error case fix for PCI probing

 - update of a defconfig

* tag 'm68knommu-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,nommu: fix implicit cast from __user in __{get,put}_user_asm()
  m68k,nommu: add missing __user in uaccess' __ptr() macro
  m68k: Drop CONFIG_MTD_M25P80 in stmark2_defconfig
  m68k/PCI: Fix a memory leak in an error handling path
---

d3ea693439833b5ed9b932512e9a90b9381035c9