Hi Linus, The following changes since commit b884a190afcecdbef34ca508ea5ee88bb7c77861: metag/usercopy: Add missing fixups (2017-04-05 15:25:07 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git tags/metag-for-v4.12 for you to fetch changes up to e3cd7f013bac3105d44b8bd5a90359989d45b5a5: metag/mm: Drop pointless increment (2017-05-03 09:56:04 +0100) A conflict is expected between commit db68ce10c4f0 ("new helper: uaccess_kernel()") in mainline which changes __kernel_ok() to use uaccess_kernel(), and commit 8a8b56638bca ("metag/uaccess: Fix access_ok()") in my tree which removes __kernel_ok(). __kernel_ok() isn't needed since my commit and can be removed in the resolution. Cheers James ---------------------------------------------------------------- metag: Changes for 4.12 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. ---------------------------------------------------------------- James Hogan (6): metag/usercopy: Reformat rapf loop inline asm metag/usercopy: Simplify rapf loop fixup corner case metag/usercopy: Add 64-bit get_user support metag/uaccess: Fix access_ok() metag/uaccess: Check access_ok in strncpy_from_user metag/mm: Drop pointless increment arch/metag/include/asm/uaccess.h | 58 ++++++---- arch/metag/lib/usercopy.c | 236 +++++++++++++++++---------------------- arch/metag/mm/mmu-meta1.c | 1 - 3 files changed, 143 insertions(+), 152 deletions(-)
Attachment:
signature.asc
Description: Digital signature