On Sun, Apr 03, 2016 at 10:31:39PM +0100, Jonathan Cameron wrote: > Hi Greg, > > Note there is a merge conflict with one of the patches in the second lot of fixes > I sent early today. This is because the change got queued up here first then > we noticed and issue which it fixed by accident. > > Anyhow, conflict is in bmg160-core.c and you want the 'short option'. > For comparison, the code is pretty much identical to bmc150-accel-core.c. > > Otherwise, various automerged corners that seem to be fine. My build tests > failed on a random thermal driver which I'll assume has long since been fixed, > but otherwise seemed fine. I've done the merge now, can you verify I got it correct? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
