]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 28 Mar 2018 11:59:50 +0000 (22:59 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 28 Mar 2018 11:59:50 +0000 (22:59 +1100)
commitcecc1a2b674bdd03f6078f82fd3454b78f5c5be3
tree4e7444555649b133c663b43190bc9d2bea4e1712
parent5c79650d718f8c6c90f8c1f0ec12c7769e930b85
parentbd8b1bb17d01df80e9c33c4b5556acd9e952bef3
Merge branch 'fixes' into next

Merge our fixes branch from the 4.16 cycle.

There were a number of important fixes merged, in particular some Power9
workarounds that we want in next for testing purposes. There's also been
some conflicting changes in the CPU features code which are best merged
and tested before going upstream.
arch/powerpc/include/asm/book3s/64/mmu.h
arch/powerpc/include/asm/cputable.h
arch/powerpc/kernel/dt_cpu_ftrs.c
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/prom_init.c
arch/powerpc/mm/hash_native_64.c
arch/powerpc/mm/mmu_context_book3s64.c
arch/powerpc/mm/tlb-radix.c
tools/testing/selftests/powerpc/tm/Makefile