linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Messed up the fixes-togreg-post-rc1 branch so cherry picking into fixes-togreg
@ 2016-08-15 14:37 Jonathan Cameron
  2016-08-15 14:43 ` Jonathan Cameron
  0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Cameron @ 2016-08-15 14:37 UTC (permalink / raw)
  To: linux-iio@vger.kernel.org

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Messed up the fixes-togreg-post-rc1 branch so cherry picking into fixes-togreg
  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
  0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Cameron @ 2016-08-15 14:43 UTC (permalink / raw)
  To: linux-iio@vger.kernel.org, Alison Schofield

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.

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
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Messed up the fixes-togreg-post-rc1 branch so cherry picking into fixes-togreg
  2016-08-15 14:43 ` Jonathan Cameron
@ 2016-08-15 23:13   ` Alison Schofield
  0 siblings, 0 replies; 3+ messages in thread
From: Alison Schofield @ 2016-08-15 23:13 UTC (permalink / raw)
  To: Jonathan Cameron; +Cc: linux-iio@vger.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
> > 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-08-15 23:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).