linux-next: manual merge of the rr tree with the arm tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature