Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next

2026-09-26 18:16:26 +00:00 · 2016-03-04 23:36:02 +00:00 · 2016-03-04 23:36:02 +00:00 · 1b3bf84797
commit 1b3bf84797
parent 18558cae02 656b8035b0 f474c8c857 b426867612 1d93ba2aaa
60 changed files with 980 additions and 382 deletions
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
--- a/Documentation/driver-model/porting.txt
+++ b/Documentation/driver-model/porting.txt
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/boot/compressed/piggy.gzip.S
+++ b/arch/arm/boot/compressed/piggy.gzip.S
--- a/arch/arm/boot/compressed/piggy.lz4.S
+++ b/arch/arm/boot/compressed/piggy.lz4.S
--- a/arch/arm/boot/compressed/piggy.lzma.S
+++ b/arch/arm/boot/compressed/piggy.lzma.S
--- a/arch/arm/boot/compressed/piggy.lzo.S
+++ b/arch/arm/boot/compressed/piggy.lzo.S
--- a/arch/arm/boot/compressed/piggy.xzkern.S
+++ b/arch/arm/boot/compressed/piggy.xzkern.S
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
--- a/arch/arm/include/asm/div64.h
+++ b/arch/arm/include/asm/div64.h
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
--- a/arch/arm/include/asm/mmu_context.h
+++ b/arch/arm/include/asm/mmu_context.h
--- a/arch/arm/include/asm/sections.h
+++ b/arch/arm/include/asm/sections.h
--- a/arch/arm/include/asm/sparsemem.h
+++ b/arch/arm/include/asm/sparsemem.h
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/hibernate.c
+++ b/arch/arm/kernel/hibernate.c
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/arch/arm/mach-davinci/include/mach/uncompress.h
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
--- a/arch/arm/mach-ks8695/include/mach/uncompress.h
+++ b/arch/arm/mach-ks8695/include/mach/uncompress.h
--- a/arch/arm/mach-netx/include/mach/uncompress.h
+++ b/arch/arm/mach-netx/include/mach/uncompress.h
--- a/arch/arm/mach-omap1/include/mach/uncompress.h
+++ b/arch/arm/mach-omap1/include/mach/uncompress.h
--- a/arch/arm/mach-rpc/include/mach/uncompress.h
+++ b/arch/arm/mach-rpc/include/mach/uncompress.h
--- a/arch/arm/mach-sa1100/include/mach/uncompress.h
+++ b/arch/arm/mach-sa1100/include/mach/uncompress.h
--- a/arch/arm/mach-w90x900/include/mach/uncompress.h
+++ b/arch/arm/mach-w90x900/include/mach/uncompress.h
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/cache-tauros2.c
+++ b/arch/arm/mm/cache-tauros2.c
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
--- a/arch/arm/mm/idmap.c
+++ b/arch/arm/mm/idmap.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
--- a/arch/arm/mm/pageattr.c
+++ b/arch/arm/mm/pageattr.c
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
--- a/include/linux/clkdev.h
+++ b/include/linux/clkdev.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dma-attrs.h
+++ b/include/linux/dma-attrs.h
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
--- a/include/media/videobuf2-dma-contig.h
+++ b/include/media/videobuf2-dma-contig.h