Hi Ben ! On Wed, 29 Jan 2014 18:46:09 +1100 Benjamin Herrenschmidt <benh at kernel.crashing.org> wrote: ... > Hrm, I get a merge conflicts with spi-mpc512x-psc.c, please check that I > fixed it up properly in powerpc-next and let me know. your fix is correct. Thanks, Anatolij