From: Jonathan Austin <Jonathan.Austin@arm.com>
To: Russell King <rmk@arm.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Will Deacon <Will.Deacon@arm.com>
Subject: Re: linux-next: manual merge of the arm-mpidr tree with the arm tree
Date: Wed, 19 Jun 2013 09:39:39 +0100 [thread overview]
Message-ID: <51C16E4B.4060809@arm.com> (raw)
In-Reply-To: <20130619082619.GA31513@flint.arm.linux.org.uk>
On 19/06/13 09:26, Russell King wrote:
> On Wed, Jun 19, 2013 at 10:44:09AM +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 aa1aadc3305c ("ARM: suspend: fix
>> CPU suspend code for !CONFIG_MMU configurations") from the arm tree and
>> commit 3fed6a1e3bf0 ("ARM: kernel: implement stack pointer save array
>> through MPIDR hashing") from the arm-mpidr tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>>
>> P.S. that arm tree commit above has no Signed-off-by from its
>> committer :-(
>
> Oh bloody hell. Now what do I do about that. The branch is a declared
> stable branch, and the commit came in from someone elses tree. So it's
> immutable...
>
Sorry guys, this was my first pull request and I didn't realise that,
though Will was the author, I needed to sign off on the patch too as *I*
had become the committer (I thought that Russell would become the
committer as this was going 'via' him, as it does when it goes through
Russell's patch system).
Apologies. I'll make sure this doesn't happen again...
Jonny
-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
next prev parent reply other threads:[~2013-06-19 8:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 0:44 linux-next: manual merge of the arm-mpidr tree with the arm tree Stephen Rothwell
2013-06-19 8:26 ` Russell King
2013-06-19 8:39 ` Jonathan Austin [this message]
2013-06-26 1:04 Stephen Rothwell
2013-06-26 8:09 ` Russell King
2013-06-26 8:57 ` Lorenzo Pieralisi
2013-06-27 0:53 ` Stephen Rothwell
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=51C16E4B.4060809@arm.com \
--to=jonathan.austin@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Will.Deacon@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--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.