From mboxrd@z Thu Jan 1 00:00:00 1970 From: compudj@krystal.dyndns.org (Mathieu Desnoyers) Date: Thu, 23 Apr 2009 13:39:21 -0400 Subject: [ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126 In-Reply-To: <49F072D9.3020003@novell.com> References: <49F072D9.3020003@novell.com> Message-ID: <20090423173921.GA20142@Krystal> * Gregory Haskins (ghaskins at novell.com) wrote: > Hi all, > I am trying to apply 2.6.30-rc2-lttng-0.126 to a clean 2.6.30-rc2 and > I am getting lots of rejects. I went through one time and resolved all > the rejects, but the resulting kernel did trace properly so I perhaps > had some fuzz issues. What kernel base should I be using for this series? > Hrm, weird, I may have messed up the packaging. I just released LTTng 0.127 which should not have such conflicts. Mathieu > -Greg > > _______________________________________________ > ltt-dev mailing list > ltt-dev at lists.casi.polymtl.ca > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev -- Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: Digital signature URL: From mboxrd@z Thu Jan 1 00:00:00 1970 From: compudj@krystal.dyndns.org (Mathieu Desnoyers) Date: Thu, 23 Apr 2009 13:39:21 -0400 Subject: [ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126 In-Reply-To: <49F072D9.3020003@novell.com> References: <49F072D9.3020003@novell.com> Message-ID: <20090423173921.GA20142@Krystal> Message-ID: <20090423173921.Ca2peFFyXUkzzHKMiMy0CGN9Zu-rzbyM-s1urSMyIJs@z> * Gregory Haskins (ghaskins at novell.com) wrote: > Hi all, > I am trying to apply 2.6.30-rc2-lttng-0.126 to a clean 2.6.30-rc2 and > I am getting lots of rejects. I went through one time and resolved all > the rejects, but the resulting kernel did trace properly so I perhaps > had some fuzz issues. What kernel base should I be using for this series? > Hrm, weird, I may have messed up the packaging. I just released LTTng 0.127 which should not have such conflicts. Mathieu > -Greg > > _______________________________________________ > ltt-dev mailing list > ltt-dev at lists.casi.polymtl.ca > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev -- Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: Digital signature URL: