From owner-svn-src-all@FreeBSD.ORG Sat Dec 27 18:07:34 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F86070E; Sat, 27 Dec 2014 18:07:34 +0000 (UTC) Received: from mail-wi0-x22d.google.com (mail-wi0-x22d.google.com [IPv6:2a00:1450:400c:c05::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B536064A21; Sat, 27 Dec 2014 18:07:33 +0000 (UTC) Received: by mail-wi0-f173.google.com with SMTP id r20so18950227wiv.0; Sat, 27 Dec 2014 10:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=2ZZEiE78ssq/CHiPRwA1lo4JYJ4amjPS6t/WjVaoWNM=; b=FvjBvsi+niyVTQ+501x95ZsaLD1+3GVmW5Ew5dwGZ3ijKbrp7YX8PxfIet/JIc2jWv Uyex1Kjy2S/CA0YQ+s6kysYani2AGumGlu0ZAHn3we1jruDzUxf4+JeDg+Af0N29gxVX 19WJwAEidZk9FVxuimi/BavKRdFhFJAEC/aA7IBCWUUzktQHWQhageQtLL4bpCdZGr3H wuOM6R2TLW+5W5CPRyM2kngI5lXjBXzvtHGYgBeCrxL4m/aUGzAxf3P/MQF5HYjTvVou SF4M8Bp3PIeXTa2604vXMVEz/x0PO9BoKjrr6AxcUpVU7AuaUoA5v+bApMhMFqK19slG rLbA== MIME-Version: 1.0 X-Received: by 10.194.24.103 with SMTP id t7mr93200320wjf.15.1419703651922; Sat, 27 Dec 2014 10:07:31 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.216.106.195 with HTTP; Sat, 27 Dec 2014 10:07:31 -0800 (PST) In-Reply-To: <201412271710.sBRHAaqH092733@svn.freebsd.org> References: <201412271710.sBRHAaqH092733@svn.freebsd.org> Date: Sat, 27 Dec 2014 10:07:31 -0800 X-Google-Sender-Auth: pCPw_WYY9pdd49qUkDUd71KvPGc Message-ID: Subject: Re: svn commit: r276308 - in head/sys: conf contrib/dev/iwn From: Adrian Chadd To: Marius Strobl Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sat, 27 Dec 2014 18:07:34 -0000 Hi! Thanks for catching this! -adrian On 27 December 2014 at 09:10, Marius Strobl wrote: > Author: marius > Date: Sat Dec 27 17:10:35 2014 > New Revision: 276308 > URL: https://svnweb.freebsd.org/changeset/base/276308 > > Log: > Use the same 6000 series g2{a,b} firmware versions when embedding these > images into the kernel as currently included into iwn6000g2{a,b}fw.ko > and delete the old files, missed in r254199 and r259135 respectively. > > MFC after: 3 days > > Deleted: > head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu > head/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu > Modified: > head/sys/conf/files > > Modified: head/sys/conf/files > ============================================================================== > --- head/sys/conf/files Sat Dec 27 17:10:14 2014 (r276307) > +++ head/sys/conf/files Sat Dec 27 17:10:35 2014 (r276308) > @@ -1731,7 +1731,7 @@ iwn6000g2afw.fwo optional iwn6000g2afw > no-implicit-rule \ > clean "iwn6000g2afw.fwo" > iwn6000g2a.fw optional iwn6000g2afw | iwnfw \ > - dependency "$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \ > + dependency "$S/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu" \ > compile-with "${NORMAL_FW}" \ > no-obj no-implicit-rule \ > clean "iwn6000g2a.fw" > @@ -1745,7 +1745,7 @@ iwn6000g2bfw.fwo optional iwn6000g2bfw > no-implicit-rule \ > clean "iwn6000g2bfw.fwo" > iwn6000g2b.fw optional iwn6000g2bfw | iwnfw \ > - dependency "$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \ > + dependency "$S/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu" \ > compile-with "${NORMAL_FW}" \ > no-obj no-implicit-rule \ > clean "iwn6000g2b.fw" >