[ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126

[compudj@krystal.dyndns.org (Mathieu Desnoyers)]

* Gregory Haskins (ghaskins at novell.com) wrote:
> 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.
> 

Hmmmmm... it works here... (just tested it again to make sure)

Can you give me the exact sequence of operation you use to apply the
patchset ? (getting kernel.org tarballs/git, unpacking the lttng
patchset, using quilt...)

Mathieu

> 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
> >>     
> >
> >
> >   
> 
> 



> _______________________________________________
> 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: <http://lists.casi.polymtl.ca/pipermail/lttng-dev/attachments/20090423/007a104d/attachment-0002.pgp>