From: Lorenzo Pieralisi <lorenzo.pieralisi@arm•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-mpidr tree with the arm tree
Date: Wed, 26 Jun 2013 09:57:20 +0100 [thread overview]
Message-ID: <20130626085719.GA22333@e102568-lin.cambridge.arm.com> (raw)
In-Reply-To: <20130626110411.d1fe3913769385fa056010be@canb.auug.org.au>
Hi Stephen,
On Wed, Jun 26, 2013 at 02:04:11AM +0100, 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?
No, arm-mpidr can be dropped from -next now that those patches, as you
correctly mentioned, are queued through the arm tree.
Thank you very much indeed,
Lorenzo
next prev parent reply other threads:[~2013-06-26 8:57 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
2013-06-26 8:57 ` Lorenzo Pieralisi [this message]
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=20130626085719.GA22333@e102568-lin.cambridge.arm.com \
--to=lorenzo.pieralisi@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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