From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Mar 2022 17:01:34 +0000 (-0700)
Subject: Merge tag 's390-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v6.1-rc5~1732
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d710d370c4911e83da5d2bc43d4a2c3b56bd27e7;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 's390-5.18-1' of git://git./linux/kernel/git/s390/linux

Pull s390 updates from Vasily Gorbik:

 - Raise minimum supported machine generation to z10, which comes with
   various cleanups and code simplifications (usercopy/spectre
   mitigation/etc).

 - Rework extables and get rid of anonymous out-of-line fixups.

 - Page table helpers cleanup. Add set_pXd()/set_pte() helper functions.
   Covert pte_val()/pXd_val() macros to functions.

 - Optimize kretprobe handling by avoiding extra kprobe on
   __kretprobe_trampoline.

 - Add support for CEX8 crypto cards.

 - Allow to trigger AP bus rescan via writing to /sys/bus/ap/scans.

 - Add CONFIG_EXPOLINE_EXTERN option to build the kernel without COMDAT
   group sections which simplifies kpatch support.

 - Always use the packed stack layout and extend kernel unwinder tests.

 - Add sanity checks for ftrace code patching.

 - Add s390dbf debug log for the vfio_ap device driver.

 - Various virtual vs physical address confusion fixes.

 - Various small fixes and improvements all over the code.

* tag 's390-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (69 commits)
  s390/test_unwind: add kretprobe tests
  s390/kprobes: Avoid additional kprobe in kretprobe handling
  s390: convert ".insn" encoding to instruction names
  s390: assume stckf is always present
  s390/nospec: move to single register thunks
  s390: raise minimum supported machine generation to z10
  s390/uaccess: Add copy_from/to_user_key functions
  s390/nospec: align and size extern thunks
  s390/nospec: add an option to use thunk-extern
  s390/nospec: generate single register thunks if possible
  s390/pci: make zpci_set_irq()/zpci_clear_irq() static
  s390: remove unused expoline to BC instructions
  s390/irq: use assignment instead of cast
  s390/traps: get rid of magic cast for per code
  s390/traps: get rid of magic cast for program interruption code
  s390/signal: fix typo in comments
  s390/asm-offsets: remove unused defines
  s390/test_unwind: avoid build warning with W=1
  s390: remove .fixup section
  s390/bpf: encode register within extable entry
  ...
---

d710d370c4911e83da5d2bc43d4a2c3b56bd27e7
diff --cc arch/s390/include/asm/uaccess.h
index e1be769,e8b4b1a..1f150a7
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@@ -289,9 -280,11 +268,9 @@@ static inline unsigned long __must_chec
  	return __clear_user(to, n);
  }
  
- int copy_to_user_real(void __user *dest, void *src, unsigned long count);
+ int copy_to_user_real(void __user *dest, unsigned long src, unsigned long count);
  void *s390_kernel_write(void *dst, const void *src, size_t size);
  
 -#define HAVE_GET_KERNEL_NOFAULT
 -
  int __noreturn __put_kernel_bad(void);
  
  #define __put_kernel_asm(val, to, insn)					\