Re: [PATCH v5 06/18] iio: magnetometer: ak8975: pass conversion timeouts as arguments

[Joshua Crofts]

On Wed, 6 May 2026 at 09:20, Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> On Wed, May 06, 2026 at 09:02:15AM +0200, Joshua Crofts wrote:
> > On Wed, 6 May 2026 at 08:34, Andy Shevchenko
> > <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> > > On Tue, May 05, 2026 at 01:46:02PM +0200, Joshua Crofts via B4 Relay wrote:
>
> ...
>
> > > >  static int ak8975_start_read_axis(struct ak8975_data *data,
> > > >                                 const struct i2c_client *client)
> > > >  {
> > > > -     /* Set up the device for taking a sample. */
> > > > -     int ret = ak8975_set_mode(data, MODE_ONCE);
> > > > +     int ret;
> > > >
> > > > +     /* Set up the device for taking a sample. */
> > > > +     ret = ak8975_set_mode(data, MODE_ONCE);
> > >
> > > But this piece does not belong to the main scope of the patch.
> >
> > Fair, probably a badly resolved merge conflict.
>
> Hmm... Usually what we use is interactive rebase. Very powerful tool!
>
>         `git rebase --rebase-merges --interactive $SHA`

I see, well I use `git rebase -i HEAD~no_of_commits_in_series` and
sometimes I move a different thing by accident. It does get a bit
crowded with 18 patches (yours were fine but I also had to do some
resolution after moving the order)

> where $SHA is the same one that you used as --base for the series.
>
> In conjunction with
>
>         `git reset HEAD~1; git commit -s --interactive -c ORIG_HEAD`
>
> technique, you can easily move parts between patches.
>
> (There are even more advanced techniques, but I'm an old-school guy.)

Good to know, thanks!

-- 
Kind regards

CJD