From: Alison Schofield <amsfield22@gmail.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: Messed up the fixes-togreg-post-rc1 branch so cherry picking into fixes-togreg
Date: Mon, 15 Aug 2016 16:13:20 -0700 [thread overview]
Message-ID: <20160815231305.GA12216@d830.WORKGROUP> (raw)
In-Reply-To: <8bc6a47d-52e2-f1f0-5218-aff27c667bde@kernel.org>
On Mon, Aug 15, 2016 at 03:43:59PM +0100, Jonathan Cameron wrote:
> On 15/08/16 15:37, Jonathan Cameron wrote:
> > Hi All,
> >
> > Seems I messed up the base of the fixes-togreg-post-rc1 branch
> > (based on a random point in togreg rather than the last
> > pull request as intended). I'll drop that branch as
> > junk having cherry picked into an updated fixes-togreg branch.
> >
> > Make a bit of a mess of dates, but otherwise should have no
> > real affect.
> >
> > This is just in case anyone was basing on that branch which
> > will shortly disappear.
> >
> > Jonathan
> Note this also involved dropping the thermocouple kconfig fix
> from Alison as that driver hasn't hit mainline yet.
>
> Alison, would you mind resending that one part of the patch based
> on the togreg branch? That way I won't forget it.
Done. Sent as an odd v2. Let me know if not ok.
alisons
>
> Thanks
>
> Jonathan
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
>
prev parent reply other threads:[~2016-08-15 23:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 14:37 Messed up the fixes-togreg-post-rc1 branch so cherry picking into fixes-togreg Jonathan Cameron
2016-08-15 14:43 ` Jonathan Cameron
2016-08-15 23:13 ` Alison Schofield [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=20160815231305.GA12216@d830.WORKGROUP \
--to=amsfield22@gmail.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
/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).