linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] GIC DT binding support
Date: Thu, 20 Oct 2011 22:15:58 +0100	[thread overview]
Message-ID: <20111020211558.GE21648@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <4EA08DD0.1090706@gmail.com>

On Thu, Oct 20, 2011 at 04:08:32PM -0500, Rob Herring wrote:
> Understood, but from a git perspective the commit ids have changed.
> While git can deal with trivial re-commits like this, my understanding
> is that should be avoided for upstream merges. Otherwise, I could just
> cherry-pick them and re-commit them in my tree.

It's precisely that need people feel to cherry-pick stuff which is
the need to keep my tree 'unstable' so that I _can_ reorganize it
to permit people to base work off it.

> Ultimately, the people working off of those branches do need them to be
> stable to merge their branches. So are you saying your l2x0 branch
> (91c2ebb90b1890abc648ba9dec5608cbc97e1cb9) is now stable? Can you
> publish it as a branch. iMX6Q is also dependent on it.

Indeed I can - all it takes is someone to tell me what they require
and I can sort it out - and this is especially so as I'm not planning
to do anything further with my git tree after this evening (on the
assumption that the merge window will open immediately after the
kernel summit.)

I already have several 'stable' branches: pm, smp, debug, and now
l2x0.

  reply	other threads:[~2011-10-20 21:15 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-14  3:01 [GIT PULL] GIC DT binding support Rob Herring
2011-10-14  3:18 ` Shawn Guo
2011-10-18  9:53 ` Domenico Andreoli
2011-10-18 14:50   ` Rob Herring
2011-10-18 14:58     ` Domenico Andreoli
2011-10-18 15:10       ` Rob Herring
2011-10-20 12:48 ` Shawn Guo
2011-10-20 12:50   ` Russell King - ARM Linux
2011-10-20 13:07 ` Arnd Bergmann
2011-10-20 14:34   ` Rob Herring
2011-10-20 16:12     ` Arnd Bergmann
2011-10-20 17:09       ` Rob Herring
2011-10-20 18:56         ` Russell King - ARM Linux
2011-10-20 21:04           ` Arnd Bergmann
2011-10-21 18:33             ` Russell King - ARM Linux
2011-10-21 19:31               ` Arnd Bergmann
2011-10-21 22:25                 ` Russell King - ARM Linux
2011-10-20 21:08           ` Rob Herring
2011-10-20 21:15             ` Russell King - ARM Linux [this message]
2011-10-20 21:17             ` Arnd Bergmann
2011-10-21  8:51       ` Arnd Bergmann
2011-10-21 20:09         ` Rob Herring
  -- strict thread matches above, loose matches on Subject: below --
2011-10-24 21:38 Rob Herring
2011-10-28 21:17 ` Rob Herring
2011-10-30 22:39   ` Arnd Bergmann
2011-10-31  0:31   ` Arnd Bergmann
2011-10-31  1:45     ` Rob Herring

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=20111020211558.GE21648@n2100.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).