Re: [PATCH v5 4/7] gpiolib: add support for biasing output lines

[Kent Gibson <warthog618@xxxxxxxxx>]

On Tue, Nov 05, 2019 at 10:03:42AM +0800, Kent Gibson wrote:
> On Mon, Nov 04, 2019 at 05:19:14PM +0100, Bartosz Golaszewski wrote:
> > pon., 4 lis 2019 o 16:59 Kent Gibson <warthog618@xxxxxxxxx> napisał(a):
> > >
> > > > Ugh, I missed one thing here - my for-next branch doesn't contain the
> > > > following commit e735244e2cf0 ("gpiolib: don't clear FLAG_IS_OUT when
> > > > emulating open-drain/open-source") which happens to modify this
> > > > function.
> > > >
> > > > If I provided you with a branch containing it - would it be a lot of
> > > > effort on your part to rebase it on top of it? If so - I can do it
> > > > myself.
> > > >
> > >
> > > I can do a rebase - though not until tomorrow (it is getting late here).
> > > I would like that commit in as well - I suspect it being missing is
> > > the reason a couple of the gpiod tests I was working on are failing.
> > > I was in the process of tracking that down when I switched back to this.
> > >
> > > Cheers,
> > > Kent.
> > >
> > >
> > 
> > No problem, it can wait until tomorrow. Please use the following
> > branch - gpio/for-kent - from my tree.
> > 
> 
> That was a lot simpler than I expected - it rebased cleanly onto the 
> new branch.  And fixed the gpiod test errors I was trying to track down.
> Will submit v6 shortly.
> 

Maybe I'm missing something, but given that the rebase was clean, was 
there actually any need for v6?
i.e. anyone can rebase the v5 patch onto gpio/for-kent:

$ git checkout -b pud_rebase brgl/gpio/for-next
Branch 'pud_rebase' set up to track remote branch 'gpio/for-next' from 'brgl'.
Switched to a new branch 'pud_rebase'
$ git am PATCH-v5-0-7-gpio-expose-line-bias-flags-to-userspace.mbox
Applying: gpio: expose pull-up/pull-down line flags to userspace
Applying: gpiolib: add support for pull up/down to lineevent_create
Applying: gpiolib: add support for disabling line bias
Applying: gpiolib: add support for biasing output lines
Applying: gpio: mockup: add set_config to support pull up/down
Applying: gpiolib: move validation of line handle flags into helper function
Applying: gpio: add new SET_CONFIG ioctl() to gpio chardev
$ git rebase brgl/gpio/for-kent
First, rewinding head to replay your work on top of it...
Applying: gpio: expose pull-up/pull-down line flags to userspace
Applying: gpiolib: add support for pull up/down to lineevent_create
Applying: gpiolib: add support for disabling line bias
Applying: gpiolib: add support for biasing output lines
Using index info to reconstruct a base tree...
M	drivers/gpio/gpiolib.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpio/gpiolib.c
Applying: gpio: mockup: add set_config to support pull up/down
Applying: gpiolib: move validation of line handle flags into helper function
Applying: gpio: add new SET_CONFIG ioctl() to gpio chardev

Or was it more about eyeballing and retesting the rebase in case the
3-way merge went haywire?

Cheers,
Kent.