$ date -R Tue, 12 Jun 2018 08:02:53 +1000 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 289cf155d95d Merge tag 'devicetree-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Merging origin/master (a2b7ab45b890 Merge tag 'linux-watchdog-4.18-rc1' of git://www.linux-watchdog.org/linux-watchdog) $ git merge origin/master Updating 289cf155d95d..a2b7ab45b890 Fast-forward Documentation/ABI/removed/sysfs-bus-nfit | 17 + Documentation/ABI/testing/evm | 13 + Documentation/ABI/testing/ima_policy | 2 +- Documentation/ABI/testing/sysfs-bus-iio | 9 + Documentation/ABI/testing/sysfs-bus-nfit | 19 - Documentation/ABI/testing/sysfs-bus-rpmsg | 20 + Documentation/ABI/testing/sysfs-class-mtd | 8 + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- Documentation/admin-guide/cgroup-v2.rst | 72 +- Documentation/admin-guide/kernel-parameters.txt | 17 + Documentation/blockdev/zram.txt | 25 + .../bindings/arm/mediatek/mediatek,g3dsys.txt | 30 + .../devicetree/bindings/clock/actions,s900-cmu.txt | 47 + .../bindings/clock/amlogic,gxbb-aoclkc.txt | 1 + .../bindings/clock/brcm,iproc-clocks.txt | 26 +- .../bindings/clock/nuvoton,npcm750-clk.txt | 100 + .../devicetree/bindings/clock/qcom,gcc.txt | 2 + .../devicetree/bindings/clock/qcom,rpmh-clk.txt | 22 + .../devicetree/bindings/clock/qcom,videocc.txt | 19 + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 10 +- .../devicetree/bindings/clock/rockchip.txt | 77 - .../devicetree/bindings/clock/sunxi-ccu.txt | 3 +- .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 2 + .../devicetree/bindings/gpio/gpio-pca953x.txt | 34 + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 9 +- .../bindings/iio/adc/amlogic,meson-saradc.txt | 1 + .../devicetree/bindings/iio/adc/mcp320x.txt | 2 +- .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 6 +- .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 7 +- .../bindings/iio/afe/current-sense-amplifier.txt | 26 + .../bindings/iio/afe/current-sense-shunt.txt | 41 + .../bindings/iio/afe/voltage-divider.txt | 53 + .../devicetree/bindings/iio/dac/ltc2632.txt | 14 + .../devicetree/bindings/iio/dac/ti,dac5571.txt | 24 + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 12 +- .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 1 + .../bindings/iio/potentiostat/lmp91000.txt | 9 +- .../devicetree/bindings/input/mtk-pmic-keys.txt | 43 + .../bindings/leds/backlight/pwm-backlight.txt | 6 + .../leds/backlight/zii,rave-sp-backlight.txt | 23 + Documentation/devicetree/bindings/mfd/arizona.txt | 6 +- Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +- .../devicetree/bindings/mfd/bd9571mwv.txt | 21 + Documentation/devicetree/bindings/mfd/da9063.txt | 32 +- .../devicetree/bindings/mfd/motorola-cpcap.txt | 42 + Documentation/devicetree/bindings/mfd/mt6397.txt | 6 + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 3 + .../devicetree/bindings/mtd/gpmi-nand.txt | 5 + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 24 +- .../devicetree/bindings/mtd/partition.txt | 2 +- .../partitions/brcm,bcm947xx-cfe-partitions.txt | 42 + .../devicetree/bindings/mtd/sunxi-nand.txt | 2 - .../devicetree/bindings/power/supply/bq27xxx.txt | 1 + .../devicetree/bindings/regulator/pfuze100.txt | 6 +- .../bindings/regulator/qcom,spmi-regulator.txt | 45 + .../devicetree/bindings/regulator/regulator.txt | 10 + .../bindings/regulator/rohm,bd71837-regulator.txt | 126 + .../bindings/regulator/sy8106a-regulator.txt | 23 + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 1 + .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 2 +- .../devicetree/bindings/rtc/st,stm32-rtc.txt | 37 +- .../devicetree/bindings/soc/qcom/qcom,smd.txt | 8 +- .../devicetree/bindings/watchdog/renesas-wdt.txt | 23 +- Documentation/driver-api/clk.rst | 2 +- Documentation/driver-api/gpio/board.rst | 16 + Documentation/driver-api/gpio/drivers-on-gpio.rst | 4 + Documentation/driver-api/index.rst | 1 + Documentation/driver-api/scsi.rst | 2 +- Documentation/driver-api/target.rst | 64 + .../features/vm/pte_special/arch-support.txt | 2 +- Documentation/filesystems/00-INDEX | 6 +- ...-mount-control.txt => autofs-mount-control.txt} | 9 +- .../filesystems/{autofs4.txt => autofs.txt} | 10 +- Documentation/filesystems/automount-support.txt | 2 +- Documentation/filesystems/f2fs.txt | 16 +- Documentation/filesystems/ncpfs.txt | 12 - Documentation/filesystems/path-lookup.md | 2 +- Documentation/ioctl/ioctl-number.txt | 2 +- Documentation/livepatch/livepatch.txt | 24 - MAINTAINERS | 90 +- arch/Kconfig | 7 + arch/arc/Kconfig | 1 + arch/arc/include/asm/pgtable.h | 2 - arch/arm/Kconfig | 2 + arch/arm/boot/dts/imx7d.dtsi | 2 +- arch/arm/boot/dts/imx7s.dtsi | 2 +- arch/arm/common/mcpm_entry.c | 2 + arch/arm/include/asm/kvm_host.h | 12 + arch/arm/include/asm/kvm_mmu.h | 5 + arch/arm/include/asm/pgtable-3level.h | 1 - arch/arm/kernel/entry-common.S | 25 +- arch/arm/kernel/perf_event_v6.c | 4 +- arch/arm/kernel/perf_event_v7.c | 3 +- arch/arm/kernel/perf_event_xscale.c | 6 +- arch/arm/kernel/signal.c | 14 + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 28 +- arch/arm/tools/syscall.tbl | 1 + arch/arm/xen/enlighten.c | 11 + arch/arm64/Kconfig | 16 +- arch/arm64/include/asm/acpi.h | 4 + arch/arm64/include/asm/cache.h | 6 +- arch/arm64/include/asm/cmpxchg.h | 4 +- arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cpufeature.h | 22 + arch/arm64/include/asm/elf.h | 13 + arch/arm64/include/asm/fpsimdmacros.h | 12 +- arch/arm64/include/asm/kvm_asm.h | 30 +- arch/arm64/include/asm/kvm_host.h | 26 + arch/arm64/include/asm/kvm_mmu.h | 25 +- arch/arm64/include/asm/pgtable.h | 2 - arch/arm64/include/asm/processor.h | 5 + arch/arm64/include/asm/thread_info.h | 1 + arch/arm64/include/asm/topology.h | 6 +- arch/arm64/include/uapi/asm/auxvec.h | 3 +- arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/armv8_deprecated.c | 3 +- arch/arm64/kernel/asm-offsets.c | 1 + arch/arm64/kernel/cacheinfo.c | 15 +- arch/arm64/kernel/cpu_errata.c | 182 + arch/arm64/kernel/cpufeature.c | 10 +- arch/arm64/kernel/entry-fpsimd.S | 2 +- arch/arm64/kernel/entry.S | 30 + arch/arm64/kernel/fpsimd.c | 18 +- arch/arm64/kernel/hibernate.c | 11 + arch/arm64/kernel/perf_event.c | 3 +- arch/arm64/kernel/ptrace.c | 5 - arch/arm64/kernel/signal.c | 57 +- arch/arm64/kernel/ssbd.c | 110 + arch/arm64/kernel/suspend.c | 8 + arch/arm64/kernel/topology.c | 104 +- arch/arm64/kernel/vmlinux.lds.S | 20 +- arch/arm64/kvm/hyp/hyp-entry.S | 38 +- arch/arm64/kvm/hyp/switch.c | 42 + arch/arm64/kvm/reset.c | 4 + arch/arm64/mm/dma-mapping.c | 5 + arch/arm64/mm/fault.c | 46 +- arch/ia64/Kconfig | 1 + arch/powerpc/Kconfig | 2 + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 - arch/powerpc/include/asm/pte-common.h | 3 - arch/powerpc/include/asm/systbl.h | 1 + arch/powerpc/include/asm/unistd.h | 2 +- arch/powerpc/include/uapi/asm/unistd.h | 1 + arch/powerpc/kernel/entry_32.S | 7 + arch/powerpc/kernel/entry_64.S | 8 + arch/powerpc/kernel/signal.c | 3 + arch/riscv/Kconfig | 1 + arch/riscv/include/asm/pgtable-bits.h | 3 - arch/riscv/kernel/cacheinfo.c | 1 - arch/s390/Kconfig | 1 + arch/s390/include/asm/pgtable.h | 1 - arch/s390/mm/pgalloc.c | 21 +- arch/sh/Kconfig | 1 + arch/sh/include/asm/pgtable.h | 2 - arch/sparc/Kconfig | 1 + arch/sparc/include/asm/pgtable_64.h | 3 - arch/um/drivers/vector_transports.c | 3 +- arch/x86/Kconfig | 6 + arch/x86/Kconfig.debug | 3 + arch/x86/boot/compressed/kaslr_64.c | 5 + arch/x86/entry/common.c | 3 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/x86/include/asm/apic.h | 2 + arch/x86/include/asm/cpufeatures.h | 2 + arch/x86/include/asm/mcsafe_test.h | 75 + arch/x86/include/asm/page_types.h | 8 +- arch/x86/include/asm/pgtable_64.h | 4 +- arch/x86/include/asm/pgtable_types.h | 1 - arch/x86/include/asm/trace/irq_vectors.h | 2 +- arch/x86/include/asm/x86_init.h | 1 + arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 45 +- arch/x86/kernel/cpu/bugs.c | 13 +- arch/x86/kernel/cpu/common.c | 9 +- arch/x86/kernel/cpu/intel_rdt.c | 2 + arch/x86/kernel/cpu/microcode/core.c | 6 +- arch/x86/kernel/cpu/mtrr/if.c | 33 +- arch/x86/kernel/i8237.c | 25 + arch/x86/kernel/idt.c | 7 +- arch/x86/kernel/platform-quirks.c | 7 +- arch/x86/kernel/signal.c | 6 + arch/x86/kvm/cpuid.c | 10 +- arch/x86/kvm/svm.c | 8 +- arch/x86/lib/memcpy_64.S | 10 + arch/x86/mm/mem_encrypt_identity.c | 3 + arch/x86/mm/pgtable.c | 10 +- arch/x86/platform/uv/tlb_uv.c | 2 +- arch/x86/platform/uv/uv_irq.c | 7 +- arch/x86/xen/mmu.c | 60 +- arch/x86/xen/xen-pvh.S | 47 +- block/bio.c | 18 + block/blk-core.c | 2 +- block/blk-flush.c | 11 +- block/ioprio.c | 22 +- block/partitions/cmdline.c | 57 + drivers/acpi/Kconfig | 3 + drivers/acpi/Makefile | 1 + drivers/acpi/nfit/core.c | 11 - drivers/acpi/pptt.c | 655 +++ drivers/acpi/tables.c | 2 +- drivers/ata/libata-scsi.c | 12 + drivers/base/cacheinfo.c | 157 +- drivers/block/loop.c | 71 +- drivers/block/nbd.c | 13 +- drivers/block/zram/Kconfig | 14 +- drivers/block/zram/zram_drv.c | 165 +- drivers/block/zram/zram_drv.h | 14 +- drivers/char/Kconfig | 12 + drivers/char/Makefile | 1 + drivers/char/adi.c | 239 ++ drivers/char/tpm/Makefile | 10 +- .../tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 3 +- drivers/char/tpm/eventlog/common.c | 195 + drivers/char/tpm/eventlog/common.h | 35 + .../tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 6 +- .../char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 11 +- .../char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 200 +- .../char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 3 +- drivers/char/tpm/st33zp24/spi.c | 4 +- drivers/char/tpm/st33zp24/st33zp24.c | 2 - drivers/char/tpm/tpm-dev-common.c | 40 +- drivers/char/tpm/tpm-dev.h | 2 +- drivers/char/tpm/tpm-interface.c | 5 +- drivers/char/tpm/tpm.h | 32 +- drivers/char/tpm/tpm2-space.c | 3 +- drivers/char/tpm/tpm_crb.c | 10 +- drivers/char/tpm/tpm_tis_core.c | 58 +- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 2 + drivers/clk/actions/Kconfig | 14 + drivers/clk/actions/Makefile | 12 + drivers/clk/actions/owl-common.c | 89 + drivers/clk/actions/owl-common.h | 41 + drivers/clk/actions/owl-composite.c | 199 + drivers/clk/actions/owl-composite.h | 124 + drivers/clk/actions/owl-divider.c | 94 + drivers/clk/actions/owl-divider.h | 75 + drivers/clk/actions/owl-factor.c | 222 + drivers/clk/actions/owl-factor.h | 83 + drivers/clk/actions/owl-fixed-factor.h | 28 + drivers/clk/actions/owl-gate.c | 77 + drivers/clk/actions/owl-gate.h | 73 + drivers/clk/actions/owl-mux.c | 60 + drivers/clk/actions/owl-mux.h | 61 + drivers/clk/actions/owl-pll.c | 194 + drivers/clk/actions/owl-pll.h | 92 + drivers/clk/actions/owl-s900.c | 721 ++++ drivers/clk/at91/clk-pll.c | 13 +- drivers/clk/bcm/clk-bcm2835.c | 42 +- drivers/clk/bcm/clk-sr.c | 135 +- drivers/clk/berlin/berlin2-avpll.c | 13 +- drivers/clk/berlin/berlin2-avpll.h | 13 +- drivers/clk/berlin/berlin2-div.c | 13 +- drivers/clk/berlin/berlin2-div.h | 13 +- drivers/clk/berlin/berlin2-pll.c | 13 +- drivers/clk/berlin/berlin2-pll.h | 13 +- drivers/clk/berlin/bg2.c | 13 +- drivers/clk/berlin/bg2q.c | 13 +- drivers/clk/berlin/common.h | 13 +- drivers/clk/clk-aspeed.c | 57 +- drivers/clk/clk-bulk.c | 5 +- drivers/clk/clk-npcm7xx.c | 656 +++ drivers/clk/clk-si544.c | 1 + drivers/clk/clk-stm32mp1.c | 12 +- drivers/clk/clk.c | 171 +- drivers/clk/davinci/pll-da830.c | 5 +- drivers/clk/davinci/pll-da850.c | 37 +- drivers/clk/davinci/pll-dm355.c | 22 +- drivers/clk/davinci/pll-dm365.c | 9 +- drivers/clk/davinci/pll-dm644x.c | 9 +- drivers/clk/davinci/pll-dm646x.c | 11 +- drivers/clk/davinci/pll.c | 314 +- drivers/clk/davinci/pll.h | 41 +- drivers/clk/davinci/psc-da830.c | 3 +- drivers/clk/davinci/psc-dm355.c | 7 +- drivers/clk/davinci/psc-dm365.c | 22 +- drivers/clk/davinci/psc-dm644x.c | 3 +- drivers/clk/davinci/psc-dm646x.c | 3 +- drivers/clk/davinci/psc.c | 72 +- drivers/clk/davinci/psc.h | 12 + drivers/clk/hisilicon/Kconfig | 13 +- drivers/clk/hisilicon/crg-hi3798cv200.c | 17 + drivers/clk/imx/clk-imx6q.c | 2 + drivers/clk/imx/clk-imx6sl.c | 2 +- drivers/clk/imx/clk-imx6sx.c | 17 +- drivers/clk/imx/clk-imx6ul.c | 20 +- drivers/clk/imx/clk-imx7d.c | 17 +- drivers/clk/ingenic/cgu.c | 8 +- drivers/clk/ingenic/cgu.h | 4 + drivers/clk/ingenic/jz4770-cgu.c | 49 +- drivers/clk/mediatek/Kconfig | 6 + drivers/clk/mediatek/Makefile | 1 + drivers/clk/mediatek/clk-mt2701-g3d.c | 95 + drivers/clk/mediatek/clk-mt2701.c | 8 +- drivers/clk/meson/Kconfig | 8 + drivers/clk/meson/Makefile | 3 +- drivers/clk/meson/axg-aoclk.c | 164 + drivers/clk/meson/axg-aoclk.h | 29 + drivers/clk/meson/axg.c | 4 + drivers/clk/meson/clk-audio-divider.c | 13 +- drivers/clk/meson/clk-mpll.c | 76 +- drivers/clk/meson/clk-pll.c | 13 +- drivers/clk/meson/clk-regmap.c | 6 +- drivers/clk/meson/clk-regmap.h | 8 +- drivers/clk/meson/clkc.h | 16 +- drivers/clk/meson/gxbb-aoclk-32k.c | 3 +- drivers/clk/meson/gxbb-aoclk.c | 147 +- drivers/clk/meson/gxbb-aoclk.h | 8 +- drivers/clk/meson/gxbb.c | 129 +- drivers/clk/meson/gxbb.h | 58 +- drivers/clk/meson/meson-aoclk.c | 81 + drivers/clk/meson/meson-aoclk.h | 34 + drivers/clk/meson/meson8b.c | 77 +- drivers/clk/meson/meson8b.h | 18 +- drivers/clk/mvebu/clk-corediv.c | 2 +- drivers/clk/qcom/Kconfig | 27 + drivers/clk/qcom/Makefile | 3 + drivers/clk/qcom/clk-alpha-pll.c | 302 +- drivers/clk/qcom/clk-alpha-pll.h | 18 +- drivers/clk/qcom/clk-branch.c | 7 +- drivers/clk/qcom/clk-branch.h | 1 + drivers/clk/qcom/clk-rcg.h | 17 +- drivers/clk/qcom/clk-rcg2.c | 168 +- drivers/clk/qcom/common.c | 32 +- drivers/clk/qcom/gcc-msm8996.c | 8 +- drivers/clk/qcom/gcc-msm8998.c | 2834 +++++++++++++ drivers/clk/qcom/gcc-sdm845.c | 3465 +++++++++++++++ drivers/clk/qcom/gdsc.c | 102 +- drivers/clk/qcom/gdsc.h | 6 +- drivers/clk/qcom/mmcc-msm8996.c | 22 +- drivers/clk/qcom/videocc-sdm845.c | 358 ++ drivers/clk/renesas/Kconfig | 10 + drivers/clk/renesas/Makefile | 2 + drivers/clk/renesas/r8a7743-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7745-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77470-cpg-mssr.c | 229 + drivers/clk/renesas/r8a7791-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7792-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7794-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77965-cpg-mssr.c | 4 + drivers/clk/renesas/r8a77980-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77990-cpg-mssr.c | 289 ++ drivers/clk/renesas/rcar-gen2-cpg.c | 24 + drivers/clk/renesas/renesas-cpg-mssr.c | 12 + drivers/clk/renesas/renesas-cpg-mssr.h | 2 + drivers/clk/rockchip/Makefile | 1 - drivers/clk/rockchip/clk-rockchip.c | 98 - drivers/clk/rockchip/clk.c | 16 +- drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +- drivers/clk/socfpga/clk-s10.c | 40 +- drivers/clk/spear/spear6xx_clock.c | 2 +- drivers/clk/sunxi-ng/Kconfig | 5 + drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 207 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 19 + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 72 +- drivers/clk/tegra/clk-dfll.c | 42 +- drivers/clk/tegra/clk-tegra114.c | 2 +- drivers/clk/tegra/clk-tegra124.c | 2 +- drivers/clk/tegra/clk-tegra20.c | 52 +- drivers/clk/tegra/clk-tegra210.c | 2 +- drivers/clk/tegra/clk-tegra30.c | 2 +- drivers/clk/tegra/clk.c | 5 +- drivers/clk/tegra/clk.h | 2 +- drivers/clk/uniphier/clk-uniphier-sys.c | 5 + drivers/clocksource/timer-sp804.c | 3 +- drivers/dax/super.c | 33 +- drivers/dma/Kconfig | 31 +- drivers/dma/Makefile | 5 +- drivers/dma/at_hdmac.c | 9 +- drivers/dma/at_xdmac.c | 9 +- drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/dmatest.c | 16 +- drivers/dma/dw/platform.c | 6 +- drivers/dma/fsldma.c | 6 +- drivers/dma/idma64.c | 6 +- drivers/dma/imx-dma.c | 26 +- drivers/dma/imx-sdma.c | 29 +- drivers/dma/mxs-dma.c | 14 +- drivers/dma/pl330.c | 209 +- drivers/dma/qcom/bam_dma.c | 10 +- drivers/dma/qcom/hidma.c | 3 +- drivers/dma/qcom/hidma_mgmt_sys.c | 6 +- drivers/dma/sh/shdmac.c | 50 +- drivers/dma/sprd-dma.c | 349 +- drivers/dma/ste_dma40.c | 12 +- drivers/dma/stm32-mdma.c | 100 +- drivers/dma/ti/Kconfig | 37 + drivers/dma/ti/Makefile | 5 + drivers/dma/{ => ti}/cppi41.c | 2 +- .../dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} | 0 drivers/dma/{ => ti}/edma.c | 4 +- drivers/dma/{ => ti}/omap-dma.c | 2 +- drivers/dma/txx9dmac.c | 8 +- drivers/gpio/Kconfig | 12 + drivers/gpio/gpio-104-dio-48e.c | 2 +- drivers/gpio/gpio-104-idi-48.c | 2 +- drivers/gpio/gpio-74xx-mmio.c | 9 +- drivers/gpio/gpio-aspeed.c | 24 +- drivers/gpio/gpio-davinci.c | 2 - drivers/gpio/gpio-dwapb.c | 57 +- drivers/gpio/gpio-eic-sprd.c | 73 + drivers/gpio/gpio-ge.c | 4 +- drivers/gpio/gpio-gpio-mm.c | 2 +- drivers/gpio/gpio-ingenic.c | 4 +- drivers/gpio/gpio-loongson.c | 116 +- drivers/gpio/gpio-lp3943.c | 2 +- drivers/gpio/gpio-lp873x.c | 2 +- drivers/gpio/gpio-lpc32xx.c | 3 +- drivers/gpio/gpio-lynxpoint.c | 2 +- drivers/gpio/gpio-max730x.c | 2 +- drivers/gpio/gpio-mc33880.c | 2 +- drivers/gpio/gpio-mc9s08dz60.c | 2 +- drivers/gpio/gpio-ml-ioh.c | 2 +- drivers/gpio/gpio-mm-lantiq.c | 2 +- drivers/gpio/gpio-mockup.c | 7 +- drivers/gpio/gpio-msic.c | 2 +- drivers/gpio/gpio-mvebu.c | 20 +- drivers/gpio/gpio-mxc.c | 54 +- drivers/gpio/gpio-mxs.c | 32 +- drivers/gpio/gpio-octeon.c | 2 +- drivers/gpio/gpio-omap.c | 2 +- drivers/gpio/gpio-palmas.c | 8 +- drivers/gpio/gpio-pca953x.c | 81 +- drivers/gpio/gpio-pcf857x.c | 2 +- drivers/gpio/gpio-pch.c | 2 +- drivers/gpio/gpio-pl061.c | 2 +- drivers/gpio/gpio-pmic-eic-sprd.c | 58 +- drivers/gpio/gpio-pxa.c | 10 +- drivers/gpio/gpio-stmpe.c | 9 +- drivers/gpio/gpio-syscon.c | 9 +- drivers/gpio/gpio-ts4900.c | 7 +- drivers/gpio/gpio-vf610.c | 4 +- drivers/gpio/gpio-xlp.c | 9 +- drivers/gpio/gpio-xra1403.c | 15 +- drivers/gpio/gpio-zynq.c | 14 +- drivers/gpio/gpiolib-of.c | 7 +- drivers/gpio/gpiolib.c | 143 +- drivers/gpio/gpiolib.h | 2 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + drivers/gpu/drm/i915/gvt/display.h | 2 +- drivers/gpu/drm/i915/gvt/handlers.c | 13 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 34 +- drivers/gpu/drm/i915/i915_gem.c | 17 +- drivers/gpu/drm/i915/intel_ddi.c | 6 +- drivers/gpu/drm/i915/intel_display.c | 7 +- drivers/gpu/drm/i915/intel_dp.c | 38 +- drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 3 +- drivers/gpu/drm/i915/intel_panel.c | 6 - drivers/gpu/drm/i915/intel_pm.c | 1 - drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 17 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 105 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 27 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 12 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c | 20 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 17 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +- drivers/gpu/drm/msm/msm_atomic.c | 258 +- drivers/gpu/drm/msm/msm_drv.c | 11 +- drivers/gpu/drm/msm/msm_drv.h | 9 +- drivers/gpu/drm/msm/msm_kms.h | 14 - drivers/gpu/drm/v3d/Kconfig | 1 + drivers/hid/Kconfig | 16 + drivers/hid/Makefile | 2 + drivers/hid/hid-alps.c | 30 +- drivers/hid/hid-core.c | 21 +- drivers/hid/hid-generic.c | 15 + drivers/hid/hid-gfrm.c | 2 +- drivers/hid/hid-ids.h | 5 + drivers/hid/hid-input.c | 123 +- drivers/hid/hid-magicmouse.c | 6 +- drivers/hid/hid-multitouch.c | 232 +- drivers/hid/hid-plantronics.c | 6 +- drivers/hid/hid-quirks.c | 1 - drivers/hid/hid-redragon.c | 86 + drivers/hid/hid-rmi.c | 20 + drivers/hid/hid-steam.c | 1115 +++++ drivers/hid/i2c-hid/i2c-hid.c | 33 +- drivers/hid/wacom_wac.c | 74 +- drivers/hsi/clients/cmt_speech.c | 2 +- drivers/hv/ring_buffer.c | 2 + drivers/hwspinlock/Kconfig | 1 + drivers/hwspinlock/hwspinlock_core.c | 77 +- drivers/hwspinlock/hwspinlock_internal.h | 10 +- drivers/hwspinlock/omap_hwspinlock.c | 10 +- drivers/hwspinlock/qcom_hwspinlock.c | 10 +- drivers/hwspinlock/sirf_hwspinlock.c | 3 +- drivers/hwspinlock/sprd_hwspinlock.c | 10 +- drivers/hwspinlock/u8500_hsem.c | 10 +- drivers/ide/alim15x3.c | 2 +- drivers/ide/ide-io.c | 4 +- drivers/ide/ide-iops.c | 13 +- drivers/ide/ide-taskfile.c | 10 +- drivers/iio/Kconfig | 2 + drivers/iio/Makefile | 2 + drivers/iio/accel/Kconfig | 24 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/adis16201.c | 321 ++ drivers/{staging => }/iio/accel/adis16209.c | 52 +- drivers/iio/accel/bmc150-accel-core.c | 23 +- drivers/iio/accel/mma8452.c | 24 +- drivers/iio/accel/sca3000.c | 13 +- drivers/iio/accel/st_accel_i2c.c | 1 + drivers/iio/adc/ad7791.c | 87 +- drivers/iio/adc/imx7d_adc.c | 2 +- drivers/iio/adc/meson_saradc.c | 83 +- drivers/iio/adc/stm32-adc-core.c | 66 +- drivers/iio/adc/stm32-adc.c | 47 +- drivers/iio/adc/stm32-dfsdm-adc.c | 17 +- drivers/iio/adc/stm32-dfsdm-core.c | 26 + drivers/iio/adc/stx104.c | 11 + drivers/iio/adc/ti-ads8688.c | 48 +- drivers/iio/afe/Kconfig | 19 + drivers/iio/afe/Makefile | 6 + drivers/iio/afe/iio-rescale.c | 359 ++ drivers/iio/amplifiers/ad8366.c | 6 +- drivers/iio/chemical/atlas-ph-sensor.c | 14 +- .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +- .../common/cros_ec_sensors/cros_ec_sensors_core.c | 9 +- .../iio/common/hid-sensors/hid-sensor-trigger.c | 9 +- drivers/iio/dac/Kconfig | 33 +- drivers/iio/dac/Makefile | 3 + drivers/iio/dac/ad5686-spi.c | 119 + drivers/iio/dac/ad5686.c | 428 +- drivers/iio/dac/ad5686.h | 145 + drivers/iio/dac/ad5696-i2c.c | 102 + drivers/iio/dac/ltc2632.c | 89 +- drivers/iio/dac/ti-dac5571.c | 439 ++ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 284 +- drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 86 +- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 22 +- drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 47 +- drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 12 +- drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 52 +- drivers/iio/imu/st_lsm6dsx/Kconfig | 3 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 10 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + drivers/iio/light/Kconfig | 8 + drivers/iio/light/Makefile | 1 + drivers/iio/light/cros_ec_light_prox.c | 3 +- drivers/iio/light/tsl2583.c | 2 +- drivers/iio/light/tsl2772.c | 1800 ++++++++ drivers/iio/magnetometer/mag3110.c | 158 +- drivers/iio/potentiometer/mcp4018.c | 41 +- drivers/iio/potentiometer/mcp4531.c | 145 +- drivers/iio/potentiostat/lmp91000.c | 2 + drivers/iio/pressure/cros_ec_baro.c | 3 +- drivers/iio/resolver/Kconfig | 17 + drivers/iio/resolver/Makefile | 5 + drivers/{staging => }/iio/resolver/ad2s1200.c | 167 +- drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/mtk-pmic-keys.c | 339 ++ drivers/iommu/Kconfig | 6 +- drivers/iommu/amd_iommu.c | 139 +- drivers/iommu/amd_iommu_types.h | 1 + drivers/iommu/dmar.c | 8 +- drivers/iommu/intel-iommu.c | 101 +- drivers/iommu/intel-svm.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/iommu/io-pgtable-arm-v7s.c | 5 +- drivers/iommu/io-pgtable-arm.c | 18 +- drivers/iommu/iommu.c | 7 +- drivers/iommu/irq_remapping.c | 5 - drivers/iommu/irq_remapping.h | 2 - drivers/iommu/qcom_iommu.c | 6 +- drivers/iommu/tegra-gart.c | 15 +- drivers/irqchip/irq-ls-scfg-msi.c | 3 + drivers/irqchip/irq-stm32-exti.c | 4 +- drivers/lightnvm/pblk-gc.c | 3 +- drivers/lightnvm/pblk-init.c | 2 +- drivers/md/dm-linear.c | 16 + drivers/md/dm-log-writes.c | 15 + drivers/md/dm-stripe.c | 21 + drivers/md/dm.c | 47 +- drivers/md/md.c | 212 +- drivers/md/md.h | 22 +- drivers/md/raid1.c | 4 +- drivers/md/raid10.c | 10 +- drivers/md/raid5.c | 12 +- drivers/md/raid5.h | 1 + drivers/message/fusion/lsi/mpi_cnfg.h | 4 +- drivers/message/fusion/mptbase.c | 2 +- drivers/message/fusion/mptfc.c | 2 +- drivers/message/fusion/mptlan.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/mfd/Makefile | 1 - drivers/mfd/ab8500-debugfs.c | 3 +- drivers/mfd/abx500-core.c | 25 +- drivers/mfd/arizona-core.c | 53 +- drivers/mfd/asic3.c | 3 + drivers/mfd/atmel-smc.c | 1 + drivers/mfd/axp20x.c | 252 +- drivers/mfd/bd9571mwv.c | 2 + drivers/mfd/cros_ec.c | 41 +- drivers/mfd/cros_ec_acpi_gpe.c | 103 - drivers/mfd/cros_ec_dev.c | 45 +- drivers/mfd/cros_ec_i2c.c | 17 +- drivers/mfd/da9062-core.c | 462 +- drivers/mfd/htc-i2cpld.c | 4 +- drivers/mfd/intel-lpss-pci.c | 25 +- drivers/mfd/intel-lpss.c | 8 +- drivers/mfd/intel_quark_i2c_gpio.c | 3 +- drivers/mfd/janz-cmodio.c | 4 +- drivers/mfd/jz4740-adc.c | 4 +- drivers/mfd/max8997.c | 4 +- drivers/mfd/mt6397-core.c | 26 +- drivers/mfd/omap-usb-host.c | 24 +- drivers/mfd/omap-usb-tll.c | 60 +- drivers/mfd/pcf50633-core.c | 7 +- drivers/mfd/qcom-spmi-pmic.c | 6 + drivers/mfd/rave-sp.c | 118 +- drivers/mfd/rc5t583.c | 6 +- drivers/mfd/si476x-i2c.c | 6 +- drivers/mfd/sm501.c | 32 +- drivers/mfd/smsc-ece1099.c | 7 +- drivers/mfd/sprd-sc27xx-spi.c | 3 + drivers/mfd/stm32-timers.c | 201 +- drivers/mfd/syscon.c | 2 + drivers/mfd/ti_am335x_tscadc.c | 5 +- drivers/mfd/timberdale.c | 2 +- drivers/mfd/tps65090.c | 4 +- drivers/mfd/tps6586x.c | 4 +- drivers/mfd/tps65910.c | 18 +- drivers/mfd/tps65911-comparator.c | 17 +- drivers/mfd/tps68470.c | 10 +- drivers/mfd/tps80031.c | 4 +- drivers/mfd/twl-core.c | 2 +- drivers/mfd/twl6030-irq.c | 4 +- drivers/mfd/viperboard.c | 4 +- drivers/mfd/wm97xx-core.c | 2 +- drivers/mtd/bcm47xxpart.c | 29 +- drivers/mtd/chips/cfi_cmdset_0002.c | 62 +- drivers/mtd/chips/cfi_probe.c | 42 + drivers/mtd/cmdlinepart.c | 5 +- drivers/mtd/devices/docg3.c | 3 +- drivers/mtd/devices/mtd_dataflash.c | 2 +- drivers/mtd/inftlmount.c | 23 +- drivers/mtd/maps/pismo.c | 1 - drivers/mtd/mtdcore.c | 24 +- drivers/mtd/mtdcore.h | 1 - drivers/mtd/mtdpart.c | 44 +- drivers/mtd/nand/onenand/samsung.c | 6 +- drivers/mtd/nand/raw/Kconfig | 8 +- drivers/mtd/nand/raw/davinci_nand.c | 25 +- drivers/mtd/nand/raw/diskonchip.c | 4 +- drivers/mtd/nand/raw/fsl_elbc_nand.c | 13 +- drivers/mtd/nand/raw/fsl_ifc_nand.c | 29 +- drivers/mtd/nand/raw/fsmc_nand.c | 27 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 54 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 188 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 25 +- drivers/mtd/nand/raw/hisi504_nand.c | 35 +- drivers/mtd/nand/raw/lpc32xx_mlc.c | 38 +- drivers/mtd/nand/raw/lpc32xx_slc.c | 26 +- drivers/mtd/nand/raw/mtk_ecc.c | 7 +- drivers/mtd/nand/raw/mtk_nand.c | 10 +- drivers/mtd/nand/raw/nand_base.c | 89 +- drivers/mtd/nand/raw/sunxi_nand.c | 91 +- drivers/mtd/nftlmount.c | 23 +- drivers/mtd/spi-nor/Kconfig | 6 +- drivers/mtd/spi-nor/cadence-quadspi.c | 96 +- drivers/mtd/spi-nor/fsl-quadspi.c | 15 +- drivers/mtd/spi-nor/hisi-sfc.c | 12 +- drivers/mtd/spi-nor/intel-spi.c | 80 +- drivers/mtd/spi-nor/spi-nor.c | 33 + drivers/mtd/spi-nor/stm32-quadspi.c | 2 +- drivers/mtd/ubi/build.c | 4 + drivers/mtd/ubi/eba.c | 111 +- drivers/mtd/ubi/fastmap.c | 20 + drivers/mtd/ubi/ubi-media.h | 22 +- drivers/mtd/ubi/ubi.h | 11 + drivers/mtd/ubi/vmt.c | 1 + drivers/mtd/ubi/vtbl.c | 16 +- drivers/mtd/ubi/wl.c | 4 +- drivers/net/bonding/bond_options.c | 1 + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 11 +- drivers/net/ethernet/mscc/ocelot.c | 2 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 10 +- drivers/net/fddi/skfp/skfddi.c | 55 +- drivers/net/hyperv/hyperv_net.h | 1 - drivers/net/hyperv/netvsc.c | 18 +- drivers/net/hyperv/netvsc_drv.c | 7 +- drivers/net/phy/dp83848.c | 35 +- drivers/net/tap.c | 5 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/xen-netfront.c | 2 +- drivers/nvdimm/bus.c | 19 +- drivers/nvdimm/e820.c | 41 +- drivers/nvdimm/pfn_devs.c | 2 - drivers/nvdimm/pmem.c | 46 +- drivers/nvdimm/region_devs.c | 3 +- drivers/nvme/host/core.c | 4 +- drivers/nvme/host/fabrics.c | 3 +- drivers/nvme/host/fabrics.h | 3 + drivers/nvme/host/nvme.h | 1 - drivers/nvme/host/pci.c | 35 +- drivers/nvme/host/rdma.c | 5 +- drivers/nvme/target/admin-cmd.c | 15 +- drivers/nvme/target/configfs.c | 14 +- drivers/perf/Kconfig | 36 +- drivers/perf/arm-cci.c | 47 +- drivers/perf/arm-ccn.c | 22 +- drivers/perf/arm_pmu.c | 2 +- drivers/perf/arm_spe_pmu.c | 6 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +- drivers/platform/chrome/cros_ec_debugfs.c | 20 + drivers/power/reset/gpio-poweroff.c | 4 +- drivers/power/supply/ab8500_bmdata.c | 63 - drivers/power/supply/ab8500_btemp.c | 93 +- drivers/power/supply/ab8500_charger.c | 133 +- drivers/power/supply/ab8500_fg.c | 14 +- drivers/power/supply/abx500_chargalg.c | 62 - drivers/power/supply/axp288_charger.c | 26 +- drivers/power/supply/axp288_fuel_gauge.c | 27 +- drivers/power/supply/bq27xxx_battery.c | 9 + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + drivers/power/supply/charger-manager.c | 5 +- drivers/power/supply/gpio-charger.c | 3 +- drivers/power/supply/power_supply_sysfs.c | 86 +- drivers/power/supply/s3c_adc_battery.c | 8 +- drivers/pwm/pwm-stm32.c | 257 ++ drivers/regulator/Kconfig | 18 + drivers/regulator/Makefile | 3 +- drivers/regulator/ab8500.c | 1779 +------- drivers/regulator/anatop-regulator.c | 22 +- drivers/regulator/arizona-ldo1.c | 19 +- drivers/regulator/axp20x-regulator.c | 2 + drivers/regulator/bd71837-regulator.c | 640 +++ drivers/regulator/bd9571mwv-regulator.c | 127 +- drivers/regulator/core.c | 244 +- drivers/regulator/cpcap-regulator.c | 2 +- drivers/regulator/internal.h | 37 +- drivers/regulator/lm363x-regulator.c | 20 +- drivers/regulator/lp87565-regulator.c | 17 +- drivers/regulator/lp8788-ldo.c | 32 +- drivers/regulator/ltc3676.c | 20 +- drivers/regulator/max8952.c | 18 +- drivers/regulator/max8973-regulator.c | 54 +- drivers/regulator/max8998.c | 3 +- drivers/regulator/mc13783-regulator.c | 18 +- drivers/regulator/mc13892-regulator.c | 18 +- drivers/regulator/mc13xxx-regulator-core.c | 28 +- drivers/regulator/of_regulator.c | 193 +- drivers/regulator/pfuze100-regulator.c | 40 +- drivers/regulator/qcom_spmi-regulator.c | 133 +- drivers/regulator/s5m8767.c | 26 +- drivers/regulator/sy8106a-regulator.c | 167 + drivers/regulator/tps65090-regulator.c | 50 +- drivers/regulator/tps6586x-regulator.c | 1 + drivers/regulator/twl-regulator.c | 2 +- drivers/regulator/wm8350-regulator.c | 1 + drivers/remoteproc/Kconfig | 1 - drivers/remoteproc/da8xx_remoteproc.c | 12 +- drivers/remoteproc/qcom_q6v5_pil.c | 201 +- drivers/rpmsg/Kconfig | 3 + drivers/rpmsg/qcom_glink_native.c | 10 +- drivers/rpmsg/qcom_glink_native.h | 10 +- drivers/rpmsg/qcom_glink_rpm.c | 10 +- drivers/rpmsg/qcom_glink_smem.c | 10 +- drivers/rpmsg/qcom_smd.c | 96 +- drivers/rpmsg/rpmsg_char.c | 10 +- drivers/rpmsg/rpmsg_core.c | 49 +- drivers/rpmsg/rpmsg_internal.h | 10 +- drivers/rpmsg/virtio_rpmsg_bus.c | 10 +- drivers/rtc/Kconfig | 2 +- drivers/rtc/interface.c | 5 + drivers/rtc/nvmem.c | 2 +- drivers/rtc/rtc-88pm80x.c | 58 +- drivers/rtc/rtc-ab-b5ze-s3.c | 30 +- drivers/rtc/rtc-at91rm9200.c | 2 + drivers/rtc/rtc-bq4802.c | 6 +- drivers/rtc/rtc-brcmstb-waketimer.c | 20 +- drivers/rtc/rtc-cmos.c | 155 +- drivers/rtc/rtc-cros-ec.c | 23 +- drivers/rtc/rtc-ds1216.c | 6 +- drivers/rtc/rtc-ds1307.c | 2 + drivers/rtc/rtc-ds1511.c | 9 +- drivers/rtc/rtc-ds1553.c | 15 +- drivers/rtc/rtc-ds1685.c | 66 +- drivers/rtc/rtc-ds1742.c | 8 +- drivers/rtc/rtc-ftrtc010.c | 36 +- drivers/rtc/rtc-lpc32xx.c | 16 +- drivers/rtc/rtc-ls1x.c | 32 +- drivers/rtc/rtc-m48t59.c | 41 +- drivers/rtc/rtc-mrst.c | 45 +- drivers/rtc/rtc-mt6397.c | 7 +- drivers/rtc/rtc-mv.c | 3 +- drivers/rtc/rtc-mxc.c | 34 +- drivers/rtc/rtc-mxc_v2.c | 29 +- drivers/rtc/rtc-pcap.c | 15 +- drivers/rtc/rtc-pxa.c | 2 +- drivers/rtc/rtc-rx8581.c | 210 +- drivers/rtc/rtc-sc27xx.c | 63 +- drivers/rtc/rtc-sh.c | 15 +- drivers/rtc/rtc-snvs.c | 13 +- drivers/rtc/rtc-st-lpc.c | 26 +- drivers/rtc/rtc-stk17ta8.c | 15 +- drivers/rtc/rtc-stm32.c | 339 +- drivers/rtc/rtc-sun6i.c | 4 +- drivers/rtc/rtc-sunxi.c | 23 +- drivers/rtc/rtc-test.c | 208 +- drivers/rtc/rtc-tps6586x.c | 55 +- drivers/rtc/rtc-tps65910.c | 26 +- drivers/rtc/rtc-vr41xx.c | 35 +- drivers/rtc/rtc-zynqmp.c | 10 +- drivers/s390/block/dcssblk.c | 7 + drivers/s390/scsi/zfcp_dbf.c | 90 +- drivers/s390/scsi/zfcp_dbf.h | 21 +- drivers/s390/scsi/zfcp_erp.c | 194 +- drivers/s390/scsi/zfcp_ext.h | 16 +- drivers/s390/scsi/zfcp_fc.c | 11 +- drivers/s390/scsi/zfcp_fc.h | 22 +- drivers/s390/scsi/zfcp_fsf.c | 61 +- drivers/s390/scsi/zfcp_fsf.h | 6 +- drivers/s390/scsi/zfcp_scsi.c | 141 +- drivers/s390/scsi/zfcp_sysfs.c | 5 +- drivers/scsi/3w-9xxx.c | 5 + drivers/scsi/3w-xxxx.c | 3 + drivers/scsi/Kconfig | 14 + drivers/scsi/Makefile | 3 +- drivers/scsi/a100u2w.c | 13 +- drivers/scsi/am53c974.c | 13 +- drivers/scsi/cxlflash/Kconfig | 2 +- drivers/scsi/cxlflash/Makefile | 4 +- drivers/scsi/cxlflash/backend.h | 55 +- drivers/scsi/cxlflash/common.h | 12 +- drivers/scsi/cxlflash/cxl_hw.c | 13 + drivers/scsi/cxlflash/lunmgt.c | 4 +- drivers/scsi/cxlflash/main.c | 97 +- drivers/scsi/cxlflash/main.h | 21 + drivers/scsi/cxlflash/ocxl_hw.c | 1436 +++++++ drivers/scsi/cxlflash/ocxl_hw.h | 77 + drivers/scsi/cxlflash/sislite.h | 41 +- drivers/scsi/cxlflash/superpipe.c | 23 +- drivers/scsi/cxlflash/vlun.c | 3 +- drivers/scsi/dpt_i2o.c | 21 +- drivers/scsi/esas2r/esas2r_init.c | 5 +- drivers/scsi/esas2r/esas2r_ioctl.c | 2 +- drivers/scsi/esas2r/esas2r_main.c | 2 +- drivers/scsi/hisi_sas/hisi_sas.h | 52 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 638 ++- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 164 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 284 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 452 +- drivers/scsi/ipr.c | 2 + drivers/scsi/ips.c | 78 +- drivers/scsi/ips.h | 11 +- drivers/scsi/isci/init.c | 3 - drivers/scsi/iscsi_tcp.c | 1 - drivers/scsi/libsas/sas_ata.c | 5 + drivers/scsi/libsas/sas_discover.c | 1 + drivers/scsi/lpfc/lpfc.h | 9 +- drivers/scsi/lpfc/lpfc_attr.c | 124 +- drivers/scsi/lpfc/lpfc_bsg.c | 20 +- drivers/scsi/lpfc/lpfc_ct.c | 10 + drivers/scsi/lpfc/lpfc_debugfs.c | 98 +- drivers/scsi/lpfc/lpfc_els.c | 1 - drivers/scsi/lpfc/lpfc_hbadisc.c | 7 +- drivers/scsi/lpfc/lpfc_hw4.h | 7 +- drivers/scsi/lpfc/lpfc_init.c | 153 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 35 +- drivers/scsi/lpfc/lpfc_nvme.c | 238 +- drivers/scsi/lpfc/lpfc_nvme.h | 17 +- drivers/scsi/lpfc/lpfc_nvmet.h | 6 +- drivers/scsi/lpfc/lpfc_scsi.c | 33 +- drivers/scsi/lpfc/lpfc_scsi.h | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 116 +- drivers/scsi/lpfc/lpfc_version.h | 4 +- drivers/scsi/megaraid.c | 3 + drivers/scsi/megaraid/megaraid_sas.h | 4 +- drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- drivers/scsi/mpt3sas/mpi/mpi2.h | 9 +- drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 30 +- drivers/scsi/mpt3sas/mpi/mpi2_init.h | 2 +- drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 7 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 477 ++- drivers/scsi/mpt3sas/mpt3sas_base.h | 60 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 33 +- drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 491 ++- drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 +- drivers/scsi/mvumi.c | 20 +- drivers/scsi/osd/osd_initiator.c | 16 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 2 +- drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 2 +- drivers/scsi/qedf/drv_scsi_fw_funcs.c | 2 +- drivers/scsi/qedf/drv_scsi_fw_funcs.h | 2 +- drivers/scsi/qedf/qedf.h | 6 +- drivers/scsi/qedf/qedf_attr.c | 2 +- drivers/scsi/qedf/qedf_dbg.c | 4 +- drivers/scsi/qedf/qedf_dbg.h | 2 +- drivers/scsi/qedf/qedf_debugfs.c | 2 +- drivers/scsi/qedf/qedf_els.c | 35 +- drivers/scsi/qedf/qedf_fip.c | 5 +- drivers/scsi/qedf/qedf_hsi.h | 2 +- drivers/scsi/qedf/qedf_io.c | 87 +- drivers/scsi/qedf/qedf_main.c | 130 +- drivers/scsi/qedf/qedf_version.h | 6 +- drivers/scsi/qla2xxx/qla_def.h | 4 +- drivers/scsi/qla2xxx/qla_gbl.h | 3 +- drivers/scsi/qla2xxx/qla_gs.c | 41 +- drivers/scsi/qla2xxx/qla_init.c | 105 +- drivers/scsi/qla2xxx/qla_os.c | 4 + drivers/scsi/qla2xxx/qla_target.c | 192 +- drivers/scsi/qla2xxx/qla_target.h | 4 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 37 +- drivers/scsi/qlogicpti.c | 6 +- drivers/scsi/scsi_debugfs.c | 2 +- drivers/scsi/scsi_devinfo.c | 31 +- drivers/scsi/scsi_dh.c | 5 +- drivers/scsi/scsi_error.c | 7 + drivers/scsi/scsi_lib.c | 4 + drivers/scsi/scsi_sysfs.c | 2 +- drivers/scsi/scsi_transport_sas.c | 4 - drivers/scsi/sd.h | 12 +- drivers/scsi/sd_zbc.c | 10 - drivers/scsi/sg.c | 2 +- drivers/scsi/snic/snic_scsi.c | 6 +- drivers/scsi/st.c | 6 +- drivers/scsi/storvsc_drv.c | 85 +- drivers/scsi/ufs/ufs-qcom.c | 2 +- drivers/scsi/ufs/ufshcd.c | 308 +- drivers/scsi/ufs/ufshcd.h | 21 + drivers/scsi/wd719x.c | 13 +- drivers/scsi/zorro_esp.c | 1172 +++++ drivers/soc/rockchip/pm_domains.c | 4 +- drivers/soc/tegra/pmc.c | 3 +- drivers/staging/Kconfig | 6 - drivers/staging/Makefile | 3 - drivers/staging/android/Kconfig | 11 +- drivers/staging/android/Makefile | 1 + drivers/staging/android/TODO | 9 + drivers/staging/android/ashmem.h | 6 +- drivers/staging/android/ion/Kconfig | 2 +- drivers/staging/android/ion/ion.c | 22 +- drivers/staging/android/ion/ion.h | 2 +- drivers/staging/android/ion/ion_page_pool.c | 5 + drivers/staging/android/uapi/ashmem.h | 6 +- drivers/staging/android/uapi/ion.h | 2 +- drivers/staging/android/uapi/vsoc_shm.h | 295 ++ drivers/staging/android/vsoc.c | 1152 +++++ drivers/staging/board/armadillo800eva.c | 10 +- drivers/staging/board/board.c | 5 +- drivers/staging/comedi/comedi_compat32.c | 12 +- drivers/staging/comedi/comedi_usb.h | 5 +- drivers/staging/comedi/comedidev.h | 2 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 6 +- drivers/staging/emxx_udc/Kconfig | 2 +- drivers/staging/emxx_udc/TODO | 2 + drivers/staging/fbtft/TODO | 4 + drivers/staging/fbtft/fbtft-bus.c | 13 +- drivers/staging/fbtft/fbtft-core.c | 4 +- drivers/staging/fbtft/fbtft.h | 1 + drivers/staging/fsl-dpaa2/Kconfig | 8 + drivers/staging/fsl-dpaa2/Makefile | 5 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 111 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 49 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 23 + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 13 + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 42 + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 6 + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 39 +- drivers/staging/fsl-dpaa2/rtc/Makefile | 7 + drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h | 137 + drivers/staging/fsl-dpaa2/rtc/dprtc.c | 701 +++ drivers/staging/fsl-dpaa2/rtc/dprtc.h | 164 + drivers/staging/fsl-dpaa2/rtc/rtc.c | 229 + drivers/staging/fsl-dpaa2/rtc/rtc.h | 14 + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 28 +- drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 4 +- drivers/staging/fsl-mc/include/dpaa2-io.h | 2 +- drivers/staging/gdm724x/gdm_endian.c | 14 +- drivers/staging/gdm724x/gdm_endian.h | 14 +- drivers/staging/gdm724x/gdm_lte.c | 16 +- drivers/staging/gdm724x/gdm_lte.h | 14 +- drivers/staging/gdm724x/gdm_mux.c | 14 +- drivers/staging/gdm724x/gdm_mux.h | 14 +- drivers/staging/gdm724x/gdm_tty.c | 14 +- drivers/staging/gdm724x/gdm_tty.h | 14 +- drivers/staging/gdm724x/gdm_usb.c | 14 +- drivers/staging/gdm724x/gdm_usb.h | 14 +- drivers/staging/gdm724x/hci.h | 14 +- drivers/staging/gdm724x/hci_packet.h | 14 +- drivers/staging/gdm724x/netlink_k.c | 14 +- drivers/staging/gdm724x/netlink_k.h | 14 +- drivers/staging/goldfish/Kconfig | 9 +- drivers/staging/goldfish/Makefile | 1 - drivers/staging/goldfish/goldfish_nand.c | 441 -- drivers/staging/goldfish/goldfish_nand_reg.h | 76 - drivers/staging/greybus/TODO | 5 + drivers/staging/greybus/arche-platform.c | 9 +- drivers/staging/greybus/audio_codec.h | 5 +- drivers/staging/greybus/audio_topology.c | 2 +- drivers/staging/greybus/camera.c | 17 +- drivers/staging/greybus/svc.c | 3 - drivers/staging/iio/Kconfig | 1 - drivers/staging/iio/Makefile | 1 - drivers/staging/iio/TODO | 9 +- drivers/staging/iio/accel/Kconfig | 24 - drivers/staging/iio/accel/Makefile | 2 - drivers/staging/iio/accel/adis16201.c | 385 -- drivers/staging/iio/adc/ad7606_par.c | 6 +- drivers/staging/iio/adc/ad7780.c | 2 +- drivers/staging/iio/cdc/ad7746.c | 44 +- drivers/staging/iio/light/Kconfig | 14 - drivers/staging/iio/light/Makefile | 5 - drivers/staging/iio/light/tsl2x7x.c | 1889 --------- drivers/staging/iio/light/tsl2x7x.h | 99 - drivers/staging/iio/meter/Kconfig | 42 - drivers/staging/iio/meter/Makefile | 8 - drivers/staging/iio/meter/ade7753.c | 630 --- drivers/staging/iio/meter/ade7754.c | 664 --- drivers/staging/iio/meter/ade7758.h | 183 - drivers/staging/iio/meter/ade7758_core.c | 955 ----- drivers/staging/iio/meter/ade7758_ring.c | 177 - drivers/staging/iio/meter/ade7758_trigger.c | 108 - drivers/staging/iio/meter/ade7759.c | 558 --- drivers/staging/iio/meter/ade7854-i2c.c | 238 +- drivers/staging/iio/meter/ade7854-spi.c | 268 +- drivers/staging/iio/meter/ade7854.c | 40 +- drivers/staging/iio/meter/ade7854.h | 16 +- drivers/staging/iio/resolver/Kconfig | 12 - drivers/staging/iio/resolver/Makefile | 1 - drivers/staging/ipx/Kconfig | 61 - drivers/staging/ipx/Makefile | 8 - drivers/staging/ipx/TODO | 4 - drivers/staging/ipx/af_ipx.c | 2082 --------- drivers/staging/ipx/ipx_proc.c | 303 -- drivers/staging/ipx/ipx_route.c | 293 -- drivers/staging/ipx/pe2.c | 36 - drivers/staging/ipx/sysctl_net_ipx.c | 40 - drivers/staging/ks7010/eap_packet.h | 76 +- drivers/staging/ks7010/ks7010_sdio.c | 632 +-- drivers/staging/ks7010/ks7010_sdio.h | 164 - drivers/staging/ks7010/ks_hostif.c | 1043 ++--- drivers/staging/ks7010/ks_hostif.h | 465 +- drivers/staging/ks7010/ks_wlan.h | 278 +- drivers/staging/ks7010/ks_wlan_ioctl.h | 7 +- drivers/staging/ks7010/ks_wlan_net.c | 1118 ++--- drivers/staging/ks7010/michael_mic.c | 28 +- drivers/staging/ks7010/michael_mic.h | 11 +- drivers/staging/lustre/Kconfig | 3 - drivers/staging/lustre/Makefile | 2 - drivers/staging/lustre/README.txt | 83 - drivers/staging/lustre/TODO | 302 -- .../staging/lustre/include/linux/libcfs/curproc.h | 85 - .../staging/lustre/include/linux/libcfs/libcfs.h | 135 - .../lustre/include/linux/libcfs/libcfs_cpu.h | 295 -- .../lustre/include/linux/libcfs/libcfs_crypto.h | 205 - .../lustre/include/linux/libcfs/libcfs_debug.h | 167 - .../lustre/include/linux/libcfs/libcfs_fail.h | 191 - .../lustre/include/linux/libcfs/libcfs_hash.h | 866 ---- .../lustre/include/linux/libcfs/libcfs_prim.h | 82 - .../lustre/include/linux/libcfs/libcfs_private.h | 200 - .../lustre/include/linux/libcfs/libcfs_string.h | 100 - .../lustre/include/linux/libcfs/libcfs_time.h | 79 - .../lustre/include/linux/libcfs/linux/libcfs.h | 133 - .../lustre/include/linux/libcfs/linux/linux-cpu.h | 78 - .../lustre/include/linux/libcfs/linux/linux-time.h | 103 - drivers/staging/lustre/include/linux/lnet/api.h | 212 - .../staging/lustre/include/linux/lnet/lib-lnet.h | 644 --- .../staging/lustre/include/linux/lnet/lib-types.h | 666 --- .../staging/lustre/include/linux/lnet/socklnd.h | 87 - .../lustre/include/uapi/linux/lnet/libcfs_debug.h | 149 - .../lustre/include/uapi/linux/lnet/libcfs_ioctl.h | 141 - .../lustre/include/uapi/linux/lnet/lnet-dlc.h | 149 - .../lustre/include/uapi/linux/lnet/lnet-types.h | 669 --- .../lustre/include/uapi/linux/lnet/lnetctl.h | 134 - .../lustre/include/uapi/linux/lnet/lnetst.h | 556 --- .../lustre/include/uapi/linux/lnet/nidstr.h | 119 - .../lustre/include/uapi/linux/lnet/socklnd.h | 44 - .../lustre/include/uapi/linux/lustre/lustre_cfg.h | 261 -- .../lustre/include/uapi/linux/lustre/lustre_fid.h | 293 -- .../include/uapi/linux/lustre/lustre_fiemap.h | 72 - .../lustre/include/uapi/linux/lustre/lustre_idl.h | 2688 ------------ .../include/uapi/linux/lustre/lustre_ioctl.h | 231 - .../include/uapi/linux/lustre/lustre_kernelcomm.h | 94 - .../include/uapi/linux/lustre/lustre_ostid.h | 236 -- .../include/uapi/linux/lustre/lustre_param.h | 94 - .../lustre/include/uapi/linux/lustre/lustre_user.h | 1325 ------ .../lustre/include/uapi/linux/lustre/lustre_ver.h | 27 - drivers/staging/lustre/lnet/Kconfig | 46 - drivers/staging/lustre/lnet/Makefile | 1 - drivers/staging/lustre/lnet/klnds/Makefile | 1 - drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 5 - .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2952 ------------- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 1038 ----- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3751 ---------------- .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 287 -- drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 6 - .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2918 ------------- .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 705 ---- .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 2592 ------------ .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 533 --- .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 184 - .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 810 ---- drivers/staging/lustre/lnet/libcfs/Makefile | 19 - drivers/staging/lustre/lnet/libcfs/debug.c | 458 -- drivers/staging/lustre/lnet/libcfs/fail.c | 142 - drivers/staging/lustre/lnet/libcfs/hash.c | 2064 --------- drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 228 - drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 152 - drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 167 - drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 556 --- .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 1079 ----- .../lustre/lnet/libcfs/linux/linux-crypto-adler.c | 139 - .../lustre/lnet/libcfs/linux/linux-crypto.c | 443 -- .../lustre/lnet/libcfs/linux/linux-crypto.h | 30 - .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 145 - .../lustre/lnet/libcfs/linux/linux-module.c | 197 - .../lustre/lnet/libcfs/linux/linux-tracefile.c | 257 -- drivers/staging/lustre/lnet/libcfs/module.c | 604 --- drivers/staging/lustre/lnet/libcfs/tracefile.c | 1191 ------ drivers/staging/lustre/lnet/libcfs/tracefile.h | 263 -- drivers/staging/lustre/lnet/lnet/Makefile | 10 - drivers/staging/lustre/lnet/lnet/acceptor.c | 501 --- drivers/staging/lustre/lnet/lnet/api-ni.c | 2307 ---------- drivers/staging/lustre/lnet/lnet/config.c | 1234 ------ drivers/staging/lustre/lnet/lnet/lib-eq.c | 426 -- drivers/staging/lustre/lnet/lnet/lib-md.c | 463 -- drivers/staging/lustre/lnet/lnet/lib-me.c | 274 -- drivers/staging/lustre/lnet/lnet/lib-move.c | 2388 ----------- drivers/staging/lustre/lnet/lnet/lib-msg.c | 625 --- drivers/staging/lustre/lnet/lnet/lib-ptl.c | 987 ----- drivers/staging/lustre/lnet/lnet/lib-socket.c | 586 --- drivers/staging/lustre/lnet/lnet/lo.c | 105 - drivers/staging/lustre/lnet/lnet/module.c | 223 - drivers/staging/lustre/lnet/lnet/net_fault.c | 1023 ----- drivers/staging/lustre/lnet/lnet/nidstrings.c | 1258 ------ drivers/staging/lustre/lnet/lnet/peer.c | 456 -- drivers/staging/lustre/lnet/lnet/router.c | 1800 -------- drivers/staging/lustre/lnet/lnet/router_proc.c | 909 ---- drivers/staging/lustre/lnet/selftest/Makefile | 7 - drivers/staging/lustre/lnet/selftest/brw_test.c | 526 --- drivers/staging/lustre/lnet/selftest/conctl.c | 799 ---- drivers/staging/lustre/lnet/selftest/conrpc.c | 1397 ------ drivers/staging/lustre/lnet/selftest/conrpc.h | 143 - drivers/staging/lustre/lnet/selftest/console.c | 2101 --------- drivers/staging/lustre/lnet/selftest/console.h | 244 -- drivers/staging/lustre/lnet/selftest/framework.c | 1786 -------- drivers/staging/lustre/lnet/selftest/module.c | 165 - drivers/staging/lustre/lnet/selftest/ping_test.c | 228 - drivers/staging/lustre/lnet/selftest/rpc.c | 1682 -------- drivers/staging/lustre/lnet/selftest/rpc.h | 295 -- drivers/staging/lustre/lnet/selftest/selftest.h | 623 --- drivers/staging/lustre/lnet/selftest/timer.c | 244 -- drivers/staging/lustre/lnet/selftest/timer.h | 50 - drivers/staging/lustre/lustre/Kconfig | 45 - drivers/staging/lustre/lustre/Makefile | 2 - drivers/staging/lustre/lustre/fid/Makefile | 5 - drivers/staging/lustre/lustre/fid/fid_internal.h | 47 - drivers/staging/lustre/lustre/fid/fid_lib.c | 88 - drivers/staging/lustre/lustre/fid/fid_request.c | 440 -- drivers/staging/lustre/lustre/fid/lproc_fid.c | 226 - drivers/staging/lustre/lustre/fld/Makefile | 5 - drivers/staging/lustre/lustre/fld/fld_cache.c | 517 --- drivers/staging/lustre/lustre/fld/fld_internal.h | 171 - drivers/staging/lustre/lustre/fld/fld_request.c | 471 --- drivers/staging/lustre/lustre/fld/lproc_fld.c | 155 - drivers/staging/lustre/lustre/include/cl_object.h | 2463 ----------- .../staging/lustre/lustre/include/interval_tree.h | 119 - drivers/staging/lustre/lustre/include/llog_swab.h | 67 - .../staging/lustre/lustre/include/lprocfs_status.h | 672 --- drivers/staging/lustre/lustre/include/lu_object.h | 1335 ------ drivers/staging/lustre/lustre/include/lu_ref.h | 178 - drivers/staging/lustre/lustre/include/lustre_acl.h | 46 - .../staging/lustre/lustre/include/lustre_compat.h | 81 - .../staging/lustre/lustre/include/lustre_debug.h | 52 - .../staging/lustre/lustre/include/lustre_disk.h | 153 - drivers/staging/lustre/lustre/include/lustre_dlm.h | 1354 ------ .../lustre/lustre/include/lustre_dlm_flags.h | 402 -- .../staging/lustre/lustre/include/lustre_errno.h | 198 - .../staging/lustre/lustre/include/lustre_export.h | 257 -- drivers/staging/lustre/lustre/include/lustre_fid.h | 676 --- drivers/staging/lustre/lustre/include/lustre_fld.h | 138 - drivers/staging/lustre/lustre/include/lustre_ha.h | 61 - .../staging/lustre/lustre/include/lustre_handles.h | 93 - .../staging/lustre/lustre/include/lustre_import.h | 368 -- .../staging/lustre/lustre/include/lustre_intent.h | 69 - .../lustre/lustre/include/lustre_kernelcomm.h | 56 - drivers/staging/lustre/lustre/include/lustre_lib.h | 124 - .../staging/lustre/lustre/include/lustre_linkea.h | 93 - drivers/staging/lustre/lustre/include/lustre_lmv.h | 174 - drivers/staging/lustre/lustre/include/lustre_log.h | 382 -- drivers/staging/lustre/lustre/include/lustre_mdc.h | 229 - drivers/staging/lustre/lustre/include/lustre_mds.h | 63 - drivers/staging/lustre/lustre/include/lustre_net.h | 2359 ----------- drivers/staging/lustre/lustre/include/lustre_nrs.h | 718 ---- .../lustre/lustre/include/lustre_nrs_fifo.h | 71 - .../staging/lustre/lustre/include/lustre_obdo.h | 55 - .../lustre/include/lustre_patchless_compat.h | 67 - .../lustre/lustre/include/lustre_req_layout.h | 307 -- drivers/staging/lustre/lustre/include/lustre_sec.h | 1070 ----- .../staging/lustre/lustre/include/lustre_swab.h | 109 - drivers/staging/lustre/lustre/include/obd.h | 1101 ----- drivers/staging/lustre/lustre/include/obd_cksum.h | 153 - drivers/staging/lustre/lustre/include/obd_class.h | 1607 ------- .../staging/lustre/lustre/include/obd_support.h | 545 --- drivers/staging/lustre/lustre/include/seq_range.h | 200 - drivers/staging/lustre/lustre/ldlm/interval_tree.c | 599 --- drivers/staging/lustre/lustre/ldlm/l_lock.c | 74 - drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 259 -- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 495 --- .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 69 - drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 342 -- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 843 ---- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2146 ---------- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 1163 ----- drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 68 - drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 1023 ----- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2080 --------- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1369 ------ drivers/staging/lustre/lustre/llite/Makefile | 11 - drivers/staging/lustre/lustre/llite/dcache.c | 300 -- drivers/staging/lustre/lustre/llite/dir.c | 1706 -------- drivers/staging/lustre/lustre/llite/file.c | 3600 ---------------- drivers/staging/lustre/lustre/llite/glimpse.c | 206 - drivers/staging/lustre/lustre/llite/lcommon_cl.c | 293 -- drivers/staging/lustre/lustre/llite/lcommon_misc.c | 186 - .../staging/lustre/lustre/llite/llite_internal.h | 1337 ------ drivers/staging/lustre/lustre/llite/llite_lib.c | 2666 ------------ drivers/staging/lustre/lustre/llite/llite_mmap.c | 478 --- drivers/staging/lustre/lustre/llite/llite_nfs.c | 375 -- drivers/staging/lustre/lustre/llite/lproc_llite.c | 1684 -------- drivers/staging/lustre/lustre/llite/namei.c | 1202 ------ drivers/staging/lustre/lustre/llite/range_lock.c | 240 -- drivers/staging/lustre/lustre/llite/range_lock.h | 83 - drivers/staging/lustre/lustre/llite/rw.c | 1214 ------ drivers/staging/lustre/lustre/llite/rw26.c | 641 --- drivers/staging/lustre/lustre/llite/statahead.c | 1577 ------- drivers/staging/lustre/lustre/llite/super25.c | 185 - drivers/staging/lustre/lustre/llite/symlink.c | 159 - drivers/staging/lustre/lustre/llite/vvp_dev.c | 659 --- drivers/staging/lustre/lustre/llite/vvp_internal.h | 321 -- drivers/staging/lustre/lustre/llite/vvp_io.c | 1374 ------ drivers/staging/lustre/lustre/llite/vvp_lock.c | 87 - drivers/staging/lustre/lustre/llite/vvp_object.c | 305 -- drivers/staging/lustre/lustre/llite/vvp_page.c | 523 --- drivers/staging/lustre/lustre/llite/xattr.c | 638 --- drivers/staging/lustre/lustre/llite/xattr_cache.c | 523 --- .../staging/lustre/lustre/llite/xattr_security.c | 96 - drivers/staging/lustre/lustre/lmv/Makefile | 5 - drivers/staging/lustre/lustre/lmv/lmv_fld.c | 82 - drivers/staging/lustre/lustre/lmv/lmv_intent.c | 517 --- drivers/staging/lustre/lustre/lmv/lmv_internal.h | 164 - drivers/staging/lustre/lustre/lmv/lmv_obd.c | 3131 -------------- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 173 - drivers/staging/lustre/lustre/lov/Makefile | 9 - .../staging/lustre/lustre/lov/lov_cl_internal.h | 641 --- drivers/staging/lustre/lustre/lov/lov_dev.c | 384 -- drivers/staging/lustre/lustre/lov/lov_ea.c | 332 -- drivers/staging/lustre/lustre/lov/lov_internal.h | 283 -- drivers/staging/lustre/lustre/lov/lov_io.c | 1023 ----- drivers/staging/lustre/lustre/lov/lov_lock.c | 348 -- drivers/staging/lustre/lustre/lov/lov_merge.c | 107 - drivers/staging/lustre/lustre/lov/lov_obd.c | 1448 ------- drivers/staging/lustre/lustre/lov/lov_object.c | 1625 ------- drivers/staging/lustre/lustre/lov/lov_offset.c | 271 -- drivers/staging/lustre/lustre/lov/lov_pack.c | 400 -- drivers/staging/lustre/lustre/lov/lov_page.c | 136 - drivers/staging/lustre/lustre/lov/lov_pool.c | 586 --- drivers/staging/lustre/lustre/lov/lov_request.c | 356 -- drivers/staging/lustre/lustre/lov/lovsub_dev.c | 147 - drivers/staging/lustre/lustre/lov/lovsub_lock.c | 81 - drivers/staging/lustre/lustre/lov/lovsub_object.c | 180 - drivers/staging/lustre/lustre/lov/lovsub_page.c | 68 - drivers/staging/lustre/lustre/lov/lproc_lov.c | 299 -- drivers/staging/lustre/lustre/mdc/Makefile | 5 - drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 231 - drivers/staging/lustre/lustre/mdc/mdc_internal.h | 144 - drivers/staging/lustre/lustre/mdc/mdc_lib.c | 497 --- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 1202 ------ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 419 -- drivers/staging/lustre/lustre/mdc/mdc_request.c | 2754 ------------ drivers/staging/lustre/lustre/mgc/Makefile | 5 - drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 69 - drivers/staging/lustre/lustre/mgc/mgc_internal.h | 58 - drivers/staging/lustre/lustre/mgc/mgc_request.c | 1844 -------- drivers/staging/lustre/lustre/obdclass/Makefile | 12 - .../staging/lustre/lustre/obdclass/cl_internal.h | 95 - drivers/staging/lustre/lustre/obdclass/cl_io.c | 1152 ----- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 275 -- drivers/staging/lustre/lustre/obdclass/cl_object.c | 1061 ----- drivers/staging/lustre/lustre/obdclass/cl_page.c | 1046 ----- drivers/staging/lustre/lustre/obdclass/class_obd.c | 535 --- drivers/staging/lustre/lustre/obdclass/debug.c | 96 - drivers/staging/lustre/lustre/obdclass/genops.c | 1514 ------- .../staging/lustre/lustre/obdclass/kernelcomm.c | 238 -- drivers/staging/lustre/lustre/obdclass/linkea.c | 249 -- .../lustre/lustre/obdclass/linux/linux-module.c | 531 --- .../lustre/lustre/obdclass/linux/linux-sysctl.c | 162 - drivers/staging/lustre/lustre/obdclass/llog.c | 523 --- drivers/staging/lustre/lustre/obdclass/llog_cat.c | 236 -- .../staging/lustre/lustre/obdclass/llog_internal.h | 79 - drivers/staging/lustre/lustre/obdclass/llog_obd.c | 225 - drivers/staging/lustre/lustre/obdclass/llog_swab.c | 412 -- .../lustre/lustre/obdclass/lprocfs_counters.c | 133 - .../lustre/lustre/obdclass/lprocfs_status.c | 1810 -------- drivers/staging/lustre/lustre/obdclass/lu_object.c | 2058 --------- drivers/staging/lustre/lustre/obdclass/lu_ref.c | 47 - .../lustre/lustre/obdclass/lustre_handles.c | 240 -- .../staging/lustre/lustre/obdclass/lustre_peer.c | 214 - .../staging/lustre/lustre/obdclass/obd_config.c | 1559 ------- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 1244 ------ drivers/staging/lustre/lustre/obdclass/obdo.c | 181 - .../staging/lustre/lustre/obdclass/statfs_pack.c | 58 - drivers/staging/lustre/lustre/obdclass/uuid.c | 47 - drivers/staging/lustre/lustre/obdecho/Makefile | 5 - .../staging/lustre/lustre/obdecho/echo_client.c | 1724 -------- .../staging/lustre/lustre/obdecho/echo_internal.h | 42 - drivers/staging/lustre/lustre/osc/Makefile | 6 - drivers/staging/lustre/lustre/osc/lproc_osc.c | 843 ---- drivers/staging/lustre/lustre/osc/osc_cache.c | 3306 --------------- .../staging/lustre/lustre/osc/osc_cl_internal.h | 683 --- drivers/staging/lustre/lustre/osc/osc_dev.c | 246 -- drivers/staging/lustre/lustre/osc/osc_internal.h | 236 -- drivers/staging/lustre/lustre/osc/osc_io.c | 918 ---- drivers/staging/lustre/lustre/osc/osc_lock.c | 1231 ------ drivers/staging/lustre/lustre/osc/osc_object.c | 474 --- drivers/staging/lustre/lustre/osc/osc_page.c | 1094 ----- drivers/staging/lustre/lustre/osc/osc_quota.c | 284 -- drivers/staging/lustre/lustre/osc/osc_request.c | 2899 ------------- drivers/staging/lustre/lustre/ptlrpc/Makefile | 23 - drivers/staging/lustre/lustre/ptlrpc/client.c | 3269 -------------- drivers/staging/lustre/lustre/ptlrpc/connection.c | 234 - drivers/staging/lustre/lustre/ptlrpc/errno.c | 381 -- drivers/staging/lustre/lustre/ptlrpc/events.c | 585 --- drivers/staging/lustre/lustre/ptlrpc/import.c | 1676 -------- drivers/staging/lustre/lustre/ptlrpc/layout.c | 2234 ---------- drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 340 -- drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 69 - .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 1332 ------ drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 770 ---- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 1612 ------- drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 269 -- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2313 ---------- drivers/staging/lustre/lustre/ptlrpc/pers.c | 72 - drivers/staging/lustre/lustre/ptlrpc/pinger.c | 477 --- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 371 -- .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 182 - drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 912 ---- drivers/staging/lustre/lustre/ptlrpc/recover.c | 374 -- drivers/staging/lustre/lustre/ptlrpc/sec.c | 2383 ----------- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 572 --- drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 850 ---- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 190 - drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 195 - drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 459 -- drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 1023 ----- drivers/staging/lustre/lustre/ptlrpc/service.c | 2804 ------------ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 4210 ------------------ drivers/staging/lustre/sysfs-fs-lustre | 654 --- drivers/staging/most/cdev/cdev.c | 16 +- drivers/staging/most/core.c | 68 +- drivers/staging/most/core.h | 4 + drivers/staging/most/dim2/Kconfig | 2 +- drivers/staging/most/dim2/dim2.c | 397 +- drivers/staging/most/dim2/dim2.h | 21 - drivers/staging/most/dim2/hal.c | 9 +- drivers/staging/most/dim2/reg.h | 84 +- drivers/staging/most/i2c/i2c.c | 140 +- drivers/staging/most/sound/sound.c | 123 +- drivers/staging/most/usb/usb.c | 55 +- drivers/staging/most/video/video.c | 32 - drivers/staging/mt7621-dts/gbpc1.dts | 3 +- drivers/staging/mt7621-dts/mt7621.dtsi | 24 +- drivers/staging/mt7621-eth/ethtool.c | 54 +- drivers/staging/mt7621-eth/gsw_mt7620.h | 4 +- drivers/staging/mt7621-eth/gsw_mt7621.c | 10 +- drivers/staging/mt7621-eth/mdio.c | 6 +- drivers/staging/mt7621-eth/mtk_eth_soc.c | 44 +- drivers/staging/mt7621-eth/mtk_eth_soc.h | 33 +- drivers/staging/mt7621-eth/soc_mt7621.c | 7 +- drivers/staging/mt7621-gpio/TODO | 2 - drivers/staging/mt7621-gpio/gpio-mt7621.c | 200 +- .../staging/mt7621-gpio/mediatek,mt7621-gpio.txt | 68 + drivers/staging/mt7621-mmc/board.h | 82 +- drivers/staging/mt7621-mmc/dbg.c | 398 +- drivers/staging/mt7621-mmc/dbg.h | 97 +- drivers/staging/mt7621-mmc/mt6575_sd.h | 1087 +++-- drivers/staging/mt7621-mmc/sd.c | 4458 +++++++++----------- drivers/staging/mt7621-pci/pci-mt7621.c | 481 +-- drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 1 - drivers/staging/mt7621-spi/spi-mt7621.c | 4 - drivers/staging/ncpfs/Kconfig | 108 - drivers/staging/ncpfs/Makefile | 17 - drivers/staging/ncpfs/TODO | 4 - drivers/staging/ncpfs/dir.c | 1220 ------ drivers/staging/ncpfs/file.c | 263 -- drivers/staging/ncpfs/getopt.c | 76 - drivers/staging/ncpfs/getopt.h | 17 - drivers/staging/ncpfs/inode.c | 1067 ----- drivers/staging/ncpfs/ioctl.c | 923 ---- drivers/staging/ncpfs/mmap.c | 125 - drivers/staging/ncpfs/ncp_fs.h | 101 - drivers/staging/ncpfs/ncp_fs_i.h | 31 - drivers/staging/ncpfs/ncp_fs_sb.h | 174 - drivers/staging/ncpfs/ncplib_kernel.c | 1326 ------ drivers/staging/ncpfs/ncplib_kernel.h | 215 - drivers/staging/ncpfs/ncpsign_kernel.c | 128 - drivers/staging/ncpfs/ncpsign_kernel.h | 27 - drivers/staging/ncpfs/sock.c | 855 ---- drivers/staging/ncpfs/symlink.c | 182 - drivers/staging/nvec/nvec.c | 81 +- drivers/staging/nvec/nvec.h | 2 +- drivers/staging/olpc_dcon/TODO | 4 + .../pi433/Documentation/devicetree/pi433.txt | 6 +- drivers/staging/pi433/Documentation/pi433.txt | 10 +- drivers/staging/pi433/Kconfig | 2 +- drivers/staging/pi433/pi433_if.c | 39 +- drivers/staging/pi433/rf69.c | 182 +- drivers/staging/pi433/rf69.h | 28 +- drivers/staging/rtl8188eu/TODO | 5 - drivers/staging/rtl8188eu/core/rtw_ap.c | 72 +- drivers/staging/rtl8188eu/core/rtw_cmd.c | 26 +- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 20 +- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 38 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 100 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 34 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 16 +- drivers/staging/rtl8188eu/include/wlan_bssdef.h | 10 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 12 +- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 4 - drivers/staging/rtl8192e/dot11d.c | 2 +- drivers/staging/rtl8192e/rtllib_tx.c | 14 +- .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 467 +- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r8192U_dm.c | 4 +- drivers/staging/rtl8723bs/Makefile | 2 +- drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 10 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +- drivers/staging/rtl8723bs/core/rtw_debug.c | 10 +- drivers/staging/rtl8723bs/core/rtw_eeprom.c | 10 +- drivers/staging/rtl8723bs/core/rtw_efuse.c | 10 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 10 +- drivers/staging/rtl8723bs/core/rtw_io.c | 10 +- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 10 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +- drivers/staging/rtl8723bs/core/rtw_odm.c | 10 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 10 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 10 +- drivers/staging/rtl8723bs/core/rtw_rf.c | 10 +- drivers/staging/rtl8723bs/core/rtw_security.c | 10 +- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 10 +- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 10 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 10 +- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 10 +- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 10 +- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 12 +- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 10 +- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 10 +- drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 10 +- drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 10 +- drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 10 +- drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h | 10 +- drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 10 +- drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h | 10 +- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 10 +- drivers/staging/rtl8723bs/hal/HalPhyRf.h | 10 +- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 10 +- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 10 +- drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 10 +- drivers/staging/rtl8723bs/hal/Mp_Precomp.h | 10 +- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +- drivers/staging/rtl8723bs/hal/hal_com.c | 10 +- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 10 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 10 +- drivers/staging/rtl8723bs/hal/hal_phy.c | 10 +- .../hal/{Hal8723BPwrSeq.c => hal_pwr_seq.c} | 12 +- drivers/staging/rtl8723bs/hal/hal_sdio.c | 10 +- drivers/staging/rtl8723bs/hal/odm.c | 10 +- drivers/staging/rtl8723bs/hal/odm.h | 10 +- drivers/staging/rtl8723bs/hal/odm_AntDiv.c | 10 +- drivers/staging/rtl8723bs/hal/odm_AntDiv.h | 10 +- drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 10 +- drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 10 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 10 +- drivers/staging/rtl8723bs/hal/odm_DIG.h | 10 +- .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 10 +- .../rtl8723bs/hal/odm_DynamicBBPowerSaving.h | 10 +- drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c | 10 +- drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h | 10 +- drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 10 +- drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h | 10 +- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 10 +- drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 10 +- drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 10 +- drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 10 +- drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 10 +- drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 10 +- drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 10 +- drivers/staging/rtl8723bs/hal/odm_RTL8723B.h | 10 +- drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 10 +- drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 10 +- drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 10 +- drivers/staging/rtl8723bs/hal/odm_debug.c | 10 +- drivers/staging/rtl8723bs/hal/odm_debug.h | 10 +- drivers/staging/rtl8723bs/hal/odm_interface.h | 10 +- drivers/staging/rtl8723bs/hal/odm_precomp.h | 10 +- drivers/staging/rtl8723bs/hal/odm_reg.h | 10 +- drivers/staging/rtl8723bs/hal/odm_types.h | 10 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 10 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 10 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 40 +- drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 10 +- drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 10 +- drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 10 +- drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 10 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 10 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 10 +- drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h | 10 +- drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 10 +- drivers/staging/rtl8723bs/include/HalVerDef.h | 10 +- drivers/staging/rtl8723bs/include/autoconf.h | 10 +- drivers/staging/rtl8723bs/include/basic_types.h | 10 +- drivers/staging/rtl8723bs/include/cmd_osdep.h | 10 +- drivers/staging/rtl8723bs/include/drv_conf.h | 10 +- drivers/staging/rtl8723bs/include/drv_types.h | 10 +- drivers/staging/rtl8723bs/include/drv_types_sdio.h | 10 +- drivers/staging/rtl8723bs/include/ethernet.h | 10 +- drivers/staging/rtl8723bs/include/hal_btcoex.h | 10 +- drivers/staging/rtl8723bs/include/hal_com.h | 10 +- drivers/staging/rtl8723bs/include/hal_com_h2c.h | 10 +- drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 10 +- drivers/staging/rtl8723bs/include/hal_com_reg.h | 10 +- drivers/staging/rtl8723bs/include/hal_data.h | 10 +- drivers/staging/rtl8723bs/include/hal_intf.h | 10 +- drivers/staging/rtl8723bs/include/hal_pg.h | 10 +- drivers/staging/rtl8723bs/include/hal_phy.h | 10 +- .../include/{Hal8723BPhyCfg.h => hal_phy_cfg.h} | 10 +- drivers/staging/rtl8723bs/include/hal_phy_reg.h | 10 +- .../{Hal8723BPhyReg.h => hal_phy_reg_8723b.h} | 10 +- .../include/{Hal8723BPwrSeq.h => hal_pwr_seq.h} | 0 drivers/staging/rtl8723bs/include/hal_sdio.h | 10 +- drivers/staging/rtl8723bs/include/ieee80211.h | 10 +- drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 10 +- drivers/staging/rtl8723bs/include/mlme_osdep.h | 10 +- drivers/staging/rtl8723bs/include/osdep_intf.h | 10 +- drivers/staging/rtl8723bs/include/osdep_service.h | 10 +- .../rtl8723bs/include/osdep_service_linux.h | 10 +- drivers/staging/rtl8723bs/include/recv_osdep.h | 10 +- drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 10 +- drivers/staging/rtl8723bs/include/rtl8192c_rf.h | 10 +- drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 10 +- drivers/staging/rtl8723bs/include/rtl8723b_dm.h | 10 +- drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 283 +- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 10 +- drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 10 +- drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 10 +- drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 10 +- drivers/staging/rtl8723bs/include/rtw_ap.h | 10 +- .../staging/rtl8723bs/include/rtw_beamforming.h | 10 +- drivers/staging/rtl8723bs/include/rtw_br_ext.h | 10 +- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 10 +- drivers/staging/rtl8723bs/include/rtw_byteorder.h | 10 +- drivers/staging/rtl8723bs/include/rtw_cmd.h | 10 +- drivers/staging/rtl8723bs/include/rtw_debug.h | 10 +- drivers/staging/rtl8723bs/include/rtw_eeprom.h | 10 +- drivers/staging/rtl8723bs/include/rtw_efuse.h | 10 +- drivers/staging/rtl8723bs/include/rtw_event.h | 10 +- drivers/staging/rtl8723bs/include/rtw_ht.h | 10 +- drivers/staging/rtl8723bs/include/rtw_io.h | 10 +- drivers/staging/rtl8723bs/include/rtw_ioctl.h | 10 +- drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 10 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 10 +- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 10 +- drivers/staging/rtl8723bs/include/rtw_mp.h | 10 +- drivers/staging/rtl8723bs/include/rtw_odm.h | 10 +- drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 35 +- drivers/staging/rtl8723bs/include/rtw_qos.h | 10 +- drivers/staging/rtl8723bs/include/rtw_recv.h | 10 +- drivers/staging/rtl8723bs/include/rtw_rf.h | 10 +- drivers/staging/rtl8723bs/include/rtw_security.h | 10 +- drivers/staging/rtl8723bs/include/rtw_version.h | 1 + drivers/staging/rtl8723bs/include/rtw_xmit.h | 10 +- drivers/staging/rtl8723bs/include/sdio_hal.h | 10 +- drivers/staging/rtl8723bs/include/sdio_ops.h | 10 +- drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 10 +- drivers/staging/rtl8723bs/include/sdio_osintf.h | 10 +- drivers/staging/rtl8723bs/include/sta_info.h | 10 +- drivers/staging/rtl8723bs/include/wifi.h | 22 +- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 10 +- drivers/staging/rtl8723bs/include/xmit_osdep.h | 10 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 +- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 10 +- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 10 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 +- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 10 +- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 10 +- drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 10 +- drivers/staging/rtl8723bs/os_dep/rtw_proc.h | 10 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 +- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 10 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +- drivers/staging/rtlwifi/base.c | 13 +- drivers/staging/rtlwifi/base.h | 13 +- drivers/staging/rtlwifi/btcoexist/halbt_precomp.h | 13 +- .../staging/rtlwifi/btcoexist/halbtc8822b1ant.c | 13 +- .../staging/rtlwifi/btcoexist/halbtc8822b1ant.h | 13 +- .../staging/rtlwifi/btcoexist/halbtc8822b2ant.c | 13 +- .../staging/rtlwifi/btcoexist/halbtc8822b2ant.h | 13 +- .../rtlwifi/btcoexist/halbtc8822bwifionly.c | 13 +- .../rtlwifi/btcoexist/halbtc8822bwifionly.h | 13 +- drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 13 +- drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h | 13 +- drivers/staging/rtlwifi/btcoexist/rtl_btc.c | 13 +- drivers/staging/rtlwifi/btcoexist/rtl_btc.h | 13 +- drivers/staging/rtlwifi/cam.c | 13 +- drivers/staging/rtlwifi/cam.h | 13 +- drivers/staging/rtlwifi/core.c | 13 +- drivers/staging/rtlwifi/core.h | 13 +- drivers/staging/rtlwifi/debug.c | 32 +- drivers/staging/rtlwifi/debug.h | 13 +- drivers/staging/rtlwifi/efuse.c | 13 +- drivers/staging/rtlwifi/efuse.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_2_platform.h | 13 +- .../halmac_88xx/halmac_8822b/halmac_8822b_cfg.h | 13 +- .../halmac_88xx/halmac_8822b/halmac_8822b_phy.c | 13 +- .../halmac_8822b/halmac_8822b_pwr_seq.c | 13 +- .../halmac_8822b/halmac_8822b_pwr_seq.h | 13 +- .../halmac_88xx/halmac_8822b/halmac_api_8822b.c | 13 +- .../halmac_88xx/halmac_8822b/halmac_api_8822b.h | 13 +- .../halmac_8822b/halmac_api_8822b_pcie.c | 13 +- .../halmac_8822b/halmac_api_8822b_pcie.h | 13 +- .../halmac_8822b/halmac_api_8822b_sdio.c | 13 +- .../halmac_8822b/halmac_api_8822b_sdio.h | 13 +- .../halmac_8822b/halmac_api_8822b_usb.c | 13 +- .../halmac_8822b/halmac_api_8822b_usb.h | 13 +- .../halmac_88xx/halmac_8822b/halmac_func_8822b.c | 13 +- .../halmac_88xx/halmac_8822b/halmac_func_8822b.h | 13 +- .../rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h | 13 +- .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c | 13 +- .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h | 13 +- .../halmac/halmac_88xx/halmac_api_88xx_pcie.c | 13 +- .../halmac/halmac_88xx/halmac_api_88xx_pcie.h | 13 +- .../halmac/halmac_88xx/halmac_api_88xx_sdio.c | 13 +- .../halmac/halmac_88xx/halmac_api_88xx_sdio.h | 13 +- .../halmac/halmac_88xx/halmac_api_88xx_usb.c | 13 +- .../halmac/halmac_88xx/halmac_api_88xx_usb.h | 13 +- .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 13 +- .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_api.c | 13 +- drivers/staging/rtlwifi/halmac/halmac_api.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_bit2.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_fw_info.h | 13 +- .../rtlwifi/halmac/halmac_fw_offload_c2h_nic.h | 13 +- .../rtlwifi/halmac/halmac_fw_offload_h2c_nic.h | 13 +- .../rtlwifi/halmac/halmac_h2c_extra_info_nic.h | 13 +- .../staging/rtlwifi/halmac/halmac_intf_phy_cmd.h | 13 +- .../rtlwifi/halmac/halmac_original_c2h_nic.h | 13 +- .../rtlwifi/halmac/halmac_original_h2c_nic.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h | 13 +- .../staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_reg2.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.h | 13 +- .../staging/rtlwifi/halmac/halmac_rx_desc_chip.h | 13 +- .../staging/rtlwifi/halmac/halmac_rx_desc_nic.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_sdio_reg.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h | 13 +- .../staging/rtlwifi/halmac/halmac_tx_desc_chip.h | 13 +- .../staging/rtlwifi/halmac/halmac_tx_desc_nic.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_type.h | 13 +- drivers/staging/rtlwifi/halmac/halmac_usb_reg.h | 13 +- drivers/staging/rtlwifi/halmac/rtl_halmac.c | 13 +- drivers/staging/rtlwifi/halmac/rtl_halmac.h | 13 +- drivers/staging/rtlwifi/pci.c | 13 +- drivers/staging/rtlwifi/pci.h | 13 +- drivers/staging/rtlwifi/phydm/halphyrf_ce.c | 13 +- drivers/staging/rtlwifi/phydm/halphyrf_ce.h | 13 +- drivers/staging/rtlwifi/phydm/mp_precomp.h | 13 +- drivers/staging/rtlwifi/phydm/phydm.c | 13 +- drivers/staging/rtlwifi/phydm/phydm.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_acs.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_acs.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_adaptivity.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_adaptivity.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_antdiv.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_antdiv.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_beamforming.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_ccx.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_ccx.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_cfotracking.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_cfotracking.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_debug.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_debug.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_dfs.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_dig.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_dig.h | 13 +- .../staging/rtlwifi/phydm/phydm_dynamic_rx_path.h | 13 +- .../rtlwifi/phydm/phydm_dynamicbbpowersaving.c | 13 +- .../rtlwifi/phydm/phydm_dynamicbbpowersaving.h | 13 +- .../staging/rtlwifi/phydm/phydm_dynamictxpower.c | 13 +- .../staging/rtlwifi/phydm/phydm_dynamictxpower.h | 13 +- .../staging/rtlwifi/phydm/phydm_edcaturbocheck.c | 13 +- .../staging/rtlwifi/phydm/phydm_edcaturbocheck.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_features.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_hwconfig.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_interface.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_interface.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_iqk.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_kfree.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_kfree.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_noisemonitor.h | 13 +- .../staging/rtlwifi/phydm/phydm_powertracking_ce.c | 13 +- .../staging/rtlwifi/phydm/phydm_powertracking_ce.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_pre_define.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_precomp.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_psd.c | 13 +- drivers/staging/rtlwifi/phydm/phydm_psd.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 17 +- drivers/staging/rtlwifi/phydm/phydm_rainfo.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_reg.h | 13 +- .../staging/rtlwifi/phydm/phydm_regdefine11ac.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h | 13 +- drivers/staging/rtlwifi/phydm/phydm_types.h | 13 +- .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c | 13 +- .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.h | 13 +- .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c | 13 +- .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.h | 13 +- .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c | 13 +- .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h | 13 +- .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.c | 47 +- .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.h | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.h | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.h | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c | 13 +- .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.h | 13 +- .../rtlwifi/phydm/rtl8822b/version_rtl8822b.h | 13 +- drivers/staging/rtlwifi/phydm/rtl_phydm.c | 13 +- drivers/staging/rtlwifi/phydm/rtl_phydm.h | 13 +- drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.h | 13 +- drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.h | 13 +- .../staging/rtlwifi/phydm/txbf/haltxbfinterface.h | 13 +- drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.h | 13 +- .../rtlwifi/phydm/txbf/phydm_hal_txbf_api.h | 13 +- drivers/staging/rtlwifi/ps.c | 13 +- drivers/staging/rtlwifi/ps.h | 13 +- drivers/staging/rtlwifi/pwrseqcmd.h | 13 +- drivers/staging/rtlwifi/rc.c | 13 +- drivers/staging/rtlwifi/rc.h | 13 +- drivers/staging/rtlwifi/regd.c | 13 +- drivers/staging/rtlwifi/regd.h | 13 +- drivers/staging/rtlwifi/rtl8822be/def.h | 13 +- drivers/staging/rtlwifi/rtl8822be/fw.c | 13 +- drivers/staging/rtlwifi/rtl8822be/fw.h | 13 +- drivers/staging/rtlwifi/rtl8822be/hw.c | 13 +- drivers/staging/rtlwifi/rtl8822be/hw.h | 13 +- drivers/staging/rtlwifi/rtl8822be/led.c | 13 +- drivers/staging/rtlwifi/rtl8822be/led.h | 13 +- drivers/staging/rtlwifi/rtl8822be/phy.c | 13 +- drivers/staging/rtlwifi/rtl8822be/phy.h | 13 +- drivers/staging/rtlwifi/rtl8822be/reg.h | 13 +- drivers/staging/rtlwifi/rtl8822be/sw.c | 13 +- drivers/staging/rtlwifi/rtl8822be/sw.h | 13 +- drivers/staging/rtlwifi/rtl8822be/trx.c | 13 +- drivers/staging/rtlwifi/rtl8822be/trx.h | 13 +- drivers/staging/rtlwifi/stats.c | 13 +- drivers/staging/rtlwifi/stats.h | 13 +- drivers/staging/rtlwifi/wifi.h | 13 +- drivers/staging/sm750fb/TODO | 5 +- drivers/staging/speakup/buffers.c | 4 + drivers/staging/speakup/main.c | 6 + drivers/staging/speakup/speakup.h | 3 +- drivers/staging/speakup/speakup_dummy.c | 1 + drivers/staging/speakup/speakup_soft.c | 3 +- drivers/staging/speakup/spk_types.h | 2 +- drivers/staging/speakup/varhandlers.c | 1 + drivers/staging/unisys/visornic/visornic_main.c | 25 +- drivers/staging/vboxvideo/vbox_main.c | 3 +- drivers/staging/vboxvideo/vbox_mode.c | 2 +- drivers/staging/vc04_services/Kconfig | 1 - drivers/staging/vc04_services/Makefile | 2 +- .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 64 +- .../staging/vc04_services/bcm2835-audio/bcm2835.c | 43 +- .../staging/vc04_services/bcm2835-audio/bcm2835.h | 12 + drivers/staging/vc04_services/bcm2835-camera/TODO | 11 - .../vc04_services/bcm2835-camera/bcm2835-camera.c | 402 +- .../vc04_services/bcm2835-camera/mmal-common.h | 9 +- .../vc04_services/bcm2835-camera/mmal-msg-port.h | 2 +- .../vc04_services/bcm2835-camera/mmal-parameters.h | 13 + .../vc04_services/bcm2835-camera/mmal-vchiq.c | 345 +- .../vc04_services/bcm2835-camera/mmal-vchiq.h | 15 +- drivers/staging/vc04_services/interface/vchi/TODO | 9 +- .../vc04_services/interface/vchi/vchi_common.h | 2 - .../interface/vchiq_arm/vchiq_2835_arm.c | 6 +- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 96 +- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 55 +- .../vc04_services/interface/vchiq_arm/vchiq_core.h | 1 - .../interface/vchiq_arm/vchiq_debugfs.c | 137 +- .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 1 - drivers/staging/vt6655/card.c | 5 +- drivers/staging/vt6655/device_main.c | 150 +- drivers/staging/wilc1000/TODO | 12 +- drivers/staging/wilc1000/coreconfigurator.c | 140 +- drivers/staging/wilc1000/coreconfigurator.h | 37 +- drivers/staging/wilc1000/host_interface.c | 549 ++- drivers/staging/wilc1000/host_interface.h | 6 +- drivers/staging/wilc1000/linux_mon.c | 90 +- drivers/staging/wilc1000/linux_wlan.c | 378 +- drivers/staging/wilc1000/wilc_debugfs.c | 2 - drivers/staging/wilc1000/wilc_sdio.c | 109 +- drivers/staging/wilc1000/wilc_spi.c | 99 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1049 +++-- drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 18 +- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 83 +- drivers/staging/wilc1000/wilc_wlan.c | 26 +- drivers/staging/wilc1000/wilc_wlan.h | 37 +- drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 - drivers/staging/wilc1000/wilc_wlan_if.h | 16 +- drivers/staging/wlan-ng/hfa384x.h | 2 +- drivers/staging/wlan-ng/hfa384x_usb.c | 7 +- drivers/staging/wlan-ng/p80211conv.c | 8 +- drivers/staging/wlan-ng/p80211conv.h | 26 +- drivers/staging/wlan-ng/p80211hdr.h | 2 +- drivers/staging/wlan-ng/p80211ioctl.h | 2 +- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/p80211metastruct.h | 90 +- drivers/staging/wlan-ng/p80211mgmt.h | 2 +- drivers/staging/wlan-ng/p80211msg.h | 2 +- drivers/staging/wlan-ng/p80211netdev.c | 8 +- drivers/staging/wlan-ng/p80211netdev.h | 8 +- drivers/staging/wlan-ng/p80211req.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 33 +- drivers/staging/wlan-ng/prism2mgmt.h | 2 +- drivers/staging/wlan-ng/prism2sta.c | 52 +- drivers/target/target_core_configfs.c | 25 + drivers/target/target_core_file.c | 137 +- drivers/target/target_core_file.h | 1 + drivers/target/target_core_internal.h | 1 + drivers/target/target_core_pscsi.c | 26 +- drivers/target/target_core_transport.c | 64 +- drivers/target/target_core_user.c | 160 +- drivers/video/backlight/Kconfig | 13 + drivers/video/backlight/Makefile | 2 + drivers/video/backlight/as3711_bl.c | 45 +- drivers/video/backlight/generic_bl.c | 5 - drivers/video/backlight/max8925_bl.c | 4 +- drivers/video/backlight/otm3225a.c | 252 ++ drivers/video/backlight/pandora_bl.c | 25 +- drivers/video/backlight/pwm_bl.c | 34 +- drivers/video/backlight/rave-sp-backlight.c | 82 + drivers/video/backlight/tps65217_bl.c | 4 +- drivers/watchdog/cadence_wdt.c | 6 +- drivers/watchdog/da9062_wdt.c | 10 - drivers/watchdog/da9063_wdt.c | 73 +- drivers/watchdog/hpwdt.c | 2 +- drivers/watchdog/mena21_wdt.c | 18 - drivers/watchdog/of_xilinx_wdt.c | 6 +- drivers/watchdog/renesas_wdt.c | 2 +- drivers/watchdog/sp805_wdt.c | 14 + drivers/watchdog/wdat_wdt.c | 6 +- drivers/xen/privcmd.c | 135 +- drivers/xen/xenbus/xenbus_probe.c | 5 +- fs/9p/v9fs.c | 29 +- fs/Kconfig | 6 +- fs/Makefile | 2 +- fs/aio.c | 18 +- fs/autofs/Kconfig | 31 + fs/autofs/Makefile | 7 + fs/{autofs4 => autofs}/autofs_i.h | 92 +- fs/{autofs4 => autofs}/dev-ioctl.c | 31 +- fs/{autofs4 => autofs}/expire.c | 133 +- fs/{autofs4 => autofs}/init.c | 13 +- fs/{autofs4 => autofs}/inode.c | 54 +- fs/{autofs4 => autofs}/root.c | 277 +- fs/{autofs4 => autofs}/symlink.c | 16 +- fs/{autofs4 => autofs}/waitq.c | 59 +- fs/autofs4/Kconfig | 20 - fs/autofs4/Makefile | 7 - fs/binfmt_misc.c | 12 +- fs/block_dev.c | 2 + fs/cifs/cifsacl.h | 14 + fs/cifs/cifsencrypt.c | 17 +- fs/cifs/cifsfs.c | 22 +- fs/cifs/cifsglob.h | 6 + fs/cifs/cifsproto.h | 7 +- fs/cifs/connect.c | 32 +- fs/cifs/link.c | 6 +- fs/cifs/misc.c | 17 + fs/cifs/smb2file.c | 3 +- fs/cifs/smb2inode.c | 3 +- fs/cifs/smb2misc.c | 4 +- fs/cifs/smb2ops.c | 73 +- fs/cifs/smb2pdu.c | 24 +- fs/cifs/smb2proto.h | 2 +- fs/cifs/smb2transport.c | 12 +- fs/cifs/smbdirect.c | 121 +- fs/cifs/smbdirect.h | 2 +- fs/cifs/transport.c | 34 +- fs/compat.c | 72 +- fs/compat_ioctl.c | 2 - fs/crypto/bio.c | 35 +- fs/crypto/crypto.c | 8 +- fs/crypto/fscrypt_private.h | 1 - fs/dax.c | 214 +- fs/exec.c | 1 + fs/ext4/readpage.c | 2 +- fs/f2fs/checkpoint.c | 149 +- fs/f2fs/data.c | 399 +- fs/f2fs/debug.c | 6 + fs/f2fs/dir.c | 76 +- fs/f2fs/extent_cache.c | 22 +- fs/f2fs/f2fs.h | 460 +- fs/f2fs/file.c | 335 +- fs/f2fs/gc.c | 183 +- fs/f2fs/gc.h | 2 - fs/f2fs/inline.c | 78 +- fs/f2fs/inode.c | 115 +- fs/f2fs/namei.c | 67 +- fs/f2fs/node.c | 285 +- fs/f2fs/recovery.c | 65 +- fs/f2fs/segment.c | 621 +-- fs/f2fs/segment.h | 31 +- fs/f2fs/shrinker.c | 4 +- fs/f2fs/super.c | 198 +- fs/f2fs/sysfs.c | 63 +- fs/f2fs/xattr.c | 26 +- fs/fcntl.c | 2 +- fs/hpfs/hpfs_fn.h | 3 +- fs/iomap.c | 1 + fs/ocfs2/dlmglue.c | 119 +- fs/ocfs2/dlmglue.h | 1 + fs/ocfs2/file.c | 10 +- fs/ocfs2/file.h | 2 - fs/ocfs2/ioctl.c | 2 +- fs/ocfs2/mmap.c | 44 +- fs/ocfs2/namei.c | 3 +- fs/ocfs2/ocfs2_fs.h | 8 +- fs/proc/array.c | 2 +- fs/proc/base.c | 265 +- fs/proc/fd.c | 2 +- fs/proc/internal.h | 2 +- fs/proc/page.c | 2 + fs/proc/task_mmu.c | 26 +- fs/ubifs/file.c | 11 +- fs/ubifs/gc.c | 2 +- fs/ubifs/journal.c | 5 +- fs/ubifs/log.c | 6 +- fs/ubifs/lpt_commit.c | 2 +- fs/ubifs/replay.c | 5 +- fs/ubifs/ubifs.h | 2 - fs/ubifs/xattr.c | 2 +- fs/userfaultfd.c | 22 +- fs/xfs/xfs_file.c | 72 +- fs/xfs/xfs_inode.h | 16 + fs/xfs/xfs_ioctl.c | 8 +- fs/xfs/xfs_iops.c | 16 +- fs/xfs/xfs_pnfs.c | 15 +- fs/xfs/xfs_pnfs.h | 5 +- include/asm-generic/int-ll64.h | 19 +- include/dt-bindings/clock/actions,s900-cmu.h | 129 + include/dt-bindings/clock/aspeed-clock.h | 4 +- include/dt-bindings/clock/axg-aoclkc.h | 26 + include/dt-bindings/clock/bcm-sr.h | 24 +- include/dt-bindings/clock/gxbb-clkc.h | 2 + include/dt-bindings/clock/histb-clock.h | 8 + include/dt-bindings/clock/imx6qdl-clock.h | 4 +- include/dt-bindings/clock/imx6sx-clock.h | 6 +- include/dt-bindings/clock/imx6ul-clock.h | 33 +- include/dt-bindings/clock/imx7d-clock.h | 4 +- include/dt-bindings/clock/meson8b-clkc.h | 1 + include/dt-bindings/clock/mt2701-clk.h | 20 +- include/dt-bindings/clock/nuvoton,npcm7xx-clock.h | 44 + include/dt-bindings/clock/qcom,gcc-msm8998.h | 208 + include/dt-bindings/clock/qcom,gcc-sdm845.h | 239 ++ include/dt-bindings/clock/qcom,rpmh.h | 22 + include/dt-bindings/clock/qcom,videocc-sdm845.h | 35 + include/dt-bindings/clock/r8a77470-cpg-mssr.h | 36 + include/dt-bindings/clock/r8a77990-cpg-mssr.h | 62 + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 24 + include/dt-bindings/reset/axg-aoclkc.h | 20 + include/dt-bindings/reset/mt2701-resets.h | 3 + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 17 + include/linux/acpi.h | 19 + include/linux/arm-smccc.h | 10 + include/linux/backlight.h | 4 - include/linux/bio.h | 1 + include/linux/cacheinfo.h | 25 +- include/linux/clk-provider.h | 23 +- include/linux/clk/davinci.h | 40 + include/linux/dax.h | 16 +- include/linux/device-mapper.h | 5 +- include/linux/dma/sprd-dma.h | 61 + include/linux/fs.h | 16 +- include/linux/fscrypt_notsupp.h | 13 +- include/linux/fscrypt_supp.h | 5 +- include/linux/gfp.h | 14 +- include/linux/gpio/consumer.h | 10 +- include/linux/gpio/machine.h | 31 + include/linux/hid.h | 19 +- include/linux/hmm.h | 8 +- include/linux/hwspinlock.h | 68 +- include/linux/hyperv.h | 12 + include/linux/iio/adc/ad_sigma_delta.h | 24 +- include/linux/iio/adc/stm32-dfsdm-adc.h | 2 + .../linux/iio/common}/cros_ec_sensors_core.h | 3 + include/linux/iio/iio.h | 24 +- include/linux/intel-iommu.h | 1 - include/linux/ioprio.h | 9 + include/linux/irq.h | 7 +- include/linux/kernel.h | 17 + include/linux/ksm.h | 17 - include/linux/libata.h | 2 + include/linux/log2.h | 35 +- include/linux/memcontrol.h | 51 +- include/linux/memfd.h | 16 + include/linux/memory_hotplug.h | 1 - include/linux/memremap.h | 36 +- include/linux/mfd/abx500.h | 1 - include/linux/mfd/abx500/ab8500-bm.h | 2 - include/linux/mfd/abx500/ux500_chargalg.h | 4 - include/linux/mfd/arizona/pdata.h | 3 +- include/linux/mfd/as3711.h | 4 +- include/linux/mfd/axp20x.h | 10 +- include/linux/mfd/bd9571mwv.h | 5 + include/linux/mfd/cros_ec.h | 20 +- include/linux/mfd/lp8788.h | 16 - include/linux/mfd/rave-sp.h | 1 + include/linux/mfd/samsung/core.h | 4 +- include/linux/mfd/stm32-timers.h | 70 + include/linux/mfd/syscon/exynos4-pmu.h | 21 - include/linux/mfd/syscon/exynos5-pmu.h | 19 - include/linux/mfd/tps65090.h | 8 +- include/linux/mfd/tps65218.h | 4 +- include/linux/mfd/tps6586x.h | 1 + include/linux/mfd/tps68470.h | 17 +- include/linux/mm.h | 83 +- include/linux/mm_types.h | 239 +- include/linux/mpi.h | 61 - include/linux/mtd/nand.h | 3 + include/linux/mtd/rawnand.h | 35 +- include/linux/mtd/spi-nor.h | 2 + include/linux/of_clk.h | 30 + include/linux/page-flags.h | 51 +- include/linux/page_counter.h | 26 +- include/linux/perf/arm_pmu.h | 2 +- include/linux/pfn_t.h | 4 +- include/linux/platform_data/gpio-dwapb.h | 3 +- include/linux/platform_data/tsl2772.h | 101 + include/linux/power/bq27xxx_battery.h | 3 +- include/linux/pwm_backlight.h | 2 + include/linux/rcupdate.h | 4 +- include/linux/regulator/ab8500.h | 157 +- include/linux/regulator/arizona-ldo1.h | 3 - include/linux/regulator/consumer.h | 1 + include/linux/regulator/driver.h | 27 +- include/linux/regulator/machine.h | 4 + include/linux/regulator/max8952.h | 1 - include/linux/rpmsg.h | 27 +- include/linux/rpmsg/qcom_glink.h | 2 + include/linux/rtc.h | 2 +- include/linux/sched.h | 134 + include/linux/sched/mm.h | 4 + include/linux/shmem_fs.h | 13 - include/linux/slab_def.h | 7 +- include/linux/slub_def.h | 1 - include/linux/ste_modem_shm.h | 56 - include/linux/syscalls.h | 4 +- include/linux/types.h | 34 +- include/linux/uio.h | 2 +- include/linux/userfaultfd_k.h | 6 +- include/linux/virtio_net.h | 11 +- include/net/transp_v6.h | 11 +- include/net/udp.h | 5 + include/scsi/scsi_device.h | 2 +- include/scsi/scsi_devinfo.h | 75 +- include/target/target_core_base.h | 1 + include/trace/events/rseq.h | 57 + include/uapi/linux/aio_abi.h | 1 + include/uapi/linux/audit.h | 1 + include/uapi/linux/auto_fs.h | 169 +- include/uapi/linux/auto_fs4.h | 153 +- include/uapi/linux/if_xdp.h | 4 +- include/uapi/linux/kernel-page-flags.h | 2 +- include/uapi/linux/ncp.h | 202 - include/uapi/linux/ncp_fs.h | 147 - include/uapi/linux/ncp_mount.h | 72 - include/uapi/linux/ncp_no.h | 20 - include/uapi/linux/netfilter/nf_tables.h | 28 +- include/uapi/linux/rpmsg.h | 9 - include/uapi/linux/rseq.h | 133 + include/uapi/linux/target_core_user.h | 11 +- include/uapi/linux/types_32_64.h | 50 + include/uapi/xen/privcmd.h | 11 + include/xen/interface/memory.h | 66 + include/xen/interface/xen.h | 7 +- include/xen/xen-ops.h | 24 +- init/Kconfig | 23 + kernel/Makefile | 4 +- kernel/bpf/verifier.c | 48 +- kernel/crash_core.c | 1 + kernel/fork.c | 3 + kernel/hung_task.c | 11 +- kernel/iomem.c | 167 + kernel/irq/manage.c | 38 +- kernel/irq/migration.c | 31 +- kernel/memremap.c | 210 +- kernel/resource.c | 1 + kernel/rseq.c | 357 ++ kernel/sched/core.c | 2 + kernel/signal.c | 24 +- kernel/sys.c | 10 +- kernel/sys_ni.c | 3 + kernel/umh.c | 3 +- kernel/workqueue.c | 1 + lib/Kconfig | 3 + lib/bitmap.c | 5 +- lib/bucket_locks.c | 5 +- lib/idr.c | 10 +- lib/mpi/mpi-internal.h | 75 +- lib/percpu_ida.c | 63 +- lib/ucs2_string.c | 2 + mm/Kconfig | 8 + mm/Makefile | 1 + mm/backing-dev.c | 4 +- mm/filemap.c | 8 +- mm/gup.c | 78 +- mm/hmm.c | 13 +- mm/huge_memory.c | 7 +- mm/hugetlb.c | 44 +- mm/hugetlb_cgroup.c | 6 +- mm/init-mm.c | 1 + mm/ksm.c | 11 + mm/memblock.c | 27 +- mm/memcontrol.c | 342 +- mm/memfd.c | 345 ++ mm/memory.c | 36 +- mm/memory_hotplug.c | 23 + mm/mmap.c | 4 +- mm/nommu.c | 2 +- mm/oom_kill.c | 2 +- mm/page_alloc.c | 74 +- mm/page_counter.c | 100 +- mm/shmem.c | 382 +- mm/slab.c | 4 +- mm/slob.c | 4 +- mm/slub.c | 112 +- mm/sparse.c | 6 +- mm/swap.c | 3 +- mm/swap_slots.c | 10 +- mm/swap_state.c | 3 - mm/userfaultfd.c | 22 +- mm/util.c | 6 +- mm/vmalloc.c | 41 +- mm/vmpressure.c | 35 +- mm/vmscan.c | 38 +- net/9p/client.c | 13 +- net/9p/trans_xen.c | 1 - net/bpfilter/Makefile | 2 +- net/bpfilter/bpfilter_kern.c | 10 +- net/bridge/br_fdb.c | 4 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv4/tcp.c | 12 +- net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +- net/ipv6/udp.c | 3 +- net/netfilter/nft_log.c | 10 +- net/packet/af_packet.c | 4 +- net/sched/act_simple.c | 15 +- net/socket.c | 18 +- net/xdp/xdp_umem.c | 6 +- net/xdp/xsk.c | 2 +- scripts/checkpatch.pl | 12 +- scripts/get_maintainer.pl | 17 +- scripts/selinux/mdp/mdp.c | 1 - scripts/tags.sh | 6 +- security/integrity/evm/Kconfig | 11 + security/integrity/evm/evm.h | 7 +- security/integrity/evm/evm_crypto.c | 10 +- security/integrity/evm/evm_main.c | 79 +- security/integrity/evm/evm_secfs.c | 206 +- security/integrity/iint.c | 18 + security/integrity/ima/ima.h | 1 - security/integrity/ima/ima_fs.c | 18 +- security/integrity/ima/ima_kexec.c | 2 + security/integrity/ima/ima_main.c | 19 +- security/integrity/ima/ima_policy.c | 70 +- security/integrity/ima/ima_template_lib.c | 2 + security/integrity/integrity.h | 2 + security/smack/smack_lsm.c | 12 +- tools/iio/iio_generic_buffer.c | 13 +- tools/objtool/check.c | 22 + tools/perf/Documentation/perf-list.txt | 6 +- tools/perf/Documentation/perf-record.txt | 3 + tools/perf/Documentation/perf-script-python.txt | 26 + tools/perf/Documentation/perf-stat.txt | 40 +- tools/perf/arch/common.c | 4 +- tools/perf/arch/common.h | 4 +- tools/perf/builtin-annotate.c | 36 +- tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-kvm.c | 2 - tools/perf/builtin-probe.c | 3 +- tools/perf/builtin-report.c | 39 +- tools/perf/builtin-sched.c | 14 +- tools/perf/builtin-script.c | 12 +- tools/perf/builtin-stat.c | 28 +- tools/perf/builtin-top.c | 48 +- tools/perf/builtin-trace.c | 2 +- tools/perf/perf.c | 1 - .../perf/scripts/python/bin/powerpc-hcalls-record | 2 + .../perf/scripts/python/bin/powerpc-hcalls-report | 2 + tools/perf/scripts/python/powerpc-hcalls.py | 200 + tools/perf/tests/code-reading.c | 1 + tools/perf/tests/kmod-path.c | 16 + tools/perf/tests/parse-events.c | 4 +- tools/perf/tests/python-use.c | 3 +- .../tests/shell/record+probe_libc_inet_pton.sh | 2 +- tools/perf/ui/browsers/annotate.c | 21 +- tools/perf/ui/browsers/hists.c | 43 +- tools/perf/ui/browsers/hists.h | 3 + tools/perf/ui/gtk/annotate.c | 2 +- tools/perf/ui/gtk/hists.c | 5 +- tools/perf/ui/hist.c | 2 +- tools/perf/ui/stdio/hist.c | 4 +- tools/perf/util/Build | 1 - tools/perf/util/annotate.c | 165 +- tools/perf/util/annotate.h | 53 +- tools/perf/util/cgroup.c | 9 +- tools/perf/util/dso.c | 2 + tools/perf/util/evsel.c | 4 +- tools/perf/util/evsel.h | 5 + tools/perf/util/header.c | 24 +- tools/perf/util/hist.c | 15 +- tools/perf/util/hist.h | 26 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 23 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 9 + tools/perf/util/intel-pt.c | 5 + tools/perf/util/map.c | 26 +- tools/perf/util/map.h | 1 + tools/perf/util/parse-events.l | 18 +- tools/perf/util/parse-events.y | 14 +- tools/perf/util/probe-event.c | 3 +- tools/perf/util/quote.c | 62 - tools/perf/util/quote.h | 31 - .../util/scripting-engines/trace-event-python.c | 250 +- tools/perf/util/session.c | 2 +- tools/perf/util/sort.c | 81 +- tools/perf/util/sort.h | 7 +- tools/perf/util/symbol.c | 3 +- tools/perf/util/symbol.h | 3 - tools/perf/util/top.h | 3 +- tools/testing/nvdimm/test/nfit.c | 104 + tools/testing/selftests/Makefile | 2 + tools/testing/selftests/bpf/get_cgroup_id_kern.c | 14 +- tools/testing/selftests/bpf/get_cgroup_id_user.c | 12 +- tools/testing/selftests/bpf/test_verifier.c | 58 +- tools/testing/selftests/lib.mk | 4 + tools/testing/selftests/proc/.gitignore | 3 + tools/testing/selftests/proc/Makefile | 5 +- tools/testing/selftests/proc/fd-001-lookup.c | 168 + tools/testing/selftests/proc/fd-002-posix-eq.c | 57 + tools/testing/selftests/proc/fd-003-kthread.c | 178 + tools/testing/selftests/proc/proc-uptime.h | 16 +- tools/testing/selftests/proc/proc.h | 39 + tools/testing/selftests/proc/read.c | 17 +- tools/testing/selftests/rseq/.gitignore | 6 + tools/testing/selftests/rseq/Makefile | 30 + .../testing/selftests/rseq/basic_percpu_ops_test.c | 312 ++ tools/testing/selftests/rseq/basic_test.c | 56 + tools/testing/selftests/rseq/param_test.c | 1260 ++++++ tools/testing/selftests/rseq/rseq-arm.h | 715 ++++ tools/testing/selftests/rseq/rseq-ppc.h | 671 +++ tools/testing/selftests/rseq/rseq-skip.h | 65 + tools/testing/selftests/rseq/rseq-x86.h | 1132 +++++ tools/testing/selftests/rseq/rseq.c | 117 + tools/testing/selftests/rseq/rseq.h | 147 + tools/testing/selftests/rseq/run_param_test.sh | 121 + tools/testing/selftests/sparc64/Makefile | 46 + tools/testing/selftests/sparc64/drivers/.gitignore | 1 + tools/testing/selftests/sparc64/drivers/Makefile | 15 + tools/testing/selftests/sparc64/drivers/adi-test.c | 721 ++++ .../selftests/sparc64/drivers/drivers_test.sh | 30 + tools/testing/selftests/sparc64/run.sh | 3 + tools/vm/page-types.c | 1 + virt/kvm/arm/arm.c | 4 + virt/kvm/arm/psci.c | 18 +- 2316 files changed, 65315 insertions(+), 243399 deletions(-) create mode 100644 Documentation/ABI/removed/sysfs-bus-nfit create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,g3dsys.txt create mode 100644 Documentation/devicetree/bindings/clock/actions,s900-cmu.txt create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.txt create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmh-clk.txt create mode 100644 Documentation/devicetree/bindings/clock/qcom,videocc.txt delete mode 100644 Documentation/devicetree/bindings/clock/rockchip.txt create mode 100644 Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt create mode 100644 Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt create mode 100644 Documentation/devicetree/bindings/iio/afe/voltage-divider.txt create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac5571.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx-cfe-partitions.txt create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.txt create mode 100644 Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt create mode 100644 Documentation/driver-api/target.rst rename Documentation/filesystems/{autofs4-mount-control.txt => autofs-mount-control.txt} (98%) rename Documentation/filesystems/{autofs4.txt => autofs.txt} (98%) delete mode 100644 Documentation/filesystems/ncpfs.txt create mode 100644 arch/arm64/kernel/ssbd.c create mode 100644 arch/x86/include/asm/mcsafe_test.h create mode 100644 drivers/acpi/pptt.c create mode 100644 drivers/char/adi.c rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (98%) create mode 100644 drivers/char/tpm/eventlog/common.c create mode 100644 drivers/char/tpm/eventlog/common.h rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (91%) rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (91%) rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (58%) rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%) create mode 100644 drivers/clk/actions/Kconfig create mode 100644 drivers/clk/actions/Makefile create mode 100644 drivers/clk/actions/owl-common.c create mode 100644 drivers/clk/actions/owl-common.h create mode 100644 drivers/clk/actions/owl-composite.c create mode 100644 drivers/clk/actions/owl-composite.h create mode 100644 drivers/clk/actions/owl-divider.c create mode 100644 drivers/clk/actions/owl-divider.h create mode 100644 drivers/clk/actions/owl-factor.c create mode 100644 drivers/clk/actions/owl-factor.h create mode 100644 drivers/clk/actions/owl-fixed-factor.h create mode 100644 drivers/clk/actions/owl-gate.c create mode 100644 drivers/clk/actions/owl-gate.h create mode 100644 drivers/clk/actions/owl-mux.c create mode 100644 drivers/clk/actions/owl-mux.h create mode 100644 drivers/clk/actions/owl-pll.c create mode 100644 drivers/clk/actions/owl-pll.h create mode 100644 drivers/clk/actions/owl-s900.c create mode 100644 drivers/clk/clk-npcm7xx.c create mode 100644 drivers/clk/mediatek/clk-mt2701-g3d.c create mode 100644 drivers/clk/meson/axg-aoclk.c create mode 100644 drivers/clk/meson/axg-aoclk.h create mode 100644 drivers/clk/meson/meson-aoclk.c create mode 100644 drivers/clk/meson/meson-aoclk.h create mode 100644 drivers/clk/qcom/gcc-msm8998.c create mode 100644 drivers/clk/qcom/gcc-sdm845.c create mode 100644 drivers/clk/qcom/videocc-sdm845.c create mode 100644 drivers/clk/renesas/r8a77470-cpg-mssr.c create mode 100644 drivers/clk/renesas/r8a77990-cpg-mssr.c delete mode 100644 drivers/clk/rockchip/clk-rockchip.c create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h create mode 100644 drivers/dma/ti/Kconfig create mode 100644 drivers/dma/ti/Makefile rename drivers/dma/{ => ti}/cppi41.c (99%) rename drivers/dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} (100%) rename drivers/dma/{ => ti}/edma.c (99%) rename drivers/dma/{ => ti}/omap-dma.c (99%) create mode 100644 drivers/hid/hid-redragon.c create mode 100644 drivers/hid/hid-steam.c create mode 100644 drivers/iio/accel/adis16201.c rename drivers/{staging => }/iio/accel/adis16209.c (92%) create mode 100644 drivers/iio/afe/Kconfig create mode 100644 drivers/iio/afe/Makefile create mode 100644 drivers/iio/afe/iio-rescale.c create mode 100644 drivers/iio/dac/ad5686-spi.c create mode 100644 drivers/iio/dac/ad5686.h create mode 100644 drivers/iio/dac/ad5696-i2c.c create mode 100644 drivers/iio/dac/ti-dac5571.c create mode 100644 drivers/iio/light/tsl2772.c create mode 100644 drivers/iio/resolver/Kconfig create mode 100644 drivers/iio/resolver/Makefile rename drivers/{staging => }/iio/resolver/ad2s1200.c (52%) create mode 100644 drivers/input/keyboard/mtk-pmic-keys.c delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c create mode 100644 drivers/regulator/bd71837-regulator.c create mode 100644 drivers/regulator/sy8106a-regulator.c create mode 100644 drivers/scsi/cxlflash/ocxl_hw.c create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h create mode 100644 drivers/scsi/zorro_esp.c create mode 100644 drivers/staging/android/uapi/vsoc_shm.h create mode 100644 drivers/staging/android/vsoc.c create mode 100644 drivers/staging/fbtft/TODO create mode 100644 drivers/staging/fsl-dpaa2/rtc/Makefile create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.c create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.h create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.c create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.h delete mode 100644 drivers/staging/goldfish/goldfish_nand.c delete mode 100644 drivers/staging/goldfish/goldfish_nand_reg.h create mode 100644 drivers/staging/greybus/TODO delete mode 100644 drivers/staging/iio/accel/adis16201.c delete mode 100644 drivers/staging/iio/light/Kconfig delete mode 100644 drivers/staging/iio/light/Makefile delete mode 100644 drivers/staging/iio/light/tsl2x7x.c delete mode 100644 drivers/staging/iio/light/tsl2x7x.h delete mode 100644 drivers/staging/iio/meter/ade7753.c delete mode 100644 drivers/staging/iio/meter/ade7754.c delete mode 100644 drivers/staging/iio/meter/ade7758.h delete mode 100644 drivers/staging/iio/meter/ade7758_core.c delete mode 100644 drivers/staging/iio/meter/ade7758_ring.c delete mode 100644 drivers/staging/iio/meter/ade7758_trigger.c delete mode 100644 drivers/staging/iio/meter/ade7759.c delete mode 100644 drivers/staging/ipx/Kconfig delete mode 100644 drivers/staging/ipx/Makefile delete mode 100644 drivers/staging/ipx/TODO delete mode 100644 drivers/staging/ipx/af_ipx.c delete mode 100644 drivers/staging/ipx/ipx_proc.c delete mode 100644 drivers/staging/ipx/ipx_route.c delete mode 100644 drivers/staging/ipx/pe2.c delete mode 100644 drivers/staging/ipx/sysctl_net_ipx.c delete mode 100644 drivers/staging/ks7010/ks7010_sdio.h delete mode 100644 drivers/staging/lustre/Kconfig delete mode 100644 drivers/staging/lustre/Makefile delete mode 100644 drivers/staging/lustre/README.txt delete mode 100644 drivers/staging/lustre/TODO delete mode 100644 drivers/staging/lustre/include/linux/libcfs/curproc.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_private.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_string.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h delete mode 100644 drivers/staging/lustre/include/linux/lnet/api.h delete mode 100644 drivers/staging/lustre/include/linux/lnet/lib-lnet.h delete mode 100644 drivers/staging/lustre/include/linux/lnet/lib-types.h delete mode 100644 drivers/staging/lustre/include/linux/lnet/socklnd.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/libcfs_debug.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/libcfs_ioctl.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/lnet-dlc.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/lnet-types.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/lnetctl.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/lnetst.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/nidstr.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/socklnd.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_fiemap.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_idl.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_param.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h delete mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_ver.h delete mode 100644 drivers/staging/lustre/lnet/Kconfig delete mode 100644 drivers/staging/lustre/lnet/Makefile delete mode 100644 drivers/staging/lustre/lnet/klnds/Makefile delete mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile delete mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c delete mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h delete mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c delete mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/Makefile delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c delete mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/Makefile delete mode 100644 drivers/staging/lustre/lnet/libcfs/debug.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/fail.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/hash.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/libcfs_lock.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/libcfs_mem.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/libcfs_string.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/module.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/tracefile.c delete mode 100644 drivers/staging/lustre/lnet/libcfs/tracefile.h delete mode 100644 drivers/staging/lustre/lnet/lnet/Makefile delete mode 100644 drivers/staging/lustre/lnet/lnet/acceptor.c delete mode 100644 drivers/staging/lustre/lnet/lnet/api-ni.c delete mode 100644 drivers/staging/lustre/lnet/lnet/config.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-eq.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-md.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-me.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-move.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-msg.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-ptl.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lib-socket.c delete mode 100644 drivers/staging/lustre/lnet/lnet/lo.c delete mode 100644 drivers/staging/lustre/lnet/lnet/module.c delete mode 100644 drivers/staging/lustre/lnet/lnet/net_fault.c delete mode 100644 drivers/staging/lustre/lnet/lnet/nidstrings.c delete mode 100644 drivers/staging/lustre/lnet/lnet/peer.c delete mode 100644 drivers/staging/lustre/lnet/lnet/router.c delete mode 100644 drivers/staging/lustre/lnet/lnet/router_proc.c delete mode 100644 drivers/staging/lustre/lnet/selftest/Makefile delete mode 100644 drivers/staging/lustre/lnet/selftest/brw_test.c delete mode 100644 drivers/staging/lustre/lnet/selftest/conctl.c delete mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.c delete mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.h delete mode 100644 drivers/staging/lustre/lnet/selftest/console.c delete mode 100644 drivers/staging/lustre/lnet/selftest/console.h delete mode 100644 drivers/staging/lustre/lnet/selftest/framework.c delete mode 100644 drivers/staging/lustre/lnet/selftest/module.c delete mode 100644 drivers/staging/lustre/lnet/selftest/ping_test.c delete mode 100644 drivers/staging/lustre/lnet/selftest/rpc.c delete mode 100644 drivers/staging/lustre/lnet/selftest/rpc.h delete mode 100644 drivers/staging/lustre/lnet/selftest/selftest.h delete mode 100644 drivers/staging/lustre/lnet/selftest/timer.c delete mode 100644 drivers/staging/lustre/lnet/selftest/timer.h delete mode 100644 drivers/staging/lustre/lustre/Kconfig delete mode 100644 drivers/staging/lustre/lustre/Makefile delete mode 100644 drivers/staging/lustre/lustre/fid/Makefile delete mode 100644 drivers/staging/lustre/lustre/fid/fid_internal.h delete mode 100644 drivers/staging/lustre/lustre/fid/fid_lib.c delete mode 100644 drivers/staging/lustre/lustre/fid/fid_request.c delete mode 100644 drivers/staging/lustre/lustre/fid/lproc_fid.c delete mode 100644 drivers/staging/lustre/lustre/fld/Makefile delete mode 100644 drivers/staging/lustre/lustre/fld/fld_cache.c delete mode 100644 drivers/staging/lustre/lustre/fld/fld_internal.h delete mode 100644 drivers/staging/lustre/lustre/fld/fld_request.c delete mode 100644 drivers/staging/lustre/lustre/fld/lproc_fld.c delete mode 100644 drivers/staging/lustre/lustre/include/cl_object.h delete mode 100644 drivers/staging/lustre/lustre/include/interval_tree.h delete mode 100644 drivers/staging/lustre/lustre/include/llog_swab.h delete mode 100644 drivers/staging/lustre/lustre/include/lprocfs_status.h delete mode 100644 drivers/staging/lustre/lustre/include/lu_object.h delete mode 100644 drivers/staging/lustre/lustre/include/lu_ref.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_acl.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_compat.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_debug.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_disk.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_dlm.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_dlm_flags.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_errno.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_export.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_fid.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_fld.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_ha.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_handles.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_import.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_intent.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_kernelcomm.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_lib.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_linkea.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_lmv.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_log.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_mdc.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_mds.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_net.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_nrs.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_obdo.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_patchless_compat.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_req_layout.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_sec.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_swab.h delete mode 100644 drivers/staging/lustre/lustre/include/obd.h delete mode 100644 drivers/staging/lustre/lustre/include/obd_cksum.h delete mode 100644 drivers/staging/lustre/lustre/include/obd_class.h delete mode 100644 drivers/staging/lustre/lustre/include/obd_support.h delete mode 100644 drivers/staging/lustre/lustre/include/seq_range.h delete mode 100644 drivers/staging/lustre/lustre/ldlm/interval_tree.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/l_lock.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_request.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c delete mode 100644 drivers/staging/lustre/lustre/llite/Makefile delete mode 100644 drivers/staging/lustre/lustre/llite/dcache.c delete mode 100644 drivers/staging/lustre/lustre/llite/dir.c delete mode 100644 drivers/staging/lustre/lustre/llite/file.c delete mode 100644 drivers/staging/lustre/lustre/llite/glimpse.c delete mode 100644 drivers/staging/lustre/lustre/llite/lcommon_cl.c delete mode 100644 drivers/staging/lustre/lustre/llite/lcommon_misc.c delete mode 100644 drivers/staging/lustre/lustre/llite/llite_internal.h delete mode 100644 drivers/staging/lustre/lustre/llite/llite_lib.c delete mode 100644 drivers/staging/lustre/lustre/llite/llite_mmap.c delete mode 100644 drivers/staging/lustre/lustre/llite/llite_nfs.c delete mode 100644 drivers/staging/lustre/lustre/llite/lproc_llite.c delete mode 100644 drivers/staging/lustre/lustre/llite/namei.c delete mode 100644 drivers/staging/lustre/lustre/llite/range_lock.c delete mode 100644 drivers/staging/lustre/lustre/llite/range_lock.h delete mode 100644 drivers/staging/lustre/lustre/llite/rw.c delete mode 100644 drivers/staging/lustre/lustre/llite/rw26.c delete mode 100644 drivers/staging/lustre/lustre/llite/statahead.c delete mode 100644 drivers/staging/lustre/lustre/llite/super25.c delete mode 100644 drivers/staging/lustre/lustre/llite/symlink.c delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_dev.c delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_internal.h delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_io.c delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_lock.c delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_object.c delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_page.c delete mode 100644 drivers/staging/lustre/lustre/llite/xattr.c delete mode 100644 drivers/staging/lustre/lustre/llite/xattr_cache.c delete mode 100644 drivers/staging/lustre/lustre/llite/xattr_security.c delete mode 100644 drivers/staging/lustre/lustre/lmv/Makefile delete mode 100644 drivers/staging/lustre/lustre/lmv/lmv_fld.c delete mode 100644 drivers/staging/lustre/lustre/lmv/lmv_intent.c delete mode 100644 drivers/staging/lustre/lustre/lmv/lmv_internal.h delete mode 100644 drivers/staging/lustre/lustre/lmv/lmv_obd.c delete mode 100644 drivers/staging/lustre/lustre/lmv/lproc_lmv.c delete mode 100644 drivers/staging/lustre/lustre/lov/Makefile delete mode 100644 drivers/staging/lustre/lustre/lov/lov_cl_internal.h delete mode 100644 drivers/staging/lustre/lustre/lov/lov_dev.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_ea.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_internal.h delete mode 100644 drivers/staging/lustre/lustre/lov/lov_io.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_lock.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_merge.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_obd.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_object.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_offset.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_pack.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_page.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_pool.c delete mode 100644 drivers/staging/lustre/lustre/lov/lov_request.c delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_dev.c delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_lock.c delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_object.c delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_page.c delete mode 100644 drivers/staging/lustre/lustre/lov/lproc_lov.c delete mode 100644 drivers/staging/lustre/lustre/mdc/Makefile delete mode 100644 drivers/staging/lustre/lustre/mdc/lproc_mdc.c delete mode 100644 drivers/staging/lustre/lustre/mdc/mdc_internal.h delete mode 100644 drivers/staging/lustre/lustre/mdc/mdc_lib.c delete mode 100644 drivers/staging/lustre/lustre/mdc/mdc_locks.c delete mode 100644 drivers/staging/lustre/lustre/mdc/mdc_reint.c delete mode 100644 drivers/staging/lustre/lustre/mdc/mdc_request.c delete mode 100644 drivers/staging/lustre/lustre/mgc/Makefile delete mode 100644 drivers/staging/lustre/lustre/mgc/lproc_mgc.c delete mode 100644 drivers/staging/lustre/lustre/mgc/mgc_internal.h delete mode 100644 drivers/staging/lustre/lustre/mgc/mgc_request.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/Makefile delete mode 100644 drivers/staging/lustre/lustre/obdclass/cl_internal.h delete mode 100644 drivers/staging/lustre/lustre/obdclass/cl_io.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/cl_lock.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/cl_object.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/cl_page.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/class_obd.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/debug.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/genops.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/kernelcomm.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/linkea.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_cat.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_internal.h delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_obd.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_swab.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_status.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lu_object.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ref.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_handles.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_peer.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/obd_config.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/obd_mount.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/obdo.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/statfs_pack.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/uuid.c delete mode 100644 drivers/staging/lustre/lustre/obdecho/Makefile delete mode 100644 drivers/staging/lustre/lustre/obdecho/echo_client.c delete mode 100644 drivers/staging/lustre/lustre/obdecho/echo_internal.h delete mode 100644 drivers/staging/lustre/lustre/osc/Makefile delete mode 100644 drivers/staging/lustre/lustre/osc/lproc_osc.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_cache.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_cl_internal.h delete mode 100644 drivers/staging/lustre/lustre/osc/osc_dev.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_internal.h delete mode 100644 drivers/staging/lustre/lustre/osc/osc_io.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_lock.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_object.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_page.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_quota.c delete mode 100644 drivers/staging/lustre/lustre/osc/osc_request.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/Makefile delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/client.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/connection.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/errno.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/events.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/import.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/layout.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_client.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_net.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/niobuf.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/pack_generic.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/pers.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/pinger.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/recover.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_config.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_null.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/service.c delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wiretest.c delete mode 100644 drivers/staging/lustre/sysfs-fs-lustre delete mode 100644 drivers/staging/most/dim2/dim2.h create mode 100644 drivers/staging/mt7621-gpio/mediatek,mt7621-gpio.txt delete mode 100644 drivers/staging/ncpfs/Kconfig delete mode 100644 drivers/staging/ncpfs/Makefile delete mode 100644 drivers/staging/ncpfs/TODO delete mode 100644 drivers/staging/ncpfs/dir.c delete mode 100644 drivers/staging/ncpfs/file.c delete mode 100644 drivers/staging/ncpfs/getopt.c delete mode 100644 drivers/staging/ncpfs/getopt.h delete mode 100644 drivers/staging/ncpfs/inode.c delete mode 100644 drivers/staging/ncpfs/ioctl.c delete mode 100644 drivers/staging/ncpfs/mmap.c delete mode 100644 drivers/staging/ncpfs/ncp_fs.h delete mode 100644 drivers/staging/ncpfs/ncp_fs_i.h delete mode 100644 drivers/staging/ncpfs/ncp_fs_sb.h delete mode 100644 drivers/staging/ncpfs/ncplib_kernel.c delete mode 100644 drivers/staging/ncpfs/ncplib_kernel.h delete mode 100644 drivers/staging/ncpfs/ncpsign_kernel.c delete mode 100644 drivers/staging/ncpfs/ncpsign_kernel.h delete mode 100644 drivers/staging/ncpfs/sock.c delete mode 100644 drivers/staging/ncpfs/symlink.c rename drivers/staging/rtl8723bs/hal/{Hal8723BPwrSeq.c => hal_pwr_seq.c} (86%) rename drivers/staging/rtl8723bs/include/{Hal8723BPhyCfg.h => hal_phy_cfg.h} (84%) rename drivers/staging/rtl8723bs/include/{Hal8723BPhyReg.h => hal_phy_reg_8723b.h} (79%) rename drivers/staging/rtl8723bs/include/{Hal8723BPwrSeq.h => hal_pwr_seq.h} (100%) create mode 100644 drivers/video/backlight/otm3225a.c create mode 100644 drivers/video/backlight/rave-sp-backlight.c create mode 100644 fs/autofs/Kconfig create mode 100644 fs/autofs/Makefile rename fs/{autofs4 => autofs}/autofs_i.h (67%) rename fs/{autofs4 => autofs}/dev-ioctl.c (96%) rename fs/{autofs4 => autofs}/expire.c (79%) rename fs/{autofs4 => autofs}/init.c (77%) rename fs/{autofs4 => autofs}/inode.c (85%) rename fs/{autofs4 => autofs}/root.c (72%) rename fs/{autofs4 => autofs}/symlink.c (59%) rename fs/{autofs4 => autofs}/waitq.c (90%) delete mode 100644 fs/autofs4/Kconfig delete mode 100644 fs/autofs4/Makefile create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h create mode 100644 include/dt-bindings/clock/axg-aoclkc.h create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clock.h create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8998.h create mode 100644 include/dt-bindings/clock/qcom,gcc-sdm845.h create mode 100644 include/dt-bindings/clock/qcom,rpmh.h create mode 100644 include/dt-bindings/clock/qcom,videocc-sdm845.h create mode 100644 include/dt-bindings/clock/r8a77470-cpg-mssr.h create mode 100644 include/dt-bindings/clock/r8a77990-cpg-mssr.h create mode 100644 include/dt-bindings/clock/sun50i-h6-r-ccu.h create mode 100644 include/dt-bindings/reset/axg-aoclkc.h create mode 100644 include/dt-bindings/reset/sun50i-h6-r-ccu.h create mode 100644 include/linux/clk/davinci.h create mode 100644 include/linux/dma/sprd-dma.h rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (98%) create mode 100644 include/linux/memfd.h delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h create mode 100644 include/linux/of_clk.h create mode 100644 include/linux/platform_data/tsl2772.h delete mode 100644 include/linux/ste_modem_shm.h create mode 100644 include/trace/events/rseq.h delete mode 100644 include/uapi/linux/ncp.h delete mode 100644 include/uapi/linux/ncp_fs.h delete mode 100644 include/uapi/linux/ncp_mount.h delete mode 100644 include/uapi/linux/ncp_no.h create mode 100644 include/uapi/linux/rseq.h create mode 100644 include/uapi/linux/types_32_64.h create mode 100644 kernel/iomem.c create mode 100644 kernel/rseq.c create mode 100644 mm/memfd.c create mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-record create mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-report create mode 100644 tools/perf/scripts/python/powerpc-hcalls.py delete mode 100644 tools/perf/util/quote.c delete mode 100644 tools/perf/util/quote.h create mode 100644 tools/testing/selftests/proc/fd-001-lookup.c create mode 100644 tools/testing/selftests/proc/fd-002-posix-eq.c create mode 100644 tools/testing/selftests/proc/fd-003-kthread.c create mode 100644 tools/testing/selftests/proc/proc.h create mode 100644 tools/testing/selftests/rseq/.gitignore create mode 100644 tools/testing/selftests/rseq/Makefile create mode 100644 tools/testing/selftests/rseq/basic_percpu_ops_test.c create mode 100644 tools/testing/selftests/rseq/basic_test.c create mode 100644 tools/testing/selftests/rseq/param_test.c create mode 100644 tools/testing/selftests/rseq/rseq-arm.h create mode 100644 tools/testing/selftests/rseq/rseq-ppc.h create mode 100644 tools/testing/selftests/rseq/rseq-skip.h create mode 100644 tools/testing/selftests/rseq/rseq-x86.h create mode 100644 tools/testing/selftests/rseq/rseq.c create mode 100644 tools/testing/selftests/rseq/rseq.h create mode 100644 tools/testing/selftests/rseq/run_param_test.sh create mode 100644 tools/testing/selftests/sparc64/Makefile create mode 100644 tools/testing/selftests/sparc64/drivers/.gitignore create mode 100644 tools/testing/selftests/sparc64/drivers/Makefile create mode 100644 tools/testing/selftests/sparc64/drivers/adi-test.c create mode 100755 tools/testing/selftests/sparc64/drivers/drivers_test.sh create mode 100755 tools/testing/selftests/sparc64/run.sh Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) $ git merge fixes/master Already up to date. Merging kbuild-current/fixes (c90fca951e90 Merge tag 'powerpc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) $ git merge kbuild-current/fixes Already up to date. Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) $ git merge arc-current/for-curr Already up to date. Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage) $ git merge arm-current/fixes Already up to date. Merging arm64-fixes/for-next/fixes (82034c23fcbc arm64: Make sure permission updates happen for pmd/pud) $ git merge arm64-fixes/for-next/fixes Already up to date. Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) $ git merge m68k-current/for-linus Already up to date. Merging powerpc-fixes/fixes (faf37c44a105 powerpc/64s: Clear PCR on boot) $ git merge powerpc-fixes/fixes Already up to date. Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge sparc/master Already up to date. Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) $ git merge fscrypt-current/for-stable Already up to date. Merging net/master (349b71d6f427 net: dsa: add error handling for pskb_trim_rcsum) $ git merge net/master Merge made by the 'recursive' strategy. net/dsa/tag_trailer.c | 3 ++- net/ipv6/route.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) Merging bpf/master (a343993c518c xsk: silence warning on memory allocation failure) $ git merge bpf/master Merge made by the 'recursive' strategy. kernel/bpf/inode.c | 14 ++++++++++++-- net/xdp/xdp_umem.c | 3 ++- tools/testing/selftests/bpf/Makefile | 4 +--- 3 files changed, 15 insertions(+), 6 deletions(-) Merging ipsec/master (d6990976af7c vti6: fix PMTU caching and reporting on xmit) $ git merge ipsec/master Merge made by the 'recursive' strategy. net/ipv6/ip6_vti.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) Merging netfilter/master (d8e87fc6d11c netfilter: remove include/net/netfilter/nft_dup.h) $ git merge netfilter/master Auto-merging net/netfilter/nft_set_rbtree.c Auto-merging net/netfilter/nf_tables_api.c Auto-merging net/netfilter/ipvs/ip_vs_xmit.c Auto-merging net/netfilter/ipvs/ip_vs_ctl.c Auto-merging net/ipv6/netfilter/ip6_tables.c Auto-merging net/ipv4/netfilter/ip_tables.c Auto-merging net/bridge/netfilter/ebtables.c Removing include/net/netfilter/nft_dup.h Auto-merging include/net/ip_vs.h Merge made by the 'recursive' strategy. include/linux/netfilter/ipset/ip_set_timeout.h | 20 ++++++++++----- include/net/ip_vs.h | 30 ++++++++++++++++++++++ include/net/netfilter/nft_dup.h | 10 -------- include/uapi/linux/netfilter/nf_conntrack_common.h | 2 +- net/bridge/netfilter/ebtables.c | 25 ++++++++++++++---- net/bridge/netfilter/nft_reject_bridge.c | 2 +- net/ipv4/netfilter/ip_tables.c | 1 + net/ipv6/netfilter/ip6_tables.c | 1 + net/netfilter/ipset/ip_set_hash_gen.h | 5 +++- net/netfilter/ipvs/ip_vs_ctl.c | 4 +++ net/netfilter/ipvs/ip_vs_xmit.c | 2 +- net/netfilter/nf_tables_api.c | 11 ++++---- net/netfilter/nft_set_rbtree.c | 2 +- net/netfilter/xt_CT.c | 10 ++++++++ net/netfilter/xt_set.c | 10 ++++---- 15 files changed, 99 insertions(+), 36 deletions(-) delete mode 100644 include/net/netfilter/nft_dup.h Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits) $ git merge ipvs/master Already up to date. Merging wireless-drivers/master (ab1068d6866e iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs) $ git merge wireless-drivers/master Already up to date. Merging mac80211/master (885892fb378d mlx4_core: restore optimal ICM memory allocation) $ git merge mac80211/master Already up to date. Merging rdma-fixes/for-rc (a840c93ca758 IB/core: Fix error code for invalid GID entry) $ git merge rdma-fixes/for-rc Already up to date. Merging sound-current/for-linus (6d531e7b972c ALSA: emu10k1: add error handling for snd_ctl_add) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/pci/emu10k1/emupcm.c | 4 +++- sound/pci/fm801.c | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) Merging sound-asoc-fixes/for-linus (2858e2cfc2ef Merge branch 'asoc-4.17' into asoc-linus) $ git merge sound-asoc-fixes/for-linus Already up to date! Merge made by the 'recursive' strategy. Merging regmap-fixes/for-linus (97fe106a8027 Merge branch 'regmap-4.17' into regmap-linus) $ git merge regmap-fixes/for-linus Already up to date! Merge made by the 'recursive' strategy. Merging regulator-fixes/for-linus (59ce5f3e5530 Merge branch 'regulator-4.17' into regulator-linus) $ git merge regulator-fixes/for-linus Already up to date! Merge made by the 'recursive' strategy. Merging spi-fixes/for-linus (5d3257b8ea48 Merge branch 'spi-4.17' into spi-linus) $ git merge spi-fixes/for-linus Already up to date! Merge made by the 'recursive' strategy. Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) $ git merge pci-current/for-linus Already up to date. Merging driver-core.current/driver-core-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge driver-core.current/driver-core-linus Already up to date. Merging tty.current/tty-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge tty.current/tty-linus Already up to date. Merging usb.current/usb-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge usb.current/usb-linus Already up to date. Merging usb-gadget-fixes/fixes (6d08b06e67cd Linux 4.17-rc2) $ git merge usb-gadget-fixes/fixes Already up to date. Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4) $ git merge usb-serial-fixes/usb-linus Already up to date. Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) $ git merge usb-chipidea-fixes/ci-for-usb-stable Already up to date. Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) $ git merge phy/fixes Already up to date. Merging staging.current/staging-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge staging.current/staging-linus Already up to date. Merging char-misc.current/char-misc-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge char-misc.current/char-misc-linus Already up to date. Merging input-current/for-linus (fc573af632b4 Input: silead - add MSSL0002 ACPI HID) $ git merge input-current/for-linus Merge made by the 'recursive' strategy. drivers/input/touchscreen/silead.c | 1 + 1 file changed, 1 insertion(+) Merging crypto-current/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) $ git merge crypto-current/master Already up to date. Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge ide/master Already up to date. Merging vfio-fixes/for-linus (89c29def6b01 Revert "vfio/type1: Improve memory pinning process for raw PFN mapping") $ git merge vfio-fixes/for-linus Already up to date. Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4) $ git merge kselftest-fixes/fixes Already up to date. Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) $ git merge modules-fixes/modules-linus Already up to date. Merging slave-dma-fixes/fixes (dbad41e7bb5f dmaengine: qcom: bam_dma: check if the runtime pm enabled) $ git merge slave-dma-fixes/fixes Already up to date. Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) $ git merge backlight-fixes/for-backlight-fixes Merge made by the 'recursive' strategy. Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit) $ git merge mtd-fixes/master Already up to date. Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) $ git merge nand-fixes/nand/fixes Already up to date. Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) $ git merge spi-nor-fixes/spi-nor/fixes Already up to date. Merging mfd-fixes/for-mfd-fixes (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy) $ git merge mfd-fixes/for-mfd-fixes Already up to date. Merging v4l-dvb-fixes/fixes (e88f5e9ebd54 media: uvcvideo: Prevent setting unavailable flags) $ git merge v4l-dvb-fixes/fixes Merge made by the 'recursive' strategy. Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) $ git merge reset-fixes/reset/fixes Already up to date. Merging mips-fixes/mips-fixes (d8a9a51afaa9 MIPS: pb44: Fix i2c-gpio GPIO descriptor table) $ git merge mips-fixes/mips-fixes Merge made by the 'recursive' strategy. arch/mips/ath79/mach-pb44.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references") $ git merge omap-fixes/fixes Already up to date. Merging kvm-fixes/master (696ca779a928 KVM: x86: fix #UD address of failed Hyper-V hypercalls) $ git merge kvm-fixes/master Already up to date. Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) $ git merge kvms390-fixes/master Already up to date. Merging hwmon-fixes/hwmon (e373e9f334a2 hwmon: (dell-smm) Disable fan support for Dell XPS13 9333) $ git merge hwmon-fixes/hwmon Merge made by the 'recursive' strategy. drivers/hwmon/dell-smm-hwmon.c | 7 +++++++ 1 file changed, 7 insertions(+) Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4) $ git merge nvdimm-fixes/libnvdimm-fixes Already up to date. Merging btrfs-fixes/next-fixes (3a7e0e2622f6 Merge branch 'misc-4.18' into next-fixes) $ git merge btrfs-fixes/next-fixes Auto-merging fs/btrfs/extent_io.c Merge made by the 'recursive' strategy. fs/btrfs/ctree.h | 2 +- fs/btrfs/extent_io.c | 4 +--- fs/btrfs/inode.c | 26 ++++++++++++-------------- fs/btrfs/ioctl.c | 4 ++++ fs/btrfs/scrub.c | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open") $ git merge vfs-fixes/fixes Merge made by the 'recursive' strategy. Merging dma-mapping-fixes/for-linus (4dc6d8e22728 Revert "iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()") $ git merge dma-mapping-fixes/for-linus Merge made by the 'recursive' strategy. Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference) $ git merge drivers-x86-fixes/fixes Already up to date. Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1) $ git merge samsung-krzk-fixes/fixes Already up to date. Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1) $ git merge pinctrl-samsung-fixes/pinctrl-fixes Already up to date. Merging devicetree-fixes/dt/linus (f130307054a5 dt-bindings: panel: lvds: Fix path to display timing bindings) $ git merge devicetree-fixes/dt/linus Already up to date. Merging scsi-fixes/fixes (3cedc8797b9c scsi: qla2xxx: Mask off Scope bits in retry delay) $ git merge scsi-fixes/fixes Auto-merging drivers/scsi/sd_zbc.c Auto-merging drivers/scsi/qla2xxx/qla_init.c Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c Merge made by the 'recursive' strategy. drivers/scsi/aacraid/commctrl.c | 4 ++-- drivers/scsi/aic7xxx/aic79xx_core.c | 8 ++++---- drivers/scsi/hpsa.c | 10 ++++++++-- drivers/scsi/mpt3sas/mpt3sas_base.c | 1 + drivers/scsi/qla2xxx/qla_init.c | 3 ++- drivers/scsi/qla2xxx/qla_isr.c | 8 ++++++-- drivers/scsi/qla2xxx/qla_mbx.c | 8 ++++++++ drivers/scsi/sd_zbc.c | 2 +- 8 files changed, 32 insertions(+), 12 deletions(-) Merging drm-intel-fixes/for-linux-next-fixes (65b3bdc807ac drm/i915/query: nospec expects no more than an unsigned long) $ git merge drm-intel-fixes/for-linux-next-fixes Already up to date. Merging mmc-fixes/fixes (3de06d5a1f05 mmc: sdhci-iproc: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for cygnus) $ git merge mmc-fixes/fixes Already up to date. Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1) $ git merge rtc-fixes/rtc-fixes Already up to date. Merging drm-misc-fixes/for-linux-next-fixes (889ad63d41ee drm/qxl: Call qxl_bo_unref outside atomic context) $ git merge drm-misc-fixes/for-linux-next-fixes Auto-merging drivers/gpu/drm/qxl/qxl_display.c Merge made by the 'recursive' strategy. drivers/gpu/drm/qxl/qxl_display.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Merging kbuild/for-next (8593080c0fcf kconfig: fix localmodconfig) $ git merge kbuild/for-next Auto-merging init/Kconfig Auto-merging arch/x86/Kconfig Auto-merging arch/powerpc/Kconfig Auto-merging arch/arm64/Kconfig Auto-merging arch/Kconfig Merge made by the 'recursive' strategy. Documentation/kbuild/kconfig-language.txt | 18 +++ Makefile | 147 ++++++------------------ arch/Kconfig | 50 ++++---- arch/arm64/Kconfig | 1 + arch/arm64/Makefile | 6 - arch/powerpc/Kconfig | 18 +-- arch/powerpc/Makefile | 13 +-- arch/powerpc/include/asm/module.h | 2 +- arch/powerpc/kernel/module_64.c | 4 +- arch/powerpc/kernel/trace/ftrace.c | 6 +- arch/powerpc/tools/gcc-check-mprofile-kernel.sh | 1 - arch/sh/include/asm/vmlinux.lds.h | 4 +- arch/x86/Kconfig | 11 +- init/Kconfig | 15 +++ kernel/gcov/Kconfig | 17 +-- kernel/gcov/Makefile | 2 - lib/Kconfig.debug | 11 +- scripts/Kconfig.include | 3 + scripts/Makefile.gcc-plugins | 91 ++++----------- scripts/Makefile.kcov | 10 +- scripts/clang-version.sh | 18 +-- scripts/gcc-plugins/Makefile | 5 +- scripts/gcc-x86_32-has-stack-protector.sh | 7 +- scripts/gcc-x86_64-has-stack-protector.sh | 5 - scripts/kconfig/streamline_config.pl | 4 +- 25 files changed, 167 insertions(+), 302 deletions(-) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) $ git merge leaks/leaks-next Merge made by the 'recursive' strategy. Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) $ git merge uuid/for-next Already up to date. Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask) $ git merge dma-mapping/for-next Already up to date. Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) $ git merge asm-generic/master Already up to date. Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) $ git merge arc/for-next Already up to date. Merging arm/for-next (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus) $ git merge arm/for-next Already up to date. Merging arm-perf/for-next/perf (73acc0315cd7 ARM: mcpm, perf/arm-cci: export mcpm_is_available) $ git merge arm-perf/for-next/perf Already up to date. Merging arm-soc/for-next (c7953e19db50 ARM: Document merges) $ git merge arm-soc/for-next Removing include/linux/platform_data/media/ir-rx51.h Auto-merging drivers/soc/ti/knav_qmss_queue.c Auto-merging drivers/soc/ti/knav_qmss.h Auto-merging drivers/soc/rockchip/pm_domains.c Auto-merging drivers/soc/qcom/Makefile Auto-merging drivers/soc/qcom/Kconfig Auto-merging drivers/of/platform.c Auto-merging drivers/mtd/nand/raw/davinci_nand.c Removing drivers/memory/tegra20-mc.c Auto-merging arch/arm64/configs/defconfig Auto-merging arch/arm64/boot/dts/synaptics/berlin4ct.dtsi Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi Removing arch/arm64/boot/dts/marvell/berlin4ct-stb.dts Removing arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts Auto-merging arch/arm/mach-shmobile/Kconfig Removing arch/arm/mach-omap2/omap-pm.h Removing arch/arm/mach-omap2/omap-pm-noop.c Auto-merging arch/arm/mach-exynos/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig Auto-merging arch/arm/include/asm/cputype.h CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h Auto-merging arch/arm/boot/dts/stm32mp157c.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32mp157c.dtsi Auto-merging arch/arm/boot/dts/stm32mp157-pinctrl.dtsi Removing arch/arm/boot/dts/ste-ccu9540.dts Removing arch/arm/boot/dts/ste-ccu8540.dts Removing arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi Auto-merging arch/arm/boot/dts/imx7s.dtsi Auto-merging arch/arm/boot/dts/imx7d.dtsi Removing arch/arm/boot/dts/exynos5440.dtsi Removing arch/arm/boot/dts/exynos5440-trip-points.dtsi Removing arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi Removing arch/arm/boot/dts/exynos5440-ssdk5440.dts Removing arch/arm/boot/dts/exynos5440-sd5v1.dts Auto-merging arch/arm/boot/dts/armada-38x.dtsi Auto-merging arch/arm/Makefile Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.txt Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt Resolved 'arch/arm/boot/dts/stm32mp157c.dtsi' using previous resolution. Resolved 'arch/arm/include/asm/cputype.h' using previous resolution. Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. Resolved 'arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2935723d08dd] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/OMAP/README | 4 + Documentation/devicetree/bindings/arm/amlogic.txt | 6 + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + .../bindings/arm/samsung/samsung-boards.txt | 2 - Documentation/devicetree/bindings/arm/shmobile.txt | 12 +- .../bindings/arm/tegra/nvidia,tegra30-mc.txt | 18 - Documentation/devicetree/bindings/bus/ti-sysc.txt | 6 +- .../bindings/clock/amlogic,gxbb-clkc.txt | 16 +- .../devicetree/bindings/firmware/qcom,scm.txt | 3 +- .../memory-controllers/nvidia,tegra20-mc.txt | 12 +- .../memory-controllers/nvidia,tegra30-mc.txt | 5 + .../bindings/nvmem/allwinner,sunxi-sid.txt | 1 + .../devicetree/bindings/power/pd-samsung.txt | 20 +- .../bindings/power/renesas,rcar-sysc.txt | 2 + .../bindings/reserved-memory/qcom,cmd-db.txt | 37 + .../devicetree/bindings/reset/renesas,rst.txt | 2 + .../devicetree/bindings/rng/brcm,bcm2835.txt | 9 +- .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 119 + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + .../bindings/soc/rockchip/power_domain.txt | 12 + .../devicetree/bindings/timer/renesas,cmt.txt | 14 +- .../devicetree/bindings/vendor-prefixes.txt | 2 + MAINTAINERS | 3 +- arch/arm/Kconfig | 2 +- arch/arm/Kconfig.debug | 13 +- arch/arm/Makefile | 2 +- arch/arm/arm-soc-for-next-contents.txt | 211 ++ arch/arm/boot/dts/Makefile | 41 +- arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/am335x-bone-common.dtsi | 9 +- arch/arm/boot/dts/am335x-boneblue.dts | 2 +- arch/arm/boot/dts/am335x-evm.dts | 9 +- arch/arm/boot/dts/am335x-evmsk.dts | 12 +- arch/arm/boot/dts/am335x-osd335x-common.dtsi | 124 + arch/arm/boot/dts/am335x-pocketbeagle.dts | 237 ++ arch/arm/boot/dts/am3517-evm.dts | 233 +- arch/arm/boot/dts/am3517-som.dtsi | 142 ++ arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- arch/arm/boot/dts/am437x-sk-evm.dts | 115 + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- arch/arm/boot/dts/am571x-idk.dts | 5 +- arch/arm/boot/dts/am572x-idk.dts | 5 +- arch/arm/boot/dts/am574x-idk.dts | 20 + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 +- arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- arch/arm/boot/dts/am57xx-idk-common.dtsi | 14 +- arch/arm/boot/dts/armada-370-db.dts | 57 +- arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 120 +- arch/arm/boot/dts/armada-370-mirabox.dts | 51 +- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 90 +- arch/arm/boot/dts/armada-370-netgear-rn104.dts | 90 +- arch/arm/boot/dts/armada-370-rd.dts | 52 +- arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 64 +- arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- arch/arm/boot/dts/armada-375-db.dts | 50 +- arch/arm/boot/dts/armada-375.dtsi | 6 +- arch/arm/boot/dts/armada-385-db-ap.dts | 69 +- arch/arm/boot/dts/armada-385-linksys-caiman.dts | 129 +- arch/arm/boot/dts/armada-385-linksys-cobra.dts | 129 +- arch/arm/boot/dts/armada-385-linksys-rango.dts | 141 +- arch/arm/boot/dts/armada-385-linksys-shelby.dts | 129 +- arch/arm/boot/dts/armada-385-linksys.dtsi | 16 +- arch/arm/boot/dts/armada-388-db.dts | 55 +- arch/arm/boot/dts/armada-38x.dtsi | 6 +- arch/arm/boot/dts/armada-390-db.dts | 66 +- arch/arm/boot/dts/armada-395-gp.dts | 74 +- arch/arm/boot/dts/armada-398-db.dts | 60 +- arch/arm/boot/dts/armada-39x.dtsi | 6 +- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 13 + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- arch/arm/boot/dts/armada-xp-db.dts | 2 +- arch/arm/boot/dts/armada-xp-gp.dts | 2 +- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 156 +- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 +- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 18 + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 129 + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 325 +++ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 6 + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 32 + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 6 + arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 159 ++ arch/arm/boot/dts/aspeed-g4.dtsi | 35 + arch/arm/boot/dts/aspeed-g5.dtsi | 47 + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +- arch/arm/boot/dts/at91-sama5d4ek.dts | 4 +- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 + arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 + arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 + arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 - arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 26 +- arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 + arch/arm/boot/dts/bcm283x.dtsi | 1 + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +- arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +- arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 3 +- arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +- arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 15 +- arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +- arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +- arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 13 +- arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +- arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +- arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +- arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +- arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +- arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +- arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +- arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 25 +- arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +- arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +- arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 57 + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +- arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +- arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 77 + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +- arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +- arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +- arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +- arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +- arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 33 +- arch/arm/boot/dts/berlin2.dtsi | 35 +- arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 65 +- arch/arm/boot/dts/berlin2cd-valve-steamlink.dts | 79 + arch/arm/boot/dts/berlin2cd.dtsi | 167 +- arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 33 +- arch/arm/boot/dts/berlin2q.dtsi | 65 +- arch/arm/boot/dts/da850-evm.dts | 298 +-- arch/arm/boot/dts/da850-lego-ev3.dts | 83 +- arch/arm/boot/dts/da850.dtsi | 154 ++ arch/arm/boot/dts/dm8148-t410.dts | 2 +- arch/arm/boot/dts/dra7-evm-common.dtsi | 15 + arch/arm/boot/dts/dra7-evm.dts | 68 + arch/arm/boot/dts/dra7-mmc-iodelay.dtsi | 19 + arch/arm/boot/dts/dra7.dtsi | 32 +- arch/arm/boot/dts/dra71-evm.dts | 17 +- arch/arm/boot/dts/dra72-evm-common.dtsi | 71 +- arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 11 + arch/arm/boot/dts/dra76-evm.dts | 34 +- arch/arm/boot/dts/emev2-kzm9d.dts | 3 - arch/arm/boot/dts/emev2.dtsi | 5 +- arch/arm/boot/dts/exynos-syscon-restart.dtsi | 28 +- arch/arm/boot/dts/exynos3250-rinato.dts | 4 + arch/arm/boot/dts/exynos3250.dtsi | 2 +- arch/arm/boot/dts/exynos4.dtsi | 3 +- arch/arm/boot/dts/exynos4210-origen.dts | 34 +- arch/arm/boot/dts/exynos4210-trats.dts | 4 +- arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 36 +- arch/arm/boot/dts/exynos4412-midas.dtsi | 86 +- arch/arm/boot/dts/exynos4412-n710x.dts | 16 +- arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 33 +- arch/arm/boot/dts/exynos4412-odroidu3.dts | 6 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 6 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412.dtsi | 2 +- arch/arm/boot/dts/exynos5.dtsi | 3 - arch/arm/boot/dts/exynos5250.dtsi | 7 +- arch/arm/boot/dts/exynos5410.dtsi | 1 + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- arch/arm/boot/dts/exynos5420.dtsi | 87 +- arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- arch/arm/boot/dts/exynos5440-sd5v1.dts | 42 - arch/arm/boot/dts/exynos5440-ssdk5440.dts | 81 - arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi | 20 - arch/arm/boot/dts/exynos5440-trip-points.dtsi | 21 - arch/arm/boot/dts/exynos5440.dtsi | 355 --- arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 +- arch/arm/boot/dts/gemini-dlink-dns-313.dts | 19 +- arch/arm/boot/dts/gemini-nas4220b.dts | 20 +- arch/arm/boot/dts/gemini-rut1xx.dts | 12 +- arch/arm/boot/dts/gemini-sq201.dts | 12 +- arch/arm/boot/dts/gemini-wbd111.dts | 17 +- arch/arm/boot/dts/gemini-wbd222.dts | 16 +- arch/arm/boot/dts/gemini.dtsi | 2 - arch/arm/boot/dts/imx1-ads.dts | 11 - arch/arm/boot/dts/imx1.dtsi | 21 +- arch/arm/boot/dts/imx23-evk.dts | 13 +- arch/arm/boot/dts/imx23.dtsi | 13 +- arch/arm/boot/dts/imx25-pdk.dts | 14 +- arch/arm/boot/dts/imx25.dtsi | 16 +- arch/arm/boot/dts/imx27-apf27.dts | 13 +- arch/arm/boot/dts/imx27-pdk.dts | 13 +- arch/arm/boot/dts/imx27.dtsi | 18 +- arch/arm/boot/dts/imx28-cfa10049.dts | 2 - arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 - arch/arm/boot/dts/imx28-evk.dts | 13 +- arch/arm/boot/dts/imx28-tx28.dts | 14 +- arch/arm/boot/dts/imx28.dtsi | 13 +- arch/arm/boot/dts/imx31.dtsi | 13 +- arch/arm/boot/dts/imx35-pdk.dts | 15 +- arch/arm/boot/dts/imx35.dtsi | 14 +- arch/arm/boot/dts/imx50-evk.dts | 17 +- arch/arm/boot/dts/imx50.dtsi | 3 - arch/arm/boot/dts/imx51-babbage.dts | 15 +- arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +- arch/arm/boot/dts/imx51.dtsi | 18 +- arch/arm/boot/dts/imx53-ard.dts | 11 +- arch/arm/boot/dts/imx53-m53.dtsi | 2 - arch/arm/boot/dts/imx53-ppd.dts | 12 +- arch/arm/boot/dts/imx53-qsb-common.dtsi | 15 +- arch/arm/boot/dts/imx53-qsb.dts | 17 +- arch/arm/boot/dts/imx53-qsrb.dts | 15 +- arch/arm/boot/dts/imx53-smd.dts | 20 +- arch/arm/boot/dts/imx53-tx53-x03x.dts | 1 + arch/arm/boot/dts/imx53-tx53.dtsi | 14 +- arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 2 +- arch/arm/boot/dts/imx53.dtsi | 11 +- arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 - arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 +- arch/arm/boot/dts/imx6dl-mamoj.dts | 224 ++ arch/arm/boot/dts/imx6dl-sabreauto.dts | 10 +- arch/arm/boot/dts/imx6dl-sabresd.dts | 10 +- arch/arm/boot/dts/imx6dl-udoo.dts | 6 +- arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 6 +- arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 6 +- arch/arm/boot/dts/imx6dl-wandboard.dts | 6 +- arch/arm/boot/dts/imx6dl.dtsi | 12 +- arch/arm/boot/dts/imx6q-b850v3.dts | 4 - arch/arm/boot/dts/imx6q-ba16.dtsi | 7 +- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 13 +- arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 151 ++ arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 476 ++++ arch/arm/boot/dts/imx6q-gk802.dts | 3 +- arch/arm/boot/dts/imx6q-icore-mipi.dts | 25 + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 31 +- arch/arm/boot/dts/imx6q-kp-tpc.dts | 22 + arch/arm/boot/dts/imx6q-kp.dtsi | 432 ++++ arch/arm/boot/dts/imx6q-novena.dts | 2 - arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- arch/arm/boot/dts/imx6q-sabreauto.dts | 15 +- arch/arm/boot/dts/imx6q-sabresd.dts | 15 +- arch/arm/boot/dts/imx6q-udoo.dts | 6 +- arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 - arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 2 - arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 6 +- arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 6 +- arch/arm/boot/dts/imx6q-wandboard.dts | 6 +- arch/arm/boot/dts/imx6q.dtsi | 39 +- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 - arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 - arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 - arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 52 +- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 47 +- arch/arm/boot/dts/imx6qdl-icore.dtsi | 25 +- arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 15 +- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 3 - arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 18 +- arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi | 1 - arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 3 - arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 +- arch/arm/boot/dts/imx6qdl-udoo.dtsi | 6 +- arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 1 - arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 1 - arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 14 +- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 24 +- arch/arm/boot/dts/imx6qdl.dtsi | 70 +- arch/arm/boot/dts/imx6qp-sabreauto.dts | 44 +- arch/arm/boot/dts/imx6qp-sabresd.dts | 44 +- arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 6 +- arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 5 + arch/arm/boot/dts/imx6qp.dtsi | 44 +- arch/arm/boot/dts/imx6sl-evk.dts | 10 +- arch/arm/boot/dts/imx6sl.dtsi | 34 +- arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 4 +- arch/arm/boot/dts/imx6sx-sabreauto.dts | 427 +++- arch/arm/boot/dts/imx6sx.dtsi | 101 +- arch/arm/boot/dts/imx6ul-14x14-evk.dts | 10 +- arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 - arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +- arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- arch/arm/boot/dts/imx6ul.dtsi | 51 +- arch/arm/boot/dts/imx6ull-pinfunc.h | 9 + arch/arm/boot/dts/imx6ull.dtsi | 2 + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 2 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 6 +- arch/arm/boot/dts/imx7d-pinfunc.h | 6 +- arch/arm/boot/dts/imx7d-sdb-sht11.dts | 44 +- arch/arm/boot/dts/imx7d-sdb.dts | 70 +- arch/arm/boot/dts/imx7d.dtsi | 71 +- arch/arm/boot/dts/imx7s-warp.dts | 4 - arch/arm/boot/dts/imx7s.dtsi | 88 +- arch/arm/boot/dts/keystone-k2g-evm.dts | 26 + arch/arm/boot/dts/logicpd-som-lv.dtsi | 34 + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 10 + arch/arm/boot/dts/meson8.dtsi | 33 +- arch/arm/boot/dts/meson8b-odroidc1.dts | 68 +- arch/arm/boot/dts/meson8b.dtsi | 24 +- arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 244 ++ arch/arm/boot/dts/meson8m2.dtsi | 54 + arch/arm/boot/dts/mt2701-evb.dts | 9 +- arch/arm/boot/dts/mt2701.dtsi | 197 +- arch/arm/boot/dts/mt6323.dtsi | 17 +- arch/arm/boot/dts/mt6580-evbp1.dts | 9 +- arch/arm/boot/dts/mt6580.dtsi | 9 +- arch/arm/boot/dts/mt6589-aquaris5.dts | 10 +- arch/arm/boot/dts/mt6589.dtsi | 12 +- arch/arm/boot/dts/mt6592-evb.dts | 9 +- arch/arm/boot/dts/mt6592.dtsi | 9 +- arch/arm/boot/dts/mt7623.dtsi | 537 ++++- arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 291 +++ arch/arm/boot/dts/mt7623a-rfb-nand.dts | 337 +++ arch/arm/boot/dts/mt7623a.dtsi | 44 + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 279 +-- arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 326 +++ arch/arm/boot/dts/mt7623n-rfb-nand.dts | 40 +- arch/arm/boot/dts/mt7623n-rfb.dtsi | 12 +- arch/arm/boot/dts/mt8127-moose.dts | 9 +- arch/arm/boot/dts/mt8127.dtsi | 9 +- arch/arm/boot/dts/mt8135-evbp1.dts | 9 +- arch/arm/boot/dts/mt8135.dtsi | 9 +- arch/arm/boot/dts/omap2420-n810.dts | 63 +- arch/arm/boot/dts/omap3-beagle-xm.dts | 10 + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 9 +- arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 5 +- arch/arm/boot/dts/omap3-gta04.dtsi | 10 + arch/arm/boot/dts/omap3-pandora-common.dtsi | 12 +- arch/arm/boot/dts/omap3-sb-t35.dtsi | 2 +- arch/arm/boot/dts/pxa3xx.dtsi | 20 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 58 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 10 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 19 + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dts | 9 + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 111 + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 64 + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dts | 25 + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 75 + arch/arm/boot/dts/qcom-ipq4019.dtsi | 178 +- arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 436 ++++ arch/arm/boot/dts/qcom-pm8941.dtsi | 6 + arch/arm/boot/dts/r7s72100.dtsi | 1038 ++++---- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- arch/arm/boot/dts/r8a73a4.dtsi | 10 +- arch/arm/boot/dts/r8a7740.dtsi | 18 + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 5 + arch/arm/boot/dts/r8a7743.dtsi | 19 +- arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 5 + arch/arm/boot/dts/r8a7745.dtsi | 19 +- arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 48 + arch/arm/boot/dts/r8a77470.dtsi | 336 +++ arch/arm/boot/dts/r8a7790-lager.dts | 8 +- arch/arm/boot/dts/r8a7790.dtsi | 67 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 11 +- arch/arm/boot/dts/r8a7791-porter.dts | 8 +- arch/arm/boot/dts/r8a7791.dtsi | 37 +- arch/arm/boot/dts/r8a7792-blanche.dts | 5 + arch/arm/boot/dts/r8a7792-wheat.dts | 16 +- arch/arm/boot/dts/r8a7792.dtsi | 19 +- arch/arm/boot/dts/r8a7793-gose.dts | 11 +- arch/arm/boot/dts/r8a7793.dtsi | 37 +- arch/arm/boot/dts/r8a7794-alt.dts | 14 +- arch/arm/boot/dts/r8a7794-silk.dts | 8 +- arch/arm/boot/dts/r8a7794.dtsi | 28 +- arch/arm/boot/dts/rk3036.dtsi | 2 + arch/arm/boot/dts/rk322x.dtsi | 8 + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 + arch/arm/boot/dts/rk3288-tinker.dts | 4 + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 3 +- arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 + arch/arm/boot/dts/rk3288.dtsi | 20 +- arch/arm/boot/dts/s3c2416-smdk2416.dts | 5 +- arch/arm/boot/dts/s3c2416.dtsi | 11 +- arch/arm/boot/dts/s3c24xx.dtsi | 4 +- arch/arm/boot/dts/s3c6410-mini6410.dts | 3 +- arch/arm/boot/dts/s3c6410-smdk6410.dts | 3 +- arch/arm/boot/dts/s3c64xx.dtsi | 4 +- arch/arm/boot/dts/sh73a0.dtsi | 9 +- arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 -- arch/arm/boot/dts/ste-ccu8540.dts | 94 - arch/arm/boot/dts/ste-ccu9540.dts | 79 - arch/arm/boot/dts/ste-snowball.dts | 10 +- arch/arm/boot/dts/stih407-family.dtsi | 52 +- arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +- arch/arm/boot/dts/stih407.dtsi | 2 +- arch/arm/boot/dts/stih410.dtsi | 18 +- arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 +- arch/arm/boot/dts/stm32f469-disco.dts | 53 +- arch/arm/boot/dts/stm32f469.dtsi | 19 + arch/arm/boot/dts/stm32f746-disco.dts | 8 + arch/arm/boot/dts/stm32f746.dtsi | 36 + arch/arm/boot/dts/stm32f769-disco.dts | 8 + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 + arch/arm/boot/dts/stm32h743.dtsi | 53 + arch/arm/boot/dts/stm32h743i-eval.dts | 8 + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 151 +- arch/arm/boot/dts/stm32mp157c-ed1.dts | 57 +- arch/arm/boot/dts/stm32mp157c-ev1.dts | 87 + arch/arm/boot/dts/stm32mp157c.dtsi | 720 +++++- .../arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts | 37 + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 3 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 33 + arch/arm/boot/dts/sun8i-a33.dtsi | 44 + arch/arm/boot/dts/sun8i-a83t.dtsi | 64 + .../boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts | 13 + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 206 +- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 21 + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 28 + arch/arm/boot/dts/sun8i-h3.dtsi | 32 +- .../boot/dts/sun8i-r16-nintendo-nes-classic.dts | 56 + .../dts/sun8i-r16-nintendo-super-nes-classic.dts | 11 + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 99 +- arch/arm/boot/dts/sun8i-r40.dtsi | 34 + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 215 ++ arch/arm/boot/dts/tegra114.dtsi | 5 + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 6 +- arch/arm/boot/dts/tegra124-apalis.dtsi | 6 +- arch/arm/boot/dts/tegra30.dtsi | 14 + arch/arm/boot/dts/uniphier-pro4.dtsi | 10 +- arch/arm/boot/dts/uniphier-pxs2.dtsi | 3 + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 712 +++--- arch/arm/boot/dts/vexpress-v2m.dtsi | 710 +++--- arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 3 +- arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 9 +- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 5 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 5 +- arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 6 - arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 4 - arch/arm/boot/dts/vf610-zii-dev.dtsi | 4 + arch/arm/boot/dts/vfxxx.dtsi | 2 +- arch/arm/common/Makefile | 1 + arch/arm/common/secure_cntvoff.S | 32 + arch/arm/configs/bcm2835_defconfig | 2 + arch/arm/configs/davinci_all_defconfig | 4 +- arch/arm/configs/exynos_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 9 + arch/arm/configs/multi_v7_defconfig | 12 +- arch/arm/configs/shmobile_defconfig | 3 +- arch/arm/include/asm/cputype.h | 14 +- arch/arm/include/asm/secure_cntvoff.h | 8 + arch/arm/include/debug/brcmstb.S | 21 +- arch/arm/mach-berlin/Kconfig | 6 +- arch/arm/mach-berlin/berlin.c | 5 +- arch/arm/mach-berlin/headsmp.S | 5 +- arch/arm/mach-berlin/platsmp.c | 6 +- arch/arm/mach-davinci/aemif.c | 8 +- arch/arm/mach-davinci/board-da830-evm.c | 1 + arch/arm/mach-davinci/board-da850-evm.c | 1 + arch/arm/mach-davinci/board-dm355-evm.c | 1 + arch/arm/mach-davinci/board-dm355-leopard.c | 1 + arch/arm/mach-davinci/board-dm365-evm.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 3 + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + arch/arm/mach-davinci/board-mityomapl138.c | 1 + arch/arm/mach-davinci/board-neuros-osd2.c | 3 + arch/arm/mach-davinci/board-sffsdr.c | 2 + arch/arm/mach-davinci/davinci.h | 1 + arch/arm/mach-davinci/dm644x.c | 13 +- arch/arm/mach-exynos/Kconfig | 12 - arch/arm/mach-exynos/common.h | 17 +- arch/arm/mach-exynos/exynos.c | 37 +- arch/arm/mach-exynos/include/mach/map.h | 2 - arch/arm/mach-exynos/platsmp.c | 27 +- arch/arm/mach-exynos/pm.c | 4 +- arch/arm/mach-exynos/suspend.c | 4 +- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/mach-mx31_3ds.c | 18 +- arch/arm/mach-imx/mach-mx31lilly.c | 12 +- arch/arm/mach-imx/mach-mx31lite.c | 16 +- arch/arm/mach-imx/mach-mx31moboard.c | 17 +- arch/arm/mach-imx/mach-pca100.c | 13 +- arch/arm/mach-imx/mach-pcm037.c | 13 +- arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- arch/arm/mach-imx/mach-pcm043.c | 13 +- arch/arm/mach-imx/mach-vpr200.c | 9 +- arch/arm/mach-meson/Kconfig | 9 +- arch/arm/mach-meson/meson.c | 1 + arch/arm/mach-omap1/board-ams-delta.c | 107 +- arch/arm/mach-omap1/board-osk.c | 10 +- arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/board-generic.c | 2 - arch/arm/mach-omap2/clockdomain.c | 73 + arch/arm/mach-omap2/clockdomain.h | 8 + arch/arm/mach-omap2/cm33xx.c | 53 + arch/arm/mach-omap2/cminst44xx.c | 43 + arch/arm/mach-omap2/common.h | 18 +- arch/arm/mach-omap2/control.c | 112 + arch/arm/mach-omap2/control.h | 61 + arch/arm/mach-omap2/display.c | 10 +- arch/arm/mach-omap2/hsmmc.c | 1 - arch/arm/mach-omap2/i2c.c | 1 - arch/arm/mach-omap2/io.c | 70 +- arch/arm/mach-omap2/omap-pm-noop.c | 176 -- arch/arm/mach-omap2/omap-pm.h | 161 -- arch/arm/mach-omap2/omap_device.c | 22 +- arch/arm/mach-omap2/omap_hwmod.c | 21 +- arch/arm/mach-omap2/omap_hwmod.h | 6 +- .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 1 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 3 + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 6 + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 1 + arch/arm/mach-omap2/pdata-quirks.c | 15 - arch/arm/mach-omap2/pm-debug.c | 5 - arch/arm/mach-omap2/pm.c | 21 +- arch/arm/mach-omap2/pm33xx-core.c | 4 +- arch/arm/mach-omap2/pm44xx.c | 13 + arch/arm/mach-omap2/powerdomain.c | 87 + arch/arm/mach-omap2/powerdomain.h | 7 + arch/arm/mach-omap2/prm33xx.c | 31 + arch/arm/mach-omap2/prm44xx.c | 104 + arch/arm/mach-omap2/timer.c | 100 +- arch/arm/mach-pxa/pxa3xx.c | 4 + arch/arm/mach-pxa/stargate2.c | 10 +- arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +- arch/arm/mach-shmobile/Kconfig | 13 + arch/arm/mach-shmobile/common.h | 1 - arch/arm/mach-shmobile/headsmp-apmu.S | 22 +- arch/arm/mach-shmobile/setup-rcar-gen2.c | 5 +- arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/headsmp.S | 81 + arch/arm/mach-sunxi/mc_smp.c | 239 +- arch/arm/mach-sunxi/sunxi.c | 20 +- arch/arm/mach-tegra/tegra.c | 4 + arch/arm/mach-ux500/Kconfig | 53 +- arch/arm/mach-ux500/cpu-db8500.c | 16 +- arch/arm/mach-ux500/db8500-regs.h | 4 - arch/arm/mm/cache-b15-rac.c | 30 +- arch/arm/plat-omap/Kconfig | 10 - arch/arm/plat-samsung/adc.c | 3 +- arch/arm/plat-samsung/include/plat/map-s5p.h | 4 - arch/arm64/Kconfig.platforms | 6 + arch/arm64/boot/dts/Makefile | 1 + arch/arm64/boot/dts/allwinner/Makefile | 5 +- arch/arm64/boot/dts/allwinner/axp803.dtsi | 5 + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 21 + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 14 + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 10 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 70 +- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 106 + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 453 +++- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 12 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 16 +- arch/arm64/boot/dts/arm/juno-base.dtsi | 15 +- arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 18 +- arch/arm64/boot/dts/arm/juno-r1.dts | 8 +- arch/arm64/boot/dts/arm/juno-r2.dts | 8 +- arch/arm64/boot/dts/arm/juno.dts | 4 +- arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 4 +- arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 453 ++-- .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 5 +- arch/arm64/boot/dts/broadcom/Makefile | 3 +- .../boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 80 +- arch/arm64/boot/dts/exynos/exynos7.dtsi | 18 +- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 147 ++ .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 38 + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 205 +- arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 8 + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 21 + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 4 + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 14 + arch/arm64/boot/dts/hisilicon/poplar-pinctrl.dtsi | 98 + arch/arm64/boot/dts/marvell/Makefile | 4 - .../boot/dts/marvell/armada-3720-espressobin.dts | 27 + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 6 + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 5 + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 10 + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 70 + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 1 + arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 - arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 66 - arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h | 1123 +++++++++ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 46 + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 11 +- arch/arm64/boot/dts/mediatek/mt7622.dtsi | 99 + arch/arm64/boot/dts/qcom/Makefile | 1 + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 2 +- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 32 +- arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 62 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 313 ++- arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +- .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 17 + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 60 + arch/arm64/boot/dts/qcom/msm8992.dtsi | 87 +- arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi | 276 +++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 110 +- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 15 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 327 +++ arch/arm64/boot/dts/renesas/Makefile | 3 +- .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 46 + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 144 +- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 46 + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 85 + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2499 +++++++++++--------- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 28 + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 28 + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2395 +++++++++++-------- .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 28 + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 28 + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1601 +++++++++---- arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 116 + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 137 ++ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 661 ++++-- arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 81 + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 60 + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 99 +- arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 65 + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 281 +++ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 +- arch/arm64/boot/dts/renesas/r8a77995.dtsi | 730 +++--- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 187 +- arch/arm64/boot/dts/renesas/ulcb.dtsi | 37 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 10 + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 8 +- .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 25 + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 + .../dts/rockchip/rk3399-sapphire-excavator.dts | 12 + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 23 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 36 +- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 5 +- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 3 + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 8 +- arch/arm64/boot/dts/sprd/sc2731.dtsi | 11 + arch/arm64/boot/dts/sprd/sc9860.dtsi | 32 +- arch/arm64/boot/dts/sprd/whale2.dtsi | 55 +- arch/arm64/boot/dts/synaptics/Makefile | 4 + arch/arm64/boot/dts/synaptics/berlin4ct-dmp.dts | 29 + arch/arm64/boot/dts/synaptics/berlin4ct-stb.dts | 29 + .../boot/dts/{marvell => synaptics}/berlin4ct.dtsi | 39 +- arch/arm64/configs/defconfig | 43 +- drivers/bus/Kconfig | 1 - drivers/bus/arm-cci.c | 2 - drivers/bus/hisi_lpc.c | 159 +- drivers/bus/ti-sysc.c | 388 ++- drivers/cpufreq/scmi-cpufreq.c | 4 +- drivers/firmware/arm_scmi/base.c | 43 +- drivers/firmware/arm_scmi/bus.c | 22 +- drivers/firmware/arm_scmi/clock.c | 24 +- drivers/firmware/arm_scmi/common.h | 22 +- drivers/firmware/arm_scmi/driver.c | 109 +- drivers/firmware/arm_scmi/perf.c | 38 +- drivers/firmware/arm_scmi/power.c | 16 +- drivers/firmware/arm_scmi/sensors.c | 20 +- drivers/firmware/qcom_scm.c | 3 + drivers/firmware/ti_sci.c | 10 +- drivers/firmware/ti_sci.h | 30 +- drivers/media/rc/ir-rx51.c | 17 +- drivers/memory/Kconfig | 10 - drivers/memory/Makefile | 1 - drivers/memory/brcmstb_dpfe.c | 42 +- drivers/memory/omap-gpmc.c | 4 +- drivers/memory/tegra/Makefile | 1 + drivers/memory/tegra/mc.c | 362 ++- drivers/memory/tegra/mc.h | 22 + drivers/memory/tegra/tegra114.c | 33 + drivers/memory/tegra/tegra124.c | 48 + drivers/memory/tegra/tegra20.c | 296 +++ drivers/memory/tegra/tegra210.c | 53 +- drivers/memory/tegra/tegra30.c | 35 + drivers/memory/tegra20-mc.c | 254 -- drivers/memory/ti-aemif.c | 60 +- drivers/mtd/nand/raw/davinci_nand.c | 6 +- drivers/of/platform.c | 1 + drivers/reset/reset-uniphier.c | 13 +- drivers/soc/Makefile | 2 +- drivers/soc/imx/gpc.c | 18 +- drivers/soc/imx/gpcv2.c | 22 +- drivers/soc/mediatek/mtk-infracfg.c | 46 +- drivers/soc/mediatek/mtk-pmic-wrap.c | 13 +- drivers/soc/mediatek/mtk-scpsys.c | 167 +- drivers/soc/qcom/Kconfig | 18 + drivers/soc/qcom/Makefile | 2 + drivers/soc/qcom/cmd-db.c | 317 +++ drivers/soc/qcom/qcom-geni-se.c | 748 ++++++ drivers/soc/qcom/qmi_interface.c | 5 +- drivers/soc/qcom/smd-rpm.c | 1 + drivers/soc/qcom/smem.c | 77 +- drivers/soc/renesas/Kconfig | 13 +- drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/r8a77470-sysc.c | 29 + drivers/soc/renesas/r8a77990-sysc.c | 68 + drivers/soc/renesas/r8a77995-sysc.c | 3 +- drivers/soc/renesas/rcar-rst.c | 2 + drivers/soc/renesas/rcar-sysc.c | 6 + drivers/soc/renesas/rcar-sysc.h | 2 + drivers/soc/renesas/renesas-soc.c | 16 + drivers/soc/rockchip/pm_domains.c | 117 +- drivers/soc/samsung/pm_domains.c | 90 +- drivers/soc/ti/knav_qmss.h | 14 +- drivers/soc/ti/knav_qmss_queue.c | 60 +- include/dt-bindings/memory/tegra114-mc.h | 17 + include/dt-bindings/memory/tegra124-mc.h | 25 + include/dt-bindings/memory/tegra20-mc.h | 21 + include/dt-bindings/memory/tegra210-mc.h | 31 + include/dt-bindings/memory/tegra30-mc.h | 19 + include/dt-bindings/power/px30-power.h | 27 + include/dt-bindings/power/r8a77470-sysc.h | 22 + include/dt-bindings/power/r8a77990-sysc.h | 26 + include/dt-bindings/power/rk3036-power.h | 13 + include/dt-bindings/power/rk3128-power.h | 14 + include/dt-bindings/power/rk3228-power.h | 21 + include/linux/platform_data/media/ir-rx51.h | 9 - include/linux/platform_data/mtd-davinci.h | 10 + include/linux/platform_data/spi-imx.h | 29 +- include/linux/platform_data/ti-aemif.h | 25 + include/linux/platform_data/ti-sysc.h | 1 + include/linux/qcom-geni-se.h | 425 ++++ include/linux/scmi_protocol.h | 18 +- include/linux/soc/qcom/smem.h | 2 + include/linux/soc/ti/ti_sci_protocol.h | 10 +- include/soc/qcom/cmd-db.h | 45 + include/soc/tegra/cpuidle.h | 2 +- include/soc/tegra/mc.h | 37 +- sound/soc/omap/ams-delta.c | 38 +- 734 files changed, 29989 insertions(+), 11702 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt create mode 100644 arch/arm/arm-soc-for-next-contents.txt create mode 100644 arch/arm/boot/dts/am335x-osd335x-common.dtsi create mode 100644 arch/arm/boot/dts/am335x-pocketbeagle.dts create mode 100644 arch/arm/boot/dts/am3517-som.dtsi create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts create mode 100644 arch/arm/boot/dts/berlin2cd-valve-steamlink.dts create mode 100644 arch/arm/boot/dts/dra7-mmc-iodelay.dtsi delete mode 100644 arch/arm/boot/dts/exynos5440-sd5v1.dts delete mode 100644 arch/arm/boot/dts/exynos5440-ssdk5440.dts delete mode 100644 arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi delete mode 100644 arch/arm/boot/dts/exynos5440-trip-points.dtsi delete mode 100644 arch/arm/boot/dts/exynos5440.dtsi create mode 100644 arch/arm/boot/dts/imx6dl-mamoj.dts create mode 100644 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts create mode 100644 arch/arm/boot/dts/imx6q-dhcom-som.dtsi create mode 100644 arch/arm/boot/dts/imx6q-icore-mipi.dts create mode 100644 arch/arm/boot/dts/imx6q-kp-tpc.dts create mode 100644 arch/arm/boot/dts/imx6q-kp.dtsi create mode 100644 arch/arm/boot/dts/meson8m2-mxiii-plus.dts create mode 100644 arch/arm/boot/dts/meson8m2.dtsi create mode 100644 arch/arm/boot/dts/mt7623a-rfb-emmc.dts create mode 100644 arch/arm/boot/dts/mt7623a-rfb-nand.dts create mode 100644 arch/arm/boot/dts/mt7623a.dtsi create mode 100644 arch/arm/boot/dts/mt7623n-rfb-emmc.dts create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dts create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dts create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts create mode 100644 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts create mode 100644 arch/arm/boot/dts/r8a77470.dtsi delete mode 100644 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi delete mode 100644 arch/arm/boot/dts/ste-ccu8540.dts delete mode 100644 arch/arm/boot/dts/ste-ccu9540.dts create mode 100644 arch/arm/boot/dts/stm32f469.dtsi create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-super-nes-classic.dts create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi create mode 100644 arch/arm/common/secure_cntvoff.S create mode 100644 arch/arm/include/asm/secure_cntvoff.h delete mode 100644 arch/arm/mach-omap2/omap-pm-noop.c delete mode 100644 arch/arm/mach-omap2/omap-pm.h create mode 100644 arch/arm/mach-sunxi/headsmp.S create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts create mode 100644 arch/arm64/boot/dts/hisilicon/poplar-pinctrl.dtsi delete mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts delete mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h create mode 100644 arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sdm845-mtp.dts create mode 100644 arch/arm64/boot/dts/qcom/sdm845.dtsi create mode 100644 arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts create mode 100644 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts create mode 100644 arch/arm64/boot/dts/renesas/r8a77990.dtsi create mode 100644 arch/arm64/boot/dts/synaptics/Makefile create mode 100644 arch/arm64/boot/dts/synaptics/berlin4ct-dmp.dts create mode 100644 arch/arm64/boot/dts/synaptics/berlin4ct-stb.dts rename arch/arm64/boot/dts/{marvell => synaptics}/berlin4ct.dtsi (78%) create mode 100644 drivers/memory/tegra/tegra20.c delete mode 100644 drivers/memory/tegra20-mc.c create mode 100644 drivers/soc/qcom/cmd-db.c create mode 100644 drivers/soc/qcom/qcom-geni-se.c create mode 100644 drivers/soc/renesas/r8a77470-sysc.c create mode 100644 drivers/soc/renesas/r8a77990-sysc.c create mode 100644 include/dt-bindings/memory/tegra20-mc.h create mode 100644 include/dt-bindings/power/px30-power.h create mode 100644 include/dt-bindings/power/r8a77470-sysc.h create mode 100644 include/dt-bindings/power/r8a77990-sysc.h create mode 100644 include/dt-bindings/power/rk3036-power.h create mode 100644 include/dt-bindings/power/rk3128-power.h create mode 100644 include/dt-bindings/power/rk3228-power.h delete mode 100644 include/linux/platform_data/media/ir-rx51.h create mode 100644 include/linux/qcom-geni-se.h create mode 100644 include/soc/qcom/cmd-db.h Merging actions/for-next (7858428186db Merge branch 'v4.19/drivers' into next) $ git merge actions/for-next Auto-merging drivers/soc/actions/owl-sps.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 1 + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 3 +-- arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 3 +-- arch/arm/boot/dts/owl-s500-guitar.dtsi | 3 +-- arch/arm/boot/dts/owl-s500.dtsi | 3 +-- arch/arm64/boot/dts/actions/Makefile | 2 ++ arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 3 +-- arch/arm64/boot/dts/actions/s900.dtsi | 3 +-- drivers/soc/actions/Makefile | 2 ++ drivers/soc/actions/owl-sps-helper.c | 6 +----- drivers/soc/actions/owl-sps.c | 6 +----- 11 files changed, 13 insertions(+), 22 deletions(-) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) $ git merge alpine/alpine/for-next Already up to date. Merging amlogic/for-next (45fa06a21334 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild) $ git merge amlogic/for-next Merge made by the 'recursive' strategy. arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 12 +++++++++--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 -------- 5 files changed, 18 insertions(+), 16 deletions(-) Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) $ git merge aspeed/for-next Already up to date! Merge made by the 'recursive' strategy. Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) $ git merge at91/at91-next Already up to date! Merge made by the 'recursive' strategy. Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) $ git merge bcm2835/for-next Already up to date! Merge made by the 'recursive' strategy. Merging imx-mxs/for-next (452daaaf6021 Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Already up to date! Merge made by the 'recursive' strategy. Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) $ git merge keystone/next Already up to date! Merge made by the 'recursive' strategy. Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next) $ git merge mediatek/for-next Already up to date! Merge made by the 'recursive' strategy. Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next) $ git merge mvebu/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next) $ git merge omap/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/dra7.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) $ git merge reset/reset/next Already up to date. Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1()) $ git merge qcom/for-next Merge made by the 'recursive' strategy. Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) $ git merge realtek/for-next Already up to date! Merge made by the 'recursive' strategy. Merging renesas/next (550ca2e6c090 Merge branch 'fixes-for-v4.18' into next) $ git merge renesas/next Merge made by the 'recursive' strategy. drivers/soc/renesas/rcar-sysc.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) Merging rockchip/for-next (42568f346f65 Merge branch 'v4.18-clk/next' into for-next) $ git merge rockchip/for-next Already up to date! Merge made by the 'recursive' strategy. Merging samsung/for-next (bebc6082da0a Linux 4.14) $ git merge samsung/for-next Already up to date. Merging samsung-krzk/for-next (fba97222728d Merge branch 'next/dt64' into for-next) $ git merge samsung-krzk/for-next Merge made by the 'recursive' strategy. Merging sunxi/sunxi/for-next (e97360054391 Merge branch 'sunxi/dt64-for-4.18' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Auto-merging drivers/clk/Makefile Merge made by the 'recursive' strategy. arch/arm64/boot/dts/allwinner/Makefile | 1 + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 188 +++++++++++++++++++++ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 12 ++ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 ++ drivers/clk/Makefile | 2 +- drivers/clk/sunxi-ng/Makefile | 39 ++--- 6 files changed, 229 insertions(+), 25 deletions(-) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next) $ git merge tegra/for-next Already up to date! Merge made by the 'recursive' strategy. Merging arm64/for-next/core (0fe42512b2f0 arm64: Fix syscall restarting around signal suppressed by tracer) $ git merge arm64/for-next/core Already up to date. Merging clk/clk-next (55913c2d3330 Merge branch 'clk-imx6ul' into clk-next) $ git merge clk/clk-next Already up to date. Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) $ git merge clk-samsung/for-next Merge made by the 'recursive' strategy. Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse) $ git merge c6x/for-linux-next Already up to date. Merging m68k/for-next (b12c8a70643f m68k: Set default dma mask for platform devices) $ git merge m68k/for-next Already up to date. Merging m68knommu/for-next (082f55c45984 m68k: fix ColdFire PCI config reads and writes) $ git merge m68knommu/for-next Already up to date. Merging microblaze/next (4dd50c514486 microblaze: Remove architecture heart beat code) $ git merge microblaze/next Removing arch/microblaze/kernel/heartbeat.c Merge made by the 'recursive' strategy. arch/microblaze/Kconfig.debug | 7 ---- arch/microblaze/include/asm/setup.h | 3 -- arch/microblaze/kernel/Makefile | 2 -- arch/microblaze/kernel/heartbeat.c | 72 ------------------------------------- arch/microblaze/kernel/timer.c | 7 ---- 5 files changed, 91 deletions(-) delete mode 100644 arch/microblaze/kernel/heartbeat.c Merging mips/mips-next (9ed8b56b80c1 MAINTAINERS: Add Paul Burton as MIPS co-maintainer) $ git merge mips/mips-next Auto-merging lib/Makefile Auto-merging lib/Kconfig Auto-merging arch/riscv/Kconfig Removing arch/mips/lib/ucmpdi2.c Removing arch/mips/lib/lshrdi3.c Removing arch/mips/lib/cmpdi2.c Removing arch/mips/lib/ashrdi3.c Removing arch/mips/lib/ashldi3.c Auto-merging arch/mips/kernel/ptrace32.c Auto-merging arch/mips/kernel/ptrace.c Auto-merging arch/mips/boot/dts/xilfpga/Makefile CONFLICT (content): Merge conflict in arch/mips/boot/dts/xilfpga/Makefile Auto-merging arch/mips/boot/dts/ingenic/jz4780.dtsi Auto-merging arch/mips/Kconfig Auto-merging MAINTAINERS Resolved 'arch/mips/boot/dts/xilfpga/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c3c112eed5eb] Merge remote-tracking branch 'mips/mips-next' $ git diff -M --stat --summary HEAD^.. .../bindings/watchdog/ingenic,jz4740-wdt.txt | 7 +- MAINTAINERS | 2 + arch/mips/Kconfig | 5 ++ arch/mips/bcm47xx/board.c | 2 + arch/mips/bcm47xx/buttons.c | 9 +++ arch/mips/bcm47xx/leds.c | 11 ++- arch/mips/boot/compressed/Makefile | 11 ++- arch/mips/boot/dts/brcm/Makefile | 2 +- arch/mips/boot/dts/cavium-octeon/Makefile | 2 +- arch/mips/boot/dts/ingenic/Makefile | 2 +- arch/mips/boot/dts/ingenic/jz4740.dtsi | 8 ++ arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +- arch/mips/boot/dts/lantiq/Makefile | 2 +- arch/mips/boot/dts/mscc/Makefile | 2 +- arch/mips/boot/dts/mscc/ocelot.dtsi | 88 +++++++++++++++++++++ arch/mips/boot/dts/mscc/ocelot_pcb123.dts | 20 +++++ arch/mips/boot/dts/mti/Makefile | 2 +- arch/mips/boot/dts/netlogic/Makefile | 2 +- arch/mips/boot/dts/pic32/Makefile | 2 +- arch/mips/boot/dts/ralink/Makefile | 2 +- arch/mips/configs/qi_lb60_defconfig | 2 + arch/mips/dec/time.c | 12 +-- arch/mips/include/asm/cpu-features.h | 7 ++ arch/mips/include/asm/cpu.h | 2 + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + arch/mips/include/asm/mach-jz4740/platform.h | 1 - arch/mips/include/asm/mc146818-time.h | 4 +- arch/mips/include/asm/mipsregs.h | 5 ++ arch/mips/include/asm/time.h | 9 --- arch/mips/jz4740/platform.c | 16 ---- arch/mips/jz4740/reset.c | 31 -------- arch/mips/kernel/cpu-probe.c | 12 +++ arch/mips/kernel/perf_event_mipsxx.c | 91 ++++++++++------------ arch/mips/kernel/ptrace.c | 4 +- arch/mips/kernel/ptrace32.c | 4 +- arch/mips/kernel/time.c | 15 ---- arch/mips/kernel/vpe.c | 2 +- arch/mips/lasat/ds1603.c | 11 ++- arch/mips/lasat/sysctl.c | 12 ++- arch/mips/lib/Makefile | 3 +- arch/mips/lib/ashldi3.c | 30 ------- arch/mips/lib/ashrdi3.c | 32 -------- arch/mips/lib/cmpdi2.c | 28 ------- arch/mips/lib/lshrdi3.c | 30 ------- arch/mips/lib/memset.S | 28 +++---- arch/mips/lib/ucmpdi2.c | 22 ------ arch/mips/loongson64/common/time.c | 2 +- arch/mips/mm/sc-debugfs.c | 9 +-- arch/mips/mti-malta/malta-time.c | 2 +- arch/mips/oprofile/op_model_mipsxx.c | 2 - arch/mips/sibyte/swarm/rtc_m41t81.c | 8 +- arch/mips/sibyte/swarm/rtc_xicor1241.c | 8 +- arch/mips/sibyte/swarm/setup.c | 18 +++-- arch/mips/sni/time.c | 6 -- arch/riscv/Kconfig | 6 +- drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- drivers/watchdog/jz4740_wdt.c | 42 ++++------ lib/Kconfig | 12 +-- lib/Makefile | 12 +-- lib/ucmpdi2.c | 2 +- 60 files changed, 339 insertions(+), 392 deletions(-) delete mode 100644 arch/mips/lib/ashldi3.c delete mode 100644 arch/mips/lib/ashrdi3.c delete mode 100644 arch/mips/lib/cmpdi2.c delete mode 100644 arch/mips/lib/lshrdi3.c delete mode 100644 arch/mips/lib/ucmpdi2.c Merging nds32/next (e5dd7e2f8a59 nds32: define __NDS32_E[BL]__ for sparse) $ git merge nds32/next Merge made by the 'recursive' strategy. arch/nds32/Makefile | 2 ++ 1 file changed, 2 insertions(+) Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) $ git merge nios2/for-next Already up to date. Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) $ git merge openrisc/for-next Already up to date. Merging parisc-hd/for-next (8d40c754fbac parisc: Drop struct sigaction from not exported header file) $ git merge parisc-hd/for-next Auto-merging arch/parisc/Makefile Merge made by the 'recursive' strategy. arch/parisc/Makefile | 4 ---- arch/parisc/include/asm/signal.h | 8 -------- 2 files changed, 12 deletions(-) Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap) $ git merge powerpc/next Already up to date. Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions) $ git merge powerpc-pkey/topic/pkey Already up to date. Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) $ git merge fsl/next Already up to date. Merging risc-v/for-next (29dcea88779c Linux 4.17) $ git merge risc-v/for-next Already up to date. Merging s390/features (1e2f71102a17 Merge tag 'vfio-ccw-20180529' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features) $ git merge s390/features Auto-merging arch/s390/Kconfig Merge made by the 'recursive' strategy. arch/s390/Kconfig | 3 + drivers/s390/cio/Makefile | 1 + drivers/s390/cio/vfio_ccw_cp.c | 140 ++++++++++++++++++++------------------ drivers/s390/cio/vfio_ccw_drv.c | 5 +- drivers/s390/cio/vfio_ccw_fsm.c | 17 ++++- drivers/s390/cio/vfio_ccw_trace.h | 54 +++++++++++++++ 6 files changed, 153 insertions(+), 67 deletions(-) create mode 100644 drivers/s390/cio/vfio_ccw_trace.h Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge sparc-next/master Already up to date. Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) $ git merge sh/for-next Already up to date. Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options) $ git merge uml/linux-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 3 +-- arch/um/drivers/vector_kern.c | 20 ++++++++++++++------ arch/um/include/asm/common.lds.S | 6 ------ arch/um/include/shared/init.h | 5 ----- arch/um/os-Linux/main.c | 12 ------------ 5 files changed, 15 insertions(+), 31 deletions(-) Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) $ git merge xtensa/xtensa-for-next Auto-merging arch/xtensa/kernel/pci-dma.c Merge made by the 'recursive' strategy. arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) $ git merge fscrypt/master Already up to date. Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) $ git merge befs/for-next Merge made by the 'recursive' strategy. fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 46 deletions(-) Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) $ git merge btrfs/next Auto-merging kernel/cgroup/cgroup.c Auto-merging include/linux/fs.h Auto-merging include/linux/buffer_head.h Auto-merging include/linux/backing-dev.h Auto-merging fs/ext4/super.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext2/super.c Auto-merging fs/ext2/inode.c Auto-merging fs/buffer.c Auto-merging fs/btrfs/super.c Auto-merging fs/btrfs/ioctl.c Auto-merging fs/btrfs/inode.c Auto-merging fs/btrfs/disk-io.c Auto-merging fs/btrfs/check-integrity.c Auto-merging fs/block_dev.c Auto-merging block/blk-cgroup.c Merge made by the 'recursive' strategy. block/blk-cgroup.c | 1 + fs/block_dev.c | 3 +-- fs/btrfs/check-integrity.c | 2 +- fs/btrfs/disk-io.c | 4 ++++ fs/btrfs/inode.c | 15 ++++++++++++--- fs/btrfs/ioctl.c | 8 +++++++- fs/btrfs/super.c | 1 - fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- fs/ext2/inode.c | 3 ++- fs/ext2/super.c | 1 - fs/ext4/inode.c | 4 +++- fs/ext4/super.c | 2 -- include/linux/backing-dev.h | 2 +- include/linux/buffer_head.h | 3 +++ include/linux/fs.h | 3 ++- kernel/cgroup/cgroup.c | 1 + 16 files changed, 72 insertions(+), 23 deletions(-) $ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch Applying: f2fs: fixup for cgroup/writeback change $ git reset HEAD^ Unstaged changes after reset: M fs/f2fs/inode.c M fs/f2fs/super.c $ git add -A . $ git commit -v -a --amend [master 3147a57da424] Merge remote-tracking branch 'btrfs/next' Date: Tue Jun 12 08:57:55 2018 +1000 Merging btrfs-kdave/for-next (e4eada7b2b40 Merge branch 'for-next-current-v4.17-20180608' into for-next-20180608) $ git merge btrfs-kdave/for-next Auto-merging fs/btrfs/super.c Auto-merging fs/btrfs/inode.c Merge made by the 'recursive' strategy. fs/btrfs/inode.c | 26 -------------------------- fs/btrfs/super.c | 1 - 2 files changed, 27 deletions(-) Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered) $ git merge ceph/master Auto-merging net/ceph/osd_client.c Auto-merging drivers/block/rbd.c Merge made by the 'recursive' strategy. Documentation/filesystems/ceph.txt | 8 +- drivers/block/rbd.c | 11 +- fs/ceph/addr.c | 1 - fs/ceph/caps.c | 160 ++++++++++++++++----------- fs/ceph/dir.c | 2 + fs/ceph/file.c | 1 - fs/ceph/inode.c | 67 +++++++----- fs/ceph/super.c | 35 ++++-- fs/ceph/xattr.c | 60 ++++++----- include/linux/ceph/ceph_fs.h | 1 + include/linux/ceph/osd_client.h | 8 +- include/linux/ceph/osdmap.h | 8 +- net/ceph/messenger.c | 31 ++---- net/ceph/osd_client.c | 216 ++++++++++++++++++++++--------------- net/ceph/osdmap.c | 19 ++-- 15 files changed, 372 insertions(+), 256 deletions(-) Merging cifs/for-next (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge cifs/for-next Already up to date. Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) $ git merge configfs/for-next Already up to date. Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) $ git merge ecryptfs/next Already up to date. Merging ext3/for_next (20b67d6401f1 Merge fsnotify cleanups from Amir into for_next.) $ git merge ext3/for_next Auto-merging kernel/auditsc.c Auto-merging kernel/audit_watch.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging fs/inode.c Resolved 'include/linux/fs.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 59d1aa484cfa] Merge remote-tracking branch 'ext3/for_next' $ git diff -M --stat --summary HEAD^.. fs/inode.c | 2 +- fs/mount.h | 11 ++- fs/notify/dnotify/dnotify.c | 16 ++-- fs/notify/fanotify/fanotify.c | 46 +++++----- fs/notify/fanotify/fanotify_user.c | 98 ++++++++------------- fs/notify/fdinfo.c | 12 +-- fs/notify/fsnotify.c | 160 ++++++++++++++++++++--------------- fs/notify/fsnotify.h | 14 +-- fs/notify/group.c | 2 +- fs/notify/inotify/inotify.h | 2 - fs/notify/inotify/inotify_fsnotify.c | 6 +- fs/notify/inotify/inotify_user.c | 16 ++-- fs/notify/mark.c | 140 ++++++++++++++---------------- include/linux/fs.h | 20 +++-- include/linux/fsnotify_backend.h | 109 +++++++++++++++++++----- include/linux/fsnotify_obj.h | 18 ++++ kernel/audit_fsnotify.c | 5 +- kernel/audit_tree.c | 22 +++-- kernel/audit_watch.c | 7 +- kernel/auditsc.c | 4 +- 20 files changed, 396 insertions(+), 314 deletions(-) create mode 100644 include/linux/fsnotify_obj.h Merging ext4/dev (4f2f76f75143 ext4: fix fencepost error in check for inode count overflow during resize) $ git merge ext4/dev Already up to date. Merging f2fs/dev (d54d35c501bc Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) $ git merge f2fs/dev Already up to date. Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().) $ git merge fuse/for-next Already up to date. Merging jfs/jfs-next (92d34134193e jfs: Fix inconsistency between memory allocation and ea_buf->max_size) $ git merge jfs/jfs-next Merge made by the 'recursive' strategy. fs/jfs/xattr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Merging nfs/linux-next (f9312a541050 NFSv4.1: Fix the client behaviour on NFS4ERR_SEQ_FALSE_RETRY) $ git merge nfs/linux-next Auto-merging fs/nfs/client.c Merge made by the 'recursive' strategy. fs/nfs/callback_proc.c | 43 ++-- fs/nfs/client.c | 3 +- fs/nfs/delegation.c | 86 +++++-- fs/nfs/dir.c | 51 +++- fs/nfs/export.c | 2 +- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + fs/nfs/inode.c | 126 +++++++--- fs/nfs/nfs3proc.c | 13 +- fs/nfs/nfs42proc.c | 6 +- fs/nfs/nfs4_fs.h | 27 +- fs/nfs/nfs4idmap.c | 5 +- fs/nfs/nfs4proc.c | 391 +++++++++++++---------------- fs/nfs/nfs4state.c | 8 + fs/nfs/nfs4xdr.c | 65 ++++- fs/nfs/pnfs.c | 325 +++++++++++++++++++++--- fs/nfs/pnfs.h | 28 ++- fs/nfs/proc.c | 13 +- fs/nfs/unlink.c | 20 +- fs/nfs/write.c | 10 +- include/linux/nfs_fs_sb.h | 2 + include/linux/nfs_xdr.h | 15 +- include/linux/rculist.h | 13 + include/linux/sunrpc/rpc_rdma.h | 1 + include/linux/sunrpc/xprt.h | 6 +- include/linux/sunrpc/xprtrdma.h | 1 + include/trace/events/rpcrdma.h | 76 ++++-- net/sunrpc/clnt.c | 1 + net/sunrpc/xprt.c | 17 +- net/sunrpc/xprtrdma/backchannel.c | 105 +++----- net/sunrpc/xprtrdma/fmr_ops.c | 23 ++ net/sunrpc/xprtrdma/frwr_ops.c | 31 ++- net/sunrpc/xprtrdma/module.c | 1 + net/sunrpc/xprtrdma/rpc_rdma.c | 66 ++--- net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 + net/sunrpc/xprtrdma/transport.c | 64 +++-- net/sunrpc/xprtrdma/verbs.c | 291 +++++++++------------ net/sunrpc/xprtrdma/xprt_rdma.h | 26 +- net/sunrpc/xprtsock.c | 4 + 38 files changed, 1236 insertions(+), 731 deletions(-) Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) $ git merge nfs-anna/linux-next Merge made by the 'recursive' strategy. Merging nfsd/nfsd-next (fdfeda224cb7 nfsd: update obselete comment referencing the BKL) $ git merge nfsd/nfsd-next Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h Auto-merging net/sunrpc/xprtrdma/verbs.c Auto-merging net/sunrpc/xprtrdma/transport.c Auto-merging net/sunrpc/xprtrdma/svc_rdma_backchannel.c Auto-merging net/sunrpc/xprtrdma/rpc_rdma.c Auto-merging net/sunrpc/xprtrdma/module.c Auto-merging net/sunrpc/xprtrdma/frwr_ops.c Auto-merging net/sunrpc/xprtrdma/fmr_ops.c Auto-merging net/sunrpc/xprtrdma/backchannel.c Auto-merging include/trace/events/rpcrdma.h Auto-merging fs/nfsd/blocklayout.c Merge made by the 'recursive' strategy. fs/nfsd/blocklayout.c | 18 +- fs/nfsd/cache.h | 5 - fs/nfsd/netns.h | 1 + fs/nfsd/nfs4proc.c | 4 + fs/nfsd/nfs4state.c | 56 ++- fs/nfsd/nfs4xdr.c | 47 ++- fs/nfsd/nfscache.c | 6 +- fs/nfsd/nfsctl.c | 5 +- fs/nfsd/nfsd.h | 1 + include/linux/nfs4.h | 8 + include/linux/sunrpc/svc_rdma.h | 95 ++--- include/trace/events/rpcrdma.h | 584 ++++++++++++++++++++++++++++- net/sunrpc/auth_gss/gss_rpc_upcall.c | 4 +- net/sunrpc/xprtrdma/backchannel.c | 2 + net/sunrpc/xprtrdma/fmr_ops.c | 3 + net/sunrpc/xprtrdma/frwr_ops.c | 2 + net/sunrpc/xprtrdma/module.c | 4 +- net/sunrpc/xprtrdma/rpc_rdma.c | 7 +- net/sunrpc/xprtrdma/svc_rdma.c | 3 +- net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 54 ++- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 439 ++++++++++++++++------ net/sunrpc/xprtrdma/svc_rdma_rw.c | 133 +++---- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 510 ++++++++++++++++--------- net/sunrpc/xprtrdma/svc_rdma_transport.c | 481 ++++-------------------- net/sunrpc/xprtrdma/transport.c | 4 + net/sunrpc/xprtrdma/verbs.c | 1 + net/sunrpc/xprtrdma/xprt_rdma.h | 2 - 27 files changed, 1583 insertions(+), 896 deletions(-) Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.) $ git merge orangefs/for-next Already up to date. Merging overlayfs/overlayfs-next (c03e30790cad ovl: Enable metadata only feature) $ git merge overlayfs/overlayfs-next Auto-merging include/uapi/linux/fs.h Auto-merging include/linux/fs.h Auto-merging fs/xfs/xfs_file.c Auto-merging fs/xattr.c Auto-merging fs/read_write.c CONFLICT (content): Merge conflict in fs/read_write.c Auto-merging fs/ocfs2/file.c Auto-merging fs/namespace.c Auto-merging fs/namei.c Auto-merging fs/locks.c Auto-merging fs/ioctl.c Auto-merging fs/inode.c Auto-merging fs/btrfs/ioctl.c CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c Auto-merging fs/btrfs/ctree.h Auto-merging Documentation/filesystems/vfs.txt Auto-merging Documentation/filesystems/Locking Resolved 'fs/btrfs/ioctl.c' using previous resolution. Resolved 'fs/read_write.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5c3ff4ed1828] Merge remote-tracking branch 'overlayfs/overlayfs-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/Locking | 3 +- Documentation/filesystems/overlayfs.txt | 90 ++++-- Documentation/filesystems/vfs.txt | 16 +- fs/btrfs/ctree.h | 5 +- fs/btrfs/ioctl.c | 7 +- fs/file_table.c | 13 +- fs/inode.c | 46 +-- fs/internal.h | 17 +- fs/ioctl.c | 1 + fs/locks.c | 20 +- fs/namei.c | 2 +- fs/namespace.c | 69 +---- fs/ocfs2/file.c | 10 +- fs/open.c | 87 +++--- fs/overlayfs/Kconfig | 19 ++ fs/overlayfs/Makefile | 4 +- fs/overlayfs/copy_up.c | 190 ++++++++---- fs/overlayfs/dir.c | 105 +++++-- fs/overlayfs/export.c | 3 + fs/overlayfs/file.c | 508 ++++++++++++++++++++++++++++++++ fs/overlayfs/inode.c | 175 +++++++---- fs/overlayfs/namei.c | 195 +++++++----- fs/overlayfs/overlayfs.h | 47 ++- fs/overlayfs/ovl_entry.h | 6 +- fs/overlayfs/super.c | 103 ++++--- fs/overlayfs/util.c | 252 +++++++++++++++- fs/read_write.c | 94 +++--- fs/xattr.c | 9 +- fs/xfs/xfs_file.c | 8 +- include/linux/dcache.h | 15 +- include/linux/fs.h | 31 +- include/linux/fsnotify.h | 14 +- include/uapi/linux/fs.h | 1 - 33 files changed, 1591 insertions(+), 574 deletions(-) create mode 100644 fs/overlayfs/file.c Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license) $ git merge ubifs/linux-next Already up to date. Merging xfs/for-next (0703a8e1c17e xfs: replace do_mod with native operations) $ git merge xfs/for-next Auto-merging fs/xfs/xfs_super.c Auto-merging fs/xfs/xfs_stats.c Auto-merging fs/xfs/xfs_iops.c Auto-merging fs/xfs/xfs_ioctl.c Auto-merging fs/xfs/xfs_inode.h Auto-merging fs/xfs/xfs_file.c Auto-merging fs/xfs/xfs_aops.h Auto-merging fs/xfs/xfs_aops.c Auto-merging fs/iomap.c Merge made by the 'recursive' strategy. fs/iomap.c | 6 +- fs/xfs/Makefile | 15 +--- fs/xfs/kmem.c | 14 +-- fs/xfs/kmem.h | 14 +-- fs/xfs/libxfs/xfs_ag_resv.c | 16 +--- fs/xfs/libxfs/xfs_ag_resv.h | 16 +--- fs/xfs/libxfs/xfs_alloc.c | 95 ++++++-------------- fs/xfs/libxfs/xfs_alloc.h | 18 +--- fs/xfs/libxfs/xfs_alloc_btree.c | 15 +--- fs/xfs/libxfs/xfs_alloc_btree.h | 14 +-- fs/xfs/libxfs/xfs_attr.c | 14 +-- fs/xfs/libxfs/xfs_attr_leaf.c | 21 +---- fs/xfs/libxfs/xfs_attr_leaf.h | 14 +-- fs/xfs/libxfs/xfs_attr_remote.c | 14 +-- fs/xfs/libxfs/xfs_attr_remote.h | 14 +-- fs/xfs/libxfs/xfs_attr_sf.h | 14 +-- fs/xfs/libxfs/xfs_bit.c | 14 +-- fs/xfs/libxfs/xfs_bit.h | 14 +-- fs/xfs/libxfs/xfs_bmap.c | 54 ++++++------ fs/xfs/libxfs/xfs_bmap.h | 14 +-- fs/xfs/libxfs/xfs_bmap_btree.c | 14 +-- fs/xfs/libxfs/xfs_bmap_btree.h | 14 +-- fs/xfs/libxfs/xfs_btree.c | 171 ++++++++++++++++++------------------ fs/xfs/libxfs/xfs_btree.h | 14 +-- fs/xfs/libxfs/xfs_da_btree.c | 24 ++--- fs/xfs/libxfs/xfs_da_btree.h | 14 +-- fs/xfs/libxfs/xfs_da_format.c | 14 +-- fs/xfs/libxfs/xfs_da_format.h | 14 +-- fs/xfs/libxfs/xfs_defer.c | 16 +--- fs/xfs/libxfs/xfs_defer.h | 16 +--- fs/xfs/libxfs/xfs_dir2.c | 14 +-- fs/xfs/libxfs/xfs_dir2.h | 14 +-- fs/xfs/libxfs/xfs_dir2_block.c | 22 ++--- fs/xfs/libxfs/xfs_dir2_data.c | 122 +++++++++++++++----------- fs/xfs/libxfs/xfs_dir2_leaf.c | 26 ++---- fs/xfs/libxfs/xfs_dir2_node.c | 17 +--- fs/xfs/libxfs/xfs_dir2_priv.h | 14 +-- fs/xfs/libxfs/xfs_dir2_sf.c | 14 +-- fs/xfs/libxfs/xfs_dquot_buf.c | 14 +-- fs/xfs/libxfs/xfs_errortag.h | 15 +--- fs/xfs/libxfs/xfs_format.h | 14 +-- fs/xfs/libxfs/xfs_fs.h | 14 +-- fs/xfs/libxfs/xfs_ialloc.c | 158 +++++++++------------------------ fs/xfs/libxfs/xfs_ialloc.h | 21 +---- fs/xfs/libxfs/xfs_ialloc_btree.c | 14 +-- fs/xfs/libxfs/xfs_ialloc_btree.h | 14 +-- fs/xfs/libxfs/xfs_iext_tree.c | 10 +-- fs/xfs/libxfs/xfs_inode_buf.c | 34 ++++---- fs/xfs/libxfs/xfs_inode_buf.h | 14 +-- fs/xfs/libxfs/xfs_inode_fork.c | 14 +-- fs/xfs/libxfs/xfs_inode_fork.h | 14 +-- fs/xfs/libxfs/xfs_log_format.h | 14 +-- fs/xfs/libxfs/xfs_log_recover.h | 14 +-- fs/xfs/libxfs/xfs_log_rlimit.c | 14 +-- fs/xfs/libxfs/xfs_quota_defs.h | 14 +-- fs/xfs/libxfs/xfs_refcount.c | 63 +++++++++----- fs/xfs/libxfs/xfs_refcount.h | 16 +--- fs/xfs/libxfs/xfs_refcount_btree.c | 17 +--- fs/xfs/libxfs/xfs_refcount_btree.h | 16 +--- fs/xfs/libxfs/xfs_rmap.c | 55 +++++++++--- fs/xfs/libxfs/xfs_rmap.h | 16 +--- fs/xfs/libxfs/xfs_rmap_btree.c | 15 +--- fs/xfs/libxfs/xfs_rmap_btree.h | 14 +-- fs/xfs/libxfs/xfs_rtbitmap.c | 26 +----- fs/xfs/libxfs/xfs_sb.c | 40 +++++---- fs/xfs/libxfs/xfs_sb.h | 14 +-- fs/xfs/libxfs/xfs_shared.h | 14 +-- fs/xfs/libxfs/xfs_symlink_remote.c | 14 +-- fs/xfs/libxfs/xfs_trans_resv.c | 30 ++----- fs/xfs/libxfs/xfs_trans_resv.h | 14 +-- fs/xfs/libxfs/xfs_trans_space.h | 14 +-- fs/xfs/libxfs/xfs_types.c | 173 +++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_types.h | 33 ++++--- fs/xfs/mrlock.h | 14 +-- fs/xfs/scrub/agheader.c | 18 +--- fs/xfs/scrub/agheader_repair.c | 16 +--- fs/xfs/scrub/alloc.c | 16 +--- fs/xfs/scrub/attr.c | 16 +--- fs/xfs/scrub/bmap.c | 16 +--- fs/xfs/scrub/btree.c | 16 +--- fs/xfs/scrub/btree.h | 16 +--- fs/xfs/scrub/common.c | 16 +--- fs/xfs/scrub/common.h | 16 +--- fs/xfs/scrub/dabtree.c | 16 +--- fs/xfs/scrub/dabtree.h | 16 +--- fs/xfs/scrub/dir.c | 16 +--- fs/xfs/scrub/ialloc.c | 16 +--- fs/xfs/scrub/inode.c | 16 +--- fs/xfs/scrub/parent.c | 16 +--- fs/xfs/scrub/quota.c | 16 +--- fs/xfs/scrub/refcount.c | 16 +--- fs/xfs/scrub/repair.c | 16 +--- fs/xfs/scrub/repair.h | 16 +--- fs/xfs/scrub/rmap.c | 16 +--- fs/xfs/scrub/rtbitmap.c | 16 +--- fs/xfs/scrub/scrub.c | 16 +--- fs/xfs/scrub/scrub.h | 16 +--- fs/xfs/scrub/symlink.c | 16 +--- fs/xfs/scrub/trace.c | 16 +--- fs/xfs/scrub/trace.h | 16 +--- fs/xfs/scrub/xfs_scrub.h | 16 +--- fs/xfs/xfs.h | 14 +-- fs/xfs/xfs_acl.c | 14 +-- fs/xfs/xfs_acl.h | 14 +-- fs/xfs/xfs_aops.c | 25 +++--- fs/xfs/xfs_aops.h | 14 +-- fs/xfs/xfs_attr.h | 14 +-- fs/xfs/xfs_attr_inactive.c | 14 +-- fs/xfs/xfs_attr_list.c | 19 +--- fs/xfs/xfs_bmap_item.c | 16 +--- fs/xfs/xfs_bmap_item.h | 16 +--- fs/xfs/xfs_bmap_util.c | 26 ++---- fs/xfs/xfs_bmap_util.h | 14 +-- fs/xfs/xfs_buf.c | 15 +--- fs/xfs/xfs_buf.h | 14 +-- fs/xfs/xfs_buf_item.c | 16 +--- fs/xfs/xfs_buf_item.h | 14 +-- fs/xfs/xfs_dir2_readdir.c | 14 +-- fs/xfs/xfs_discard.c | 14 +-- fs/xfs/xfs_dquot.c | 14 +-- fs/xfs/xfs_dquot.h | 14 +-- fs/xfs/xfs_dquot_item.c | 14 +-- fs/xfs/xfs_dquot_item.h | 14 +-- fs/xfs/xfs_error.c | 19 +--- fs/xfs/xfs_error.h | 23 ++--- fs/xfs/xfs_export.c | 29 +++---- fs/xfs/xfs_export.h | 14 +-- fs/xfs/xfs_extent_busy.c | 14 +-- fs/xfs/xfs_extent_busy.h | 14 +-- fs/xfs/xfs_extfree_item.c | 14 +-- fs/xfs/xfs_extfree_item.h | 14 +-- fs/xfs/xfs_file.c | 14 +-- fs/xfs/xfs_filestream.c | 14 +-- fs/xfs/xfs_filestream.h | 14 +-- fs/xfs/xfs_fsmap.c | 16 +--- fs/xfs/xfs_fsmap.h | 16 +--- fs/xfs/xfs_fsops.c | 14 +-- fs/xfs/xfs_fsops.h | 14 +-- fs/xfs/xfs_globals.c | 14 +-- fs/xfs/xfs_icache.c | 14 +-- fs/xfs/xfs_icache.h | 14 +-- fs/xfs/xfs_icreate_item.c | 14 +-- fs/xfs/xfs_icreate_item.h | 14 +-- fs/xfs/xfs_inode.c | 35 ++++---- fs/xfs/xfs_inode.h | 14 +-- fs/xfs/xfs_inode_item.c | 14 +-- fs/xfs/xfs_inode_item.h | 14 +-- fs/xfs/xfs_ioctl.c | 33 +++---- fs/xfs/xfs_ioctl.h | 14 +-- fs/xfs/xfs_ioctl32.c | 14 +-- fs/xfs/xfs_ioctl32.h | 14 +-- fs/xfs/xfs_iomap.c | 20 +---- fs/xfs/xfs_iomap.h | 18 +--- fs/xfs/xfs_iops.c | 22 ++--- fs/xfs/xfs_iops.h | 14 +-- fs/xfs/xfs_itable.c | 16 +--- fs/xfs/xfs_itable.h | 14 +-- fs/xfs/xfs_linux.h | 36 +------- fs/xfs/xfs_log.c | 18 +--- fs/xfs/xfs_log.h | 14 +-- fs/xfs/xfs_log_cil.c | 14 +-- fs/xfs/xfs_log_priv.h | 14 +-- fs/xfs/xfs_log_recover.c | 67 ++++++++------ fs/xfs/xfs_message.c | 14 +-- fs/xfs/xfs_mount.c | 21 ++--- fs/xfs/xfs_mount.h | 16 +--- fs/xfs/xfs_mru_cache.c | 14 +-- fs/xfs/xfs_mru_cache.h | 14 +-- fs/xfs/xfs_ondisk.h | 14 +-- fs/xfs/xfs_qm.c | 14 +-- fs/xfs/xfs_qm.h | 14 +-- fs/xfs/xfs_qm_bhv.c | 14 +-- fs/xfs/xfs_qm_syscalls.c | 14 +-- fs/xfs/xfs_quota.h | 14 +-- fs/xfs/xfs_quotaops.c | 14 +-- fs/xfs/xfs_refcount_item.c | 16 +--- fs/xfs/xfs_refcount_item.h | 16 +--- fs/xfs/xfs_reflink.c | 16 +--- fs/xfs/xfs_reflink.h | 16 +--- fs/xfs/xfs_rmap_item.c | 16 +--- fs/xfs/xfs_rmap_item.h | 16 +--- fs/xfs/xfs_rtalloc.c | 24 ++--- fs/xfs/xfs_rtalloc.h | 14 +-- fs/xfs/xfs_stats.c | 14 +-- fs/xfs/xfs_stats.h | 14 +-- fs/xfs/xfs_super.c | 16 +--- fs/xfs/xfs_super.h | 14 +-- fs/xfs/xfs_symlink.c | 14 +-- fs/xfs/xfs_symlink.h | 14 +-- fs/xfs/xfs_sysctl.c | 14 +-- fs/xfs/xfs_sysctl.h | 14 +-- fs/xfs/xfs_sysfs.c | 14 +-- fs/xfs/xfs_sysfs.h | 14 +-- fs/xfs/xfs_trace.c | 14 +-- fs/xfs/xfs_trace.h | 14 +-- fs/xfs/xfs_trans.c | 14 +-- fs/xfs/xfs_trans.h | 14 +-- fs/xfs/xfs_trans_ail.c | 14 +-- fs/xfs/xfs_trans_bmap.c | 16 +--- fs/xfs/xfs_trans_buf.c | 14 +-- fs/xfs/xfs_trans_dquot.c | 14 +-- fs/xfs/xfs_trans_extfree.c | 14 +-- fs/xfs/xfs_trans_inode.c | 14 +-- fs/xfs/xfs_trans_priv.h | 14 +-- fs/xfs/xfs_trans_refcount.c | 16 +--- fs/xfs/xfs_trans_rmap.c | 16 +--- fs/xfs/xfs_xattr.c | 14 +-- 207 files changed, 937 insertions(+), 3195 deletions(-) create mode 100644 fs/xfs/libxfs/xfs_types.c Merging file-locks/locks-next (716a685fdb89 Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) $ git merge file-locks/locks-next Already up to date. Merging vfs/for-next (5f181c9ca108 Merge branch 'work.compat' into for-next) $ git merge vfs/for-next Auto-merging fs/signalfd.c Auto-merging fs/proc/internal.h Auto-merging fs/orangefs/devorangefs-req.c Merge made by the 'recursive' strategy. fs/afs/cell.c | 12 +- fs/afs/cmservice.c | 2 +- fs/afs/fsclient.c | 100 +++--- fs/afs/internal.h | 45 +-- fs/afs/main.c | 33 +- fs/afs/netdevices.c | 6 +- fs/afs/proc.c | 787 ++++++++++++++++-------------------------- fs/afs/rxrpc.c | 2 +- fs/afs/super.c | 20 +- fs/orangefs/devorangefs-req.c | 54 +-- fs/proc/generic.c | 24 ++ fs/proc/internal.h | 2 + fs/proc/proc_net.c | 92 +++++ fs/signalfd.c | 50 +-- fs/splice.c | 98 +++--- include/linux/proc_fs.h | 12 + 16 files changed, 632 insertions(+), 707 deletions(-) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) $ git merge vfs-miklos/next Already up to date. Merging printk/for-next (8bafa2a44ff3 Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18) $ git merge printk/for-next Already up to date. Merging pci/next (ce4c7b241227 Merge branch 'pci/aer-squash') $ git merge pci/next Auto-merging drivers/pci/pcie/aer_inject.c Removing drivers/pci/pcie/aer/ecrc.c Removing drivers/pci/pcie/aer/aerdrv_errprint.c Removing drivers/pci/pcie/aer/aerdrv_core.c Removing drivers/pci/pcie/aer/aerdrv_acpi.c Removing drivers/pci/pcie/aer/aerdrv.h Removing drivers/pci/pcie/aer/aerdrv.c Removing drivers/pci/pcie/aer/Makefile Removing drivers/pci/pcie/aer/Kconfig.debug Removing drivers/pci/pcie/aer/Kconfig Auto-merging drivers/pci/controller/dwc/pcie-hisi.c Auto-merging drivers/pci/controller/dwc/pcie-designware-host.c Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c Auto-merging drivers/pci/controller/Makefile Auto-merging drivers/pci/controller/Kconfig Removing drivers/pci/cadence/Makefile Removing drivers/pci/cadence/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 70 +- drivers/pci/Kconfig | 4 +- drivers/pci/Makefile | 6 +- drivers/pci/cadence/Kconfig | 27 - drivers/pci/cadence/Makefile | 4 - drivers/pci/{host => controller}/Kconfig | 31 +- drivers/pci/{host => controller}/Makefile | 6 + drivers/pci/{ => controller}/dwc/Kconfig | 0 drivers/pci/{ => controller}/dwc/Makefile | 0 drivers/pci/{ => controller}/dwc/pci-dra7xx.c | 2 +- drivers/pci/{ => controller}/dwc/pci-exynos.c | 0 drivers/pci/{ => controller}/dwc/pci-imx6.c | 0 drivers/pci/{ => controller}/dwc/pci-keystone-dw.c | 0 drivers/pci/{ => controller}/dwc/pci-keystone.c | 0 drivers/pci/{ => controller}/dwc/pci-keystone.h | 0 drivers/pci/{ => controller}/dwc/pci-layerscape.c | 0 drivers/pci/{ => controller}/dwc/pcie-armada8k.c | 0 drivers/pci/{ => controller}/dwc/pcie-artpec6.c | 0 .../pci/{ => controller}/dwc/pcie-designware-ep.c | 0 .../{ => controller}/dwc/pcie-designware-host.c | 2 +- .../{ => controller}/dwc/pcie-designware-plat.c | 0 drivers/pci/{ => controller}/dwc/pcie-designware.c | 0 drivers/pci/{ => controller}/dwc/pcie-designware.h | 0 drivers/pci/{ => controller}/dwc/pcie-hisi.c | 2 +- drivers/pci/{ => controller}/dwc/pcie-histb.c | 0 drivers/pci/{ => controller}/dwc/pcie-kirin.c | 0 drivers/pci/{ => controller}/dwc/pcie-qcom.c | 0 drivers/pci/{ => controller}/dwc/pcie-spear13xx.c | 0 drivers/pci/{host => controller}/pci-aardvark.c | 0 drivers/pci/{host => controller}/pci-ftpci100.c | 0 drivers/pci/{host => controller}/pci-host-common.c | 0 .../pci/{host => controller}/pci-host-generic.c | 0 drivers/pci/{host => controller}/pci-hyperv.c | 0 drivers/pci/{host => controller}/pci-mvebu.c | 0 drivers/pci/{host => controller}/pci-rcar-gen2.c | 0 drivers/pci/{host => controller}/pci-tegra.c | 0 .../pci/{host => controller}/pci-thunder-ecam.c | 0 drivers/pci/{host => controller}/pci-thunder-pem.c | 0 drivers/pci/{host => controller}/pci-v3-semi.c | 0 drivers/pci/{host => controller}/pci-versatile.c | 0 drivers/pci/{host => controller}/pci-xgene-msi.c | 0 drivers/pci/{host => controller}/pci-xgene.c | 0 drivers/pci/{host => controller}/pcie-altera-msi.c | 0 drivers/pci/{host => controller}/pcie-altera.c | 0 .../pci/{cadence => controller}/pcie-cadence-ep.c | 0 .../{cadence => controller}/pcie-cadence-host.c | 0 drivers/pci/{cadence => controller}/pcie-cadence.c | 0 drivers/pci/{cadence => controller}/pcie-cadence.h | 0 drivers/pci/{host => controller}/pcie-iproc-bcma.c | 0 drivers/pci/{host => controller}/pcie-iproc-msi.c | 0 .../pci/{host => controller}/pcie-iproc-platform.c | 0 drivers/pci/{host => controller}/pcie-iproc.c | 0 drivers/pci/{host => controller}/pcie-iproc.h | 0 drivers/pci/{host => controller}/pcie-mediatek.c | 0 drivers/pci/{host => controller}/pcie-mobiveil.c | 0 drivers/pci/{host => controller}/pcie-rcar.c | 0 .../pci/{host => controller}/pcie-rockchip-ep.c | 0 .../pci/{host => controller}/pcie-rockchip-host.c | 0 drivers/pci/{host => controller}/pcie-rockchip.c | 0 drivers/pci/{host => controller}/pcie-rockchip.h | 0 drivers/pci/{host => controller}/pcie-tango.c | 0 drivers/pci/{host => controller}/pcie-xilinx-nwl.c | 0 drivers/pci/{host => controller}/pcie-xilinx.c | 0 drivers/pci/{host => controller}/vmd.c | 0 drivers/pci/pcie/Kconfig | 41 +- drivers/pci/pcie/Makefile | 3 +- drivers/pci/pcie/aer.c | 1377 ++++++++++++++++++++ drivers/pci/pcie/aer/Kconfig | 29 - drivers/pci/pcie/aer/Kconfig.debug | 19 - drivers/pci/pcie/aer/Makefile | 13 - drivers/pci/pcie/aer/aerdrv.c | 371 ------ drivers/pci/pcie/aer/aerdrv.h | 95 -- drivers/pci/pcie/aer/aerdrv_acpi.c | 141 -- drivers/pci/pcie/aer/aerdrv_core.c | 496 ------- drivers/pci/pcie/aer/aerdrv_errprint.c | 260 ---- drivers/pci/pcie/aer/ecrc.c | 117 -- drivers/pci/pcie/{aer => }/aer_inject.c | 3 +- drivers/pci/pcie/dpc.c | 1 - drivers/pci/pcie/portdrv.h | 15 + 79 files changed, 1509 insertions(+), 1626 deletions(-) delete mode 100644 drivers/pci/cadence/Kconfig delete mode 100644 drivers/pci/cadence/Makefile rename drivers/pci/{host => controller}/Kconfig (90%) rename drivers/pci/{host => controller}/Makefile (89%) rename drivers/pci/{ => controller}/dwc/Kconfig (100%) rename drivers/pci/{ => controller}/dwc/Makefile (100%) rename drivers/pci/{ => controller}/dwc/pci-dra7xx.c (99%) rename drivers/pci/{ => controller}/dwc/pci-exynos.c (100%) rename drivers/pci/{ => controller}/dwc/pci-imx6.c (100%) rename drivers/pci/{ => controller}/dwc/pci-keystone-dw.c (100%) rename drivers/pci/{ => controller}/dwc/pci-keystone.c (100%) rename drivers/pci/{ => controller}/dwc/pci-keystone.h (100%) rename drivers/pci/{ => controller}/dwc/pci-layerscape.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-armada8k.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-artpec6.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-designware-ep.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-designware-host.c (99%) rename drivers/pci/{ => controller}/dwc/pcie-designware-plat.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-designware.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-designware.h (100%) rename drivers/pci/{ => controller}/dwc/pcie-hisi.c (99%) rename drivers/pci/{ => controller}/dwc/pcie-histb.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-kirin.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-qcom.c (100%) rename drivers/pci/{ => controller}/dwc/pcie-spear13xx.c (100%) rename drivers/pci/{host => controller}/pci-aardvark.c (100%) rename drivers/pci/{host => controller}/pci-ftpci100.c (100%) rename drivers/pci/{host => controller}/pci-host-common.c (100%) rename drivers/pci/{host => controller}/pci-host-generic.c (100%) rename drivers/pci/{host => controller}/pci-hyperv.c (100%) rename drivers/pci/{host => controller}/pci-mvebu.c (100%) rename drivers/pci/{host => controller}/pci-rcar-gen2.c (100%) rename drivers/pci/{host => controller}/pci-tegra.c (100%) rename drivers/pci/{host => controller}/pci-thunder-ecam.c (100%) rename drivers/pci/{host => controller}/pci-thunder-pem.c (100%) rename drivers/pci/{host => controller}/pci-v3-semi.c (100%) rename drivers/pci/{host => controller}/pci-versatile.c (100%) rename drivers/pci/{host => controller}/pci-xgene-msi.c (100%) rename drivers/pci/{host => controller}/pci-xgene.c (100%) rename drivers/pci/{host => controller}/pcie-altera-msi.c (100%) rename drivers/pci/{host => controller}/pcie-altera.c (100%) rename drivers/pci/{cadence => controller}/pcie-cadence-ep.c (100%) rename drivers/pci/{cadence => controller}/pcie-cadence-host.c (100%) rename drivers/pci/{cadence => controller}/pcie-cadence.c (100%) rename drivers/pci/{cadence => controller}/pcie-cadence.h (100%) rename drivers/pci/{host => controller}/pcie-iproc-bcma.c (100%) rename drivers/pci/{host => controller}/pcie-iproc-msi.c (100%) rename drivers/pci/{host => controller}/pcie-iproc-platform.c (100%) rename drivers/pci/{host => controller}/pcie-iproc.c (100%) rename drivers/pci/{host => controller}/pcie-iproc.h (100%) rename drivers/pci/{host => controller}/pcie-mediatek.c (100%) rename drivers/pci/{host => controller}/pcie-mobiveil.c (100%) rename drivers/pci/{host => controller}/pcie-rcar.c (100%) rename drivers/pci/{host => controller}/pcie-rockchip-ep.c (100%) rename drivers/pci/{host => controller}/pcie-rockchip-host.c (100%) rename drivers/pci/{host => controller}/pcie-rockchip.c (100%) rename drivers/pci/{host => controller}/pcie-rockchip.h (100%) rename drivers/pci/{host => controller}/pcie-tango.c (100%) rename drivers/pci/{host => controller}/pcie-xilinx-nwl.c (100%) rename drivers/pci/{host => controller}/pcie-xilinx.c (100%) rename drivers/pci/{host => controller}/vmd.c (100%) create mode 100644 drivers/pci/pcie/aer.c delete mode 100644 drivers/pci/pcie/aer/Kconfig delete mode 100644 drivers/pci/pcie/aer/Kconfig.debug delete mode 100644 drivers/pci/pcie/aer/Makefile delete mode 100644 drivers/pci/pcie/aer/aerdrv.c delete mode 100644 drivers/pci/pcie/aer/aerdrv.h delete mode 100644 drivers/pci/pcie/aer/aerdrv_acpi.c delete mode 100644 drivers/pci/pcie/aer/aerdrv_core.c delete mode 100644 drivers/pci/pcie/aer/aerdrv_errprint.c delete mode 100644 drivers/pci/pcie/aer/ecrc.c rename drivers/pci/pcie/{aer => }/aer_inject.c (99%) Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) $ git merge pstore/for-next/pstore Already up to date. Merging hid/for-next (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next) $ git merge hid/for-next Already up to date! Merge made by the 'recursive' strategy. Merging i2c/i2c/for-next (1840b5ac656f Merge branch 'i2c/for-4.18' into i2c/for-next) $ git merge i2c/i2c/for-next Removing include/linux/i2c-pnx.h Auto-merging drivers/mfd/timberdale.c Auto-merging drivers/mfd/sm501.c Auto-merging drivers/media/platform/marvell-ccic/mmp-driver.c Auto-merging drivers/i2c/i2c-core-base.c Auto-merging drivers/i2c/busses/Kconfig Auto-merging arch/arm/mach-sa1100/simpad.c Auto-merging arch/arm/mach-pxa/viper.c Auto-merging arch/arm/mach-pxa/palmz72.c Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_54xx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c Auto-merging arch/arm/mach-omap2/common.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/i2c/i2c-davinci.txt | 2 +- Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 4 +- Documentation/i2c/busses/i2c-mlxcpld | 4 + Documentation/i2c/busses/i2c-ocores | 2 +- Documentation/i2c/muxes/i2c-mux-gpio | 4 +- MAINTAINERS | 8 +- arch/arm/mach-ks8695/board-acs5k.c | 2 +- arch/arm/mach-omap1/board-htcherald.c | 2 +- arch/arm/mach-omap1/common.h | 2 +- arch/arm/mach-omap1/i2c.c | 2 +- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-sa1100/simpad.c | 2 +- arch/mips/alchemy/board-gpr.c | 2 +- arch/sh/boards/board-sh7785lcr.c | 2 +- drivers/i2c/algos/i2c-algo-bit.c | 4 +- drivers/i2c/algos/i2c-algo-pca.c | 5 +- drivers/i2c/algos/i2c-algo-pcf.c | 8 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/Makefile | 3 +- drivers/i2c/busses/i2c-aspeed.c | 3 +- drivers/i2c/busses/i2c-at91.c | 12 +- drivers/i2c/busses/i2c-axxia.c | 31 +- drivers/i2c/busses/i2c-designware-common.c | 20 +- drivers/i2c/busses/i2c-designware-core.h | 14 +- drivers/i2c/busses/i2c-designware-master.c | 8 +- drivers/i2c/busses/i2c-designware-slave.c | 6 +- drivers/i2c/busses/i2c-diolan-u2c.c | 11 +- drivers/i2c/busses/i2c-efm32.c | 3 +- drivers/i2c/busses/i2c-eg20t.c | 5 +- drivers/i2c/busses/i2c-emev2.c | 2 +- drivers/i2c/busses/i2c-exynos5.c | 29 +- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-hix5hd2.c | 22 +- drivers/i2c/busses/i2c-i801.c | 7 +- drivers/i2c/busses/i2c-ibm_iic.c | 3 - drivers/i2c/busses/i2c-imx-lpi2c.c | 16 +- drivers/i2c/busses/i2c-imx.c | 21 +- drivers/i2c/busses/i2c-kempld.c | 7 +- drivers/i2c/busses/i2c-mlxcpld.c | 68 +- drivers/i2c/busses/i2c-mt65xx.c | 8 +- drivers/i2c/busses/i2c-mxs.c | 16 +- drivers/i2c/busses/i2c-nomadik.c | 2 - drivers/i2c/busses/i2c-ocores.c | 7 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/i2c/busses/i2c-opal.c | 4 - drivers/i2c/busses/i2c-pasemi.c | 2 +- drivers/i2c/busses/i2c-pca-platform.c | 2 +- drivers/i2c/busses/i2c-pnx.c | 21 +- drivers/i2c/busses/i2c-qup.c | 59 +- drivers/i2c/busses/i2c-rcar.c | 4 +- drivers/i2c/busses/i2c-riic.c | 5 +- drivers/i2c/busses/i2c-rk3x.c | 2 - drivers/i2c/busses/i2c-robotfuzz-osif.c | 21 +- drivers/i2c/busses/i2c-s3c2410.c | 2 - drivers/i2c/busses/i2c-sh_mobile.c | 11 - drivers/i2c/busses/i2c-stm32.c | 153 +++ drivers/i2c/busses/i2c-stm32.h | 37 + drivers/i2c/busses/i2c-stm32f7.c | 1045 +++++++++++++++++++- drivers/i2c/busses/i2c-stu300.c | 22 +- drivers/i2c/busses/i2c-synquacer.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 33 - drivers/i2c/busses/i2c-xiic.c | 17 +- drivers/i2c/busses/i2c-xlp9xx.c | 89 +- drivers/i2c/i2c-core-base.c | 10 +- drivers/i2c/i2c-core-of.c | 51 +- drivers/i2c/i2c-core-smbus.c | 2 + drivers/i2c/i2c-mux.c | 2 +- drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +- drivers/i2c/muxes/i2c-mux-gpio.c | 2 +- drivers/i2c/muxes/i2c-mux-ltc4306.c | 7 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 18 +- drivers/i2c/muxes/i2c-mux-reg.c | 4 +- drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- drivers/mfd/sm501.c | 2 +- drivers/mfd/timberdale.c | 4 +- drivers/misc/eeprom/at24.c | 71 +- include/linux/i2c-pnx.h | 38 - include/linux/i2c.h | 12 +- include/linux/{ => platform_data}/i2c-gpio.h | 0 include/linux/{ => platform_data}/i2c-mux-gpio.h | 0 include/linux/{ => platform_data}/i2c-ocores.h | 0 include/linux/{ => platform_data}/i2c-omap.h | 0 .../linux/{ => platform_data}/i2c-pca-platform.h | 0 include/linux/{ => platform_data}/i2c-xiic.h | 0 94 files changed, 1683 insertions(+), 483 deletions(-) create mode 100644 drivers/i2c/busses/i2c-stm32.c delete mode 100644 include/linux/i2c-pnx.h rename include/linux/{ => platform_data}/i2c-gpio.h (100%) rename include/linux/{ => platform_data}/i2c-mux-gpio.h (100%) rename include/linux/{ => platform_data}/i2c-ocores.h (100%) rename include/linux/{ => platform_data}/i2c-omap.h (100%) rename include/linux/{ => platform_data}/i2c-pca-platform.h (100%) rename include/linux/{ => platform_data}/i2c-xiic.h (100%) Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string) $ git merge dmi/master Auto-merging include/linux/mod_devicetable.h Merge made by the 'recursive' strategy. drivers/firmware/dmi-id.c | 2 ++ drivers/firmware/dmi_scan.c | 1 + include/linux/mod_devicetable.h | 1 + 3 files changed, 4 insertions(+) Merging hwmon-staging/hwmon-next (c9bdf291542e hwmon: (asus_atk0110) Make use of device managed memory) $ git merge hwmon-staging/hwmon-next Already up to date. Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter) $ git merge jc_docs/docs-next Already up to date. Merging v4l-dvb/master (f2809d20b925 media: omap2: fix compile-testing with FB_OMAP2=m) $ git merge v4l-dvb/master Merge made by the 'recursive' strategy. Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) $ git merge v4l-dvb-next/master Already up to date. Merging fbdev/fbdev-for-next (85ebd164de56 fb_omap2: add gpiolib dependency) $ git merge fbdev/fbdev-for-next Removing include/video/sh_mobile_meram.h Removing include/video/auo_k190xfb.h Auto-merging drivers/video/fbdev/via/viafbdev.c Removing drivers/video/fbdev/sh_mobile_meram.c Removing drivers/video/fbdev/auo_k190x.h Removing drivers/video/fbdev/auo_k190x.c Removing drivers/video/fbdev/auo_k1901fb.c Removing drivers/video/fbdev/auo_k1900fb.c Auto-merging drivers/media/platform/via-camera.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 6 +- drivers/gpu/drm/shmobile/Kconfig | 1 - drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 42 - drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 - drivers/gpu/drm/shmobile/shmob_drm_drv.h | 2 - drivers/gpu/drm/shmobile/shmob_drm_kms.c | 11 - drivers/gpu/drm/shmobile/shmob_drm_kms.h | 1 - drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 - drivers/media/platform/via-camera.c | 5 + drivers/video/fbdev/Kconfig | 48 +- drivers/video/fbdev/Makefile | 4 - drivers/video/fbdev/aty/aty128fb.c | 2 +- drivers/video/fbdev/aty/radeon_pm.c | 8 +- drivers/video/fbdev/au1100fb.c | 2 +- drivers/video/fbdev/au1200fb.c | 2 +- drivers/video/fbdev/auo_k1900fb.c | 204 ---- drivers/video/fbdev/auo_k1901fb.c | 257 ----- drivers/video/fbdev/auo_k190x.c | 1195 -------------------- drivers/video/fbdev/auo_k190x.h | 129 --- drivers/video/fbdev/core/fb_defio.c | 4 +- drivers/video/fbdev/mmp/fb/mmpfb.c | 5 +- drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 8 +- drivers/video/fbdev/nvidia/nvidia.c | 2 +- drivers/video/fbdev/omap/lcd_ams_delta.c | 4 + drivers/video/fbdev/omap/lcd_h3.c | 4 + drivers/video/fbdev/omap/lcd_htcherald.c | 4 + drivers/video/fbdev/omap/lcd_inn1510.c | 4 + drivers/video/fbdev/omap/lcd_inn1610.c | 4 + drivers/video/fbdev/omap/lcd_osk.c | 4 + drivers/video/fbdev/omap/lcd_palmte.c | 4 + drivers/video/fbdev/omap/lcd_palmtt.c | 4 + drivers/video/fbdev/omap/lcd_palmz71.c | 4 + drivers/video/fbdev/omap/omapfb_main.c | 2 +- drivers/video/fbdev/omap2/omapfb/Kconfig | 1 + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 18 +- drivers/video/fbdev/pxafb.c | 8 +- drivers/video/fbdev/savage/savagefb_driver.c | 8 +- drivers/video/fbdev/sh_mobile_lcdcfb.c | 77 +- drivers/video/fbdev/sh_mobile_lcdcfb.h | 1 - drivers/video/fbdev/sh_mobile_meram.c | 758 ------------- drivers/video/fbdev/sm501fb.c | 3 +- drivers/video/fbdev/via/global.h | 6 + drivers/video/fbdev/via/hw.c | 1 - drivers/video/fbdev/via/via-core.c | 1 - drivers/video/fbdev/via/via_clock.c | 2 +- drivers/video/fbdev/via/viafbdev.c | 1 - include/linux/platform_data/shmob_drm.h | 4 - include/video/auo_k190xfb.h | 107 -- include/video/sh_mobile_lcdc.h | 3 - include/video/sh_mobile_meram.h | 95 -- 50 files changed, 87 insertions(+), 2986 deletions(-) delete mode 100644 drivers/video/fbdev/auo_k1900fb.c delete mode 100644 drivers/video/fbdev/auo_k1901fb.c delete mode 100644 drivers/video/fbdev/auo_k190x.c delete mode 100644 drivers/video/fbdev/auo_k190x.h delete mode 100644 drivers/video/fbdev/sh_mobile_meram.c delete mode 100644 include/video/auo_k190xfb.h delete mode 100644 include/video/sh_mobile_meram.h Merging pm/linux-next (88064d757b61 Merge branch 'pm-cpufreq' into linux-next) $ git merge pm/linux-next Auto-merging drivers/base/core.c Merge made by the 'recursive' strategy. Documentation/acpi/method-customizing.txt | 10 +- .../devicetree/bindings/power/power_domain.txt | 19 ++- drivers/acpi/acpica/dbnames.c | 1 + drivers/acpi/acpica/dbobject.c | 23 ++- drivers/acpi/acpica/dsdebug.c | 12 +- drivers/acpi/acpica/exconfig.c | 11 ++ drivers/acpi/acpica/nsdump.c | 3 + drivers/acpi/acpica/psloop.c | 51 +++++- drivers/acpi/acpica/psobject.c | 30 ++++ drivers/acpi/acpica/pswalk.c | 34 +++- drivers/acpi/acpica/uterror.c | 10 +- drivers/acpi/acpica/utosi.c | 1 + drivers/base/core.c | 4 +- drivers/base/power/common.c | 43 ++++- drivers/base/power/domain.c | 134 ++++++++++++--- drivers/base/power/sysfs.c | 2 +- drivers/cpufreq/Kconfig.arm | 2 +- drivers/cpufreq/acpi-cpufreq.c | 4 +- drivers/cpufreq/cpufreq_governor.c | 12 +- drivers/cpufreq/imx6q-cpufreq.c | 29 +++- drivers/cpufreq/intel_pstate.c | 179 ++++++++++++++++++++- drivers/cpufreq/ti-cpufreq.c | 7 +- include/acpi/acoutput.h | 4 +- include/acpi/acpixf.h | 2 +- include/acpi/actbl2.h | 25 ++- include/acpi/actypes.h | 1 + include/linux/pm_domain.h | 15 ++ tools/power/cpupower/bench/parse.c | 2 +- .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 15 ++ .../cpupower/utils/idle_monitor/cpupower-monitor.c | 35 ++-- .../cpupower/utils/idle_monitor/cpupower-monitor.h | 9 ++ 31 files changed, 633 insertions(+), 96 deletions(-) Merging cpupower/cpupower (f9652d5cae04 cpupower : Fix header name to read idle state name) $ git merge cpupower/cpupower Already up to date. Merging idle/next (8a5776a5f498 Linux 4.14-rc4) $ git merge idle/next Already up to date. Merging opp/opp/linux-next (8a352fd8787c OPP: Allow same OPP table to be used for multiple genpd) $ git merge opp/opp/linux-next Already up to date. Merging thermal/next (d04d6c6d7a8d Merge branch 'thermal-soc' into next) $ git merge thermal/next Removing drivers/thermal/samsung/exynos_tmu.h Auto-merging drivers/thermal/qcom/tsens.c CONFLICT (content): Merge conflict in drivers/thermal/qcom/tsens.c Auto-merging Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt Resolved 'drivers/thermal/qcom/tsens.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 059414747a5d] Merge remote-tracking branch 'thermal/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/thermal/exynos-thermal.txt | 14 +- .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- .../bindings/thermal/mediatek-thermal.txt | 1 + .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + .../bindings/thermal/rcar-gen3-thermal.txt | 3 +- .../devicetree/bindings/thermal/rcar-thermal.txt | 7 +- .../bindings/thermal/uniphier-thermal.txt | 1 + drivers/thermal/imx_thermal.c | 306 +++++-- .../thermal/int340x_thermal/int340x_thermal_zone.c | 6 +- .../int340x_thermal/processor_thermal_device.c | 4 + drivers/thermal/mtk_thermal.c | 40 +- drivers/thermal/of-thermal.c | 19 +- drivers/thermal/qcom-spmi-temp-alarm.c | 92 +- drivers/thermal/qcom/tsens.c | 13 +- drivers/thermal/rcar_gen3_thermal.c | 17 +- drivers/thermal/rcar_thermal.c | 158 +++- drivers/thermal/samsung/exynos_tmu.c | 959 ++++++++------------- drivers/thermal/samsung/exynos_tmu.h | 75 -- drivers/thermal/tegra/soctherm.c | 31 +- drivers/thermal/thermal_core.c | 11 +- drivers/thermal/thermal_core.h | 30 +- drivers/thermal/thermal_helpers.c | 5 +- drivers/thermal/thermal_hwmon.c | 17 +- drivers/thermal/thermal_hwmon.h | 17 +- drivers/thermal/thermal_sysfs.c | 81 +- .../thermal/ti-soc-thermal/omap5-thermal-data.c | 2 +- drivers/thermal/uniphier_thermal.c | 4 + include/linux/thermal.h | 17 +- 28 files changed, 901 insertions(+), 1039 deletions(-) delete mode 100644 drivers/thermal/samsung/exynos_tmu.h Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT) $ git merge thermal-soc/next Already up to date. Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) $ git merge ieee1394/for-next Already up to date. Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) $ git merge dlm/next Already up to date. Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) $ git merge swiotlb/linux-next Already up to date. Merging rdma/for-next (c1191a19feca RDMA/mlx5: Update SPDX tags to show proper license) $ git merge rdma/for-next Already up to date. Merging net-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge net-next/master Already up to date. Merging bpf-next/master (75d4e704fa8d netdev-FAQ: clarify DaveM's position for stable backports) $ git merge bpf-next/master Already up to date. Merging ipsec-next/master (f03329627b46 Merge branch 'hns3-next') $ git merge ipsec-next/master Already up to date. Merging netfilter-next/master (f624434a0ec9 Merge tag 'wireless-drivers-next-for-davem-2018-05-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next) $ git merge netfilter-next/master Already up to date. Merging nfc-next/master (7579d009c4a1 NFC: fdp: Remove __func__ from dev_dbg()) $ git merge nfc-next/master Merge made by the 'recursive' strategy. drivers/nfc/fdp/fdp.c | 22 +++++----------------- drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- drivers/nfc/st21nfca/dep.c | 3 ++- drivers/nfc/st21nfca/se.c | 5 +++-- drivers/nfc/st95hf/core.c | 7 ++----- net/nfc/hci/core.c | 10 ++++++++++ net/nfc/netlink.c | 6 ++++-- 7 files changed, 39 insertions(+), 40 deletions(-) Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables) $ git merge ipvs-next/master Already up to date. Merging wireless-drivers-next/master (76606886c9f4 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) $ git merge wireless-drivers-next/master Already up to date. Merging bluetooth/master (3a979e8c07e3 Merge tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration) $ git merge bluetooth/master Already up to date. Merging mac80211-next/master (7d840a606515 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge mac80211-next/master Already up to date. Merging gfs2/for-next (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge gfs2/for-next Already up to date. Merging mtd/mtd/next (b771327a4530 Merge tag 'spi-nor/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next) $ git merge mtd/mtd/next Already up to date. Merging nand/nand/next (f567c71f4f91 mtd: nand: Pass mode information to nand_page_io_req) $ git merge nand/nand/next Already up to date. Merging spi-nor/spi-nor/next (771ff17e82fa mtd: spi-nor: Add support for EN25QH32) $ git merge spi-nor/spi-nor/next Already up to date. Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) $ git merge crypto/master Already up to date. Merging drm/drm-next (33ce21d6a249 Merge tag 'drm-intel-next-fixes-2018-06-08-2' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) $ git merge drm/drm-next Already up to date. Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) $ git merge drm-panel/drm/panel/for-next Already up to date. Merging drm-intel/for-linux-next (807cba6559cf Merge tag 'gvt-fixes-2018-04-19' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) $ git merge drm-intel/for-linux-next Already up to date. Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) $ git merge drm-tegra/drm/tegra/for-next Already up to date. Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device) $ git merge drm-misc/for-linux-next Auto-merging drivers/gpu/drm/drm_drv.c Merge made by the 'recursive' strategy. drivers/gpu/drm/drm_drv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Merging drm-msm/msm-next (ef2e83fb8fee drm/msm/gpu: Increase the pm runtime autosuspend for 5xx) $ git merge drm-msm/msm-next Auto-merging drivers/gpu/drm/msm/adreno/adreno_device.c Merge made by the 'recursive' strategy. drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +++++++++++++- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 ++- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 + drivers/gpu/drm/msm/msm_drv.c | 9 +++++++++ drivers/gpu/drm/msm/msm_drv.h | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) $ git merge hdlcd/for-upstream/hdlcd Already up to date. Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) $ git merge mali-dp/for-upstream/mali-dp Already up to date. Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) $ git merge sunxi-drm/sunxi-drm/for-next Already up to date! Merge made by the 'recursive' strategy. Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate) $ git merge imx-drm/imx-drm/next Merge made by the 'recursive' strategy. drivers/gpu/drm/imx/imx-drm.h | 1 - drivers/gpu/drm/imx/imx-ldb.c | 9 ++++++--- drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - drivers/gpu/ipu-v3/ipu-csi.c | 37 ++++++++++++++++++++++++++++++------- 4 files changed, 36 insertions(+), 12 deletions(-) Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags) $ git merge etnaviv/etnaviv/next Already up to date. Merging kconfig/for-next (bebc6082da0a Linux 4.14) $ git merge kconfig/for-next Already up to date. Merging regmap/for-next (66431563e0d9 Merge branch 'regmap-4.18' into regmap-next) $ git merge regmap/for-next Already up to date! Merge made by the 'recursive' strategy. Merging sound/for-next (6d531e7b972c ALSA: emu10k1: add error handling for snd_ctl_add) $ git merge sound/for-next Already up to date. Merging sound-asoc/for-next (5544717d416d Merge branch 'asoc-4.18' into asoc-next) $ git merge sound-asoc/for-next Already up to date! Merge made by the 'recursive' strategy. Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) $ git merge modules/modules-next Auto-merging kernel/module.c Merge made by the 'recursive' strategy. kernel/module.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Merging input/next (c258e84b180d Input: do not assign new tracking ID when changing tool type) $ git merge input/next Auto-merging drivers/input/input-mt.c Merge made by the 'recursive' strategy. .../bindings/input/sprd,sc27xx-vibra.txt | 23 +++ drivers/input/input-mt.c | 12 +- 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/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 - include/linux/input/mt.h | 2 +- include/linux/rmi.h | 2 + 20 files changed, 337 insertions(+), 112 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt create mode 100644 drivers/input/misc/sc27xx-vibra.c Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next) $ git merge block/for-next Already up to date! Merge made by the 'recursive' strategy. Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) $ git merge lightnvm/for-next Already up to date. Merging device-mapper/for-next (48debafe4f2f dm: add writecache target) $ git merge device-mapper/for-next Merge made by the 'recursive' strategy. Documentation/device-mapper/writecache.txt | 68 + drivers/md/Kconfig | 11 + drivers/md/Makefile | 1 + drivers/md/dm-bio-prison-v1.c | 2 +- drivers/md/dm-bio-prison-v2.c | 2 +- drivers/md/dm-cache-target.c | 61 +- drivers/md/dm-core.h | 38 +- drivers/md/dm-crypt.c | 26 +- drivers/md/dm-ioctl.c | 3 +- drivers/md/dm-kcopyd.c | 3 +- drivers/md/dm-region-hash.c | 13 +- drivers/md/dm-thin.c | 5 +- drivers/md/dm-writecache.c | 2305 ++++++++++++++++++++++++++++ drivers/md/dm-zoned-target.c | 2 +- 14 files changed, 2466 insertions(+), 74 deletions(-) create mode 100644 Documentation/device-mapper/writecache.txt create mode 100644 drivers/md/dm-writecache.c Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) $ git merge pcmcia/pcmcia-next Merge made by the 'recursive' strategy. drivers/char/pcmcia/cm4040_cs.c | 2 +- drivers/scsi/pcmcia/aha152x_stub.c | 14 +------------- drivers/scsi/pcmcia/nsp_cs.c | 15 +-------------- drivers/scsi/pcmcia/nsp_cs.h | 4 ---- drivers/scsi/pcmcia/qlogic_stub.c | 13 +------------ drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- 6 files changed, 5 insertions(+), 59 deletions(-) Merging mmc/next (ef5332c10d4f mmc: renesas_sdhi: really fix WP logic regressions) $ git merge mmc/next Already up to date. Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) $ git merge kgdb/kgdb-next Already up to date. Merging md/for-next (5a409b4f56d5 MD: fix lock contention for flush bios) $ git merge md/for-next Already up to date. Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function) $ git merge mfd/for-mfd-next Already up to date. Merging backlight/for-backlight-next (d5318d302e7c backlight: as3711_bl: Fix Device Tree node leaks) $ git merge backlight/for-backlight-next Already up to date. Merging battery/for-next (c42812da1395 MAINTAINERS: add entry for LEGO MINDSTORMS EV3) $ git merge battery/for-next Already up to date. Merging regulator/for-next (13ed4964057e Merge branch 'regulator-4.17' into regulator-4.18 merge window) $ git merge regulator/for-next Already up to date. Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) $ git merge security/next-testing Already up to date! Merge made by the 'recursive' strategy. Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check) $ git merge apparmor/apparmor-next Merge made by the 'recursive' strategy. Documentation/admin-guide/LSM/apparmor.rst | 6 +- security/apparmor/audit.c | 90 ++++++++++++++++- security/apparmor/domain.c | 2 +- security/apparmor/include/audit.h | 6 ++ security/apparmor/include/label.h | 2 +- security/apparmor/include/path.h | 33 +++---- security/apparmor/include/secid.h | 17 +++- security/apparmor/label.c | 15 ++- security/apparmor/lib.c | 2 +- security/apparmor/lsm.c | 50 +++++++--- security/apparmor/match.c | 2 +- security/apparmor/mount.c | 2 +- security/apparmor/policy.c | 7 +- security/apparmor/resource.c | 2 +- security/apparmor/secid.c | 151 +++++++++++++++++++++++++---- 15 files changed, 313 insertions(+), 74 deletions(-) Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs()) $ git merge integrity/next-integrity Already up to date. Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) $ git merge keys/keys-next Already up to date. Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record) $ git merge selinux/next Already up to date. Merging tpmdd/next (3ac7e6225c0b tpm: migrate tpm2_get_random() to use struct tpm_buf) $ git merge tpmdd/next Auto-merging drivers/char/tpm/tpm.h Merge made by the 'recursive' strategy. drivers/char/tpm/tpm.h | 19 ++-- drivers/char/tpm/tpm2-cmd.c | 258 ++++++++++++++++++-------------------------- 2 files changed, 116 insertions(+), 161 deletions(-) Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls) $ git merge watchdog/master Already up to date. Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) $ git merge iommu/next Already up to date. Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) $ git merge dwmw2-iommu/master Already up to date. Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency) $ git merge vfio/next Merge made by the 'recursive' strategy. Documentation/vfio-mediated-device.txt | 5 + drivers/vfio/mdev/mdev_core.c | 102 +- drivers/vfio/mdev/mdev_private.h | 2 +- drivers/vfio/mdev/mdev_sysfs.c | 14 +- drivers/vfio/platform/vfio_platform_common.c | 30 +- drivers/vfio/vfio.c | 11 +- drivers/vfio/vfio_iommu_type1.c | 73 +- samples/Kconfig | 31 + samples/vfio-mdev/Makefile | 3 + samples/vfio-mdev/mbochs.c | 1406 ++++++++++++++++++++++++++ samples/vfio-mdev/mdpy-defs.h | 22 + samples/vfio-mdev/mdpy-fb.c | 232 +++++ samples/vfio-mdev/mdpy.c | 807 +++++++++++++++ 13 files changed, 2622 insertions(+), 116 deletions(-) create mode 100644 samples/vfio-mdev/mbochs.c create mode 100644 samples/vfio-mdev/mdpy-defs.h create mode 100644 samples/vfio-mdev/mdpy-fb.c create mode 100644 samples/vfio-mdev/mdpy.c Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) $ git merge trivial/for-next Already up to date. Merging audit/next (5b71388663c0 audit: Fix wrong task in comparison of session ID) $ git merge audit/next Already up to date. Merging devicetree/for-next (44acf1058790 dt-bindings: submitting-patches: add guidance on patch content and subject) $ git merge devicetree/for-next Already up to date. Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX) $ git merge mailbox/mailbox-for-next Already up to date. Merging spi/for-next (39202ebf0939 Merge branch 'spi-4.18' into spi-next) $ git merge spi/for-next Already up to date! Merge made by the 'recursive' strategy. Merging tip/auto-latest (f10846f7381d Merge branch 'ras/urgent') $ git merge tip/auto-latest Merge made by the 'recursive' strategy. arch/x86/kernel/apic/vector.c | 17 ++++------------- arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 +++++ arch/x86/kernel/quirks.c | 11 +++++++++-- 3 files changed, 18 insertions(+), 15 deletions(-) Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) $ git merge clockevents/clockevents/next Already up to date. Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) $ git merge edac/linux_next Already up to date. Merging edac-amd/for-next (eaa3a1d46cfd EDAC, ghes: Make platform-based whitelisting x86-only) $ git merge edac-amd/for-next Already up to date. Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl) $ git merge irqchip/irq/irqchip-next Already up to date. Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) $ git merge ftrace/for-next Already up to date. Merging rcu/rcu/next (443da8397d9f rcu: Make rcu_seq_diff() more exact) $ git merge rcu/rcu/next Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot Auto-merging include/linux/rcupdate.h Auto-merging drivers/iommu/amd_iommu.c CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c Auto-merging Documentation/core-api/atomic_ops.rst Auto-merging Documentation/admin-guide/kernel-parameters.txt Recorded preimage for 'drivers/iommu/amd_iommu.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/iommu/amd_iommu.c'. [master 4cae156ad567] Merge remote-tracking branch 'rcu/rcu/next' $ git diff -M --stat --summary HEAD^.. .../Design/Data-Structures/Data-Structures.html | 118 +-- .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 22 +- .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 123 +-- .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 16 +- .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 56 +- .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 237 ++--- .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 12 +- Documentation/RCU/stallwarn.txt | 24 +- Documentation/RCU/whatisRCU.txt | 16 +- Documentation/admin-guide/kernel-parameters.txt | 4 +- Documentation/core-api/atomic_ops.rst | 2 +- drivers/iommu/amd_iommu.c | 6 + include/linux/rcupdate.h | 20 +- include/linux/rcutiny.h | 2 +- include/linux/srcu.h | 17 + include/linux/torture.h | 4 +- include/trace/events/rcu.h | 112 ++- kernel/locking/locktorture.c | 5 +- kernel/rcu/rcu.h | 124 ++- kernel/rcu/rcuperf.c | 57 +- kernel/rcu/rcutorture.c | 341 ++++--- kernel/rcu/srcutree.c | 36 +- kernel/rcu/tiny.c | 4 +- kernel/rcu/tree.c | 1004 ++++++++++---------- kernel/rcu/tree.h | 71 +- kernel/rcu/tree_exp.h | 5 +- kernel/rcu/tree_plugin.h | 174 ++-- kernel/rcu/update.c | 45 +- kernel/torture.c | 15 +- .../testing/selftests/rcutorture/bin/configinit.sh | 26 +- .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 1 + .../selftests/rcutorture/bin/kvm-recheck.sh | 1 + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- .../selftests/rcutorture/bin/parse-console.sh | 7 + .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 +- .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 - .../rcutorture/configs/rcu/ver_functions.sh | 2 +- 39 files changed, 1545 insertions(+), 1187 deletions(-) delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot Merging kvm/linux-next (d7a8bea3638d Merge tag 'kvm-s390-next-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) $ git merge kvm/linux-next Auto-merging virt/kvm/arm/arm.c Auto-merging include/linux/sched.h Auto-merging arch/x86/kvm/x86.c Auto-merging arch/x86/kvm/vmx.c Auto-merging arch/x86/kvm/svm.c Auto-merging arch/x86/kvm/mmu.c Auto-merging arch/x86/kvm/lapic.c Auto-merging arch/x86/kvm/hyperv.c CONFLICT (content): Merge conflict in arch/x86/kvm/hyperv.c Auto-merging arch/x86/kvm/cpuid.c Auto-merging arch/x86/include/asm/kvm_host.h Auto-merging arch/s390/kvm/priv.c Auto-merging arch/s390/include/asm/pgtable.h Auto-merging arch/arm64/kvm/hyp/switch.c CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/switch.c Auto-merging arch/arm64/kvm/hyp/hyp-entry.S Auto-merging arch/arm64/kernel/ptrace.c Auto-merging arch/arm64/kernel/fpsimd.c Auto-merging arch/arm64/include/asm/thread_info.h Auto-merging arch/arm64/include/asm/processor.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h Auto-merging arch/arm64/include/asm/kvm_host.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h Auto-merging arch/arm64/include/asm/kvm_asm.h Auto-merging arch/arm64/include/asm/cpufeature.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h Auto-merging arch/arm64/Kconfig Auto-merging arch/arm/include/asm/kvm_host.h Resolved 'arch/arm64/include/asm/cpufeature.h' using previous resolution. Resolved 'arch/arm64/include/asm/kvm_host.h' using previous resolution. Resolved 'arch/arm64/include/asm/processor.h' using previous resolution. Resolved 'arch/arm64/kvm/hyp/switch.c' using previous resolution. Resolved 'arch/x86/kvm/hyperv.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d98e0ed89980] Merge remote-tracking branch 'kvm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/kvm/api.txt | 27 +- Documentation/virtual/kvm/devices/arm-vgic-v3.txt | 30 +- Documentation/virtual/kvm/mmu.txt | 2 +- arch/arm/include/asm/kvm_host.h | 10 +- arch/arm/include/uapi/asm/kvm.h | 1 + arch/arm64/Kconfig | 7 + arch/arm64/include/asm/cpufeature.h | 29 -- arch/arm64/include/asm/fpsimd.h | 21 ++ arch/arm64/include/asm/kvm_asm.h | 8 +- arch/arm64/include/asm/kvm_host.h | 45 ++- arch/arm64/include/asm/processor.h | 15 +- arch/arm64/include/asm/thread_info.h | 13 +- arch/arm64/include/uapi/asm/kvm.h | 1 + arch/arm64/kernel/fpsimd.c | 177 +++++------ arch/arm64/kernel/ptrace.c | 1 + arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/debug.c | 8 +- arch/arm64/kvm/fpsimd.c | 110 +++++++ arch/arm64/kvm/hyp/debug-sr.c | 6 +- arch/arm64/kvm/hyp/entry.S | 43 --- arch/arm64/kvm/hyp/hyp-entry.S | 19 -- arch/arm64/kvm/hyp/switch.c | 124 +++++--- arch/arm64/kvm/hyp/sysreg-sr.c | 4 +- arch/arm64/kvm/sys_regs.c | 9 +- arch/s390/include/asm/ctl_reg.h | 12 + arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/mmu.h | 2 +- arch/s390/include/asm/mmu_context.h | 2 +- arch/s390/include/asm/pgtable.h | 4 +- arch/s390/kvm/guestdbg.c | 2 +- arch/s390/kvm/interrupt.c | 20 +- arch/s390/kvm/kvm-s390.c | 59 ++-- arch/s390/kvm/kvm-s390.h | 13 + arch/s390/kvm/priv.c | 28 +- arch/s390/kvm/vsie.c | 10 +- arch/s390/mm/gmap.c | 6 +- arch/s390/mm/pgtable.c | 4 +- arch/x86/hyperv/mmu.c | 28 +- arch/x86/include/asm/hyperv-tlfs.h | 25 +- arch/x86/include/asm/kvm_host.h | 7 +- arch/x86/include/asm/mshyperv.h | 2 +- arch/x86/include/asm/vmx.h | 2 + arch/x86/kvm/cpuid.c | 3 +- arch/x86/kvm/emulate.c | 4 +- arch/x86/kvm/hyperv.c | 171 +++++++++- arch/x86/kvm/lapic.c | 12 +- arch/x86/kvm/lapic.h | 14 + arch/x86/kvm/mmu.c | 78 ++--- arch/x86/kvm/svm.c | 12 +- arch/x86/kvm/trace.h | 51 +++ arch/x86/kvm/vmx.c | 363 +++++++++++++++++----- arch/x86/kvm/x86.c | 35 ++- include/kvm/arm_vgic.h | 17 +- include/linux/kvm_host.h | 12 + include/linux/sched.h | 6 + include/linux/thread_info.h | 11 + include/uapi/linux/kvm.h | 1 + virt/kvm/Kconfig | 3 + virt/kvm/arm/arm.c | 15 +- virt/kvm/arm/vgic/vgic-init.c | 100 +++--- virt/kvm/arm/vgic/vgic-kvm-device.c | 53 +++- virt/kvm/arm/vgic/vgic-mmio-v3.c | 112 ++++++- virt/kvm/arm/vgic/vgic-v3.c | 99 +++++- virt/kvm/arm/vgic/vgic.h | 42 ++- virt/kvm/kvm_main.c | 41 ++- 66 files changed, 1586 insertions(+), 609 deletions(-) create mode 100644 arch/arm64/kvm/fpsimd.c Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512) $ git merge kvm-arm/next Already up to date. Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) $ git merge kvm-mips/next Already up to date. Merging kvm-ppc/kvm-ppc-next (deeb879de955 KVM: PPC: Book3S PR: Enable kvmppc_get/set_one_reg_pr() for HTM registers) $ git merge kvm-ppc/kvm-ppc-next Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S Auto-merging arch/powerpc/kvm/book3s_hv.c Auto-merging arch/powerpc/kernel/asm-offsets.c Auto-merging arch/powerpc/include/asm/asm-prototypes.h Merge made by the 'recursive' strategy. arch/powerpc/include/asm/asm-prototypes.h | 6 + arch/powerpc/include/asm/kvm_book3s.h | 37 +- arch/powerpc/include/asm/kvm_book3s_64.h | 20 +- arch/powerpc/include/asm/kvm_booke.h | 20 +- arch/powerpc/include/asm/kvm_host.h | 21 +- arch/powerpc/include/asm/kvm_ppc.h | 17 +- arch/powerpc/include/asm/reg.h | 1 + arch/powerpc/include/uapi/asm/kvm.h | 1 + arch/powerpc/kernel/asm-offsets.c | 18 +- arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s.c | 10 +- arch/powerpc/kvm/book3s.h | 6 + arch/powerpc/kvm/book3s_32_mmu.c | 2 +- arch/powerpc/kvm/book3s_64_mmu.c | 11 +- arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 + arch/powerpc/kvm/book3s_64_mmu_radix.c | 348 +++++++++----- arch/powerpc/kvm/book3s_64_vio.c | 71 ++- arch/powerpc/kvm/book3s_64_vio_hv.c | 54 ++- arch/powerpc/kvm/book3s_emulate.c | 369 ++++++++++++++- arch/powerpc/kvm/book3s_hv.c | 97 +++- arch/powerpc/kvm/book3s_hv_builtin.c | 21 +- arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 36 +- arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 318 +++---------- arch/powerpc/kvm/book3s_hv_tm.c | 10 +- arch/powerpc/kvm/book3s_hv_tm_builtin.c | 10 +- arch/powerpc/kvm/book3s_pr.c | 437 ++++++++++++++--- arch/powerpc/kvm/book3s_segment.S | 13 + arch/powerpc/kvm/book3s_xive_template.c | 4 +- arch/powerpc/kvm/booke.c | 41 +- arch/powerpc/kvm/booke_emulate.c | 6 +- arch/powerpc/kvm/e500_emulate.c | 6 +- arch/powerpc/kvm/e500_mmu.c | 2 +- arch/powerpc/kvm/e500_mmu_host.c | 8 +- arch/powerpc/kvm/emulate_loadstore.c | 752 +++++++++--------------------- arch/powerpc/kvm/powerpc.c | 311 +++++++++--- arch/powerpc/kvm/tm.S | 384 +++++++++++++++ 38 files changed, 2283 insertions(+), 1195 deletions(-) create mode 100644 arch/powerpc/kvm/tm.S Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks) $ git merge kvms390/next Already up to date. Merging xen-tip/linux-next (7f47e1c52d0c xen/PVH: Make GDT selectors PVH-specific) $ git merge xen-tip/linux-next Already up to date. Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) $ git merge percpu/for-next Already up to date. Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block) $ git merge workqueues/for-next Already up to date. Merging drivers-x86/for-next (2da502a0aea7 platform/x86: silead_dmi: Add touchscreen info for the Chuwi Vi10 tablet) $ git merge drivers-x86/for-next Auto-merging drivers/platform/x86/asus-wmi.c Auto-merging drivers/platform/x86/asus-wireless.c Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-platform-ideapad-laptop | 13 + Documentation/laptops/thinkpad-acpi.txt | 2 + drivers/platform/mellanox/mlxreg-hotplug.c | 54 ++- drivers/platform/x86/acer-wmi.c | 1 + drivers/platform/x86/apple-gmux.c | 2 +- drivers/platform/x86/asus-laptop.c | 3 +- drivers/platform/x86/asus-wireless.c | 2 +- drivers/platform/x86/asus-wmi.c | 3 +- drivers/platform/x86/dell-laptop.c | 17 +- drivers/platform/x86/dell-smbios-base.c | 5 +- drivers/platform/x86/dell-wmi.c | 16 +- drivers/platform/x86/fujitsu-laptop.c | 47 +- drivers/platform/x86/ideapad-laptop.c | 66 ++- drivers/platform/x86/intel_scu_ipc.c | 4 +- drivers/platform/x86/mlx-platform.c | 289 +++++++++++- drivers/platform/x86/samsung-laptop.c | 3 +- drivers/platform/x86/silead_dmi.c | 486 +++++++++++++-------- drivers/platform/x86/thinkpad_acpi.c | 30 +- include/linux/platform_data/mlxreg.h | 3 +- include/linux/string_helpers.h | 1 + 20 files changed, 792 insertions(+), 255 deletions(-) $ git am -3 ../patches/0001-Revert-platform-x86-silead_dmi-Add-touchscreen-info-.patch Applying: Revert "platform/x86: silead_dmi: Add touchscreen info for the Chuwi Vi10 tablet" $ git reset HEAD^ Unstaged changes after reset: M drivers/platform/x86/silead_dmi.c $ git add -A . $ git commit -v -a --amend [master e4e8461bab8c] Merge remote-tracking branch 'drivers-x86/for-next' Date: Tue Jun 12 11:11:10 2018 +1000 Merging chrome-platform/for-next (5cd7e690bdc1 platform/chrome: chromeos_tbmc - fix SPDX identifier) $ git merge chrome-platform/for-next Merge made by the 'recursive' strategy. drivers/platform/chrome/chromeos_tbmc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) $ git merge hsi/for-next Already up to date. Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness) $ git merge leds/for-next Already up to date. Merging ipmi/for-next (048f7c3e352e ipmi: Properly release srcu locks on error conditions) $ git merge ipmi/for-next Already up to date. Merging driver-core/driver-core-next (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge driver-core/driver-core-next Already up to date. Merging usb/usb-next (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge usb/usb-next Already up to date. Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) $ git merge usb-gadget/next Already up to date. Merging usb-serial/usb-next (7041d9c3f01b USB: serial: pl2303: add support for tx xon/xoff flow control) $ git merge usb-serial/usb-next Already up to date. Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure) $ git merge usb-chipidea-next/ci-for-usb-next Merge made by the 'recursive' strategy. Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver) $ git merge phy-next/next Already up to date. Merging tty/tty-next (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge tty/tty-next Already up to date. Merging char-misc/char-misc-next (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge char-misc/char-misc-next Already up to date. Merging extcon/extcon-next (1da1063a16b4 extcon: usbc-cros-ec: Switch to SPDX identifier.) $ git merge extcon/extcon-next Merge made by the 'recursive' strategy. drivers/extcon/extcon-intel-int3496.c | 2 +- drivers/extcon/extcon-usbc-cros-ec.c | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) Merging staging/staging-next (3ca24ce9ff76 Merge branch 'proc-cmdline') $ git merge staging/staging-next Already up to date. Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) $ git merge mux/for-next Merge made by the 'recursive' strategy. Documentation/driver-model/devres.txt | 1 + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- include/linux/mux/consumer.h | 4 ++ 3 files changed, 89 insertions(+), 20 deletions(-) Merging slave-dma/next (c79c2212f7c9 Merge branch 'for-linus' into next) $ git merge slave-dma/next Merge made by the 'recursive' strategy. drivers/dma/pl330.c | 28 ---------------------------- 1 file changed, 28 deletions(-) Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock) $ git merge cgroup/for-next Already up to date. Merging scsi/for-next (3cedc8797b9c scsi: qla2xxx: Mask off Scope bits in retry delay) $ git merge scsi/for-next Already up to date. Merging scsi-mkp/for-next (1b5c2cb19668 scsi: lpfc: update driver version to 12.0.0.4) $ git merge scsi-mkp/for-next Already up to date. Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) $ git merge target-updates/for-next Already up to date. Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) $ git merge target-bva/for-next Already up to date. Merging libata/for-next (ed058253618e Merge branch 'for-4.17-fixes' into for-next) $ git merge libata/for-next Already up to date! Merge made by the 'recursive' strategy. Merging vhost/linux-next (aa15783ee62d virtio: update the comments for transport features) $ git merge vhost/linux-next Auto-merging mm/page_alloc.c Auto-merging include/linux/mm.h Auto-merging drivers/vhost/vhost.c Merge made by the 'recursive' strategy. drivers/vhost/vhost.c | 3 + drivers/virtio/virtio_balloon.c | 298 +++++++++++++++++++++++++++++++----- drivers/virtio/virtio_pci_common.c | 30 ++++ drivers/virtio/virtio_pci_modern.c | 14 ++ include/linux/mm.h | 6 + include/linux/virtio_ring.h | 4 +- include/uapi/linux/virtio_balloon.h | 7 + include/uapi/linux/virtio_config.h | 16 +- mm/page_alloc.c | 97 ++++++++++++ mm/page_poison.c | 6 + 10 files changed, 439 insertions(+), 42 deletions(-) Merging rpmsg/for-next (1601c6923d66 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) $ git merge rpmsg/for-next Already up to date! Merge made by the 'recursive' strategy. Merging gpio/for-next (6310b930ccbb gpio: davinci: fix build warning when !CONFIG_OF) $ git merge gpio/for-next Already up to date. Merging pinctrl/for-next (86c5dd6860a6 pinctrl: cherryview: limit Strago DMI workarounds to version 1.0) $ git merge pinctrl/for-next Already up to date. Merging pinctrl-samsung/for-next (7c24e71c8a64 pinctrl: samsung: Fix suspend/resume for Exynos5433 GPF1..5 banks) $ git merge pinctrl-samsung/for-next Already up to date. Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled) $ git merge pwm/for-next Auto-merging drivers/pwm/pwm-stm32.c Auto-merging drivers/acpi/acpi_lpss.c Merge made by the 'recursive' strategy. .../devicetree/bindings/mfd/stm32-timers.txt | 20 +++++++++++++++ drivers/acpi/acpi_lpss.c | 2 ++ drivers/pwm/Kconfig | 2 +- drivers/pwm/pwm-atmel-tcb.c | 6 ++--- drivers/pwm/pwm-lpss-platform.c | 5 ++++ drivers/pwm/pwm-lpss.c | 30 ++++++++++++++++++++++ drivers/pwm/pwm-lpss.h | 2 ++ drivers/pwm/pwm-meson.c | 4 +-- drivers/pwm/pwm-rcar.c | 3 +-- drivers/pwm/pwm-stm32.c | 4 +-- 10 files changed, 66 insertions(+), 12 deletions(-) Merging userns/for-next (4b245b90065b Merge of my siginfo-next and userns-next trees for testing in linux-next) $ git merge userns/for-next Already up to date! Merge made by the 'recursive' strategy. Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) $ git merge ktest/for-next Already up to date. Merging random/dev (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash) $ git merge random/dev Auto-merging lib/vsprintf.c Auto-merging Documentation/admin-guide/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/admin-guide/kernel-parameters.txt | 9 ++++++++ drivers/char/random.c | 23 +++++++++++-------- include/linux/random.h | 2 +- lib/vsprintf.c | 30 ++++++++++++++++++++++++- 4 files changed, 53 insertions(+), 11 deletions(-) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) $ git merge aio/master Already up to date. Merging kselftest/next (53c3daf8cfea kselftest/cgroup: fix a signedness bug) $ git merge kselftest/next Merge made by the 'recursive' strategy. tools/testing/selftests/cgroup/cgroup_util.c | 4 ++-- .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 8 ++++++++ .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) Merging y2038/y2038 (e0ffebf0f3f3 pstore: Remove bogus format string definition) $ git merge y2038/y2038 Auto-merging include/linux/fs.h Auto-merging fs/xfs/xfs_trans_inode.c Auto-merging fs/xfs/xfs_iops.c Auto-merging fs/xfs/xfs_inode.c Auto-merging fs/udf/udfdecl.h Auto-merging fs/udf/super.c Auto-merging fs/ubifs/ubifs.h Auto-merging fs/ubifs/file.c Auto-merging fs/ubifs/dir.c Auto-merging fs/proc/uptime.c Auto-merging fs/orangefs/orangefs-kernel.h Auto-merging fs/orangefs/inode.c Auto-merging fs/ocfs2/file.c Auto-merging fs/ocfs2/dlmglue.c Auto-merging fs/nfsd/nfs4xdr.c Auto-merging fs/nfsd/blocklayout.c Auto-merging fs/nfs/callback_proc.c Auto-merging fs/locks.c Auto-merging fs/inode.c Auto-merging fs/hfs/inode.c Auto-merging fs/fuse/inode.c Auto-merging fs/fat/namei_vfat.c Auto-merging fs/fat/namei_msdos.c Auto-merging fs/f2fs/namei.c Auto-merging fs/f2fs/inode.c Auto-merging fs/f2fs/file.c Auto-merging fs/f2fs/f2fs.h Auto-merging fs/ext4/ialloc.c Auto-merging fs/ext4/ext4.h Auto-merging fs/cramfs/inode.c Auto-merging fs/cifs/inode.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/file.c Auto-merging fs/ceph/caps.c Auto-merging fs/ceph/addr.c CONFLICT (content): Merge conflict in fs/ceph/addr.c Auto-merging fs/btrfs/transaction.c Auto-merging fs/btrfs/ioctl.c Auto-merging fs/btrfs/inode.c Auto-merging fs/attr.c Auto-merging fs/afs/fsclient.c Auto-merging drivers/usb/gadget/function/f_fs.c CONFLICT (modify/delete): drivers/staging/lustre/lustre/obdclass/obdo.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/obdclass/obdo.c left in tree. CONFLICT (modify/delete): drivers/staging/lustre/lustre/mdc/mdc_reint.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/mdc/mdc_reint.c left in tree. CONFLICT (modify/delete): drivers/staging/lustre/lustre/lmv/lmv_obd.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/lmv/lmv_obd.c left in tree. CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/namei.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/llite/namei.c left in tree. CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/llite_lib.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/llite/llite_lib.c left in tree. Resolved 'fs/ceph/addr.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/lustre/lustre/llite/llite_lib.c drivers/staging/lustre/lustre/llite/namei.c drivers/staging/lustre/lustre/lmv/lmv_obd.c drivers/staging/lustre/lustre/mdc/mdc_reint.c drivers/staging/lustre/lustre/obdclass/obdo.c drivers/staging/lustre/lustre/llite/llite_lib.c: needs merge drivers/staging/lustre/lustre/llite/namei.c: needs merge drivers/staging/lustre/lustre/lmv/lmv_obd.c: needs merge drivers/staging/lustre/lustre/mdc/mdc_reint.c: needs merge drivers/staging/lustre/lustre/obdclass/obdo.c: needs merge rm 'drivers/staging/lustre/lustre/llite/llite_lib.c' rm 'drivers/staging/lustre/lustre/llite/namei.c' rm 'drivers/staging/lustre/lustre/lmv/lmv_obd.c' rm 'drivers/staging/lustre/lustre/mdc/mdc_reint.c' rm 'drivers/staging/lustre/lustre/obdclass/obdo.c' $ git commit -v -a [master 985dbf616416] Merge remote-tracking branch 'y2038/y2038' $ git diff -M --stat --summary HEAD^.. drivers/firmware/efi/efi-pstore.c | 27 ++++++------ drivers/tty/tty_io.c | 15 +++++-- drivers/usb/gadget/function/f_fs.c | 2 +- fs/adfs/inode.c | 7 +++- fs/afs/fsclient.c | 2 +- fs/attr.c | 14 +++---- fs/bad_inode.c | 2 +- fs/btrfs/file.c | 6 +-- fs/btrfs/inode.c | 8 ++-- fs/btrfs/ioctl.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/transaction.c | 2 +- fs/ceph/addr.c | 12 +++--- fs/ceph/cache.c | 4 +- fs/ceph/caps.c | 6 +-- fs/ceph/file.c | 6 +-- fs/ceph/inode.c | 86 ++++++++++++++++++++------------------ fs/ceph/mds_client.c | 7 +++- fs/ceph/snap.c | 6 +-- fs/cifs/cache.c | 4 +- fs/cifs/fscache.c | 8 ++-- fs/cifs/inode.c | 26 ++++++------ fs/coda/coda_linux.c | 12 +++--- fs/configfs/inode.c | 12 +++--- fs/cramfs/inode.c | 2 +- fs/ext4/ext4.h | 34 ++++++++------- fs/ext4/ialloc.c | 4 +- fs/ext4/namei.c | 2 +- fs/f2fs/f2fs.h | 10 +++-- fs/f2fs/file.c | 12 +++--- fs/f2fs/inode.c | 12 +++--- fs/f2fs/namei.c | 4 +- fs/fat/inode.c | 20 ++++++--- fs/fat/namei_msdos.c | 21 ++++++---- fs/fat/namei_vfat.c | 22 ++++++---- fs/fuse/inode.c | 2 +- fs/gfs2/dir.c | 6 +-- fs/gfs2/glops.c | 4 +- fs/hfs/inode.c | 4 +- fs/hfsplus/inode.c | 12 +++--- fs/hostfs/hostfs_kern.c | 12 +++--- fs/inode.c | 54 +++++++++++++++++------- fs/jffs2/dir.c | 18 ++++---- fs/jffs2/file.c | 2 +- fs/jffs2/fs.c | 12 +++--- fs/kernfs/dir.c | 4 +- fs/kernfs/inode.c | 8 ++-- fs/locks.c | 2 +- fs/nfs/callback_proc.c | 4 +- fs/nfs/fscache-index.c | 4 +- fs/nfs/fscache.c | 12 +++--- fs/nfs/inode.c | 49 ++++++++++++---------- fs/nfs/nfs2xdr.c | 25 ++++++----- fs/nfs/nfs3xdr.c | 8 +++- fs/nfs/nfs4xdr.c | 7 +++- fs/nfsd/blocklayout.c | 8 ++-- fs/nfsd/nfs3xdr.c | 14 ++++--- fs/nfsd/nfs4xdr.c | 7 +++- fs/nfsd/nfsxdr.c | 2 +- fs/ntfs/inode.c | 30 ++++++------- fs/ocfs2/dlmglue.c | 20 ++++++--- fs/ocfs2/file.c | 6 +-- fs/orangefs/inode.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- fs/overlayfs/file.c | 4 +- fs/overlayfs/inode.c | 16 +++---- fs/overlayfs/overlayfs.h | 2 +- fs/proc/uptime.c | 2 +- fs/pstore/platform.c | 2 +- fs/pstore/ram.c | 18 ++++---- fs/reiserfs/namei.c | 2 +- fs/reiserfs/xattr.c | 4 +- fs/ubifs/dir.c | 4 +- fs/ubifs/file.c | 23 +++++----- fs/ubifs/ubifs.h | 2 +- fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 59 +++++++++++++------------- fs/udf/super.c | 17 ++++---- fs/udf/udfdecl.h | 4 +- fs/udf/udftime.c | 9 +--- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_trans_inode.c | 2 +- include/linux/fs.h | 24 ++++++----- include/linux/pstore.h | 2 +- include/linux/stat.h | 8 ++-- 86 files changed, 546 insertions(+), 431 deletions(-) Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next) $ git merge livepatching/for-next Already up to date! Merge made by the 'recursive' strategy. Merging coresight/next (b66e01615a29 coresight: tmc: Add configuration support for trace buffer size) $ git merge coresight/next Auto-merging include/linux/coresight.h Auto-merging drivers/hwtracing/coresight/coresight.c Auto-merging drivers/hwtracing/coresight/coresight-tmc.h Auto-merging drivers/hwtracing/coresight/coresight-tmc.c Auto-merging drivers/hwtracing/coresight/coresight-tmc-etr.c CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-tmc-etr.c Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c Auto-merging drivers/hwtracing/coresight/coresight-priv.h Auto-merging drivers/hwtracing/coresight/coresight-etm4x.h Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c Auto-merging drivers/hwtracing/coresight/coresight-etm4x-sysfs.c Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c Auto-merging drivers/hwtracing/coresight/coresight-etm3x-sysfs.c Auto-merging drivers/hwtracing/coresight/coresight-etm.h Auto-merging drivers/hwtracing/coresight/coresight-etb10.c Resolved 'drivers/hwtracing/coresight/coresight-tmc-etr.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 813a0617a23a] Merge remote-tracking branch 'coresight/next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-bus-coresight-devices-tmc | 8 + .../devicetree/bindings/arm/coresight.txt | 5 +- drivers/hwtracing/coresight/coresight-etb10.c | 12 +- drivers/hwtracing/coresight/coresight-etm.h | 3 - .../hwtracing/coresight/coresight-etm3x-sysfs.c | 43 +- drivers/hwtracing/coresight/coresight-etm3x.c | 4 +- .../hwtracing/coresight/coresight-etm4x-sysfs.c | 47 +- drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- drivers/hwtracing/coresight/coresight-etm4x.h | 3 - drivers/hwtracing/coresight/coresight-priv.h | 10 +- drivers/hwtracing/coresight/coresight-tmc-etf.c | 45 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 1010 ++++++++++++++++++-- drivers/hwtracing/coresight/coresight-tmc.c | 83 +- drivers/hwtracing/coresight/coresight-tmc.h | 110 ++- drivers/hwtracing/coresight/coresight.c | 3 +- include/linux/coresight.h | 20 - 16 files changed, 1219 insertions(+), 218 deletions(-) Merging rtc/rtc-next (e4302aec8a06 rtc: pxa: fix probe function) $ git merge rtc/rtc-next Already up to date. Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next) $ git merge nvdimm/libnvdimm-for-next Auto-merging mm/huge_memory.c Auto-merging include/linux/mm.h Auto-merging include/linux/dax.h Auto-merging fs/dax.c Auto-merging drivers/dax/device.c Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Merge made by the 'recursive' strategy. arch/x86/include/asm/set_memory.h | 42 +++++++++ arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 ---- arch/x86/kernel/cpu/mcheck/mce.c | 38 +------- arch/x86/mm/pat.c | 16 ++++ drivers/dax/device.c | 97 ++++++++++++-------- drivers/nvdimm/pmem.c | 26 ++++++ drivers/nvdimm/pmem.h | 13 +++ fs/dax.c | 92 ++++++++++++++++++- include/linux/dax.h | 16 +++- include/linux/huge_mm.h | 5 +- include/linux/mm.h | 1 + include/linux/set_memory.h | 14 +++ mm/huge_memory.c | 4 +- mm/madvise.c | 18 +++- mm/memory-failure.c | 143 ++++++++++++++++++++++++++++-- 15 files changed, 434 insertions(+), 106 deletions(-) Merging at24/at24/for-next (73b0d922cd5b eeprom: at24: provide a separate routine for creating dummy i2c clients) $ git merge at24/at24/for-next Already up to date. Merging ntb/ntb-next (c9160b69258e ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_create_queue) $ git merge ntb/ntb-next Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c Merge made by the 'recursive' strategy. drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +- drivers/ntb/hw/intel/Makefile | 1 + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- drivers/ntb/ntb_transport.c | 6 +- 8 files changed, 1001 insertions(+), 813 deletions(-) rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs) $ git merge kspp/for-next/kspp Already up to date. Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) $ git merge init_task/init_task Already up to date. Merging cisco/for-next (5997aab0a11e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge cisco/for-next Already up to date. Merging akpm-current/current (8a85411459a4 ipc: use new return type vm_fault_t) $ git merge --no-ff akpm-current/current Auto-merging security/apparmor/lsm.c Auto-merging mm/memory.c Auto-merging mm/hmm.c Auto-merging lib/Kconfig.debug Auto-merging kernel/sched/core.c Auto-merging kernel/memremap.c Auto-merging kernel/fork.c Auto-merging kernel/cgroup/cgroup.c Auto-merging include/linux/sched.h Auto-merging include/linux/memremap.h Auto-merging include/linux/fs.h Auto-merging fs/proc/base.c Auto-merging fs/ocfs2/file.c Auto-merging fs/ocfs2/dlmglue.c Auto-merging fs/namei.c Auto-merging fs/fat/inode.c Auto-merging fs/exec.c Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-bdi | 8 + Documentation/admin-guide/cgroup-v2.rst | 74 ++++++++ Documentation/sysctl/fs.txt | 36 ++++ Documentation/vm/hmm.rst | 1 - arch/arm/Kconfig | 3 +- arch/arm/boot/compressed/Makefile | 3 + arch/arm/include/asm/page.h | 2 + arch/arm/kvm/hyp/Makefile | 8 + arch/arm/vdso/Makefile | 3 + block/genhd.c | 2 +- fs/bfs/inode.c | 9 +- fs/binfmt_elf.c | 16 +- fs/dcache.c | 3 +- fs/exec.c | 1 + fs/exofs/ore.c | 84 +++++---- fs/exofs/ore_raid.c | 75 ++++++-- fs/exofs/super.c | 23 ++- fs/fat/inode.c | 7 +- fs/namei.c | 53 +++++- fs/ocfs2/buffer_head_io.c | 77 ++++++-- fs/ocfs2/dir.c | 3 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/journal.c | 51 +++-- fs/ocfs2/stackglue.c | 6 - fs/ocfs2/stackglue.h | 3 - fs/proc/base.c | 9 +- include/linux/cgroup-defs.h | 5 + include/linux/fs.h | 2 + include/linux/hmm.h | 4 +- include/linux/kcov.h | 14 ++ include/linux/memcontrol.h | 34 ++++ include/linux/memremap.h | 1 + include/linux/oom.h | 12 +- include/linux/sched.h | 2 +- include/linux/sched/signal.h | 3 + include/linux/slab.h | 1 + include/linux/swap.h | 13 +- include/uapi/linux/prctl.h | 4 + ipc/sem.c | 18 +- ipc/shm.c | 2 +- kernel/cgroup/cgroup.c | 13 +- kernel/cred.c | 1 + kernel/exit.c | 4 + kernel/fork.c | 10 + kernel/kcov.c | 21 ++- kernel/memremap.c | 39 +++- kernel/relay.c | 2 +- kernel/sched/core.c | 4 + kernel/sys.c | 11 ++ kernel/sysctl.c | 18 ++ lib/Kconfig.debug | 36 ++-- mm/backing-dev.c | 35 ++++ mm/hmm.c | 297 +++++------------------------- mm/ksm.c | 14 +- mm/list_lru.c | 7 + mm/memcontrol.c | 279 +++++++++++++++++++++++++++- mm/memory.c | 4 +- mm/mincore.c | 12 +- mm/oom_kill.c | 210 ++++++++++++++------- mm/page_owner.c | 4 +- mm/slab_common.c | 21 ++- mm/sparse-vmemmap.c | 1 - mm/sparse.c | 29 ++- mm/swap_state.c | 16 +- mm/swapfile.c | 156 ++++++++++++---- scripts/checkpatch.pl | 7 + security/apparmor/lsm.c | 1 + security/selinux/hooks.c | 1 + 69 files changed, 1364 insertions(+), 570 deletions(-) $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base First, rewinding head to replay your work on top of it... Applying: mm: use octal not symbolic permissions Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX Applying: mm: fix oom_kill event handling Applying: mm-fix-oom_kill-event-handling-fix Applying: hexagon: fix printk format warning in setup.c Applying: hexagon: drop the unused variable zero_page_mask Applying: mm, memcg: propagate memory effective protection on setting memory.min/low Applying: mm, memcg: don't skip memory guarantee calculations Applying: selftests: cgroup: add test for memory.low corner cases Applying: lib/test_printf.c: call wait_for_random_bytes() before plain %p tests Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() Applying: kernel/kexec_file.c: load kernel at top of system RAM if required Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Applying: sparc64: NG4 memset 32 bits overflow $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + fdaae85b307a...0d6d22d964dc akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (0d6d22d964dc sparc64: NG4 memset 32 bits overflow) $ git merge --no-ff akpm/master Merge made by the 'recursive' strategy. arch/arm64/mm/init.c | 6 +- arch/hexagon/include/asm/pgtable.h | 1 - arch/hexagon/kernel/setup.c | 2 +- arch/hexagon/mm/init.c | 3 - arch/mips/kernel/setup.c | 4 +- arch/powerpc/mm/mem.c | 2 +- arch/sparc/lib/NG4memset.S | 26 ++--- arch/sparc/mm/init_64.c | 2 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 2 +- drivers/firmware/efi/arm-init.c | 2 +- drivers/media/platform/sti/delta/delta-ipc.c | 4 +- drivers/remoteproc/qcom_q6v5_pil.c | 2 +- drivers/soc/qcom/mdt_loader.c | 4 +- include/linux/ioport.h | 3 + include/linux/memcontrol.h | 26 ++++- kernel/kexec_file.c | 2 + kernel/resource.c | 63 +++++++++++++ lib/test_printf.c | 7 ++ mm/cleancache.c | 10 +- mm/cma_debug.c | 25 ++--- mm/compaction.c | 2 +- mm/dmapool.c | 2 +- mm/failslab.c | 2 +- mm/frontswap.c | 11 +-- mm/memblock.c | 9 +- mm/memcontrol.c | 35 ++++--- mm/oom_kill.c | 2 +- mm/page_alloc.c | 2 +- mm/page_idle.c | 2 +- mm/page_owner.c | 4 +- mm/shmem.c | 9 +- mm/slab_common.c | 4 +- mm/vmalloc.c | 4 +- mm/zsmalloc.c | 5 +- mm/zswap.c | 38 ++++---- tools/testing/selftests/cgroup/test_memcontrol.c | 115 +++++++++++++++++++++++ 37 files changed, 329 insertions(+), 115 deletions(-)