On Wed, Apr 11, 2007 at 08:25:49PM +0200, Bastian Blank wrote: > On Tue, Apr 10, 2007 at 01:58:59PM -0600, dann frazier wrote: > > Kyle created a patch for 2.6.20 that I've committed in r8460. I've got > > a few more config changes to commit, then hppa should be ready. > > The patch conflicts with other patches.
Should be fixed in r8467: Author: dannf Date: Wed Apr 11 19:46:23 2007 New Revision: 8467 Added: dists/sid/linux-2.6/debian/patches/series/2-extra Modified: dists/sid/linux-2.6/debian/patches/series/2 Log: make parisc patch arch-specific. This is just a temporary workaround due to conflicts between the vserver and hppa patches. In general, it makes security maintenance easier if we avoid arch-specific patches as much as possible (*hint*) Modified: dists/sid/linux-2.6/debian/patches/series/2 ============================================================================== --- dists/sid/linux-2.6/debian/patches/series/2 (original) +++ dists/sid/linux-2.6/debian/patches/series/2 Wed Apr 11 19:46:23 2007 @@ -1,2 +1 @@ - features/mips/sb1-duart.patch -+ bugfix/hppa/parisc.patch Added: dists/sid/linux-2.6/debian/patches/series/2-extra ============================================================================== --- (empty file) +++ dists/sid/linux-2.6/debian/patches/series/2-extra Wed Apr 11 19:46:23 2007 @@ -0,0 +1 @@ ++ bugfix/hppa/parisc.patch hppa -- dann frazier -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
