All of lore.kernel.org
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] arm-soc: Xilinx zynq core - smp for v3.10
Date: Mon, 8 Apr 2013 19:05:46 +0200	[thread overview]
Message-ID: <201304081905.46201.arnd@arndb.de> (raw)
In-Reply-To: <890ef3b8-f536-4b00-9bd8-5ea50de3bf51@DB8EHSMHS032.ehs.local>

On Thursday 04 April 2013, Michal Simek wrote:
> Hi Arnd and Olof,
> 
> please pull the following smp support to your arm-soc tree.
> 
> This branch is based on zynq/clksrc/cleanup parts because
> there are some dependencies on moving timer to generic location.
> 
> I could based it on standard Linux tagged version but you will get
> several conflicts you will have to resolve.
> If you are OK to resolving these problems, please let me know
> I will create another branch with core-smp changes which are not based
> on zynq/clksrc/cleanup branch.
> 

This one gave me a little trouble because of conflicts with Catalin's
gic/cleanup branch. Could both of you (Michal and Catalin) have a look
at my resolution? I basically just removed the zynq_secondary_init()
function added in this branch.

I've merged it all into next/soc2 and added a merge with gic/cleanup
to resolve the conflict.

Also, please use signed tags for sending pull requests and include
a description of the branch contents that will end up in the merge
commit.

	Arnd

  reply	other threads:[~2013-04-08 17:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04  7:47 [GIT PULL] arm-soc: Xilinx zynq core - smp for v3.10 Michal Simek
2013-04-08 17:05 ` Arnd Bergmann [this message]
2013-05-24 11:26 ` Russell King - ARM Linux
2013-05-24 12:10   ` Michal Simek
2013-05-24 12:31     ` Russell King - ARM Linux
2013-05-24 12:31       ` Russell King - ARM Linux
2013-05-24 12:37         ` Michal Simek
2013-05-27 14:05   ` Michal Simek

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=201304081905.46201.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 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.