* iio togreg branch rebase.
@ 2021-03-25 19:18 Jonathan Cameron
2021-03-26 11:10 ` Andy Shevchenko
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Cameron @ 2021-03-25 19:18 UTC (permalink / raw)
To: linux-iio
Hi All,
Unfortunately the mess I made of building the immutable branch earlier
in this cycle to deal with the SCMI driver meant I'd missed some
fixes tags that needed updating.
Anyhow, upshot is I only realised during last minute tests before
a pull request. Had to rebase to fix, so apologies to anyone who
happened to be basing their trees on IIO.
No actual code changes, but the history will be different.
I need to redo the SCMI IB merge on top, but for now the togreg
branch should be good again.
It's likely any fixes in flight for stuff this cycle will need
their tags updating, but hopefully I'll spot them this time!
Thanks,
Jonathan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: iio togreg branch rebase.
2021-03-25 19:18 iio togreg branch rebase Jonathan Cameron
@ 2021-03-26 11:10 ` Andy Shevchenko
2021-04-07 15:25 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2021-03-26 11:10 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio
On Thu, Mar 25, 2021 at 9:20 PM Jonathan Cameron <jic23@kernel.org> wrote:
>
> Hi All,
>
> Unfortunately the mess I made of building the immutable branch earlier
> in this cycle to deal with the SCMI driver meant I'd missed some
> fixes tags that needed updating.
>
> Anyhow, upshot is I only realised during last minute tests before
> a pull request. Had to rebase to fix, so apologies to anyone who
> happened to be basing their trees on IIO.
>
> No actual code changes, but the history will be different.
>
> I need to redo the SCMI IB merge on top, but for now the togreg
> branch should be good again.
To make less impact I use --rebase-merges option for `git rebase
--interactive ...`, so I can save as much history as possible in this
case.
> It's likely any fixes in flight for stuff this cycle will need
> their tags updating, but hopefully I'll spot them this time!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: iio togreg branch rebase.
2021-03-26 11:10 ` Andy Shevchenko
@ 2021-04-07 15:25 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2021-04-07 15:25 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Jonathan Cameron, linux-iio
On Fri, 26 Mar 2021 13:10:04 +0200
Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> On Thu, Mar 25, 2021 at 9:20 PM Jonathan Cameron <jic23@kernel.org> wrote:
> >
> > Hi All,
> >
> > Unfortunately the mess I made of building the immutable branch earlier
> > in this cycle to deal with the SCMI driver meant I'd missed some
> > fixes tags that needed updating.
> >
> > Anyhow, upshot is I only realised during last minute tests before
> > a pull request. Had to rebase to fix, so apologies to anyone who
> > happened to be basing their trees on IIO.
> >
> > No actual code changes, but the history will be different.
> >
> > I need to redo the SCMI IB merge on top, but for now the togreg
> > branch should be good again.
>
> To make less impact I use --rebase-merges option for `git rebase
> --interactive ...`, so I can save as much history as possible in this
> case.
>
Thanks! That came in very handy this morning :)
Jonathan
> > It's likely any fixes in flight for stuff this cycle will need
> > their tags updating, but hopefully I'll spot them this time!
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-07 15:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-25 19:18 iio togreg branch rebase Jonathan Cameron
2021-03-26 11:10 ` Andy Shevchenko
2021-04-07 15:25 ` Jonathan Cameron
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).