linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Samsung cleanup-spi for v3.3
Date: Wed, 28 Dec 2011 00:14:33 +0000	[thread overview]
Message-ID: <201112280014.34021.arnd@arndb.de> (raw)
In-Reply-To: <088001ccc1d7$7c0da460$7428ed20$%kim@samsung.com>

On Saturday 24 December 2011, Kukjin Kim wrote:
> Please pull the samsung-cleanup-spi for v3.3.
> It depends on samsung-devel-spi3 branch...
> 
> If any problems, please let me know.

I've applied next-samsung-cleanup-mmc2, next-samsung-devel-spi3 and
next-samsung-cleanup-spi4, all into next/cleanup2 now.

This was the best solution I could come up with, because strictly following
the normal rules would have meant creating an insane number of merge
commits and sending out each of your branches separately to Linus, after
all the other stuff.

I normally try to send out all cleanups before everything else, except
when a cleanup has a dependency on another branch, in which case I have
to create an extra cleanup branch. What you sent me would have
meant doing something like:

1. cleanup
	all cleanup branches except samsung

2. dt
	all dt branches

3. devel
	all devel branches, including devel-ohci but not devel-spi
	or devel-mmc-spi

4.-10.
	everything else except samsung

11. cleanup2
	only samsung/cleanup-mmc

12. devel2
	only samsung/devel-spi

13. cleanup3
	only samsung/cleanup-spi

14. devel3
	only samsung/devel-mmc-spi

I've now squashed samsung/devel-spi into the cleanup2 branch, which also lets me
put cleanup-spi in there, and put it right after next/dt. This works because
devel-spi can still be considered a cleanup (although you did not consider it that).

Right now, the order we have in arm-soc is "fixes-non-critical", "cleanup", "dt",
"cleanup2", "soc", "boards", "devel", "drivers", "pm", "timer", "move". There
is some flexibility towards the end, but if you use a different order, that creates
circular dependencies which we absolutely don't want.

	Arnd

  reply	other threads:[~2011-12-28  0:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-24  1:00 [GIT PULL] Samsung cleanup-spi for v3.3 Kukjin Kim
2011-12-28  0:14 ` Arnd Bergmann [this message]
2011-12-28  8:01   ` Kukjin Kim

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=201112280014.34021.arnd@arndb.de \
    --to=arnd@arndb.de \
    --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).