Re: [GIT PULL] mfd: exynos-lpass: Pinctrl dependency

[Lee Jones]

On Tue, 04 Apr 2017, Krzysztof Kozlowski wrote:

> On Tue, Apr 04, 2017 at 10:50:54AM +0100, Lee Jones wrote:
> > On Tue, 04 Apr 2017, Krzysztof Kozlowski wrote:
> > 
> > > On Mon, Apr 3, 2017 at 12:18 PM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> > > > On Tue, 28 Mar 2017, Krzysztof Kozlowski wrote:
> > > >
> > > >>
> > > >> Hi Lee,
> > > >>
> > > >>
> > > >> This is dependency for mfd/exynos-lpass driver changes from Marek Szyprowski.
> > > >> That's a material for v4.12 and I will be pushing this later to Linus Walleij.
> > > >
> > > > This does not work, and *may* still break.
> > > >
> > > > The only way to guarantee the order of the patches is to have them
> > > > *all* as part of the pull-request.  Not just some of them.
> > > 
> > > What do you mean exactly? If these two patches come through my tree
> > > first, then everything will work fine because they do not break any
> > > other stuff.
> > > 
> > > If you pull it and apply the rest on top, then it should also work
> > > without problems because your history will contain everything needed
> > > in proper order.
> > > 
> > > In both cases bisectability is preserved. Did I missed something?
> > 
> > Okay, so you're suggesting that I rebase MFD *on-top* of your PR.  That
> > does work for me because I insist on being able to re-work my tree at
> > any time.  However, be aware that some Maintainers do not work this
> > way, thus *normally* you will have to send PR containing all of the
> > dependant patches.
> 
> You could either rebased on top of this PR or merge it before applying
> rest of patches. It does not matter because in both cases all dependant
> patches will be after the dependency. Also in both cases you will be
> sending them in your PR.
> 
> You can then rebase your stuff as well, keeping only the external
> commits untouced and merged.

Right.  As I say, it does work for me because I always rebase MFD
patches on-top of the immutable branches.

What time trying to say is that, some Maintainers treat their master
branches as stable once they get pushed, so this style of "pull this
and apply it as a base for patches already in your tree" pull-request
will not work for some.

> Really, that does not differ from all your stable immutable branches you
> have been providing for other folks.

No, this is different.  When I create a pull-request it always
contains *all* of the dependencies, so it can be pulled in before or
after any other patches.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog