Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Author: Ralf Baechle <[email protected]> Thu Jul 12 09:49:27 2018 +0200
Commit: c1f1ac98a3435c926d08bf902684bdb2017e859f
Gitweb: https://git.linux-mips.org/g/ralf/linux/c1f1ac98a343
Branch: master

---

 Documentation/admin-guide/kernel-parameters.txt |    5 +
 MAINTAINERS                                     |    9 +
 arch/mips/kernel/process.c                      |   43 +++++--
 arch/mips/kernel/traps.c                        |    1 
 arch/mips/mm/ioremap.c                          |   37 ++++--
 drivers/acpi/acpica/hwsleep.c                   |   15 ++
 drivers/ata/Kconfig                             |    2 
 drivers/ata/ahci.c                              |   60 ++++++++++
 drivers/ata/ahci_mvebu.c                        |    2 
 drivers/ata/libahci.c                           |    7 +
 drivers/ata/libata-core.c                       |    3 
 drivers/ata/libata-eh.c                         |   41 +++----
 drivers/ata/libata-scsi.c                       |   18 ++-
 drivers/ata/sata_fsl.c                          |    9 -
 drivers/ata/sata_nv.c                           |    3 
 drivers/fpga/altera-cvp.c                       |    6 +
 drivers/gpu/drm/etnaviv/etnaviv_drv.c           |   24 +++-
 drivers/gpu/drm/etnaviv/etnaviv_gpu.h           |    3 
 drivers/gpu/drm/etnaviv/etnaviv_sched.c         |   24 ++++
 drivers/hid/hid-core.c                          |    5 +
 drivers/hid/hid-debug.c                         |    8 +
 drivers/hid/i2c-hid/i2c-hid.c                   |    2 
 drivers/hid/usbhid/hiddev.c                     |   11 ++
 drivers/hid/wacom_wac.c                         |   10 +-
 drivers/i2c/busses/i2c-cht-wc.c                 |    3 
 drivers/misc/ibmasm/ibmasmfs.c                  |   27 ----
 drivers/misc/mei/interrupt.c                    |    5 +
 drivers/misc/vmw_balloon.c                      |    4 -
 drivers/mmc/core/slot-gpio.c                    |    2 
 drivers/mmc/host/dw_mmc.c                       |    7 +
 drivers/mmc/host/renesas_sdhi_internal_dmac.c   |   15 +-
 drivers/mmc/host/sdhci-esdhc-imx.c              |   21 +--
 drivers/mmc/host/sunxi-mmc.c                    |    7 +
 drivers/nvmem/core.c                            |    4 +
 drivers/staging/rtl8723bs/core/rtw_ap.c         |    2 
 drivers/staging/rtlwifi/rtl8822be/hw.c          |    2 
 drivers/staging/rtlwifi/wifi.h                  |    1 
 drivers/thunderbolt/domain.c                    |    4 +
 drivers/uio/uio.c                               |  139 +++++++++++++++++------
 drivers/usb/core/quirks.c                       |    4 +
 drivers/usb/gadget/udc/aspeed-vhub/Kconfig      |    1 
 drivers/usb/host/xhci-dbgcap.c                  |   12 +-
 drivers/usb/host/xhci-mem.c                     |    2 
 drivers/usb/misc/yurex.c                        |   23 +---
 drivers/usb/serial/ch341.c                      |    2 
 drivers/usb/serial/cp210x.c                     |    1 
 drivers/usb/serial/keyspan_pda.c                |    4 -
 drivers/usb/serial/mos7840.c                    |    3 
 drivers/usb/typec/tcpm.c                        |    5 -
 include/linux/hid.h                             |    3 
 include/linux/libata.h                          |   24 ++++
 include/linux/uio_driver.h                      |    2 
 kernel/trace/trace_kprobe.c                     |    6 +
 53 files changed, 473 insertions(+), 210 deletions(-)