git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 516fa8d 1a92a80)

author	Michael Ellerman <mpe@ellerman.id.au>
	Wed, 23 Aug 2017 12:20:10 +0000 (22:20 +1000)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Wed, 23 Aug 2017 12:20:10 +0000 (22:20 +1000)
commit	15c659ff9d5b367c886166a9854a89b72c524a68
tree	d33acaf62889bf6304f6109dd69923a17ab938be	tree \| snapshot (tar.gz zip)
parent	516fa8d0e19d854253460ea7692551e836e7e2b5	commit \| diff
parent	1a92a80ad386a1a6e3b36d576d52a1a456394b70	commit \| diff

Merge branch 'fixes' into next

There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.

16 files changed:

arch/powerpc/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/book3s/64/mmu.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/book3s/64/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/mmu_context.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/exceptions-64s.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/idle_book3s.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/watchdog.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mmu_context_book3s64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/pgtable-radix.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/tlb-radix.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/idle.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/pci-ioda.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/reconfig.c	diff1 \|	diff2 \|	blob \| history