OSDN Git Service

Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Sun, 12 Feb 2023 11:11:56 +0000 (22:11 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 12 Feb 2023 11:11:56 +0000 (22:11 +1100)
commitfc8a898cfdbb0e63cfde547715c2031de22e7893
treee1eaae008d673bb68cdc003d72eadc4ba5535a18
parent544f823ec7a34332550f22735959d3e1ffcf4684
parent2ea31e2e62bbc4d11c411eeb36f1b02841dbcab1
Merge branch 'fixes' into next

Merge our fixes branch to bring in some changes that conflict with
upcoming next content.
arch/powerpc/Kconfig
arch/powerpc/include/asm/hw_irq.h
arch/powerpc/kernel/time.c
arch/powerpc/mm/book3s64/hash_utils.c