From owner-svn-src-stable-10@freebsd.org  Sat Jul 15 18:26:01 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 324E1AFF9A7;
 Sat, 15 Jul 2017 18:26:01 +0000 (UTC)
 (envelope-from dchagin@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 F2B897E6EC;
 Sat, 15 Jul 2017 18:26:00 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6FIQ0rv089507;
 Sat, 15 Jul 2017 18:26:00 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6FIQ088089501;
 Sat, 15 Jul 2017 18:26:00 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201707151826.v6FIQ088089501@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dchagin set sender to
 dchagin@FreeBSD.org using -f
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 15 Jul 2017 18:25:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r321026 - in stable/10/sys: amd64/linux compat/linux
X-SVN-Group: stable-10
X-SVN-Commit-Author: dchagin
X-SVN-Commit-Paths: in stable/10/sys: amd64/linux compat/linux
X-SVN-Commit-Revision: 321026
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jul 2017 18:26:01 -0000

Author: dchagin
Date: Sat Jul 15 18:25:59 2017
New Revision: 321026
URL: https://svnweb.freebsd.org/changeset/base/321026

Log:
  MFC r305994 (by emaste@):
  
  Catch up to sys/capability.h rename to sys/capsicum.h in r263232

Modified:
  stable/10/sys/amd64/linux/linux_machdep.c
  stable/10/sys/compat/linux/linux_event.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/linux/linux_machdep.c
==============================================================================
--- stable/10/sys/amd64/linux/linux_machdep.c	Sat Jul 15 18:08:20 2017	(r321025)
+++ stable/10/sys/amd64/linux/linux_machdep.c	Sat Jul 15 18:25:59 2017	(r321026)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>

Modified: stable/10/sys/compat/linux/linux_event.c
==============================================================================
--- stable/10/sys/compat/linux/linux_event.c	Sat Jul 15 18:08:20 2017	(r321025)
+++ stable/10/sys/compat/linux/linux_event.c	Sat Jul 15 18:25:59 2017	(r321026)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>