[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20150707083951.2163a4e4@canb.auug.org.au>
Date: Tue, 7 Jul 2015 08:39:51 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ingo Molnar <mingo@...nel.org>
Cc: Riku Voipio <riku.voipio@....fi>,
Rusty Russell <rusty@...tcorp.com.au>,
Peter Zijlstra <peterz@...radead.org>, mingo@...hat.com,
acme@...nel.org, linux-kernel@...r.kernel.org,
"Paul E. McKenney" <paulmck@...ibm.com>
Subject: Re: [PATCH] tools/perf, rbtree: Add RCU wrappers to make rbtree.h
usable in user-space
Hi Ingo,
On Mon, 6 Jul 2015 11:41:17 +0200 Ingo Molnar <mingo@...nel.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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists