Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jan 2017 21:27:40 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r311550 - in projects/bsnmp-ipv6-mib: bin/pax contrib/mtree sbin/fsck_ffs sbin/ping share/man/man4 share/man/man5 share/misc sys/contrib/dev/acpica/compiler sys/dev/rtwn/usb sys/dev/usb...
Message-ID:  <201701062127.v06LReMx097653@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Fri Jan  6 21:27:39 2017
New Revision: 311550
URL: https://svnweb.freebsd.org/changeset/base/311550

Log:
  MFhead@r311549

Modified:
  projects/bsnmp-ipv6-mib/bin/pax/gen_subs.c
  projects/bsnmp-ipv6-mib/contrib/mtree/create.c
  projects/bsnmp-ipv6-mib/contrib/mtree/spec.c
  projects/bsnmp-ipv6-mib/contrib/mtree/specspec.c
  projects/bsnmp-ipv6-mib/sbin/fsck_ffs/suj.c
  projects/bsnmp-ipv6-mib/sbin/ping/ping.c
  projects/bsnmp-ipv6-mib/share/man/man4/rtwn_usb.4
  projects/bsnmp-ipv6-mib/share/man/man5/src.conf.5
  projects/bsnmp-ipv6-mib/share/misc/scsi_modes
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/aslhelp.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/bsnmp-ipv6-mib/sys/dev/rtwn/usb/rtwn_usb_attach.h
  projects/bsnmp-ipv6-mib/sys/dev/usb/usbdevs
  projects/bsnmp-ipv6-mib/sys/fs/nfsclient/nfs_clvnops.c
  projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs.h
  projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_fifoops.c
  projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_subr.c
  projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vnops.c
  projects/bsnmp-ipv6-mib/sys/kern/kern_exec.c
  projects/bsnmp-ipv6-mib/sys/ufs/ffs/ffs_softdep.c
  projects/bsnmp-ipv6-mib/sys/ufs/ufs/ufs_vnops.c
  projects/bsnmp-ipv6-mib/tests/sys/kern/pipe/pipe_ino_test.c
  projects/bsnmp-ipv6-mib/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES
  projects/bsnmp-ipv6-mib/usr.bin/find/ls.c
  projects/bsnmp-ipv6-mib/usr.bin/gzip/gzip.c
  projects/bsnmp-ipv6-mib/usr.sbin/crunch/crunchgen/crunchgen.1
  projects/bsnmp-ipv6-mib/usr.sbin/fmtree/compare.c
  projects/bsnmp-ipv6-mib/usr.sbin/fmtree/create.c
  projects/bsnmp-ipv6-mib/usr.sbin/fmtree/specspec.c
Directory Properties:
  projects/bsnmp-ipv6-mib/   (props changed)
  projects/bsnmp-ipv6-mib/contrib/mtree/   (props changed)
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/   (props changed)

Modified: projects/bsnmp-ipv6-mib/bin/pax/gen_subs.c
==============================================================================
--- projects/bsnmp-ipv6-mib/bin/pax/gen_subs.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/bin/pax/gen_subs.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -109,7 +109,8 @@ ls_list(ARCHD *arcn, time_t now, FILE *f
 	 */
 	if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0)
 		f_date[0] = '\0';
-	(void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink,
+	(void)fprintf(fp, "%s%2ju %-12s %-12s ", f_mode,
+		(uintmax_t)sbp->st_nlink,
 		name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1));
 
 	/*

Modified: projects/bsnmp-ipv6-mib/contrib/mtree/create.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/mtree/create.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/contrib/mtree/create.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -224,7 +224,8 @@ statf(FILE *fp, int indent, FTSENT *p)
 		output(fp, indent, &offset, "device=%#jx",
 		    (uintmax_t)p->fts_statp->st_rdev);
 	if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
-		output(fp, indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
+		output(fp, indent, &offset, "nlink=%ju",
+		    (uintmax_t)p->fts_statp->st_nlink);
 	if (keys & F_SIZE &&
 	    (flavor == F_FREEBSD9 || S_ISREG(p->fts_statp->st_mode)))
 		output(fp, indent, &offset, "size=%ju",

Modified: projects/bsnmp-ipv6-mib/contrib/mtree/spec.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/mtree/spec.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/contrib/mtree/spec.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -363,7 +363,8 @@ dump_nodes(FILE *fp, const char *dir, NO
 			appendfield(fp, pathlast, "device=%#jx",
 			    (uintmax_t)cur->st_rdev);
 		if (MATCHFLAG(F_NLINK))
-			appendfield(fp, pathlast, "nlink=%d", cur->st_nlink);
+			appendfield(fp, pathlast, "nlink=%ju",
+			    (uintmax_t)cur->st_nlink);
 		if (MATCHFLAG(F_SLINK))
 			appendfield(fp, pathlast, "link=%s",
 			    vispath(cur->slink));

Modified: projects/bsnmp-ipv6-mib/contrib/mtree/specspec.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/mtree/specspec.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/contrib/mtree/specspec.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -73,7 +73,7 @@ shownode(NODE *n, int f, char const *pat
 	if (f & F_MODE)
 		printf(" mode=%o", n->st_mode);
 	if (f & F_NLINK)
-		printf(" nlink=%d", n->st_nlink);
+		printf(" nlink=%ju", (uintmax_t)n->st_nlink);
 	if (f & F_SIZE)
 		printf(" size=%jd", (intmax_t)n->st_size);
 	if (f & F_UID)

Modified: projects/bsnmp-ipv6-mib/sbin/fsck_ffs/suj.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sbin/fsck_ffs/suj.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sbin/fsck_ffs/suj.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -1396,11 +1396,12 @@ ino_adjust(struct suj_ino *sino)
 	ip = ino_read(ino);
 	mode = DIP(ip, di_mode) & IFMT;
 	if (nlink > LINK_MAX)
-		err_suj("ino %ju nlink manipulation error, new %d, old %d\n",
-		    (uintmax_t)ino, nlink, DIP(ip, di_nlink));
+		err_suj("ino %ju nlink manipulation error, new %ju, old %d\n",
+		    (uintmax_t)ino, (uintmax_t)nlink, DIP(ip, di_nlink));
 	if (debug)
-		printf("Adjusting ino %ju, nlink %d, old link %d lastmode %o\n",
-		    (uintmax_t)ino, nlink, DIP(ip, di_nlink), sino->si_mode);
+	       printf("Adjusting ino %ju, nlink %ju, old link %d lastmode %o\n",
+		    (uintmax_t)ino, (uintmax_t)nlink, DIP(ip, di_nlink),
+		    sino->si_mode);
 	if (mode == 0) {
 		if (debug)
 			printf("ino %ju, zero inode freeing bitmap\n",
@@ -1419,8 +1420,9 @@ ino_adjust(struct suj_ino *sino)
 	/* If the inode doesn't have enough links to live, free it. */
 	if (nlink < reqlink) {
 		if (debug)
-			printf("ino %ju not enough links to live %d < %d\n",
-			    (uintmax_t)ino, nlink, reqlink);
+			printf("ino %ju not enough links to live %ju < %ju\n",
+			    (uintmax_t)ino, (uintmax_t)nlink,
+			    (uintmax_t)reqlink);
 		ino_reclaim(ip, ino, mode);
 		return;
 	}
@@ -1657,10 +1659,12 @@ ino_check(struct suj_ino *sino)
 			err_suj("Inode mode/directory type mismatch %o != %o\n",
 			    mode, rrec->jr_mode);
 		if (debug)
-			printf("jrefrec: op %d ino %ju, nlink %d, parent %d, "
+			printf("jrefrec: op %d ino %ju, nlink %ju, parent %ju, "
 			    "diroff %jd, mode %o, isat %d, isdot %d\n",
 			    rrec->jr_op, (uintmax_t)rrec->jr_ino,
-			    rrec->jr_nlink, rrec->jr_parent, rrec->jr_diroff,
+			    (uintmax_t)rrec->jr_nlink,
+			    (uintmax_t)rrec->jr_parent,
+			    (uintmax_t)rrec->jr_diroff,
 			    rrec->jr_mode, isat, isdot);
 		mode = rrec->jr_mode & IFMT;
 		if (rrec->jr_op == JOP_REMREF)
@@ -1677,8 +1681,10 @@ ino_check(struct suj_ino *sino)
 	 * by one.
 	 */
 	if (debug)
-		printf("ino %ju nlink %d newlinks %d removes %d dotlinks %d\n",
-		    (uintmax_t)ino, nlink, newlinks, removes, dotlinks);
+		printf(
+		    "ino %ju nlink %ju newlinks %ju removes %ju dotlinks %ju\n",
+		    (uintmax_t)ino, (uintmax_t)nlink, (uintmax_t)newlinks,
+		    (uintmax_t)removes, (uintmax_t)dotlinks);
 	nlink += newlinks;
 	nlink -= removes;
 	sino->si_linkadj = 1;
@@ -1962,15 +1968,17 @@ ino_append(union jrec *rec)
 	mvrec = &rec->rec_jmvrec;
 	refrec = &rec->rec_jrefrec;
 	if (debug && mvrec->jm_op == JOP_MVREF)
-		printf("ino move: ino %d, parent %d, diroff %jd, oldoff %jd\n",
-		    mvrec->jm_ino, mvrec->jm_parent, mvrec->jm_newoff,
-		    mvrec->jm_oldoff);
+		printf("ino move: ino %ju, parent %ju, "
+		    "diroff %jd, oldoff %jd\n",
+		    (uintmax_t)mvrec->jm_ino, (uintmax_t)mvrec->jm_parent,
+		    (uintmax_t)mvrec->jm_newoff, (uintmax_t)mvrec->jm_oldoff);
 	else if (debug &&
 	    (refrec->jr_op == JOP_ADDREF || refrec->jr_op == JOP_REMREF))
-		printf("ino ref: op %d, ino %d, nlink %d, "
-		    "parent %d, diroff %jd\n",
-		    refrec->jr_op, refrec->jr_ino, refrec->jr_nlink,
-		    refrec->jr_parent, refrec->jr_diroff);
+		printf("ino ref: op %d, ino %ju, nlink %ju, "
+		    "parent %ju, diroff %jd\n",
+		    refrec->jr_op, (uintmax_t)refrec->jr_ino,
+		    (uintmax_t)refrec->jr_nlink,
+		    (uintmax_t)refrec->jr_parent, (uintmax_t)refrec->jr_diroff);
 	sino = ino_lookup(((struct jrefrec *)rec)->jr_ino, 1);
 	sino->si_hasrecs = 1;
 	srec = errmalloc(sizeof(*srec));
@@ -2182,9 +2190,10 @@ blk_build(struct jblkrec *blkrec)
 
 	if (debug)
 		printf("blk_build: op %d blkno %jd frags %d oldfrags %d "
-		    "ino %d lbn %jd\n",
-		    blkrec->jb_op, blkrec->jb_blkno, blkrec->jb_frags,
-		    blkrec->jb_oldfrags, blkrec->jb_ino, blkrec->jb_lbn);
+		    "ino %ju lbn %jd\n",
+		    blkrec->jb_op, (uintmax_t)blkrec->jb_blkno,
+		    blkrec->jb_frags, blkrec->jb_oldfrags,
+		    (uintmax_t)blkrec->jb_ino, (uintmax_t)blkrec->jb_lbn);
 
 	blk = blknum(fs, blkrec->jb_blkno);
 	frag = fragnum(fs, blkrec->jb_blkno);
@@ -2232,8 +2241,9 @@ ino_build_trunc(struct jtrncrec *rec)
 	struct suj_ino *sino;
 
 	if (debug)
-		printf("ino_build_trunc: op %d ino %d, size %jd\n",
-		    rec->jt_op, rec->jt_ino, rec->jt_size);
+		printf("ino_build_trunc: op %d ino %ju, size %jd\n",
+		    rec->jt_op, (uintmax_t)rec->jt_ino,
+		    (uintmax_t)rec->jt_size);
 	sino = ino_lookup(rec->jt_ino, 1);
 	if (rec->jt_op == JOP_SYNC) {
 		sino->si_trunc = NULL;

Modified: projects/bsnmp-ipv6-mib/sbin/ping/ping.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sbin/ping/ping.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sbin/ping/ping.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -1666,6 +1666,7 @@ pr_icmph(struct icmp *icp)
 static void
 pr_iph(struct ip *ip)
 {
+	struct in_addr ina;
 	u_char *cp;
 	int hlen;
 
@@ -1681,8 +1682,10 @@ pr_iph(struct ip *ip)
 	    (u_long) ntohl(ip->ip_off) & 0x1fff);
 	(void)printf("  %02x  %02x %04x", ip->ip_ttl, ip->ip_p,
 							    ntohs(ip->ip_sum));
-	(void)printf(" %s ", inet_ntoa(*(struct in_addr *)&ip->ip_src.s_addr));
-	(void)printf(" %s ", inet_ntoa(*(struct in_addr *)&ip->ip_dst.s_addr));
+	memcpy(&ina, &ip->ip_src.s_addr, sizeof ina);
+	(void)printf(" %s ", inet_ntoa(ina));
+	memcpy(&ina, &ip->ip_dst.s_addr, sizeof ina);
+	(void)printf(" %s ", inet_ntoa(ina));
 	/* dump any option bytes */
 	while (hlen-- > 20) {
 		(void)printf("%02x", *cp++);

Modified: projects/bsnmp-ipv6-mib/share/man/man4/rtwn_usb.4
==============================================================================
--- projects/bsnmp-ipv6-mib/share/man/man4/rtwn_usb.4	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/share/man/man4/rtwn_usb.4	Fri Jan  6 21:27:39 2017	(r311550)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd October 17, 2016
+.Dd January 6, 2017
 .Dt RTWN_USB 4
 .Os
 .Sh NAME
@@ -93,6 +93,8 @@ based USB wireless network adapters, inc
 .It "TP-Link Archer T4U" Ta USB 3.0
 .It "TP-LINK TL-WN723N v3" Ta USB 2.0
 .It "TP-LINK TL-WN725N v2" Ta USB 2.0
+.It "TP-LINK TL-WN821N v4" Ta USB 2.0
+.It "TP-LINK TL-WN823N v1" Ta USB 2.0
 .It "TRENDnet TEW-805UB" Ta USB 3.0
 .It "ZyXEL NWD6605" Ta USB 3.0
 .El

Modified: projects/bsnmp-ipv6-mib/share/man/man5/src.conf.5
==============================================================================
--- projects/bsnmp-ipv6-mib/share/man/man5/src.conf.5	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/share/man/man5/src.conf.5	Fri Jan  6 21:27:39 2017	(r311550)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 306729 2016-10-05 20:12:00Z emaste
 .\" $FreeBSD$
-.Dd January 2, 2017
+.Dd January 6, 2017
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1628,8 +1628,8 @@ and related programs.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru
 Set to not build USB-related programs and libraries.
 .It Va WITHOUT_USB_GADGET_EXAMPLES
-.\" from FreeBSD: head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES 274665 2014-11-18 17:06:50Z imp
-Set to build USB gadget kernel modules.
+.\" from FreeBSD: head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES 311548 2017-01-06 21:08:19Z ngie
+Set to not build USB gadget kernel modules.
 .It Va WITHOUT_UTMPX
 .\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 231530 2012-02-11 20:28:42Z ed
 Set to not build user accounting tools such as

Modified: projects/bsnmp-ipv6-mib/share/misc/scsi_modes
==============================================================================
--- projects/bsnmp-ipv6-mib/share/misc/scsi_modes	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/share/misc/scsi_modes	Fri Jan  6 21:27:39 2017	(r311550)
@@ -71,7 +71,7 @@
 	{TAS} t1
 	{ATMPE} t1
 	{RWWP} t1
-	{Reserved} *t1
+	{SBLP (Supported Block Lengths and Protection)} t1
 	{Autoload Mode} t3
 	{Ready AEN Holdoff Period} i2
 	{Busy Timeout Period} i2
@@ -148,6 +148,15 @@
 	{Minimum Pre-fetch} i2
 	{Maximum Pre-fetch} i2
 	{Maximum Pre-fetch Ceiling} i2
+	{FSW (Force Sequential Write)} t1
+	{LBCSS (Logical Block Cache Segment Size)} t1
+	{DRA (Disable Read-Ahead)} t1
+	{Vendor Specific} t2
+	{SYNC_PROG} t1
+	{NV_DIS} t1
+	{Number of Cache Segments} i1
+	{Cache Segment Size} i2
+	{Reserved} *t4
 }
 
 0x05 "Flexible Disk Page" {
@@ -224,7 +233,8 @@
 	{Head Offset Count} i1
 	{Data Strobe Offset Count} i1
 	{LBPERE (LBP Error Reporting Enabled)} t1
-	{Reserved} *t7
+	{MWR (Misaligned Write Reporting)} t2
+	{Reserved} *t5
 	{Write Retry Count} i1
 	{Reserved} *i1
 	{Recovery Time Limit} i2

Modified: projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/aslhelp.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/aslhelp.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/aslhelp.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -73,7 +73,6 @@ Usage (
     ACPI_OPTION ("-I <dir>",        "Specify additional include directory");
     ACPI_OPTION ("-p <prefix>",     "Specify path/filename prefix for all output files");
     ACPI_OPTION ("-v",              "Display compiler version");
-    ACPI_OPTION ("-vd",             "Display compiler build date and time");
     ACPI_OPTION ("-vo",             "Enable optimization comments");
     ACPI_OPTION ("-vs",             "Disable signon");
 

Modified: projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/asloptions.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/asloptions.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/asloptions.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -70,9 +70,6 @@ AslDoResponseFile (
 #define ASL_TOKEN_SEPARATORS    " \t\n"
 #define ASL_SUPPORTED_OPTIONS   "@:a:b|c|d^D:e:f^gh^i|I:l^m:no|p:P^r:s|t|T+G^v^w|x:z"
 
-static char ASL_BUILD_DATE[] = __DATE__;
-static char ASL_BUILD_TIME[] = __TIME__;
-
 
 /*******************************************************************************
  *
@@ -727,12 +724,6 @@ AslDoOptions (
             Gbl_NoErrors = TRUE;
             break;
 
-        case 'd':
-
-            printf ("%s Build date/time: %s %s\n",
-                ASL_COMPILER_NAME, ASL_BUILD_DATE, ASL_BUILD_TIME);
-            exit (0);
-
         case 'e':
 
             /* Disable all warning/remark messages (errors only) */

Modified: projects/bsnmp-ipv6-mib/sys/dev/rtwn/usb/rtwn_usb_attach.h
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/dev/rtwn/usb/rtwn_usb_attach.h	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/dev/rtwn/usb/rtwn_usb_attach.h	Fri Jan  6 21:27:39 2017	(r311550)
@@ -92,6 +92,7 @@ static const STRUCT_USB_HOST_ID rtwn_dev
 	RTWN_RTL8192CU_DEV(REALTEK,		RTL8191CU),
 	RTWN_RTL8192CU_DEV(REALTEK,		RTL8192CE),
 	RTWN_RTL8192CU_DEV(REALTEK,		RTL8192CU),
+	RTWN_RTL8192CU_DEV(REALTEK,		RTL8192CU_1),
 	RTWN_RTL8192CU_DEV(SITECOMEU,		RTL8188CU_1),
 	RTWN_RTL8192CU_DEV(SITECOMEU,		RTL8188CU_2),
 	RTWN_RTL8192CU_DEV(SITECOMEU,		RTL8192CU),

Modified: projects/bsnmp-ipv6-mib/sys/dev/usb/usbdevs
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/dev/usb/usbdevs	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/dev/usb/usbdevs	Fri Jan  6 21:27:39 2017	(r311550)
@@ -3820,6 +3820,7 @@ product REALTEK RTL8172		0x8172	RTL8172
 product REALTEK RTL8173		0x8173	RTL8173
 product REALTEK RTL8174		0x8174	RTL8174
 product REALTEK RTL8188CU_0	0x8176	RTL8188CU
+product REALTEK RTL8192CU_1	0x8178	RTL8192CU
 product REALTEK RTL8188EU	0x8179	RTL8188EU
 product REALTEK RTL8188CE_1	0x817e	RTL8188CE
 product REALTEK RTL8188CU_1	0x817a	RTL8188CU

Modified: projects/bsnmp-ipv6-mib/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/fs/nfsclient/nfs_clvnops.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/fs/nfsclient/nfs_clvnops.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -3135,8 +3135,8 @@ nfs_print(struct vop_print_args *ap)
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
 
-	printf("\tfileid %ld fsid 0x%x", np->n_vattr.na_fileid,
-	    np->n_vattr.na_fsid);
+	printf("\tfileid %jd fsid 0x%jx", (uintmax_t)np->n_vattr.na_fileid,
+	    (uintmax_t)np->n_vattr.na_fsid);
 	if (vp->v_type == VFIFO)
 		fifo_printinfo(vp);
 	printf("\n");

Modified: projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs.h
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs.h	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs.h	Fri Jan  6 21:27:39 2017	(r311550)
@@ -199,7 +199,9 @@ struct tmpfs_node {
 	 * allocated for it or it has been reclaimed). */
 	struct vnode *		tn_vnode;
 
-	/* interlock to protect tn_vpstate */
+	/* Interlock to protect tn_vpstate, and tn_status under shared
+	 * vnode lock.
+	 */
 	struct mtx	tn_interlock;
 
 	/* Identify if current node has vnode assiocate with
@@ -420,6 +422,7 @@ int	tmpfs_chtimes(struct vnode *, struct
 void	tmpfs_itimes(struct vnode *, const struct timespec *,
 	    const struct timespec *);
 
+void	tmpfs_set_status(struct tmpfs_node *node, int status);
 void	tmpfs_update(struct vnode *);
 int	tmpfs_truncate(struct vnode *, off_t);
 

Modified: projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_fifoops.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_fifoops.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_fifoops.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -49,35 +49,14 @@
 #include <fs/tmpfs/tmpfs_vnops.h>
 
 static int
-tmpfs_fifo_kqfilter(struct vop_kqfilter_args *ap)
-{
-	struct vnode *vp;
-	struct tmpfs_node *node;
-
-	vp = ap->a_vp;
-	node = VP_TO_TMPFS_NODE(vp);
-
-	switch (ap->a_kn->kn_filter){
-	case EVFILT_READ:
-		node->tn_status |= TMPFS_NODE_ACCESSED;
-		break;
-	case EVFILT_WRITE:
-		node->tn_status |= TMPFS_NODE_MODIFIED;
-		break;
-	}
-
-	return fifo_specops.vop_kqfilter(ap);
-}
-
-static int
 tmpfs_fifo_close(struct vop_close_args *v)
 {
 	struct tmpfs_node *node;
-	node = VP_TO_TMPFS_NODE(v->a_vp);
-	node->tn_status |= TMPFS_NODE_ACCESSED;
 
+	node = VP_TO_TMPFS_NODE(v->a_vp);
+	tmpfs_set_status(node, TMPFS_NODE_ACCESSED);
 	tmpfs_update(v->a_vp);
-	return fifo_specops.vop_close(v);
+	return (fifo_specops.vop_close(v));
 }
 
 /*
@@ -90,6 +69,5 @@ struct vop_vector tmpfs_fifoop_entries =
 	.vop_access =			tmpfs_access,
 	.vop_getattr =			tmpfs_getattr,
 	.vop_setattr =			tmpfs_setattr,
-	.vop_kqfilter =			tmpfs_fifo_kqfilter,
 };
 

Modified: projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_subr.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_subr.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -1092,9 +1092,9 @@ tmpfs_dir_getdotdent(struct tmpfs_node *
 	else
 		error = uiomove(&dent, dent.d_reclen, uio);
 
-	node->tn_status |= TMPFS_NODE_ACCESSED;
+	tmpfs_set_status(node, TMPFS_NODE_ACCESSED);
 
-	return error;
+	return (error);
 }
 
 /*
@@ -1137,9 +1137,9 @@ tmpfs_dir_getdotdotdent(struct tmpfs_nod
 	else
 		error = uiomove(&dent, dent.d_reclen, uio);
 
-	node->tn_status |= TMPFS_NODE_ACCESSED;
+	tmpfs_set_status(node, TMPFS_NODE_ACCESSED);
 
-	return error;
+	return (error);
 }
 
 /*
@@ -1282,7 +1282,7 @@ tmpfs_dir_getdents(struct tmpfs_node *no
 	node->tn_dir.tn_readdir_lastn = off;
 	node->tn_dir.tn_readdir_lastp = de;
 
-	node->tn_status |= TMPFS_NODE_ACCESSED;
+	tmpfs_set_status(node, TMPFS_NODE_ACCESSED);
 	return error;
 }
 
@@ -1462,7 +1462,7 @@ tmpfs_chflags(struct vnode *vp, u_long f
 	int error;
 	struct tmpfs_node *node;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chflags");
 
 	node = VP_TO_TMPFS_NODE(vp);
 
@@ -1502,9 +1502,9 @@ tmpfs_chflags(struct vnode *vp, u_long f
 	node->tn_flags = flags;
 	node->tn_status |= TMPFS_NODE_CHANGED;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chflags2");
 
-	return 0;
+	return (0);
 }
 
 /*
@@ -1518,7 +1518,7 @@ tmpfs_chmod(struct vnode *vp, mode_t mod
 	int error;
 	struct tmpfs_node *node;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chmod");
 
 	node = VP_TO_TMPFS_NODE(vp);
 
@@ -1558,9 +1558,9 @@ tmpfs_chmod(struct vnode *vp, mode_t mod
 
 	node->tn_status |= TMPFS_NODE_CHANGED;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chmod2");
 
-	return 0;
+	return (0);
 }
 
 /*
@@ -1579,7 +1579,7 @@ tmpfs_chown(struct vnode *vp, uid_t uid,
 	uid_t ouid;
 	gid_t ogid;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chown");
 
 	node = VP_TO_TMPFS_NODE(vp);
 
@@ -1629,9 +1629,9 @@ tmpfs_chown(struct vnode *vp, uid_t uid,
 			node->tn_mode &= ~(S_ISUID | S_ISGID);
 	}
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chown2");
 
-	return 0;
+	return (0);
 }
 
 /*
@@ -1646,7 +1646,7 @@ tmpfs_chsize(struct vnode *vp, u_quad_t 
 	int error;
 	struct tmpfs_node *node;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chsize");
 
 	node = VP_TO_TMPFS_NODE(vp);
 
@@ -1684,9 +1684,9 @@ tmpfs_chsize(struct vnode *vp, u_quad_t 
 	/* tmpfs_truncate will raise the NOTE_EXTEND and NOTE_ATTRIB kevents
 	 * for us, as will update tn_status; no need to do that here. */
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chsize2");
 
-	return error;
+	return (error);
 }
 
 /*
@@ -1701,7 +1701,7 @@ tmpfs_chtimes(struct vnode *vp, struct v
 	int error;
 	struct tmpfs_node *node;
 
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chtimes");
 
 	node = VP_TO_TMPFS_NODE(vp);
 
@@ -1730,9 +1730,20 @@ tmpfs_chtimes(struct vnode *vp, struct v
 
 	if (vap->va_birthtime.tv_sec != VNOVAL)
 		node->tn_birthtime = vap->va_birthtime;
-	MPASS(VOP_ISLOCKED(vp));
+	ASSERT_VOP_ELOCKED(vp, "chtimes2");
 
-	return 0;
+	return (0);
+}
+
+void
+tmpfs_set_status(struct tmpfs_node *node, int status)
+{
+
+	if ((node->tn_status & status) == status)
+		return;
+	TMPFS_NODE_LOCK(node);
+	node->tn_status |= status;
+	TMPFS_NODE_UNLOCK(node);
 }
 
 /* Sync timestamps */
@@ -1743,6 +1754,7 @@ tmpfs_itimes(struct vnode *vp, const str
 	struct tmpfs_node *node;
 	struct timespec now;
 
+	ASSERT_VOP_LOCKED(vp, "tmpfs_itimes");
 	node = VP_TO_TMPFS_NODE(vp);
 
 	if ((node->tn_status & (TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED |
@@ -1750,6 +1762,7 @@ tmpfs_itimes(struct vnode *vp, const str
 		return;
 
 	vfs_timestamp(&now);
+	TMPFS_NODE_LOCK(node);
 	if (node->tn_status & TMPFS_NODE_ACCESSED) {
 		if (acc == NULL)
 			 acc = &now;
@@ -1760,11 +1773,12 @@ tmpfs_itimes(struct vnode *vp, const str
 			mod = &now;
 		node->tn_mtime = *mod;
 	}
-	if (node->tn_status & TMPFS_NODE_CHANGED) {
+	if (node->tn_status & TMPFS_NODE_CHANGED)
 		node->tn_ctime = now;
-	}
-	node->tn_status &=
-	    ~(TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED | TMPFS_NODE_CHANGED);
+	node->tn_status &= ~(TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED |
+	    TMPFS_NODE_CHANGED);
+	TMPFS_NODE_UNLOCK(node);
+
 	/* XXX: FIX? The entropy here is desirable, but the harvesting may be expensive */
 	random_harvest_queue(node, sizeof(*node), 1, RANDOM_FS_ATIME);
 }
@@ -1798,14 +1812,13 @@ tmpfs_truncate(struct vnode *vp, off_t l
 		return (EFBIG);
 
 	error = tmpfs_reg_resize(vp, length, FALSE);
-	if (error == 0) {
+	if (error == 0)
 		node->tn_status |= TMPFS_NODE_CHANGED | TMPFS_NODE_MODIFIED;
-	}
 
 out:
 	tmpfs_update(vp);
 
-	return error;
+	return (error);
 }
 
 static __inline int

Modified: projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vfsops.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vfsops.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -257,7 +257,7 @@ tmpfs_mount(struct mount *mp)
 
 	MNT_ILOCK(mp);
 	mp->mnt_flag |= MNT_LOCAL;
-	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED;
+	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED;
 	MNT_IUNLOCK(mp);
 
 	mp->mnt_data = tmp;

Modified: projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vnops.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/fs/tmpfs/tmpfs_vnops.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -445,7 +445,7 @@ tmpfs_read(struct vop_read_args *v)
 	if (uio->uio_offset < 0)
 		return (EINVAL);
 	node = VP_TO_TMPFS_NODE(vp);
-	node->tn_status |= TMPFS_NODE_ACCESSED;
+	tmpfs_set_status(node, TMPFS_NODE_ACCESSED);
 	return (uiomove_object(node->tn_reg.tn_aobj, node->tn_size, uio));
 }
 
@@ -1082,8 +1082,8 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
 	    v->a_cnp->cn_namelen));
 
 	/* Check flags to see if we are allowed to remove the directory. */
-	if (dnode->tn_flags & APPEND
-		|| node->tn_flags & (NOUNLINK | IMMUTABLE | APPEND)) {
+	if ((dnode->tn_flags & APPEND) != 0 ||
+	    (node->tn_flags & (NOUNLINK | IMMUTABLE | APPEND)) != 0) {
 		error = EPERM;
 		goto out;
 	}
@@ -1099,7 +1099,7 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
 	TMPFS_ASSERT_ELOCKED(node);
 	node->tn_links--;
 	node->tn_dir.tn_parent = NULL;
-	node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED | \
+	node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED |
 	    TMPFS_NODE_MODIFIED;
 
 	TMPFS_NODE_UNLOCK(node);
@@ -1107,8 +1107,8 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
 	TMPFS_NODE_LOCK(dnode);
 	TMPFS_ASSERT_ELOCKED(dnode);
 	dnode->tn_links--;
-	dnode->tn_status |= TMPFS_NODE_ACCESSED | \
-	    TMPFS_NODE_CHANGED | TMPFS_NODE_MODIFIED;
+	dnode->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED |
+	    TMPFS_NODE_MODIFIED;
 	TMPFS_NODE_UNLOCK(dnode);
 
 	cache_purge(dvp);
@@ -1220,9 +1220,9 @@ tmpfs_readlink(struct vop_readlink_args 
 
 	error = uiomove(node->tn_link, MIN(node->tn_size, uio->uio_resid),
 	    uio);
-	node->tn_status |= TMPFS_NODE_ACCESSED;
+	tmpfs_set_status(node, TMPFS_NODE_ACCESSED);
 
-	return error;
+	return (error);
 }
 
 static int
@@ -1286,8 +1286,8 @@ tmpfs_print(struct vop_print_args *v)
 
 	node = VP_TO_TMPFS_NODE(vp);
 
-	printf("tag VT_TMPFS, tmpfs_node %p, flags 0x%lx, links %d\n",
-	    node, node->tn_flags, node->tn_links);
+	printf("tag VT_TMPFS, tmpfs_node %p, flags 0x%lx, links %jd\n",
+	    node, node->tn_flags, (uintmax_t)node->tn_links);
 	printf("\tmode 0%o, owner %d, group %d, size %jd, status 0x%x\n",
 	    node->tn_mode, node->tn_uid, node->tn_gid,
 	    (intmax_t)node->tn_size, node->tn_status);

Modified: projects/bsnmp-ipv6-mib/sys/kern/kern_exec.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/kern/kern_exec.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/kern/kern_exec.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
+#include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 #include "opt_vm.h"

Modified: projects/bsnmp-ipv6-mib/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/ufs/ffs/ffs_softdep.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/ufs/ffs/ffs_softdep.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -11525,7 +11525,8 @@ handle_written_inodeblock(inodedep, bp, 
 		panic("handle_written_inodeblock: bad size");
 	if (inodedep->id_savednlink > LINK_MAX)
 		panic("handle_written_inodeblock: Invalid link count "
-		    "%d for inodedep %p", inodedep->id_savednlink, inodedep);
+		    "%jd for inodedep %p", (uintmax_t)inodedep->id_savednlink,
+		    inodedep);
 	if (fstype == UFS1) {
 		if (dp1->di_nlink != inodedep->id_savednlink) { 
 			dp1->di_nlink = inodedep->id_savednlink;
@@ -14271,13 +14272,14 @@ softdep_error(func, error)
 static void
 inodedep_print(struct inodedep *inodedep, int verbose)
 {
-	db_printf("%p fs %p st %x ino %jd inoblk %jd delta %d nlink %d"
+	db_printf("%p fs %p st %x ino %jd inoblk %jd delta %jd nlink %jd"
 	    " saveino %p\n",
 	    inodedep, inodedep->id_fs, inodedep->id_state,
 	    (intmax_t)inodedep->id_ino,
 	    (intmax_t)fsbtodb(inodedep->id_fs,
 	    ino_to_fsba(inodedep->id_fs, inodedep->id_ino)),
-	    inodedep->id_nlinkdelta, inodedep->id_savednlink,
+	    (intmax_t)inodedep->id_nlinkdelta,
+	    (intmax_t)inodedep->id_savednlink,
 	    inodedep->id_savedino1);
 
 	if (verbose == 0)

Modified: projects/bsnmp-ipv6-mib/sys/ufs/ufs/ufs_vnops.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/ufs/ufs/ufs_vnops.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/sys/ufs/ufs/ufs_vnops.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -948,8 +948,8 @@ print_bad_link_count(const char *funcnam
 	struct inode *dip;
 
 	dip = VTOI(dvp);
-	uprintf("%s: Bad link count %d on parent inode %d in file system %s\n",
-	    funcname, dip->i_effnlink, dip->i_number,
+	uprintf("%s: Bad link count %d on parent inode %jd in file system %s\n",
+	    funcname, dip->i_effnlink, (intmax_t)dip->i_number,
 	    dvp->v_mount->mnt_stat.f_mntonname);
 }
 

Modified: projects/bsnmp-ipv6-mib/tests/sys/kern/pipe/pipe_ino_test.c
==============================================================================
--- projects/bsnmp-ipv6-mib/tests/sys/kern/pipe/pipe_ino_test.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/tests/sys/kern/pipe/pipe_ino_test.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -53,9 +53,11 @@ main(void)
 	if (fstat(pipefd[1], &st2) == -1)
 		err(1, "FAIL: fstat st2");
 	if (st1.st_dev != st2.st_dev || st1.st_dev == 0 || st2.st_dev == 0)
-		errx(1, "FAIL: wrong dev number %d %d", st1.st_dev, st2.st_dev);
+		errx(1, "FAIL: wrong dev number %ju %ju",
+		    (uintmax_t)st1.st_dev, (uintmax_t)st2.st_dev);
 	if (st1.st_ino == st2.st_ino)
-		errx(1, "FAIL: inode numbers are equal: %d", st1.st_ino);
+		errx(1, "FAIL: inode numbers are equal: %ju",
+		    (uintmax_t)st1.st_ino);
 
 	close(pipefd[0]);
 	close(pipefd[1]);

Modified: projects/bsnmp-ipv6-mib/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES
==============================================================================
--- projects/bsnmp-ipv6-mib/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES	Fri Jan  6 21:27:39 2017	(r311550)
@@ -1,2 +1,2 @@
 .\" $FreeBSD$
-Set to build USB gadget kernel modules.
+Set to not build USB gadget kernel modules.

Modified: projects/bsnmp-ipv6-mib/usr.bin/find/ls.c
==============================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/find/ls.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/usr.bin/find/ls.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -65,7 +65,8 @@ printlong(char *name, char *accpath, str
 
 	(void)printf("%6ju %8"PRId64" ", (uintmax_t)sb->st_ino, sb->st_blocks);
 	(void)strmode(sb->st_mode, modep);
-	(void)printf("%s %3u %-*s %-*s ", modep, sb->st_nlink, MAXLOGNAME - 1,
+	(void)printf("%s %3ju %-*s %-*s ", modep, (uintmax_t)sb->st_nlink,
+	    MAXLOGNAME - 1,
 	    user_from_uid(sb->st_uid, 0), MAXLOGNAME - 1,
 	    group_from_gid(sb->st_gid, 0));
 

Modified: projects/bsnmp-ipv6-mib/usr.bin/gzip/gzip.c
==============================================================================
--- projects/bsnmp-ipv6-mib/usr.bin/gzip/gzip.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/usr.bin/gzip/gzip.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -1252,8 +1252,8 @@ file_compress(char *file, char *outfile,
 	if (cflag == 0) {
 #ifndef SMALL
 		if (isb.st_nlink > 1 && fflag == 0) {
-			maybe_warnx("%s has %d other link%s -- skipping",
-			    file, isb.st_nlink - 1,
+			maybe_warnx("%s has %ju other link%s -- skipping",
+			    file, (uintmax_t)isb.st_nlink - 1,
 			    (isb.st_nlink - 1) == 1 ? "" : "s");
 			close(in);
 			return (-1);
@@ -1448,8 +1448,8 @@ file_uncompress(char *file, char *outfil
 			goto lose;
 #ifndef SMALL
 		if (isb.st_nlink > 1 && lflag == 0 && fflag == 0) {
-			maybe_warnx("%s has %d other links -- skipping",
-			    file, isb.st_nlink - 1);
+			maybe_warnx("%s has %ju other links -- skipping",
+			    file, (uintmax_t)isb.st_nlink - 1);
 			goto lose;
 		}
 		if (nflag == 0 && timestamp)

Modified: projects/bsnmp-ipv6-mib/usr.sbin/crunch/crunchgen/crunchgen.1
==============================================================================
--- projects/bsnmp-ipv6-mib/usr.sbin/crunch/crunchgen/crunchgen.1	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/usr.sbin/crunch/crunchgen/crunchgen.1	Fri Jan  6 21:27:39 2017	(r311550)
@@ -24,7 +24,7 @@
 .\"			   University of Maryland at College Park
 .\" $FreeBSD$
 .\"
-.Dd December 23, 2005
+.Dd January 6, 2017
 .Dt CRUNCHGEN 1
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Op Fl p Ar obj-prefix
 .Op Fl c Ar c-file-name
 .Op Fl e Ar exec-file-name
-.Op Ar conf-file
+.Ar conf-file
 .Ek
 .Sh DESCRIPTION
 A crunched binary is a program made up of many other programs linked
@@ -308,7 +308,7 @@ This is normally
 but some
 .Pa Makefile Ns s
 might like to use other conventions or
-prepend the program's name to the variable, e.g.\&
+prepend the program's name to the variable, e.g.,
 .Va SSHD_OBJS .
 .It Ic special Ar progname Ic lib Ar library-name ...
 Specifies libraries to be linked with object files to produce

Modified: projects/bsnmp-ipv6-mib/usr.sbin/fmtree/compare.c
==============================================================================
--- projects/bsnmp-ipv6-mib/usr.sbin/fmtree/compare.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/usr.sbin/fmtree/compare.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -165,8 +165,9 @@ typeerr:		LABEL;
 	if (s->flags & F_NLINK && s->type != F_DIR &&
 	    s->st_nlink != p->fts_statp->st_nlink) {
 		LABEL;
-		(void)printf("%slink_count expected %u found %u\n",
-		    tab, s->st_nlink, p->fts_statp->st_nlink);
+		(void)printf("%slink_count expected %ju found %ju\n",
+		    tab, (uintmax_t)s->st_nlink,
+		    (uintmax_t)p->fts_statp->st_nlink);
 		tab = "\t";
 	}
 	if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size &&

Modified: projects/bsnmp-ipv6-mib/usr.sbin/fmtree/create.c
==============================================================================
--- projects/bsnmp-ipv6-mib/usr.sbin/fmtree/create.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/usr.sbin/fmtree/create.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -207,7 +207,8 @@ statf(int indent, FTSENT *p)
 	if (keys & F_MODE && (p->fts_statp->st_mode & MBITS) != mode)
 		output(indent, &offset, "mode=%#o", p->fts_statp->st_mode & MBITS);
 	if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
-		output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
+		output(indent, &offset, "nlink=%ju",
+		    (uintmax_t)p->fts_statp->st_nlink);
 	if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
 		output(indent, &offset, "size=%jd",
 		    (intmax_t)p->fts_statp->st_size);

Modified: projects/bsnmp-ipv6-mib/usr.sbin/fmtree/specspec.c
==============================================================================
--- projects/bsnmp-ipv6-mib/usr.sbin/fmtree/specspec.c	Fri Jan  6 21:14:07 2017	(r311549)
+++ projects/bsnmp-ipv6-mib/usr.sbin/fmtree/specspec.c	Fri Jan  6 21:27:39 2017	(r311550)
@@ -64,7 +64,7 @@ shownode(NODE *n, int f, char const *pat
 	if (f & F_MODE)
 		printf(" mode=%o", n->st_mode);
 	if (f & F_NLINK)
-		printf(" nlink=%d", n->st_nlink);
+		printf(" nlink=%ju", (uintmax_t)n->st_nlink);
 	if (f & F_SIZE)
 		printf(" size=%jd", (intmax_t)n->st_size);
 	if (f & F_UID)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701062127.v06LReMx097653>