From: Jonathan Cameron <jic23@kernel.org>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: Andreas Klinger <ak@it-klinger.de>,
knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
linux-iio@vger.kernel.org, robh+dt@kernel.org,
mark.rutland@arm.com, linux-i2c@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/5] iio: srf08: add device tree binding for srf02 and srf10
Date: Thu, 17 Aug 2017 15:30:17 +0100 [thread overview]
Message-ID: <20170817153017.6615fc96@archlinux> (raw)
In-Reply-To: <20170814123725.GA2238@katana>
On Mon, 14 Aug 2017 14:37:26 +0200
Wolfram Sang <wsa@the-dreams.de> wrote:
> On Mon, Aug 14, 2017 at 12:39:18PM +0200, Andreas Klinger wrote:
> > Wolfram Sang <wsa@the-dreams.de> 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@it-klinger.de>
> > > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > > > ---
> > > > 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
prev parent reply other threads:[~2017-08-17 14:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 8:59 [PATCH v2 1/5] iio: srf08: add device tree binding for srf02 and srf10 Andreas Klinger
2017-08-14 9:11 ` Wolfram Sang
2017-08-14 10:39 ` Andreas Klinger
2017-08-14 12:37 ` Wolfram Sang
2017-08-17 14:30 ` Jonathan Cameron [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170817153017.6615fc96@archlinux \
--to=jic23@kernel.org \
--cc=ak@it-klinger.de \
--cc=devicetree@vger.kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).