From owner-svn-src-all@freebsd.org Wed Aug 24 03:06:12 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2253FBC3DA7; Wed, 24 Aug 2016 03:06:12 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id DC3BD1C22; Wed, 24 Aug 2016 03:06:11 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c122-106-149-109.carlnfd1.nsw.optusnet.com.au (c122-106-149-109.carlnfd1.nsw.optusnet.com.au [122.106.149.109]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 689AD1A6B5D; Wed, 24 Aug 2016 13:06:05 +1000 (AEST) Date: Wed, 24 Aug 2016 13:06:04 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: "Ngie Cooper (yaneurabeya)" cc: Bryan Drewery , Bruce Evans , Hans Petter Selasky , Bruce Evans , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r304567 - head/sys/dev/usb/input In-Reply-To: <11F43201-868B-48DF-8612-95974A1B15AB@gmail.com> Message-ID: <20160824125906.S850@besplex.bde.org> References: <201608211606.u7LG60pS063983@repo.freebsd.org> <20160822185617.I1897@besplex.bde.org> <55444c61-f280-265a-e223-52b128382b71@FreeBSD.org> <11F43201-868B-48DF-8612-95974A1B15AB@gmail.com> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=VIkg5I7X c=1 sm=1 tr=0 a=R/f3m204ZbWUO/0rwPSMPw==:117 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=nlC_4_pT8q9DhB4Ho9EA:9 a=6I5d2MoRAAAA:8 a=U3Qa8ne3PVn-3QgmXoYA:9 a=45ClL6m2LaAA:10 a=IjZwj45LgO3ly-622nXo:22 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2016 03:06:12 -0000 On Tue, 23 Aug 2016, Ngie Cooper (yaneurabeya) wrote: >> On Aug 23, 2016, at 13:57, Bryan Drewery wrote: > ... > >> Well yours only supports stable/10+ and not 9- with the older merge styl= e. > > =09*shrugs* The older method promoted broken mergeinfo=85 The method I wr= ote up works fine with ^/stable/9- =97 just with non-sparse checkouts (I do= n=92t recommend sparse checkouts, again because it can screw up mergeinfo) = :). I have to/want to use a very sparse checkout. Currently 19MB. This doesn't seem to have caused any problems so far, except I somehow got =2Esvn databases in the most active subdirs. Bruce From owner-svn-src-all@freebsd.org Wed Aug 24 03:08:14 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90BEEBC3EBF; Wed, 24 Aug 2016 03:08:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D7321DFB; Wed, 24 Aug 2016 03:08:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7O38DJJ001501; Wed, 24 Aug 2016 03:08:13 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7O38DXT001499; Wed, 24 Aug 2016 03:08:13 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201608240308.u7O38DXT001499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Wed, 24 Aug 2016 03:08:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r304722 - in head/sys: dev/usb/net net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2016 03:08:14 -0000 Author: sephe Date: Wed Aug 24 03:08:13 2016 New Revision: 304722 URL: https://svnweb.freebsd.org/changeset/base/304722 Log: net/rndis: Add canonical RNDIS major/minor version as of today. Reviewed by: hps MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D7593 Modified: head/sys/dev/usb/net/if_urndis.c head/sys/net/rndis.h Modified: head/sys/dev/usb/net/if_urndis.c ============================================================================== --- head/sys/dev/usb/net/if_urndis.c Wed Aug 24 02:41:24 2016 (r304721) +++ head/sys/dev/usb/net/if_urndis.c Wed Aug 24 03:08:13 2016 (r304722) @@ -658,7 +658,7 @@ urndis_ctrl_init(struct urndis_softc *sc msg.rm_type = htole32(REMOTE_NDIS_INITIALIZE_MSG); msg.rm_len = htole32(sizeof(msg)); msg.rm_rid = 0; - msg.rm_ver_major = htole32(1); + msg.rm_ver_major = htole32(RNDIS_VERSION_MAJOR); msg.rm_ver_minor = htole32(1); msg.rm_max_xfersz = htole32(RNDIS_RX_MAXLEN); Modified: head/sys/net/rndis.h ============================================================================== --- head/sys/net/rndis.h Wed Aug 24 02:41:24 2016 (r304721) +++ head/sys/net/rndis.h Wed Aug 24 03:08:13 2016 (r304722) @@ -23,6 +23,10 @@ #ifndef _NET_RNDIS_H_ #define _NET_RNDIS_H_ +/* Canonical major/minor version as of 22th Aug. 2016. */ +#define RNDIS_VERSION_MAJOR 0x00000001 +#define RNDIS_VERSION_MINOR 0x00000000 + #define RNDIS_STATUS_BUFFER_OVERFLOW 0x80000005L #define RNDIS_STATUS_FAILURE 0xC0000001L #define RNDIS_STATUS_INVALID_DATA 0xC0010015L