linux-kernel - linux-next: manual merge of the arm-current tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130814111837.9a692a77b35ba8cbb4a9149b@canb.auug.org.au>
Date:	Wed, 14 Aug 2013 11:18:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephen Boyd <sboyd@...eaurora.org>,
	Ingo Molnar <mingo@...nel.org>,
	Vince Weaver <vincent.weaver@...ne.edu>,
	Linus <torvalds@...ux-foundation.org>,
	Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the arm-current tree with Linus' tree

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).

P.S. the version in Linus' tree has no Signed-off-by from the author.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped