git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Michael Ellerman <mpe@ellerman.id.au>
	Fri, 30 Mar 2018 13:11:24 +0000 (00:11 +1100)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Fri, 30 Mar 2018 22:09:36 +0000 (09:09 +1100)
commit	f437c51748fa1dd423a878c870ad203843a51c8d
tree	d1593fe45c0341f88eecd26568bb913ac74c64a1	tree \| snapshot
parent	872a100a49c3785b4577e002580ca5689d1be7a1	commit \| diff
parent	29ab6c4708a587bc27ea0c765ac36aef9c1a77c9	commit \| diff

Merge branch 'topic/paca' into next

Bring in yet another series that touches KVM code, and might need to
be merged into the kvm-ppc branch to resolve conflicts.

This required some changes in pnv_power9_force_smt4_catch/release()
due to the paca array becomming an array of pointers.

24 files changed:

arch/powerpc/include/asm/book3s/64/hash.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/paca.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/setup.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/paca.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/sysfs.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rmhandlers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/hash_utils_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/pgtable-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/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/hotplug-cpu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/lpar.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/smp.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/xmon/xmon.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

arch/powerpc/include/asm/book3s/64/hash.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/paca.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/setup.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/paca.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/sysfs.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rmhandlers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/hash_utils_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/pgtable-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/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/hotplug-cpu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/lpar.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/smp.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/xmon/xmon.c	diff1 \|	diff2 \|	blob \| history