From mboxrd@z Thu Jan 1 00:00:00 1970 From: ghaskins@novell.com (Gregory Haskins) Date: Thu, 23 Apr 2009 14:55:29 -0400 Subject: [ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126 In-Reply-To: <20090423173921.GA20142@Krystal> References: <49F072D9.3020003@novell.com> <20090423173921.GA20142@Krystal> Message-ID: <49F0B9A1.3040301@novell.com> Message-ID: <20090423185529.uqCjEMIFd1kC3_nA4GWBJhjShWDFBZQxKux9XEKHUMA@z> Mathieu Desnoyers wrote: > * 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. > Hi Mathieu, I am seeing more or less the same thing with 0.127. The series has a ton of conflicts against 30-rc2 and even itself. Its as if the patches are based on a different tree. Its probably operator error, but I cannot see what I am doing wrong. Its the same procedure I have always used to bring your tree in. Any help appreciated. -Greg > Mathieu > > >> -Greg >> >> > > > > >> _______________________________________________ >> ltt-dev mailing list >> ltt-dev at lists.casi.polymtl.ca >> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev >> > > > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 266 bytes Desc: OpenPGP digital signature URL: