From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Oct 2019 22:19:04 +0000 (-0400)
Subject: Merge tag 'copy-struct-from-user-v5.4-rc4' of gitolite.kernel.org:pub/scm/linux/kerne... 
X-Git-Tag: Ubuntu-5.10.0-12.13~4297
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8eb4b3b0dd9ae3e5399ff902da87d13740a2b70f;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'copy-struct-from-user-v5.4-rc4' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux

Pull usercopy test fixlets from Christian Brauner:
 "This contains two improvements for the copy_struct_from_user() tests:

   - a coding style change to get rid of the ugly "if ((ret |= test()))"
     pointed out when pulling the original patchset.

   - avoid a soft lockups when running the usercopy tests on machines
     with large page sizes by scanning only a 1024 byte region"

* tag 'copy-struct-from-user-v5.4-rc4' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux:
  usercopy: Avoid soft lockups in test_check_nonzero_user()
  lib: test_user_copy: style cleanup
---

8eb4b3b0dd9ae3e5399ff902da87d13740a2b70f