From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2019 17:25:36 +0000 (-0800)
Subject: Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.10.7~3828
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd4771f7709211082cbc41dc1f5b2be774ef1604;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'x86-entry-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 syscall entry updates from Ingo Molnar:
 "These changes relate to the preparatory cleanup of syscall function
  type signatures - to fix indirect call mismatches with Control-Flow
  Integrity (CFI) checking.

  No change in behavior intended"

* 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Use the correct function type for native_set_fixmap()
  syscalls/x86: Fix function types in COND_SYSCALL
  syscalls/x86: Use the correct function type for sys_ni_syscall
  syscalls/x86: Use COMPAT_SYSCALL_DEFINE0 for IA32 (rt_)sigreturn
  syscalls/x86: Wire up COMPAT_SYSCALL_DEFINE0
  syscalls/x86: Use the correct function type in SYSCALL_DEFINE0
---

cd4771f7709211082cbc41dc1f5b2be774ef1604