]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Jan 2018 12:21:14 +0000 (23:21 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Jan 2018 12:21:14 +0000 (23:21 +1100)
commitc685492d2ad3e8dd34a49cb0b3b8b39235bcc01c
treef00716a1dbde6b54dea5469ef209baac01883ec3
parent9a4e60be2461fef0c12a0d5ab310ee15eb6126ec
parent46b8d95c44eb9816c5fd9a34ced9de0235f8bc90
Merge branch 'fixes' into next

Merge our fixes branch from the 4.15 cycle.

Unusually the fixes branch saw some significant features merged,
notably the RFI flush patches, so we want the code in next to be
tested against that, to avoid any surprises when the two are merged.

There's also some other work on the panic handling that was reverted
in fixes and we now want to do properly in next, which would conflict.

And we also fix a few other minor merge conflicts.
19 files changed:
arch/powerpc/Kconfig
arch/powerpc/include/asm/exception-64s.h
arch/powerpc/include/asm/machdep.h
arch/powerpc/include/asm/paca.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/cpu_setup_power.S
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/process.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/vmlinux.lds.S
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/lib/feature-fixups.c
arch/powerpc/mm/fault.c
arch/powerpc/perf/core-book3s.c
arch/powerpc/perf/imc-pmu.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/xmon/xmon.c