Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756033AbbGFWkH (ORCPT ); Mon, 6 Jul 2015 18:40:07 -0400 Received: from ozlabs.org ([103.22.144.67]:49716 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754375AbbGFWj6 (ORCPT ); Mon, 6 Jul 2015 18:39:58 -0400 Date: Tue, 7 Jul 2015 08:39:51 +1000 From: Stephen Rothwell To: Ingo Molnar Cc: Riku Voipio , Rusty Russell , Peter Zijlstra , mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org, "Paul E. McKenney" Subject: Re: [PATCH] tools/perf, rbtree: Add RCU wrappers to make rbtree.h usable in user-space Message-ID: <20150707083951.2163a4e4@canb.auug.org.au> In-Reply-To: <20150706094117.GA15868@gmail.com> References: <20150617060952.GA5375@kos.to> <20150617091703.GA2883@gmail.com> <20150706181332.0f7f61f7@canb.auug.org.au> <20150706094117.GA15868@gmail.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/GprlJosg5Yp5Ebtpkx/OGx_"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1916 Lines: 50 --Sig_/GprlJosg5Yp5Ebtpkx/OGx_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Ingo, On Mon, 6 Jul 2015 11:41:17 +0200 Ingo Molnar wrote: > > On next linux-next iteration you should be able to just drop your merge c= onflict=20 > 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/GprlJosg5Yp5Ebtpkx/OGx_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVmwO8AAoJEMDTa8Ir7ZwVDFsP/iomhspemtPjabfKAY8aMpP1 bJ4fOY+pFf5sLtzgR8Cx5ViyaPSYtsS/uwfYjoSVn5djo14XorRdVScU2OnbP+Cp 1o8yyGGDf8gqVPRwwNGXdbsBgvH3OtZQcBYWqSC+kqVMFihNNHRmCCbsNbF1RGiC s1sTHjTCm/DKiReG7zzKikfImSUWesSy+dK/cYuG3fr0yHRVHu9GbfqnAIW/yAYo mnKWM/DJv1DE6iHggIywig5+xTgIm5QZAOHu7fttJ7X95kHRZY99CLMwzmafZQ50 itoE+SelyMONWo+r4KZuSgN7zbTAJ8pz4tvQHL7sC3ipKCIpRIqqtCfKe9RhLjhZ XbwupHQ1XzpBgo8p74e5PHYzM7JWbfUgI870+RKexA2oVnrloKDLoxQ044nFNlrZ 1mOfNmR9qlIWZC4NS0TMUM/giENs0vuzYPLCbJQp10bLSoFJhjAitw2W6CHeiJjv vGiqMB5HVlWzwnJ9XNeasTLHuqXqMbIFYJn7pI+G3TPzPMYyaou4Tox7EE1UeKlU K7jnARo+k30Szg+6cpgBW8/1L5KU8LpZDDHj8oQoBrG5Tu8N9OLoJOqOjglp+dS9 Ju8m73KpWX/BUhIBm2fn+pfQhf9faQkuc7/ZCTLJ5M/VKGikJ7WcMPX/dYoxCHLO oQaEf2VDanHjvPysv7oN =DYw3 -----END PGP SIGNATURE----- --Sig_/GprlJosg5Yp5Ebtpkx/OGx_-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/