]> 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)
commitc1b5b7b1acc1e4f4c2c7dc01bf61f999b9f5e60d
treeae23bfb84d1bf196f7270bc438472d5329aeee92
parent25ce5edd7903490ca8be4b76e0476a403c6ae883
parent2c4a96992b8a6c9cbd8b9700f069511deb7d03e3
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