Merge MTD fixes into -next

2026-09-26 18:16:26 +00:00 · 2017-06-01 11:24:24 -07:00 · 2017-06-01 11:24:24 -07:00 · e3db1289e7
commit e3db1289e7
parent c316cf6704 05e97a9eda
411 changed files with 3512 additions and 1564 deletions
--- a/Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
+++ b/Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
--- a/Documentation/usb/typec.rst
+++ b/Documentation/usb/typec.rst
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
--- a/15
+++ b/15
--- a/4
+++ b/4
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
--- a/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
+++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
--- a/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
+++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
--- a/arch/arm/boot/dts/imx53-qsrb.dts
+++ b/arch/arm/boot/dts/imx53-qsrb.dts
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
--- a/arch/arm/boot/dts/include/arm
+++ b/arch/arm/boot/dts/include/arm
--- a/arch/arm/boot/dts/include/arm64
+++ b/arch/arm/boot/dts/include/arm64
--- a/arch/arm/boot/dts/include/dt-bindings
+++ b/arch/arm/boot/dts/include/dt-bindings
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
--- a/arch/arm/boot/dts/omap4-panda-a4.dts
+++ b/arch/arm/boot/dts/omap4-panda-a4.dts
--- a/arch/arm/boot/dts/omap4-panda-es.dts
+++ b/arch/arm/boot/dts/omap4-panda-es.dts
--- a/arch/arm/configs/gemini_defconfig
+++ b/arch/arm/configs/gemini_defconfig
--- a/arch/arm/include/asm/kvm_coproc.h
+++ b/arch/arm/include/asm/kvm_coproc.h
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
--- a/arch/arm/kvm/handle_exit.c
+++ b/arch/arm/kvm/handle_exit.c
--- a/arch/arm/kvm/hyp/Makefile
+++ b/arch/arm/kvm/hyp/Makefile
--- a/arch/arm/kvm/hyp/switch.c
+++ b/arch/arm/kvm/hyp/switch.c
--- a/arch/arm/kvm/trace.h
+++ b/arch/arm/kvm/trace.h
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
--- a/arch/arm/mach-bcm/bcm_kona_smc.c
+++ b/arch/arm/mach-bcm/bcm_kona_smc.c
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
--- a/arch/arm/mach-spear/time.c
+++ b/arch/arm/mach-spear/time.c
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
--- a/arch/arm64/boot/dts/include/arm
+++ b/arch/arm64/boot/dts/include/arm
--- a/arch/arm64/boot/dts/include/arm64
+++ b/arch/arm64/boot/dts/include/arm64
--- a/arch/arm64/boot/dts/include/dt-bindings
+++ b/arch/arm64/boot/dts/include/dt-bindings
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
--- a/arch/arm64/include/asm/atomic_ll_sc.h
+++ b/arch/arm64/include/asm/atomic_ll_sc.h
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
--- a/arch/cris/boot/dts/include/dt-bindings
+++ b/arch/cris/boot/dts/include/dt-bindings
--- a/arch/metag/boot/dts/include/dt-bindings
+++ b/arch/metag/boot/dts/include/dt-bindings
--- a/arch/mips/boot/dts/include/dt-bindings
+++ b/arch/mips/boot/dts/include/dt-bindings
--- a/arch/powerpc/boot/dts/include/dt-bindings
+++ b/arch/powerpc/boot/dts/include/dt-bindings
--- a/arch/powerpc/include/asm/module.h
+++ b/arch/powerpc/include/asm/module.h
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
--- a/arch/powerpc/kvm/book3s_pr_papr.c
+++ b/arch/powerpc/kvm/book3s_pr_papr.c
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
--- a/arch/powerpc/mm/dump_linuxpagetables.c
+++ b/arch/powerpc/mm/dump_linuxpagetables.c
--- a/arch/s390/include/asm/debug.h
+++ b/arch/s390/include/asm/debug.h
--- a/arch/s390/include/asm/dis.h
+++ b/arch/s390/include/asm/dis.h
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
--- a/arch/s390/lib/probes.c
+++ b/arch/s390/lib/probes.c
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
--- a/arch/sparc/include/asm/setup.h
+++ b/arch/sparc/include/asm/setup.h
--- a/arch/sparc/kernel/ftrace.c
+++ b/arch/sparc/kernel/ftrace.c
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
--- a/arch/x86/kvm/pmu_intel.c
+++ b/arch/x86/kvm/pmu_intel.c
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
--- a/Show more
+++ b/Show more