]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 05:59:06 +0000 (15:59 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 05:59:06 +0000 (15:59 +1000)
commit64f064175d028dc68943833c14d095d5c0c84f53
treeae23bfb84d1bf196f7270bc438472d5329aeee92
parent7c937264d61f570810c06d021c7044f3d0fac0f5
parentc4b85d826414fd131b0c05dcb983f0ca5aa0eb29
Merge branch 'fixes' into next

Merge our fixes branch from the 4.18 cycle to resolve some minor
conflicts.
arch/powerpc/Makefile
arch/powerpc/kernel/idle_book3s.S
arch/powerpc/kvm/book3s_64_vio.c
arch/powerpc/kvm/book3s_64_vio_hv.c
arch/powerpc/xmon/xmon.c
drivers/vfio/vfio_iommu_spapr_tce.c