From mboxrd@z Thu Jan 1 00:00:00 1970 From: compudj@krystal.dyndns.org (Mathieu Desnoyers) Date: Thu, 23 Apr 2009 15:34:01 -0400 Subject: [ltt-dev] Problems with merging patch-2.6.30-rc2-lttng-0.126 In-Reply-To: <49F0BFCB.9080506@novell.com> References: <49F072D9.3020003@novell.com> <20090423173921.GA20142@Krystal> <49F0B9A1.3040301@novell.com> <20090423191243.GA22770@Krystal> <49F0BFCB.9080506@novell.com> Message-ID: <20090423193401.GA23945@Krystal> Message-ID: <20090423193401.Yt2a9LBXnxRGXMGzKVIFR2v_t5fnc6Lpa_V9DFXpNBo@z> * Gregory Haskins (ghaskins at novell.com) wrote: > Mathieu Desnoyers wrote: > > * 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...) > > > > Sure, I am using git as the base, and then stgit "import" to pull the > series in. Here is a dump of my history from my current attempt: > > 1070 git clone -l linux-2.6 linux-2.6-ltt > 1071 cd linux-2.6-ltt/ > 1072 wget > http://ltt.polymtl.ca/files/lttng/patch-2.6.30-rc2-lttng-0.127.tar.bz2 > 1073 tar -jxvf patch-2.6.30-rc2-lttng-0.127.tar.bz2 > 1074 git branch > 1075 git checkout -b master v2.6.30-rc2 > 1076 git log > 1077 stg init > 1078 stg import --ignore -s patch-2.6.30-rc2-lttng-0.127/series > > I have confirmed that Linus' 2.6.30-rc2 tag is the ancestor that > immediately precedes the first LTT patch. I have used this same > procedure for years successfully, including working with LTT. I'm sure > I am doing something wrong, but I can't see it. > 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 ? Thanks, 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: