Merge tag 'v5.1-rc6' into for-5.2/block

Pull in v5.1-rc6 to resolve two conflicts. One is in BFQ, in just a
comment, and is trivial. The other one is a conflict due to a later fix
in the bio multi-page work, and needs a bit more care.

* tag 'v5.1-rc6': (770 commits)
  Linux 5.1-rc6
  block: make sure that bvec length can't be overflow
  block: kill all_q_node in request_queue
  x86/cpu/intel: Lower the "ENERGY_PERF_BIAS: Set to normal" message's log priority
  coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping
  mm/kmemleak.c: fix unused-function warning
  init: initialize jump labels before command line option parsing
  kernel/watchdog_hld.c: hard lockup message should end with a newline
  kcov: improve CONFIG_ARCH_HAS_KCOV help text
  mm: fix inactive list balancing between NUMA nodes and cgroups
  mm/hotplug: treat CMA pages as unmovable
  proc: fixup proc-pid-vm test
  proc: fix map_files test on F29
  mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
  mm/memory_hotplug: do not unlock after failing to take the device_hotplug_lock
  mm: swapoff: shmem_unuse() stop eviction without igrab()
  mm: swapoff: take notice of completion sooner
  mm: swapoff: remove too limiting SWAP_UNUSE_MAX_TRIES
  mm: swapoff: shmem_find_swap_entries() filter out other types
  slab: store tagged freelist for off-slab slabmgmt
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>

3 files changed, 16 insertions, 43 deletions

diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
index 958f46da3a79..d91065e81a4e 100644
--- a/arch/sh/boards/of-generic.c
+++ b/arch/sh/boards/of-generic.c
@@ -164,10 +164,10 @@ static struct sh_machine_vector __initmv sh_of_generic_mv = {
 
 struct sh_clk_ops;
 
-void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)
+void __init __weak arch_init_clk_ops(struct sh_clk_ops **ops, int idx)
 {
 }
 
-void __init plat_irq_setup(void)
+void __init __weak plat_irq_setup(void)
 {
 }
diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall_32.h
index 6e118799831c..8c9d7e5e5dcc 100644
--- a/arch/sh/include/asm/syscall_32.h
+++ b/arch/sh/include/asm/syscall_32.h
@@ -48,51 +48,28 @@ static inline void syscall_set_return_value(struct task_struct *task,
 
 static inline void syscall_get_arguments(struct task_struct *task,
                                          struct pt_regs *regs,
-                                         unsigned int i, unsigned int n,
                                          unsigned long *args)
 {
-        /*
-         * Do this simply for now. If we need to start supporting
-         * fetching arguments from arbitrary indices, this will need some
-         * extra logic. Presently there are no in-tree users that depend
-         * on this behaviour.
-         */
-        BUG_ON(i);
 
         /* Argument pattern is: R4, R5, R6, R7, R0, R1 */
-        switch (n) {
-        case 6: args[5] = regs->regs[1];
-        case 5: args[4] = regs->regs[0];
-        case 4: args[3] = regs->regs[7];
-        case 3: args[2] = regs->regs[6];
-        case 2: args[1] = regs->regs[5];
-        case 1: args[0] = regs->regs[4];
-        case 0:
-                break;
-        default:
-                BUG();
-        }
+        args[5] = regs->regs[1];
+        args[4] = regs->regs[0];
+        args[3] = regs->regs[7];
+        args[2] = regs->regs[6];
+        args[1] = regs->regs[5];
+        args[0] = regs->regs[4];
 }
 
 static inline void syscall_set_arguments(struct task_struct *task,
                                          struct pt_regs *regs,
-                                         unsigned int i, unsigned int n,
                                          const unsigned long *args)
 {
-        /* Same note as above applies */
-        BUG_ON(i);
-
-        switch (n) {
-        case 6: regs->regs[1] = args[5];
-        case 5: regs->regs[0] = args[4];
-        case 4: regs->regs[7] = args[3];
-        case 3: regs->regs[6] = args[2];
-        case 2: regs->regs[5] = args[1];
-        case 1: regs->regs[4] = args[0];
-                break;
-        default:
-                BUG();
-        }
+        regs->regs[1] = args[5];
+        regs->regs[0] = args[4];
+        regs->regs[7] = args[3];
+        regs->regs[6] = args[2];
+        regs->regs[5] = args[1];
+        regs->regs[4] = args[0];
 }
 
 static inline int syscall_get_arch(void)
diff --git a/arch/sh/include/asm/syscall_64.h b/arch/sh/include/asm/syscall_64.h
index 43882580c7f9..22fad97da066 100644
--- a/arch/sh/include/asm/syscall_64.h
+++ b/arch/sh/include/asm/syscall_64.h
@@ -47,20 +47,16 @@ static inline void syscall_set_return_value(struct task_struct *task,
 
 static inline void syscall_get_arguments(struct task_struct *task,
                                          struct pt_regs *regs,
-                                         unsigned int i, unsigned int n,
                                          unsigned long *args)
 {
-        BUG_ON(i + n > 6);
-        memcpy(args, &regs->regs[2 + i], n * sizeof(args[0]));
+        memcpy(args, &regs->regs[2], 6 * sizeof(args[0]));
 }
 
 static inline void syscall_set_arguments(struct task_struct *task,
                                          struct pt_regs *regs,
-                                         unsigned int i, unsigned int n,
                                          const unsigned long *args)
 {
-        BUG_ON(i + n > 6);
-        memcpy(&regs->regs[2 + i], args, n * sizeof(args[0]));
+        memcpy(&regs->regs[2], args, 6 * sizeof(args[0]));
 }
 
 static inline int syscall_get_arch(void)