From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McHardy Subject: Re: Resend: Patch : ulogd fix for kernel 64bits/userspace 32bits system Date: Fri, 13 Oct 2006 08:03:19 +0200 Message-ID: <452F2C27.9030603@trash.net> References: <1160654607.9238.5.camel@localhost.localdomain> <452E30AE.9030805@trash.net> <1160662471.15687.11.camel@localhost.localdomain> <452E4FEF.1080100@trash.net> <1160669923.27911.5.camel@localhost.localdomain> <452F2B82.5060308@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: netfilter-devel@lists.netfilter.org Return-path: To: Eric Leblond In-Reply-To: <452F2B82.5060308@trash.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org Patrick McHardy wrote: > The patch looks good, but doesn't apply: > > (Stripping trailing CRs from patch.) > patching file configure.in > (Stripping trailing CRs from patch.) > patching file libipulog/include/linux/netfilter_ipv4/ipt_ULOG.h > (Stripping trailing CRs from patch.) > patching file libipulog/include/libipulog/libipulog.h > Hunk #1 FAILED at 1. > 1 out of 2 hunks FAILED -- saving rejects to file > libipulog/include/libipulog/libipulog.h.rej > (Stripping trailing CRs from patch.) > patching file Rules.make.in > > Please rediff against current SVN. Never mind, it was this part: -/* $Id: libipulog.h,v 1.6 2002/07/30 07:23:36 laforge Exp $ */ +/* $Id$ */ I fixed it up manually. Thanks Eric.