On Mon, 14 Aug 2017 14:37:26 +0200 Wolfram Sang <wsa@xxxxxxxxxxxxx> wrote: > On Mon, Aug 14, 2017 at 12:39:18PM +0200, Andreas Klinger wrote: > > Wolfram Sang <wsa@xxxxxxxxxxxxx> schrieb am Mon, 14. Aug 11:11: > > > On Mon, Aug 14, 2017 at 10:59:41AM +0200, Andreas Klinger wrote: > > > > add trivial device tree binding "devantech,srf02" and "devantech,srf10" > > > > > > > > Signed-off-by: Andreas Klinger <ak@xxxxxxxxxxxxx> > > > > Acked-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > > > > --- > > > > Documentation/devicetree/bindings/i2c/trivial-devices.txt | 2 ++ > > > > > > Again: This file has moved since v4.12-rc1. Please rebase to v4.12 or > > > even v4.13-rc5. > > > > > > > Then i split the patch series up in two parts: > > - patch with only device tree binding against >= v4.12 > > - everything else as patch series against git tree of IIO > > > > Ok? > > Wooha, the master branch of iio.git is at v4.11? I see. So, this is the > culprit, sorry! @Jonathan: is that the branch people should develop on, > or is it your testing branch? > Yeah, that's a dead end really. Mostly developing against latest mainline is the best bet (or latest recentish version). Last time I tried to delete the master branch I think it broke the web interface on kernel.org as it didn't know what branch to default to. Not tried it for a while. Anyhow, I just pushed out my upstream as master so it should now be a fairly random pull I did of Greg's tree but will include everything that is in linux-next from IIO. I'll try and remember to do that when I fast forward after he has taken a pull request. Jonathan -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
