From owner-svn-src-stable@freebsd.org Sat Apr 16 06:54:21 2016 Return-Path: Delivered-To: svn-src-stable@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 70909B1019C; Sat, 16 Apr 2016 06:54:21 +0000 (UTC) (envelope-from herbert@mailbox.org) Received: from mx2.mailbox.org (mx2.mailbox.org [80.241.60.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.mailbox.org", Issuer "SwissSign Server Silver CA 2014 - G22" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3368419C1; Sat, 16 Apr 2016 06:54:20 +0000 (UTC) (envelope-from herbert@mailbox.org) Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 96822434EE; Sat, 16 Apr 2016 08:49:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-type:content-type:mime-version:references:in-reply-to :subject:subject:from:from:message-id:date:date:received; s= mail20150812; t=1460789346; bh=D6voyW67qEwZPEcW8v2fpIiajQtEylYLZ KUN/vJiWRQ=; b=hcyL0UvydaT8NBdN9PRUQ/KXOR4UCx0VqgXFSAN8lUZ1R1p2k y43UpFdZzG+XqlsDYOxW4bLafB/ybo4IJ+z2nJWcR/xy79kCD6gQQspbNiX54Z84 ju/4E8bdCzFHzBMqac7e17w5byqacYT26k2Plm3laYV+4h7dkJo47zwplNTzikok X39z1aga42OFiRU7fgGLWKGpxZg5sss/fduabic1g2TBxhrukf3UiPEqVadvt8cy maHC+x4Amjtnpp1A0mhX/26tH5kbfG627AgPwrS5g1hAfiFVku1TrmB/v1Lz5Mds USt5wOSvZdf2VlNqPq/Tk4gVqwE9shSGgSZLQ== X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id PUYPqcjSYbHi; Sat, 16 Apr 2016 08:49:06 +0200 (CEST) Date: Sat, 16 Apr 2016 08:49:04 +0200 Message-ID: <86oa9a59r3.wl-herbert@mailbox.org> From: "Herbert J. Skuhra" To: Luiz Otavio O Souza Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r298091 - in stable/10: sbin/pfctl share/man/man4 sys/conf sys/contrib/altq/altq sys/netpfil/pf In-Reply-To: <201604160211.u3G2B4Mv078856@repo.freebsd.org> References: <201604160211.u3G2B4Mv078856@repo.freebsd.org> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 06:54:21 -0000 Luiz Otavio O Souza skrev: > > Author: loos > Date: Sat Apr 16 02:11:04 2016 > New Revision: 298091 > URL: https://svnweb.freebsd.org/changeset/base/298091 > > Log: > MFC r284777, r284814, r284863 and r298088: > > ALTQ FAIRQ discipline import from DragonFLY. > > Differential Revision: https://reviews.freebsd.org/D2847 > Obtained from: pfSense > Sponsored by: Rubicon Communications (Netgate) > > Added: > stable/10/sys/contrib/altq/altq/altq_fairq.c (contents, props changed) > stable/10/sys/contrib/altq/altq/altq_fairq.h (contents, props changed) > Modified: > stable/10/sbin/pfctl/parse.y > stable/10/sbin/pfctl/pfctl_altq.c > stable/10/sbin/pfctl/pfctl_parser.h > stable/10/sbin/pfctl/pfctl_qstats.c > stable/10/share/man/man4/altq.4 > stable/10/sys/conf/NOTES > stable/10/sys/conf/files > stable/10/sys/conf/options > stable/10/sys/contrib/altq/altq/altq.h > stable/10/sys/contrib/altq/altq/altq_subr.c > stable/10/sys/contrib/altq/altq/altq_var.h > stable/10/sys/netpfil/pf/pf.c > stable/10/sys/netpfil/pf/pf_altq.h > stable/10/sys/netpfil/pf/pf_mtag.h > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sbin/pfctl/parse.y > ============================================================================== > --- stable/10/sbin/pfctl/parse.y Sat Apr 16 00:01:16 2016 (r298090) > +++ stable/10/sbin/pfctl/parse.y Sat Apr 16 02:11:04 2016 (r298091) > @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include ^^^^ This is obviously wrong!? Index: sbin/pfctl/parse.y =================================================================== --- sbin/pfctl/parse.y (revision 298102) +++ sbin/pfctl/parse.y (working copy) @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include Index: sbin/pfctl/pfctl_altq.c =================================================================== --- sbin/pfctl/pfctl_altq.c (revision 298102) +++ sbin/pfctl/pfctl_altq.c (working copy) @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "pfctl_parser.h" #include "pfctl.h" Index: sbin/pfctl/pfctl_qstats.c =================================================================== --- sbin/pfctl/pfctl_qstats.c (revision 298102) +++ sbin/pfctl/pfctl_qstats.c (working copy) @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "pfctl.h" #include "pfctl_parser.h" -- Herbert