On 26/08/16 08:39, Linus Walleij wrote: > On Thu, Aug 25, 2016 at 10:32 PM, Peter Rosin <peda@xxxxxxxxxx> wrote: >> On 2016-08-25 14:44, Linus Walleij wrote: > >>> Then the rest is merge mechanics, dunno the best there, >>> Jonathan can decide. >> >> I waited a bit for someone to scream about v4.8-rc3 being a bad base >> for some reason, but there was only silence. I have now pushed the >> series, and it can be pulled by anyone interested. >> >> Wolfram, please merge it into i2c/for-next >> >> Linus/Jonathan, technically you don't need all patches and can skip >> the last three, but it seems a bit over the top to be super anal >> about that detail... > > OK I'll pull this into my development branch. At least we can > merge the bindings, whether to merge the driver this or next merge > window (or simply apply the patch to the I2C tree!) is another issue. > > Yours, > Linus Walleij When you post future versions Linus, please include a mention of the dependency and a link to Peter's tree. Peter, please can keep that branch around for now. If we get this sorted in time to be prior to the next merge window I'll pull your tree into IIO as well as Wolfram having already pulled it into i2c. Both will work there way upstream and all will be fine. My pull request tag will simply have a description of why we are doing this. Jonathan > -- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html