linux-kernel - linux-next: manual merge of the rr tree with the arm 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>] [day] [month] [year] [list]

Message-Id: <20120229132946.3683c8a06314a7bd541aaa0c@canb.auug.org.au>
Date:	Wed, 29 Feb 2012 13:29:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rabin Vincent <rabin@....in>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the rr tree with the arm tree

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/arm/kernel/kprobes.c between commit 214f3e7464bc ("ARM: 7332/1:
extract out code patch function from kprobes") from the arm tree and
commit 8dcf0d7856cf ("remove references to cpu_*_map in arch/") from the
rr tree.

The former moved part of the code modified by the latter into another
file and, in doing so, applied the appropriate fixup.  So I just used the
arm version of arch_arm_kprobe() - the patch to arch_disarm_kprobe() is
still required.

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

Content of type "application/pgp-signature" skipped