All of lore.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the arm-mpidr tree with the arm tree
Date: Wed, 26 Jun 2013 09:09:36 +0100	[thread overview]
Message-ID: <20130626080936.GD7193@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20130626110411.d1fe3913769385fa056010be@canb.auug.org.au>

On Wed, Jun 26, 2013 at 11:04:11AM +1000, Stephen Rothwell wrote:
> Hi Lorenzo,
> 
> Today's linux-next merge of the arm-mpidr tree got a conflict in
> arch/arm/kernel/suspend.c between commit 7604537bbb57 ("ARM: kernel:
> implement stack pointer save array through MPIDR hashing") from the arm
> tree and commit 3fed6a1e3bf0 ("ARM: kernel: implement stack pointer save
> array through MPIDR hashing") from the arm-mpidr tree.
> 
> The former is just a rebase of the latter, so I used it.  It then turns
> out that the arm-mpidr contains nothing that is not already included in
> the arm tree, so is it needed any more i.e. is there further work coming?

The reason for this is that the changes were submitted to me as patches
as two of the changes are for -rc, the other one is a development change,
but in Lorenzo's git tree, they're all part of a single branch, and so
can't be separately pushed upstream.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

  reply	other threads:[~2013-06-26  8:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-26  1:04 linux-next: manual merge of the arm-mpidr tree with the arm tree Stephen Rothwell
2013-06-26  8:09 ` Russell King [this message]
2013-06-26  8:57 ` Lorenzo Pieralisi
2013-06-27  0:53   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2013-06-19  0:44 Stephen Rothwell
2013-06-19  8:26 ` Russell King
2013-06-19  8:39   ` Jonathan Austin

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=20130626080936.GD7193@flint.arm.linux.org.uk \
    --to=rmk@arm.linux.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=sfr@canb.auug.org.au \
    /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.