Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 02 Feb 2018 13:21:41 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994883AbeBBMVnmh8tP/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Jan 10 10:42:57 2018 +0100 Commit: 9fa4a351379dbc2720cf3a9627c341037b8809ef Gitweb: https://git.linux-mips.org/g/ralf/linux/9fa4a351379d Branch: master --- arch/mips/kernel/cps-vec.S | 2 arch/mips/kernel/process.c | 12 +++ arch/mips/kernel/ptrace.c | 147 +++++++++++++++++++++++++++----- arch/riscv/configs/defconfig | 75 ++++++++++++++++ arch/riscv/include/asm/csr.h | 8 +- arch/riscv/include/asm/io.h | 4 - arch/riscv/include/asm/irqflags.h | 10 +- arch/riscv/include/asm/pgtable.h | 4 - arch/riscv/include/asm/ptrace.h | 2 arch/riscv/include/asm/tlbflush.h | 4 - arch/riscv/include/asm/uaccess.h | 12 --- arch/riscv/include/asm/unistd.h | 1 arch/riscv/include/asm/vdso-syscalls.h | 28 ------ arch/riscv/include/uapi/asm/syscalls.h | 26 ++++++ arch/riscv/kernel/entry.S | 8 +- arch/riscv/kernel/process.c | 4 - arch/riscv/kernel/syscall_table.c | 1 arch/riscv/kernel/vdso/flush_icache.S | 1 arch/riscv/mm/fault.c | 2 block/blk-core.c | 9 ++ block/blk-mq.c | 2 block/blk.h | 2 drivers/block/loop.c | 10 ++ drivers/nvme/host/core.c | 7 +- drivers/nvme/host/nvme.h | 12 +++ drivers/nvme/host/pci.c | 42 ++++----- drivers/nvme/host/rdma.c | 14 +++ drivers/nvme/target/fcloop.c | 2 28 files changed, 326 insertions(+), 125 deletions(-)