Received: with ECARTIS (v1.0.0; list netdev); Fri, 18 Oct 2002 18:23:21 -0700 (PDT)
Received: from pizda.ninka.net (IDENT:root@pizda.ninka.net [216.101.162.242])
	by oss.sgi.com (8.12.5/8.12.5) with SMTP id g9J1NGtG004668
	for <netdev@oss.sgi.com>; Fri, 18 Oct 2002 18:23:17 -0700
Received: from localhost (IDENT:davem@localhost.localdomain [127.0.0.1])
	by pizda.ninka.net (8.9.3/8.9.3) with ESMTP id SAA15422;
	Fri, 18 Oct 2002 18:15:32 -0700
Date: Fri, 18 Oct 2002 18:15:32 -0700 (PDT)
Message-Id: <20021018.181532.45064096.davem@redhat.com>
To: yoshfuji@linux-ipv6.org
Cc: linux-kernel@vger.kernel.org, netdev@oss.sgi.com, usagi@linux-ipv6.org
Subject: Re: [PATCH] IPv6: Sevaral MLD Fixes
From: "David S. Miller" <davem@redhat.com>
In-Reply-To: <20021018.125223.130322644.yoshfuji@linux-ipv6.org>
References: <20021018.125223.130322644.yoshfuji@linux-ipv6.org>
X-FalunGong: Information control.
X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
X-archive-position: 777
X-ecartis-version: Ecartis v1.0.0
Sender: netdev-bounce@oss.sgi.com
Errors-to: netdev-bounce@oss.sgi.com
X-original-sender: davem@redhat.com
Precedence: bulk
X-list: netdev

   From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
   Date: Fri, 18 Oct 2002 12:52:23 +0900 (JST)

I am going to apply this patch, but please be more careful
in the future.  You submitted two patches which modify
the same hunk of comment to two different values, guarenteeing
that if I just run 'patch' this one will not apply without rejects.

   @@ -18,6 +18,9 @@
    /* Changes:
     *
     *	yoshfuji	: fix format of router-alert option
   + *	YOSHIFUJI Hideaki @USAGI:
   + *		- Ignore Queries for invalid addresses.
   + *		- MLD for link-local addresses.
     */
    
    #define __NO_VERSION__

Next time, please make patch relative to previous one and
tell me "this patch depends upon MLD source address selection
patch being applied first".

This way we can avoid this problem.