Re: [GIT PULL] Immutable branch between MFD, GPIO and Regulator due for the v4.9 merge window

Lee Jones
2016-09-12T09:16:53Z

On Fri, 09 Sep 2016, Mark Brown wrote:

> On Thu, Sep 08, 2016 at 08:26:46AM +0100, Lee Jones wrote:
> > On Wed, 07 Sep 2016, Linus Walleij wrote:
>
> > > Hm it is based on a later release candidate than my tree so I'll wait
> > > and see if I
> > > have to pull it (like if there are clashes in linux-next...)
>
> > You use -rc1 as your base? Crazy man. :)
>
> I do that too for the topic branches. It's really helpful for cross
> tree work as it avoids issues like the above - wherever it's being
> merges it shouldn't pull in any extra dependencies so things are clearer
> when reviewing diffs/logs and git has an easier time coping.

I've always used -rc2 for everything. It's usually more stable for
build-testing purposes. But I'll bow down, and try to use -rc1 in
future, if it's preferred.

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