From owner-svn-src-stable@freebsd.org  Thu Mar 30 06:13:40 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
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 A82A0D253DE;
 Thu, 30 Mar 2017 06:13:40 +0000 (UTC)
 (envelope-from ngie@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 58032BA4;
 Thu, 30 Mar 2017 06:13:40 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2U6DdEH007165;
 Thu, 30 Mar 2017 06:13:39 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2U6DdAt007163;
 Thu, 30 Mar 2017 06:13:39 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703300613.v2U6DdAt007163@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Thu, 30 Mar 2017 06:13:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r316252 - in stable/11/usr.sbin: ctladm ctld
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Mar 2017 06:13:40 -0000

Author: ngie
Date: Thu Mar 30 06:13:39 2017
New Revision: 316252
URL: https://svnweb.freebsd.org/changeset/base/316252

Log:
  MFC r316050,r316051:
  
  r316050:
  
  ctld: sort #includes per style(9)
  
  - Only include sys/types.h or sys/param.h, not both.
  - Sort alphabetically.
  
  r316051:
  
  ctldadm: sort #includes per style(9)
  
  - Only include sys/types.h or sys/param.h, not both.
  - Sort alphabetically.

Modified:
  stable/11/usr.sbin/ctladm/ctladm.c
  stable/11/usr.sbin/ctld/kernel.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/11/usr.sbin/ctladm/ctladm.c	Thu Mar 30 06:11:56 2017	(r316251)
+++ stable/11/usr.sbin/ctladm/ctladm.c	Thu Mar 30 06:13:39 2017	(r316252)
@@ -43,25 +43,24 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/callout.h>
+#include <sys/ioctl.h>
 #include <sys/linker.h>
 #include <sys/queue.h>
-#include <sys/callout.h>
 #include <sys/sbuf.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <sys/stat.h>
+#include <bsdxml.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <string.h>
-#include <errno.h>
-#include <err.h>
-#include <ctype.h>
-#include <bsdxml.h>
+#include <unistd.h>
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/ctl/ctl.h>

Modified: stable/11/usr.sbin/ctld/kernel.c
==============================================================================
--- stable/11/usr.sbin/ctld/kernel.c	Thu Mar 30 06:11:56 2017	(r316251)
+++ stable/11/usr.sbin/ctld/kernel.c	Thu Mar 30 06:13:39 2017	(r316252)
@@ -37,15 +37,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/capsicum.h>
+#include <sys/callout.h>
+#include <sys/ioctl.h>
 #include <sys/linker.h>
 #include <sys/queue.h>
-#include <sys/callout.h>
 #include <sys/sbuf.h>
-#include <sys/capsicum.h>
+#include <sys/stat.h>
 #include <assert.h>
 #include <bsdxml.h>
 #include <ctype.h>