From owner-freebsd-current@FreeBSD.ORG  Tue Mar 16 10:15:06 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 82A8916A4CE
	for <current@freebsd.org>; Tue, 16 Mar 2004 10:15:06 -0800 (PST)
Received: from carver.gumbysoft.com (carver.gumbysoft.com [66.220.23.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 67FF643D41
	for <current@freebsd.org>; Tue, 16 Mar 2004 10:15:06 -0800 (PST)
	(envelope-from dwhite@gumbysoft.com)
Received: by carver.gumbysoft.com (Postfix, from userid 1000)
	id 5A4A272DD2; Tue, 16 Mar 2004 10:15:06 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
	by carver.gumbysoft.com (Postfix) with ESMTP id 5482372DB5
	for <current@freebsd.org>; Tue, 16 Mar 2004 10:15:06 -0800 (PST)
Date: Tue, 16 Mar 2004 10:15:06 -0800 (PST)
From: Doug White <dwhite@gumbysoft.com>
To: current@freebsd.org
Message-ID: <20040316101323.K42196@carver.gumbysoft.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: src/etc/Makefile rev 1.326
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Mar 2004 18:15:06 -0000

I've received a report that this rev of src/etc/Makefile is causing
device.hints to get spammed unconditionally by mergemaster.  Can someone
verify this with their install?  I suggest backing up your device.hints
first :)

The change was mainly to allow mergemaster to merge hints changes.

Thanks!

-- 
Doug White                    |  FreeBSD: The Power to Serve
dwhite@gumbysoft.com          |  www.FreeBSD.org