From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 May 2017 18:40:36 +0000 (-0700)
Subject: Merge tag 'metag-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f94c128eefcce2e3448d543f13cd7d7b8aa660a5;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'metag-for-v4.12' of git://git./linux/kernel/git/jhogan/metag

Pull metag updates from James Hogan:
 "These patches primarily make some usercopy improvements (following on
  from the recent usercopy fixes):

   - reformat and simplify rapf copy loops

   - add 64-bit get_user support

  And fix a couple more uaccess issues, partily pointed out by Al:

   - fix access_ok() serious shortcomings

   - fix strncpy_from_user() address validation

  Also included is a trivial removal of a redundant increment"

* tag 'metag-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag/mm: Drop pointless increment
  metag/uaccess: Check access_ok in strncpy_from_user
  metag/uaccess: Fix access_ok()
  metag/usercopy: Add 64-bit get_user support
  metag/usercopy: Simplify rapf loop fixup corner case
  metag/usercopy: Reformat rapf loop inline asm
---

f94c128eefcce2e3448d543f13cd7d7b8aa660a5