Skip to contentSkip to conversation

iio togreg branch rebase.

DISCUSSION Jonathan Cameron 3 participants 3 messages Mar 25, 2021 – Apr 7, 2021 IIO

lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

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

#1 lore raw
Quoted 7 lines · Jonathan Cameron

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.

Quoted 8 lines

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.

Quoted 2 lines

It's likely any fixes in flight for stuff this cycle will need their tags updating, but hopefully I'll spot them this time!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 12 lines · On Fri, 26 Mar 2021 13:10:04 +0200 Andy Shevchenko <[email protected]>…
Quoted 11 lines · Jonathan Cameron

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.

Quoted 9 lines
Quoted 4 lines

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

Quoted 5 lines
Quoted 2 lines

It's likely any fixes in flight for stuff this cycle will need their tags updating, but hopefully I'll spot them this time!