Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git

diff --cc arch/powerpc/xmon/xmon.c
Simple merge

diff --cc drivers/tty/serial/qcom_geni_serial.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc drivers/tty/serial/sifive.c
Simple merge

diff --cc drivers/tty/serial/ucc_uart.c
Simple merge

diff --cc drivers/tty/sysrq.c
index e1df63a88aac8f2e2628c52287353f86d04cc70d,28127bcb146dc07e9b93afe657c766838e70a90c..23198e3f1461acc49dfb4e88bbc06f3941b2b0d4
--- 1/drivers/tty/sysrq.c
--- 2/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@@ -340,9 -339,9 +339,9 @@@ static const struct sysrq_key_op sysrq_
  #define sysrq_ftrace_dump_op (*(const struct sysrq_key_op *)NULL)
  #endif
  
- static void sysrq_handle_showmem(int key)
+ static void sysrq_handle_showmem(u8 key)
  {
 -      show_mem(0, NULL);
 +      show_mem();
  }
  static const struct sysrq_key_op sysrq_showmem_op = {
        .handler        = sysrq_handle_showmem,

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc kernel/rcu/tree_stall.h
Simple merge