Merge branch 'fixes' into features

This helps to avoid several merge conflicts later.

* fixes:
  s390/extable: fix exception table sorting
  s390/ftrace: fix arch_ftrace_get_regs implementation
  s390/ftrace: fix ftrace_caller/ftrace_regs_caller generation
  s390/setup: preserve memory at OLDMEM_BASE and OLDMEM_SIZE
  s390/cio: verify the driver availability for path_event call
  s390/module: fix building test_modules_helpers.o with clang
  MAINTAINERS: downgrade myself to Reviewer for s390
  MAINTAINERS: add Alexander Gordeev as maintainer for s390

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/kernel/ftrace.c
index 1db9cc7,89c0870..d8b96c5
--- 1/arch/s390/kernel/ftrace.c
--- 2/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@@ -188,8 -217,14 +217,14 @@@ int ftrace_make_nop(struct module *mod
  
  int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
  {
 -      brcl_enable((void *)rec->ip);
 -      return 0;
+       struct ftrace_hotpatch_trampoline *trampoline;
+ 
+       trampoline = ftrace_get_trampoline(rec);
+       if (IS_ERR(trampoline))
+               return PTR_ERR(trampoline);
+       s390_kernel_write(&trampoline->interceptor, &addr, sizeof(addr));
 +      /* Expect brcl 0x0,... */
 +      return ftrace_patch_branch_mask((void *)rec->ip, 0xc004, true);
  }
  
  int ftrace_update_ftrace_func(ftrace_func_t func)

diff --cc arch/s390/kernel/mcount.S
Simple merge