OSDN Git Service

Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 10 Mar 2020 04:16:42 +0000 (15:16 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 10 Mar 2020 04:16:42 +0000 (15:16 +1100)
commit819723a8a2fb66678fe15d177ae56af38163f364
treeab51b2cc5555cbf5f1899432b923995e41647633
parent247257b03b04398ca07da4bce3d17bee25d623cb
parent59bee45b9712c759ea4d3dcc4eff1752f3a66558
Merge branch 'fixes' into next

Merge in our fixes branch. In particular we want to merge the TM and KUAP fixes,
so we can add selftests for them in next.
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/head_32.h
arch/powerpc/mm/book3s32/hash_low.S
arch/powerpc/mm/book3s32/mmu.c
arch/powerpc/mm/kasan/kasan_init_32.c
arch/powerpc/mm/mem.c