mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, arm@kernel.org
Subject: [GIT PULL 0/3] arm-soc: late changes for 3.9
Date: Thu, 28 Feb 2013 14:54:49 -0800	[thread overview]
Message-ID: <1362092093-4839-1-git-send-email-olof@lixom.net> (raw)

Hi Linus,

Here is a series of merge requests for arm-soc branches.

The first two are mostly normal changes, The OMAP changes came in late
before the merge window opened, so we wanted to let them sit for a few
more days in -next. The i.MX branch is a churny branch that I wanted to
keep separate and not have other code depend on, and thus held it off
to the second batch.

Final two pull requests are for the same code. As Arnd describes in the
tags, they are for a set of mvebu patches that depend on contents in
the MMC tree. We had pulled in part of the MMC branch as a dependency,
but unfortunately Chris Ball rebased it.

We're giving you the choice of taking the rebased version, or a
non-rebased-but-merged-and-fixed-up version to avoid dealing with the
excessive conflicts. The rebased one has the obvious benefit of not
having duplicate commits in the tree for the same changes, but, well,
it's rebased. Actual tree contents is identical though.

I've pushed a resolved branch for reference (late-branches-resolved)
in case you want to compare conflict resolutions.


Thanks,

-Olof


             reply	other threads:[~2013-02-28 22:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-28 22:54 Olof Johansson [this message]
2013-02-28 22:54 ` [GIT PULL 1/3] arm-soc: i.MX DT changes Olof Johansson
2013-02-28 22:54 ` [GIT PULL 2/3] arm-soc: late OMAP changes Olof Johansson
2013-02-28 22:54 ` [GIT PULL 3/3] arm-soc: mvebu platform changes (not rebased) Olof Johansson
2013-02-28 22:54 ` [GIT PULL 3/3] arm-soc: mvebu platform changes (rebased) Olof Johansson
2013-03-01  4:18 ` [GIT PULL 0/3] arm-soc: late changes for 3.9 Linus Torvalds
2013-03-01  6:19   ` Olof Johansson
2013-03-04 21:14   ` Arnd Bergmann

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=1362092093-4839-1-git-send-email-olof@lixom.net \
    --to=olof@lixom.net \
    --cc=arm@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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

all inboxes | Powered by JetHome®