From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@kernel.org>
Cc: Riku Voipio <riku.voipio@iki.fi>,
Rusty Russell <rusty@rustcorp.com.au>,
Peter Zijlstra <peterz@infradead.org>,
mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org,
"Paul E. McKenney" <paulmck@us.ibm.com>
Subject: Re: [PATCH] tools/perf, rbtree: Add RCU wrappers to make rbtree.h usable in user-space
Date: Tue, 7 Jul 2015 08:39:51 +1000 [thread overview]
Message-ID: <20150707083951.2163a4e4@canb.auug.org.au> (raw)
In-Reply-To: <20150706094117.GA15868@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
Hi Ingo,
On Mon, 6 Jul 2015 11:41:17 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> On next linux-next iteration you should be able to just drop your merge conflict
> resolution, and use the -tip tree as-is with no extra fixups.
I dropped the patch I had yesterday and just merged
perf-urgent-for-linus from the tip tree into my fixes tree (since I
merge my fixes tree immediately on top of Linus' tree and before I try
to do any builds). I will drop that merge when Linus takes your pull
request.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-07-06 22:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 6:09 Building tools/perf fails on next Riku Voipio
2015-06-17 9:17 ` [PATCH] tools/perf, rbtree: Add RCU wrappers to make rbtree.h usable in user-space Ingo Molnar
2015-06-17 9:33 ` Riku Voipio
2015-07-06 8:13 ` Stephen Rothwell
2015-07-06 9:41 ` Ingo Molnar
2015-07-06 22:39 ` Stephen Rothwell [this message]
2015-07-02 0:52 [PATCH 1/2 block/for-linus] writeback: don't embed root bdi_writeback_congested in bdi_writeback Tejun Heo
2015-07-02 0:53 ` [PATCH 2/2 block/for-linus] writeback: don't drain bdi_writeback_congested on bdi destruction Tejun Heo
2015-07-02 3:02 ` Jon Christopherson
[not found] ` <5594AD98.4050402@jons.org>
2015-07-02 13:21 ` [PATCH] tools/perf, rbtree: Add RCU wrappers to make rbtree.h usable in user-space Tejun Heo
2015-07-02 20:51 ` Rusty Russell
2015-07-03 7:14 ` Peter Zijlstra
2015-07-03 10:00 ` Jon Christopherson
2015-07-04 16:15 ` Arnaldo Carvalho de Melo
2015-07-06 10:57 ` Peter Zijlstra
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=20150707083951.2163a4e4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=paulmck@us.ibm.com \
--cc=peterz@infradead.org \
--cc=riku.voipio@iki.fi \
--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®