From owner-svn-src-all@FreeBSD.ORG  Mon Nov 29 03:39:05 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 4622C106566C;
	Mon, 29 Nov 2010 03:39:05 +0000 (UTC) (envelope-from andy@fud.org.nz)
Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50])
	by mx1.freebsd.org (Postfix) with ESMTP id 68D6C8FC1A;
	Mon, 29 Nov 2010 03:39:04 +0000 (UTC)
Received: by wwb24 with SMTP id 24so227411wwb.31
	for <multiple recipients>; Sun, 28 Nov 2010 19:39:03 -0800 (PST)
MIME-Version: 1.0
Received: by 10.227.151.70 with SMTP id b6mr5278615wbw.205.1291001942476; Sun,
	28 Nov 2010 19:39:02 -0800 (PST)
Sender: andy@fud.org.nz
Received: by 10.227.143.200 with HTTP; Sun, 28 Nov 2010 19:39:02 -0800 (PST)
In-Reply-To: <m2mxosx3g7.fsf@crouton.trit.net>
References: <201011280703.oAS73Llh067002@svn.freebsd.org>
	<m2mxosx3g7.fsf@crouton.trit.net>
Date: Mon, 29 Nov 2010 16:39:02 +1300
X-Google-Sender-Auth: tJAmqVcglBVeksX5kI2HpLzGq_s
Message-ID: <AANLkTikrh4h56j49riT7xx=eGqXGeU-pDmgjNFrz+U6a@mail.gmail.com>
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Dima Dorfman <dd@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
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 03:39:05 -0000

On 29 November 2010 15:34, Dima Dorfman <dd@freebsd.org> wrote:
> 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:
>> =A0 MFC r213804,213879,213880,214800
>>
>> =A0 Add new device IDs.
> ...
>> Modified: stable/8/sys/dev/usb/serial/u3g.c
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
>> --- stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 06:43:39 2010 =A0 =A0 =
=A0 =A0(r215979)
>> +++ stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 07:03:21 2010 =A0 =A0 =
=A0 =A0(r215980)
>> @@ -285,11 +285,12 @@ static const struct usb_device_id u3g_de
>> =A0 =A0 =A0 U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI),
>> =A0 =A0 =A0 U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI),
>> =A0 =A0 =A0 U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI),
>> - =A0 =A0 U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI),
>> + =A0 =A0 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
> : =A0 =A0 =A0 U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI),
> : =A0 =A0 =A0 U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI),


Should be fixed now, thanks for pointing it out.