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,
Paul Mackerras <paulus@samba.org>
Subject: linux-next: manual merge of the rr tree with Linus' tree
Date: Thu, 17 Dec 2009 13:07:58 +1100 [thread overview]
Message-ID: <20091217130758.edfe0da6.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
kernel/perf_event.c between commit
0f624e7e5625f4c30c836b7a5decfe2553582391 ("perf_event: Fix incorrect
range check on cpu number") from Linus' tree and commit
40b7c6b7eefc950d625945f773b4c57dcc95b8a4
("cpumask:kernel_perf_event-deprecated-function") from the rr tree.
Overlapping changes. I used the version from Linus' tree (since it was a
bug fix).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-12-17 2:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-17 2:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-21 2:11 linux-next: manual merge of the rr tree with Linus' tree Stephen Rothwell
2012-05-23 2:15 Stephen Rothwell
2010-01-18 4:06 Stephen Rothwell
2010-01-12 2:13 Stephen Rothwell
2009-09-15 3:26 Stephen Rothwell
2009-08-24 3:07 Stephen Rothwell
2009-07-06 2:05 Stephen Rothwell
2009-06-29 3:43 Stephen Rothwell
2009-06-24 3:08 Stephen Rothwell
2009-06-12 3:54 Stephen Rothwell
2009-05-27 3:55 Stephen Rothwell
2009-04-16 2:19 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=20091217130758.edfe0da6.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulus@samba.org \
--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