From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Russell King <rmk@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Stephen Boyd <sboyd@codeaurora.org>,
Vince Weaver <vincent.weaver@maine.edu>,
Linus <torvalds@linux-foundation.org>,
Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the arm-current tree with Linus' tree
Date: Wed, 14 Aug 2013 12:01:01 +0200 [thread overview]
Message-ID: <20130814100101.GC10849@gmail.com> (raw)
In-Reply-To: <20130814111837.9a692a77b35ba8cbb4a9149b@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm-current tree got a conflict in
> arch/arm/kernel/perf_event.c between commit b88a2595b6d8 ("perf/arm: Fix
> armpmu_map_hw_event()") from Linus' tree and commit d9f966357b14 ("ARM:
> 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()")
> from the arm-current tree.
>
> These are the same patch except for the return code (and the much more
> comprehensive commit message in the arm-current tree version). I fixed
> it up (using the arm-current tree version - return -EINVAL instead of
> -ENOENT - I have no way to guess which is right) and can carry the fix
> as necessary (no action is required).
-EINVAL would be the better/cleaner one, so when this gets merged upstream
we should pick up Russell's version. It does not affect functionality.
Thanks,
Ingo
next prev parent reply other threads:[~2013-08-14 10:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 1:18 linux-next: manual merge of the arm-current tree with Linus' tree Stephen Rothwell
2013-08-14 10:01 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-12 0:34 Stephen Rothwell
2012-01-24 0:59 Stephen Rothwell
2012-01-13 0:49 Stephen Rothwell
2012-01-13 0:59 ` Kukjin Kim
2012-01-13 8:40 ` Russell King
2012-01-13 8:46 ` Kukjin Kim
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=20130814100101.GC10849@gmail.com \
--to=mingo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sboyd@codeaurora.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=vincent.weaver@maine.edu \
--cc=will.deacon@arm.com \
/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;
as well as URLs for NNTP newsgroup(s).