]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
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)
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.

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge