[OpenAFS] Re: 1.4.14+patches = panic

Jeff Blaine jblaine@kickflop.net
Wed, 02 Mar 2011 11:18:54 -0500


On 3/2/2011 10:56 AM, Andrew Deason wrote:
> On Wed, 02 Mar 2011 10:49:42 -0500
> Jeff Blaine<jblaine@kickflop.net>  wrote:
>
>> FWIW, that sequence fails as follows:
>> [...]
>> openafs-1.4.14-PATCHED:cairo>  git cherry-pick
>> 885dfd0e9d0cb6b4e2e32280a9266d1776ea6859
>> fatal: Could not find 885dfd0e9d0cb6b4e2e32280a9266d1776ea6859
>
> You can't (easily) cherry-pick that one. I said to cherry-pick these
> commits:
>
> 514256cd403c15da7acf6601aa11371504f856fe
> b90f32d8cac7d2e5185e75740b0cf167d370ddb4
> 7d187f131bf3937b5a299eecb32d237a34c6bbee
> b89a9e4fa001b453a3ef5f041ac7978ba696b8e3
> d933e5ca54c486d52ed8766e4407987650c903e5
> f59e45e2bdf1b2f0b9fd2edf10476bd5e463226d

It's clear now that I read a completely alternate interpretation
of your message yesterday then :)

=================================================================

After you clone, you do

git checkout openafs-stable-1_4_14
git cherry-pick <commit1>
git cherry-pick <commit2>
...
git cherry-pick <commitN>

Or you can go in to the gitweb interface, get the patch for each of
those commits, and apply them manually. But that's only if you're scared
of git :)
=================================================================

     Interpretation: You're not using git right.  Here's
                     how you use git to retrieve commits
                     given a hash.

=================================================================
In any case, that's not your problem, though. By chance, you checked out
code pretty close to the head of the 1.4.x branch, and it has all of the
patches I mentioned. The reason you have a panic is that the patches I
mentioned are not sufficient (I apologize, but the road to getting the
Solaris client stoppable has been long, and I forget what's where).
=================================================================

     Interpretation: What you did (clone openafs-stable-1_4_14)
                     actually includes the 6 commits I mentioned,
                     however, I realize now they're not enough.

=================================================================
What you want to do is do the above steps, and then apply two patches
that I forgot to mention that aren't in 1.4.x yet:
=================================================================

     Interpretation: You also need these 2 patches.
                     clone openafs-stable-1_4_14 and apply these
                     2 extra patches.

                     [ My mistake here was equating 'patches' ]
                     [ with 'commits'                         ]

Off to try again.