]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'powerpc-4.5-4' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 25 Feb 2016 10:52:58 +0000 (21:52 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 25 Feb 2016 10:52:58 +0000 (21:52 +1100)
commit9914df5886699b8940808b415e6cbe11edeba1c4
tree41de92d988a4deccb2d5087a964a51682f155e99
parent08de03721b7e8ef52712a5ce684d34a8e0189163
parentca7d31897ffd2bc2ccbd7fb45008ac581f65815d
Merge tag 'powerpc-4.5-4' into next

Pull in our current fixes from 4.5, in particular the "Fix Multi hit
ERAT" bug is causing folks some grief when testing next.
arch/powerpc/Kconfig
arch/powerpc/kernel/eeh_driver.c
arch/powerpc/platforms/powernv/eeh-powernv.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.c
arch/powerpc/platforms/powernv/pci.h
mm/huge_memory.c