Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Thu, 28 Jun 2018 20:09:40 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993514AbeF1SJm2JjMX/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Jun 28 20:04:57 2018 +0200 Commit: 763695cc8c48e5e726f8efe09c50864b95ce9a69 Gitweb: https://git.linux-mips.org/g/ralf/linux/763695cc8c48 Branch: master --- .../bindings/input/sprd,sc27xx-vibra.txt | 23 + MAINTAINERS | 16 + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 arch/arm/boot/dts/bcm-cygnus.dtsi | 24 + arch/arm/boot/dts/bcm-hr2.dtsi | 24 + arch/arm/boot/dts/bcm-nsp.dtsi | 32 +- arch/arm/boot/dts/bcm5301x.dtsi | 2 arch/arm/boot/dts/imx6q.dtsi | 2 arch/arm/boot/dts/imx6sx.dtsi | 2 arch/arm/boot/dts/socfpga.dtsi | 4 arch/arm/boot/dts/socfpga_arria10.dtsi | 5 arch/arm/common/Makefile | 2 arch/arm/configs/multi_v7_defconfig | 378 ++++++++------------ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 8 .../boot/dts/broadcom/stingray/bcm958742k.dts | 4 .../boot/dts/broadcom/stingray/bcm958742t.dts | 4 .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 .../boot/dts/socionext/uniphier-ld11-global.dts | 2 .../boot/dts/socionext/uniphier-ld20-global.dts | 2 arch/arm64/configs/defconfig | 102 ++--- arch/microblaze/Kconfig.debug | 7 arch/microblaze/include/asm/setup.h | 5 arch/microblaze/include/asm/unistd.h | 2 arch/microblaze/include/uapi/asm/unistd.h | 2 arch/microblaze/kernel/Makefile | 4 arch/microblaze/kernel/heartbeat.c | 72 ---- arch/microblaze/kernel/platform.c | 29 -- arch/microblaze/kernel/reset.c | 11 - arch/microblaze/kernel/syscall_table.S | 2 arch/microblaze/kernel/timer.c | 7 arch/mips/kernel/signal.c | 4 certs/blacklist.h | 2 drivers/input/input-mt.c | 12 - drivers/input/joystick/xpad.c | 2 drivers/input/keyboard/goldfish_events.c | 9 drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 drivers/input/misc/sc27xx-vibra.c | 154 ++++++++ drivers/input/mouse/elan_i2c.h | 2 drivers/input/mouse/elan_i2c_core.c | 3 drivers/input/mouse/elan_i2c_smbus.c | 10 - drivers/input/mouse/elantech.c | 11 - drivers/input/mouse/psmouse-base.c | 12 - drivers/input/rmi4/Kconfig | 1 drivers/input/rmi4/rmi_2d_sensor.c | 34 +- drivers/input/rmi4/rmi_bus.c | 50 +++ drivers/input/rmi4/rmi_bus.h | 10 - drivers/input/rmi4/rmi_driver.c | 52 +-- drivers/input/rmi4/rmi_f01.c | 10 - drivers/input/rmi4/rmi_f03.c | 9 drivers/input/rmi4/rmi_f11.c | 42 +- drivers/input/rmi4/rmi_f12.c | 8 drivers/input/rmi4/rmi_f30.c | 9 drivers/input/rmi4/rmi_f34.c | 5 drivers/input/rmi4/rmi_f54.c | 6 drivers/input/touchscreen/silead.c | 1 drivers/scsi/ipr.c | 2 drivers/scsi/qla2xxx/qla_target.c | 7 drivers/scsi/scsi_debug.c | 2 drivers/soc/imx/gpcv2.c | 13 - drivers/soc/qcom/Kconfig | 3 drivers/soc/renesas/rcar-sysc.c | 35 ++ drivers/target/target_core_user.c | 44 ++ fs/xfs/libxfs/xfs_ag_resv.c | 31 +- fs/xfs/libxfs/xfs_bmap.c | 26 + fs/xfs/libxfs/xfs_bmap.h | 2 fs/xfs/libxfs/xfs_format.h | 5 fs/xfs/libxfs/xfs_inode_buf.c | 76 ++-- fs/xfs/libxfs/xfs_rtbitmap.c | 4 fs/xfs/xfs_bmap_util.c | 106 +++--- fs/xfs/xfs_fsmap.c | 4 fs/xfs/xfs_fsops.c | 2 fs/xfs/xfs_inode.c | 57 +-- fs/xfs/xfs_iomap.c | 15 + fs/xfs/xfs_trans.c | 7 include/linux/input/mt.h | 2 include/linux/rmi.h | 2 include/uapi/linux/target_core_user.h | 4 scripts/checkpatch.pl | 6 security/keys/dh.c | 6 84 files changed, 948 insertions(+), 779 deletions(-)