Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759565Ab2EVBKZ (ORCPT ); Mon, 21 May 2012 21:10:25 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:41238 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751617Ab2EVBKX (ORCPT ); Mon, 21 May 2012 21:10:23 -0400 Date: Tue, 22 May 2012 11:10:07 +1000 From: Stephen Rothwell To: Linus Torvalds Cc: Andrew Morton , mingo@redhat.com, a.p.zijlstra@chello.nl, peterz@infradead.org, anton@redhat.com, rostedt@goodmis.org, tglx@linutronix.de, oleg@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, hpa@zytor.com, jkenisto@us.ibm.com, andi@firstfloor.org, hch@infradead.org, ananth@in.ibm.com, vda.linux@googlemail.com, masami.hiramatsu.pt@hitachi.com, acme@infradead.org, srikar@linux.vnet.ibm.com, roland@hack.frob.com, mingo@elte.hu, linux-tip-commits@vger.kernel.org Subject: Re: [tip:perf/uprobes] uprobes, mm, x86: Add the ability to install and remove uprobes breakpoints Message-Id: <20120522111007.26f8870307b705f3e09ab36c@canb.auug.org.au> In-Reply-To: References: <20120209092642.GE16600@linux.vnet.ibm.com> <20120521143701.74ab2d0b.akpm@linux-foundation.org> X-Mailer: Sylpheed 3.2.0beta7 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__22_May_2012_11_10_07_+1000_1F.Lbx0mFuMra2bl" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2223 Lines: 57 --Signature=_Tue__22_May_2012_11_10_07_+1000_1F.Lbx0mFuMra2bl Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Linus, On Mon, 21 May 2012 15:00:28 -0700 Linus Torvalds wrote: > > On Mon, May 21, 2012 at 2:37 PM, Andrew Morton > wrote: > > > > hm, we seem to have conflicting commits between mainline and linux-next. > > During the merge window. =C2=A0Again. =C2=A0Nobody knows why this happe= ns. >=20 > I didn't have my trivial cleanup branches in linux-next, I'm afraid. > Usually my pending cleanups are just small patches that I carry along > without even committing them, this time around I had slightly more > than that. You could set up a branch that is merged into linux-next if you want to ... it may lower the suprise factor. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__22_May_2012_11_10_07_+1000_1F.Lbx0mFuMra2bl Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJPuudvAAoJEECxmPOUX5FESDIP/2gGAQ1hIh7AkJvR5uW8a915 fpvvhpbAIflOcEOWgtWZGuquk4DTed1j8ZmDOwTh1MuY2VIeS7QU1LEcJmunhypD MElhNShXW4q+o7qqMtBUkbZFrZ4KP6XRw2zHx0Ds8tCblPR5pPiOYuJzx9yWq76V CofAJVcX9GyeIdnJ+xBOQ73J3ZEJ4fVolMEmzXVKQMJOnJNwmE5ggVreTodLYDAQ CXBrvA5dvmPsQ1arptLKuqR6RlTgBlz+dKUBL4mcz9q1nj/wUf0f4jrZdqn6/z7F OzqKSGv20Pt7IujUtuFG0iIJx5lm6Sqk6UpGZKuP9XzED6Q+H79jS6cCjVs/3LmL 6sUlHTxcnrvpLqagM+9mFOJ9nkiykDiHjUpR7d47nfp14EqkcXhJz3NZgdN09FTA ULf4/IC+BcDn4uuWoFGJrGqdSuL0XciLLNgmqdChF1zAzXzEjEgcJKRZ/XNZ0v9w Dzb6Er09cWBVpoJAT5G5RDapH90A8uJquUQoSaDf4Mi8PL0eN/1RIq4OiZ2c6sVv HOhHudmlPPDyTpBcv9gGTt6Eogd/pg13qgxFZgfRqwk943Na7ythgJg66EFNWcrd y2wk012SJl6vQXmttCrXNJna9kSBsMqdGJLWaloWF+IEy83GCkH+CDK3WX2PfwMV GQnRw6Vmzix0XgSPpHIC =Wo4R -----END PGP SIGNATURE----- --Signature=_Tue__22_May_2012_11_10_07_+1000_1F.Lbx0mFuMra2bl-- -- 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/