From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-omap@vger.kernel.org, arm@kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 2/2] omap device tree changes for v4.4
Date: Fri, 16 Oct 2015 07:49:53 -0700 [thread overview]
Message-ID: <20151016144953.GS10113@atomide.com> (raw)
In-Reply-To: <17309037.Mt8pPYt4aa@wuerfel>
* Arnd Bergmann <arnd@arndb.de> [151016 02:50]:
> On Thursday 15 October 2015 14:04:26 Tony Lindgren wrote:
> > * Arnd Bergmann <arnd@arndb.de> [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
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/2] omap device tree changes for v4.4
Date: Fri, 16 Oct 2015 07:49:53 -0700 [thread overview]
Message-ID: <20151016144953.GS10113@atomide.com> (raw)
In-Reply-To: <17309037.Mt8pPYt4aa@wuerfel>
* Arnd Bergmann <arnd@arndb.de> [151016 02:50]:
> On Thursday 15 October 2015 14:04:26 Tony Lindgren wrote:
> > * Arnd Bergmann <arnd@arndb.de> [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
next prev parent reply other threads:[~2015-10-16 14:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <8058507.49AsgX8PR9@wuerfel>
2015-10-15 21:04 ` [GIT PULL 2/2] omap device tree changes for v4.4 Tony Lindgren
2015-10-15 21:04 ` Tony Lindgren
2015-10-16 9:45 ` Arnd Bergmann
2015-10-16 9:45 ` Arnd Bergmann
2015-10-16 14:49 ` Tony Lindgren [this message]
2015-10-16 14:49 ` Tony Lindgren
2015-10-14 21:38 [GIT PULL 1/2] omap clean-up " Tony Lindgren
2015-10-14 21:38 ` [GIT PULL 2/2] omap device tree changes " Tony Lindgren
2015-10-14 21:38 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151016144953.GS10113@atomide.com \
--to=tony@atomide.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.