Re: iio togreg branch rebase.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Mar 25, 2021 at 9:20 PM Jonathan Cameron <jic23@xxxxxxxxxx> 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



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux