From mboxrd@z Thu Jan 1 00:00:00 1970 From: ghaskins@novell.com (Gregory Haskins) Date: Thu, 23 Apr 2009 15:54:07 -0400 Subject: [ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126 In-Reply-To: <20090423193401.GA23945@Krystal> References: <49F072D9.3020003@novell.com> <20090423173921.GA20142@Krystal> <49F0B9A1.3040301@novell.com> <20090423191243.GA22770@Krystal> <49F0BFCB.9080506@novell.com> <20090423193401.GA23945@Krystal> Message-ID: <49F0C75F.1000704@novell.com> Mathieu Desnoyers wrote: >> > > Nah, it's my bad. I always check&refresh patches with "fuzz", but I > forgot to refresh them this time. Can you try with LTTng 0.128 ? > > 0.128 merged flawlessly! Thanks Mathieu. I will report back if the empty trace issue is resolved with the new tree. Thanks again, -Greg -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 266 bytes Desc: OpenPGP digital signature URL: From mboxrd@z Thu Jan 1 00:00:00 1970 From: ghaskins@novell.com (Gregory Haskins) Date: Thu, 23 Apr 2009 15:54:07 -0400 Subject: [ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126 In-Reply-To: <20090423193401.GA23945@Krystal> References: <49F072D9.3020003@novell.com> <20090423173921.GA20142@Krystal> <49F0B9A1.3040301@novell.com> <20090423191243.GA22770@Krystal> <49F0BFCB.9080506@novell.com> <20090423193401.GA23945@Krystal> Message-ID: <49F0C75F.1000704@novell.com> Message-ID: <20090423195407.tI3Ee_YkBrMliVmkP92VE937kzv7Mjib_zTWYkv6QCQ@z> Mathieu Desnoyers wrote: >> > > Nah, it's my bad. I always check&refresh patches with "fuzz", but I > forgot to refresh them this time. Can you try with LTTng 0.128 ? > > 0.128 merged flawlessly! Thanks Mathieu. I will report back if the empty trace issue is resolved with the new tree. Thanks again, -Greg -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 266 bytes Desc: OpenPGP digital signature URL: