From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rabin Vincent <rabin@rab.in>, Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the rr tree with the arm tree
Date: Wed, 29 Feb 2012 13:29:46 +1100 [thread overview]
Message-ID: <20120229132946.3683c8a06314a7bd541aaa0c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-02-29 2:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 2:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-26 1:59 Stephen Rothwell
2009-11-25 5:21 Stephen Rothwell
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=20120229132946.3683c8a06314a7bd541aaa0c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rabin@rab.in \
--cc=rmk@arm.linux.org.uk \
--cc=rusty@rustcorp.com.au \
/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
all inboxes | Powered by JetHome®