From owner-freebsd-current  Sun Mar  1 13:48:39 1998
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id NAA08702
          for freebsd-current-outgoing; Sun, 1 Mar 1998 13:48:39 -0800 (PST)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from vader.cs.berkeley.edu (vader.CS.Berkeley.EDU [128.32.38.234])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA08697
          for <current@freebsd.org>; Sun, 1 Mar 1998 13:48:38 -0800 (PST)
          (envelope-from asami@vader.cs.berkeley.edu)
Received: from baloon.mimi.com (sjx-ca126-20.ix.netcom.com [207.92.177.212]) by vader.cs.berkeley.edu (8.8.7/8.7.3) with ESMTP id NAA24628; Sun, 1 Mar 1998 13:48:09 -0800 (PST)
Received: (from asami@localhost)
	by baloon.mimi.com (8.8.8/8.8.8) id NAA09826;
	Sun, 1 Mar 1998 13:47:59 -0800 (PST)
	(envelope-from asami)
Date: Sun, 1 Mar 1998 13:47:59 -0800 (PST)
Message-Id: <199803012147.NAA09826@baloon.mimi.com>
To: iang@digs.iafrica.com
CC: current@FreeBSD.ORG
In-reply-to: <E0y98KQ-0001ZC-00@brane.digs.iafrica.com> (message from Ian Freislich on Sun, 01 Mar 1998 14:58:49 +0200)
Subject: Re: Duplicate cases in /usr/src/sys/pci/pcisupport.c
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

 * Looking in the file:
 * @207:
 *         case 0x71008086:
 *                 return ("Intel 82439TX System Controller (MTXC)");
 * @217:
 *         case 0x71008086:
 *                 return ("Intel 82439TX PCI cache memory controller");

Yikes.  The second one in my commit yesterday.  How did this happen?

(Dig into cvs logs, mail with Jordan, etc....)

Eek.  So this was already in -current for quite some time:

===
1.54 Wed Sep 24 7:37:56 1997 by phk 
Diffs to 1.53 

Remove the 82371 IDE devices.
Add Intel 82439TX System Controller (MTXC)
fix a whitespace problem.
===

But he didn't bother to merge it into -stable.  I am running -stable
here (where I made the diffs) and Jordan is running -stable on catfish
too, where we initially noticed that the chipset is not recognized and
also tested the diffs.

Blast.  Sorry, will fix it, it is my fault not checking with -current
first.

But I really wish people will merge trivial things like this, with
"real" changes and non-real changes between -stable and -current
intermixed, it's so hard to see what's going on! :<

Satoshi

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message