On Sat, 2015-08-22 at 09:39 +0530, Vasant Hegde wrote: > On 08/22/2015 05:10 AM, Michael Ellerman wrote: > > On Fri, 2015-08-21 at 14:29 +0530, Vasant Hegde wrote: > >> On 08/21/2015 01:55 PM, Stephen Rothwell wrote: > >>> Hi all, > >>> > >>> After merging the nvdimm tree, today's linux-next build (powerpc > >>> allyesconfig) failed like this: > >> > >> Stephen, > >> > >> Thanks for reporting! I checked powerpc tree.. This is because of commit > >> 8a8d9181 in powerpc tree.. Basically Michael missed one hunk (below hunk in > >> opal-api.h) > > > > Hmm, looks like it. > > > > I do remember the patch didn't apply to my tree, so I guess I accidentally > > dropped a hunk when I was forcing it to apply. > > Hmmm yeah..My patchset was based on upstream tree (4.2-rc7) instead of powerpc > next tree. That's OK. Usually that works fine, and usually when there is a conflict I can just fix it up. I'm not sure how I managed to drop that chunk, I'll have to go back and look at what I did. I suspect I hand-edited the patch, and if you do that wrong it can lead to patch just ignoring the rest of the patch. I probably should have just asked you to rebase on my next, but given it was already version 10 I didn't really feel like doing another revision :) > > Also we're obviously not building this in any of our defconfigs. Can you please > > send a patch to enable it for pseries_defconfig and ppc64_defconfig. > > Sure.. Will send separate patch. Thanks. cheers -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
