Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262754AbVBYRPB (ORCPT ); Fri, 25 Feb 2005 12:15:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262757AbVBYRPA (ORCPT ); Fri, 25 Feb 2005 12:15:00 -0500 Received: from gockel.physik3.uni-rostock.de ([139.30.44.16]:37336 "EHLO gockel.physik3.uni-rostock.de") by vger.kernel.org with ESMTP id S262754AbVBYRND (ORCPT ); Fri, 25 Feb 2005 12:13:03 -0500 Date: Fri, 25 Feb 2005 18:12:12 +0100 (CET) From: Tim Schmielau To: Mark Fortescue cc: davem@davemloft.net, kuznet@ms2.inr.ac.ru, pekkas@netcore.fi, jmorris@redhat.com, yoshfuji@linux-ipv6.org, kaber@coreworks.de, netdev@oss.sgi.com, lkml Subject: Re: linux-2.6.8.1 to linux-2.6.10: Kernel Patching Issues. In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1761 Lines: 44 On Fri, 25 Feb 2005, Mark Fortescue wrote: > The kernel patch files patch-2.6.9 and patch-2.6.10 do not apear to be > correct. I had some errors during patching so I generated a diff against a > freshly downloaded linux-2.6.10 kernel. See the steps below: > > 1) bzcat linux-2.6.8.1.tar.bz2 | tar -xf - > 2) cd linux-2.6.8.1 > 3) bzcat ../patch-2.6.8.1.bz2 | patch -R -p1 > This gives a 2.6.8 kernel. > > 4) bzcat ../patch-2.6.9.bz2 | patch -p1 > This should give a 2.6.9 kernel. The patch has two errors: > ./net/ipv4/netfilter/ipt_ecn.c.rej > ./net/ipv4/netfilter/ipt_tcpmss.c.rej > > 5) bzcat ../patch-2.6.10.bz2 | patch -p1 -f > This should give a 2.6.10 kernel. The patch has three erros: > ./include/linux/netfilter_ipv4/ipt_connmark.h.rej > ./net/ipv4/netfilter/ipt_connmark.c.rej > ./net/ipv6/netfilter/ip6t_MARK.c.rej > 6) cd ..; mv linux-2.6.8.1 linux-2.6.10p > 7) bzcat linux-2.6.10.tar.bz2 | tar -xf - > 8) diff -rupN linux-2.6.10p linux-2.6.10 | tee patch-2.6.10.err Yes, these steps should work. Actually, I just checked (copy & paste the commands from your mail), and it works for me. Are you sure your files are ok? md5sums for my copies of the files are cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 98f93075c7c24e681eaf7e70783af5e4 linux-2.6.8.1.tar.gz 98b7db13a3f13199a48e89a79d2ee388 patch-2.6.10.bz2 824b7d88ab2fabc031f1a6c1e6e288ee patch-2.6.8.1.bz2 fe744cdcd31b97b803e51ad785520489 patch-2.6.9.bz2 Are you sure your filesystem works ok? Not out of quota? Tim - 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/