On Wed, Jun 29, 2016 at 07:54:54PM +0100, Jonathan Cameron wrote: > Hi Greg, > > A few merge conflicts on this. Two are the obvious choice. > The third is in industrialio-trigger.c and you want the version that > doesn't check for trig->ops (as it is no longer considered optional so > must exist by that point). Odd, I only had a conflict in a Kconfig and the .mailmap file. Can you check that I got this all right? 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
