Re: [GIT PULL 2/2] omap device tree changes for v4.4

[Arnd Bergmann]

On Thursday 15 October 2015 14:04:26 Tony Lindgren wrote:
> * Arnd Bergmann  [151015 13:40]:
> > On Wednesday 14 October 2015 14:38:59 Tony Lindgren wrote:
> > 
> > > Note that this branch is against v4.3-rc4 as that contains critical
> > > MMC related fixes to boot with MMC working on most omaps.
> > 
> > While we are lucky this time as I based the branch on -rc4 anyway,
> > a nicer way to do this would be to ensure that a fix you want
> > to base on is based an older -rc, and then you base your own branch
> > on top of that fix, to minimize the number of back-merged patches.
> 
> Sure that would be doable too at the cost of a few extra merges.

You can always look at our existing next/* branches to see what they are
based on. If we already have the commit you need (like this time), it's
not a problem at all to use the same base.

Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PULL 2/2] omap device tree changes for v4.4

[Tony Lindgren]

* Arnd Bergmann  [151016 02:50]:
> On Thursday 15 October 2015 14:04:26 Tony Lindgren wrote:
> > * Arnd Bergmann  [151015 13:40]:
> > > On Wednesday 14 October 2015 14:38:59 Tony Lindgren wrote:
> > > 
> > > > Note that this branch is against v4.3-rc4 as that contains critical
> > > > MMC related fixes to boot with MMC working on most omaps.
> > > 
> > > While we are lucky this time as I based the branch on -rc4 anyway,
> > > a nicer way to do this would be to ensure that a fix you want
> > > to base on is based an older -rc, and then you base your own branch
> > > on top of that fix, to minimize the number of back-merged patches.
> > 
> > Sure that would be doable too at the cost of a few extra merges.
> 
> You can always look at our existing next/* branches to see what they are
> based on. If we already have the commit you need (like this time), it's
> not a problem at all to use the same base.

Yeah no problem. Usually -rc2 is just fine for us in general as the
base.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PULL 2/2] omap device tree changes for v4.4

[Arnd Bergmann]

On Wednesday 14 October 2015 14:38:59 Tony Lindgren wrote:
> Device tree changes for omaps for v4.4 merge window:
> 
> - DCAN sleep pins for am437x-gp-evm
> 
> - A series of changes to add audio support for dra7
> 
> - Add support for gpio keys and LEDs on dra7
> 
> - Regulator clean-up for am335x-wega
> 
> - A series of changes to enable IOMMUs and mailboxes for dra7
>   accelerators
> 
> - Add support for am335x-bonegreen
> 
> - Fix up GPIO flags where 0 was used instead of GPIO_ACTIVE_HIGH
> 
> - Fix omap3-lilly-am33x IRQ level flag
> 
> - Remove duplicate uart2 pinmux for igep and fix indentation and
>   update igep to use pinctrl macros for the register offsets
> 
> - Fix MMC cd-gpios usage

Pulled into next/dt, thanks!

> Note that this branch is against v4.3-rc4 as that contains critical
> MMC related fixes to boot with MMC working on most omaps.

While we are lucky this time as I based the branch on -rc4 anyway,
a nicer way to do this would be to ensure that a fix you want
to base on is based an older -rc, and then you base your own branch
on top of that fix, to minimize the number of back-merged patches.

Arnd

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PULL 2/2] omap device tree changes for v4.4

[Tony Lindgren]

* Arnd Bergmann  [151015 13:40]:
> On Wednesday 14 October 2015 14:38:59 Tony Lindgren wrote:
> 
> > Note that this branch is against v4.3-rc4 as that contains critical
> > MMC related fixes to boot with MMC working on most omaps.
> 
> While we are lucky this time as I based the branch on -rc4 anyway,
> a nicer way to do this would be to ensure that a fix you want
> to base on is based an older -rc, and then you base your own branch
> on top of that fix, to minimize the number of back-merged patches.

Sure that would be doable too at the cost of a few extra merges.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html