linux-kernel - linux-next: manual merge of the arm-perf tree with the 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: <20150601101253.2e454719@canb.auug.org.au>
Date:	Mon, 1 Jun 2015 10:12:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Will Deacon <will.deacon@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark Rutland <mark.rutland@....com>
Subject: linux-next: manual merge of the arm-perf tree with the  tree

Hi Will,

Today's linux-next merge of the arm-perf tree got a conflict in arch/arm/kernel/perf_event_cpu.c between commit 338d9dd3e2ae ("ARM:
8351/1: perf: don't warn about missing interrupt-affinity property for
PPIs") (and others) from Linus' tree and commit 74cf0bc75f16 ("arm:
perf: unify perf_event{,_cpu}.c") from the arm-perf tree.

I fixed it up (the changes from Linus' tree have been included in the
arm-perf tree change, so I just removed the file) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped