From owner-svn-src-all@FreeBSD.ORG  Mon Nov 29 02:53:42 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F3F8106564A;
	Mon, 29 Nov 2010 02:53:42 +0000 (UTC) (envelope-from dd@freebsd.org)
Received: from postie.trit.net (postie.trit.net [208.90.32.17])
	by mx1.freebsd.org (Postfix) with ESMTP id DB5FB8FC14;
	Mon, 29 Nov 2010 02:53:41 +0000 (UTC)
Received: from crouton.trit.net (alice.qvzn.com [208.75.88.199])
	by postie.trit.net (Postfix) with ESMTPSA id B77939BAEB2;
	Mon, 29 Nov 2010 02:34:49 +0000 (UTC)
Received: by crouton.trit.net (Postfix, from userid 501)
	id 9581E342520; Sun, 28 Nov 2010 21:34:48 -0500 (EST)
From: Dima Dorfman <dd@freebsd.org>
To: Andrew Thompson <thompsa@FreeBSD.org>
References: <201011280703.oAS73Llh067002@svn.freebsd.org>
Date: Sun, 28 Nov 2010 21:34:48 -0500
In-Reply-To: <201011280703.oAS73Llh067002@svn.freebsd.org> (Andrew Thompson's
	message of "Sun, 28 Nov 2010 07:03:21 +0000 (UTC)")
Message-ID: <m2mxosx3g7.fsf@crouton.trit.net>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (darwin)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: svn-src-all@freebsd.org, src-committers@freebsd.org,
	Hans Petter Selasky <hselasky@freebsd.org>
Subject: Re: svn commit: r215980 - in stable/8/sys/dev/usb: . quirk serial
	wlan
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Nov 2010 02:53:42 -0000

Andrew Thompson <thompsa@FreeBSD.org> writes:
> Author: thompsa
> Date: Sun Nov 28 07:03:21 2010
> New Revision: 215980
> URL: http://svn.freebsd.org/changeset/base/215980
>
> Log:
>   MFC r213804,213879,213880,214800
>   
>   Add new device IDs.
...
> Modified: stable/8/sys/dev/usb/serial/u3g.c
> ==============================================================================
> --- stable/8/sys/dev/usb/serial/u3g.c	Sun Nov 28 06:43:39 2010	(r215979)
> +++ stable/8/sys/dev/usb/serial/u3g.c	Sun Nov 28 07:03:21 2010	(r215980)
> @@ -285,11 +285,12 @@ static const struct usb_device_id u3g_de
>  	U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI),
>  	U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI),
>  	U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI),
> -	U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI),
> +	U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI),

This looks like a merge error. Both K3765 and K3765_INIT are supposed to
be listed, with different flags. Like how it is in -current:

: % grep K3765 head/sys/dev/usb/serial/u3g.c
: 	U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI),
: 	U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI),

-- 
Dima