lkml.org 
[lkml]   [2006]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 2.6.18-rc5-mm1 + all hotfixes -- INFO: possible recursive locking detected
Miles Lane wrote:
> I am having trouble with backing out the git-ieee1394 patches.

Take a look at
http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc5/2.6.18-rc5-mm1/broken-out/series

There are a number of 1394 subsystem patches; the last one is
ieee1394-sbp2-more-help-in-kconfig.patch. (That's supposed that no
further external patches touch ieee1394.) The order of patches in
patch-series is how they were applied.

Not all of these patches depend on each other, but some do. So the
safest way to unapply them is to follow the exact reverse order.

One tool to make this a little bit easier is quilt. This should be
available as a package for most distributions. I haven't tried it myself
yet, but akpm's "broken-out" patch distribution can be manipulated by
quilt. I guess it works like the following method --- which has the
drawback that you cannot use it with your existing linux-2.6.18-rc5-mm1
build. (Except with a trick, see below.)

Install linux-2.6.18-rc5.
Unpack
http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc5/2.6.18-rc5-mm1/2.6.18-rc5-mm1-broken-out.tar.bz2

Rename the broken-out directory to "linux-2.6.18-rc5/patches".
Copy your linux-2.6.18-rc5-mm1/.config to linux-2.6.18-rc5.

Apply all the patches, in the order given by patches/series:
$ cd linux-2.6.18-rc5
$ quilt push -a

Fetch all of
http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc5/2.6.18-rc5-mm1/hot-fixes/
and add it on top of all regular mm1 patches:
$ quilt import ~/hot-fixes/*.patch
$ quilt push -a

Now open patches/series in an editor. Find the ieee1394 patches. Move
all of them to the bottom of the series file. Save it. You can now
revert each 1394 patch by
$ quilt pop

Build the kernel as usual.

Now to the trick I mentioned before. To avoid starting from
linux-2.6.18-rc5 even though you already built and booted
2.6.18-rc5-mm1, perform the steps above on top of 2.6.18-rc5 until and
including the step where you imported and pushed the hot-fixes. After
that, just copy the patches/ and .pc/ directories over to your existing
2.6.18-rc5-mm1. Check the effect with
$ cd ../2.6.18-rc5-mm1
$ quilt top
This should give a message that the last hot fix is topmost. It should
now be possible to run "quilt pop" etc.

Anyway; manually removing the ieee1394 patches by looking at the order
in the series file may be faster than setting up quilt and the second
kernel source tree.
--
Stefan Richter
-=====-=-==- =--= --=-=
http://arcgraph.de/sr/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-09-05 22:23    [W:0.093 / U:1.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site