svn commit: r279717 - in projects/cxl_iscsi: bin/rcp bin/sh contrib/tzdata lib/libc/gen lib/libc/stdlib lib/libc/sys lib/libmt lib/libucl sbin/ifconfig share/misc sys/amd64/amd64 sys/amd64/vmm/io s...

Fri Mar 6 23:55:47 UTC 2015

Author: np
Date: Fri Mar  6 23:55:36 2015
New Revision: 279717
URL: https://svnweb.freebsd.org/changeset/base/279717

Log:
  Merge r278538 through r279716.

Deleted:
  projects/cxl_iscsi/usr.bin/calendar/calcpp.c
Modified:
  projects/cxl_iscsi/bin/rcp/Makefile
  projects/cxl_iscsi/bin/sh/error.c
  projects/cxl_iscsi/bin/sh/mknodes.c
  projects/cxl_iscsi/bin/sh/mksyntax.c
  projects/cxl_iscsi/bin/sh/var.c
  projects/cxl_iscsi/bin/sh/var.h
  projects/cxl_iscsi/contrib/tzdata/antarctica
  projects/cxl_iscsi/contrib/tzdata/asia
  projects/cxl_iscsi/contrib/tzdata/backward
  projects/cxl_iscsi/contrib/tzdata/europe
  projects/cxl_iscsi/contrib/tzdata/leap-seconds.list
  projects/cxl_iscsi/contrib/tzdata/northamerica
  projects/cxl_iscsi/contrib/tzdata/southamerica
  projects/cxl_iscsi/contrib/tzdata/zone.tab
  projects/cxl_iscsi/contrib/tzdata/zone1970.tab
  projects/cxl_iscsi/lib/libc/gen/getpwent.c
  projects/cxl_iscsi/lib/libc/stdlib/qsort.c
  projects/cxl_iscsi/lib/libc/sys/cap_ioctls_limit.2
  projects/cxl_iscsi/lib/libmt/mtlib.c
  projects/cxl_iscsi/lib/libucl/Makefile
  projects/cxl_iscsi/sbin/ifconfig/af_inet6.c
  projects/cxl_iscsi/sbin/ifconfig/af_nd6.c
  projects/cxl_iscsi/sbin/ifconfig/ifconfig.8
  projects/cxl_iscsi/share/misc/committers-src.dot
  projects/cxl_iscsi/sys/amd64/amd64/mp_machdep.c
  projects/cxl_iscsi/sys/amd64/vmm/io/vatpic.c
  projects/cxl_iscsi/sys/arm/arm/db_trace.c
  projects/cxl_iscsi/sys/arm/arm/exception.S
  projects/cxl_iscsi/sys/arm/arm/physmem.c
  projects/cxl_iscsi/sys/arm/arm/undefined.c
  projects/cxl_iscsi/sys/arm/conf/BEAGLEBONE
  projects/cxl_iscsi/sys/arm/xilinx/zy7_devcfg.c
  projects/cxl_iscsi/sys/arm/xilinx/zy7_slcr.c
  projects/cxl_iscsi/sys/arm/xilinx/zy7_slcr.h
  projects/cxl_iscsi/sys/boot/i386/boot2/Makefile
  projects/cxl_iscsi/sys/boot/pc98/boot2/Makefile
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/cxl_iscsi/sys/cddl/dev/dtrace/arm/dtrace_asm.S
  projects/cxl_iscsi/sys/cddl/dev/dtrace/arm/dtrace_subr.c
  projects/cxl_iscsi/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
  projects/cxl_iscsi/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/cxl_iscsi/sys/dev/acpica/acpi.c
  projects/cxl_iscsi/sys/dev/ahci/ahci_pci.c
  projects/cxl_iscsi/sys/dev/cxgbe/t4_netmap.c
  projects/cxl_iscsi/sys/dev/drm2/drm_irq.c
  projects/cxl_iscsi/sys/dev/flash/at45d.c
  projects/cxl_iscsi/sys/dev/gpio/gpiobus.c
  projects/cxl_iscsi/sys/dev/gpio/gpiobusvar.h
  projects/cxl_iscsi/sys/dev/gpio/ofw_gpiobus.c
  projects/cxl_iscsi/sys/dev/mps/mps_sas.c
  projects/cxl_iscsi/sys/dev/uart/uart_dev_pl011.c
  projects/cxl_iscsi/sys/dev/usb/controller/dwc_otg_fdt.c
  projects/cxl_iscsi/sys/dev/usb/controller/xhci_pci.c
  projects/cxl_iscsi/sys/dev/virtio/block/virtio_blk.c
  projects/cxl_iscsi/sys/dev/virtio/block/virtio_blk.h
  projects/cxl_iscsi/sys/i386/i386/mp_machdep.c
  projects/cxl_iscsi/sys/mips/atheros/qca955x_chip.c
  projects/cxl_iscsi/sys/mips/atheros/qca955xreg.h
  projects/cxl_iscsi/sys/mips/conf/AP135.hints
  projects/cxl_iscsi/sys/modules/drm2/Makefile
  projects/cxl_iscsi/sys/modules/drm2/radeonkmsfw/Makefile
  projects/cxl_iscsi/sys/modules/dtb/imx6/Makefile
  projects/cxl_iscsi/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/cxl_iscsi/sys/modules/usb/Makefile
  projects/cxl_iscsi/sys/net/if_media.c
  projects/cxl_iscsi/sys/netinet6/in6.c
  projects/cxl_iscsi/sys/netinet6/in6_pcb.c
  projects/cxl_iscsi/sys/netinet6/ip6_input.c
  projects/cxl_iscsi/sys/netinet6/ip6_output.c
  projects/cxl_iscsi/sys/netinet6/ip6_var.h
  projects/cxl_iscsi/sys/netinet6/nd6.h
  projects/cxl_iscsi/sys/netinet6/nd6_nbr.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/cmd.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/en_main.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/main.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/mcg.c
  projects/cxl_iscsi/sys/ofed/drivers/net/mlx4/mlx4_en.h
  projects/cxl_iscsi/sys/ofed/include/linux/kernel.h
  projects/cxl_iscsi/sys/ofed/include/linux/mlx4/device.h
  projects/cxl_iscsi/sys/ofed/include/linux/mlx4/qp.h
  projects/cxl_iscsi/sys/powerpc/aim/mmu_oea.c
  projects/cxl_iscsi/sys/powerpc/aim/mmu_oea64.c
  projects/cxl_iscsi/sys/powerpc/aim/trap.c
  projects/cxl_iscsi/sys/powerpc/booke/interrupt.c
  projects/cxl_iscsi/sys/powerpc/booke/locore.S
  projects/cxl_iscsi/sys/powerpc/booke/machdep.c
  projects/cxl_iscsi/sys/powerpc/booke/pmap.c
  projects/cxl_iscsi/sys/powerpc/booke/trap.c
  projects/cxl_iscsi/sys/powerpc/include/frame.h
  projects/cxl_iscsi/sys/powerpc/include/pte.h
  projects/cxl_iscsi/sys/powerpc/powerpc/db_trace.c
  projects/cxl_iscsi/sys/powerpc/powerpc/exec_machdep.c
  projects/cxl_iscsi/sys/powerpc/powerpc/genassym.c
  projects/cxl_iscsi/sys/powerpc/powerpc/swtch32.S
  projects/cxl_iscsi/sys/powerpc/powerpc/swtch64.S
  projects/cxl_iscsi/sys/sys/buf.h
  projects/cxl_iscsi/sys/sys/elf_common.h
  projects/cxl_iscsi/sys/vm/vm_pager.c
  projects/cxl_iscsi/sys/vm/vnode_pager.c
  projects/cxl_iscsi/usr.bin/calendar/Makefile
  projects/cxl_iscsi/usr.bin/calendar/calendar.h
  projects/cxl_iscsi/usr.bin/calendar/io.c
  projects/cxl_iscsi/usr.bin/mt/mt.1
  projects/cxl_iscsi/usr.bin/netstat/if.c
  projects/cxl_iscsi/usr.bin/rlogin/Makefile
  projects/cxl_iscsi/usr.bin/rlogin/rlogin.c
  projects/cxl_iscsi/usr.bin/rsh/Makefile
  projects/cxl_iscsi/usr.sbin/bhyve/block_if.c
  projects/cxl_iscsi/usr.sbin/bhyve/block_if.h
  projects/cxl_iscsi/usr.sbin/bhyve/pci_ahci.c
  projects/cxl_iscsi/usr.sbin/bhyve/pci_virtio_block.c
  projects/cxl_iscsi/usr.sbin/ctld/ctl.conf.5
  projects/cxl_iscsi/usr.sbin/ctld/discovery.c
  projects/cxl_iscsi/usr.sbin/ctld/kernel.c
  projects/cxl_iscsi/usr.sbin/freebsd-update/freebsd-update.8
  projects/cxl_iscsi/usr.sbin/freebsd-update/freebsd-update.sh
  projects/cxl_iscsi/usr.sbin/syslogd/syslogd.8
  projects/cxl_iscsi/usr.sbin/syslogd/syslogd.c
  projects/cxl_iscsi/usr.sbin/sysrc/sysrc
  projects/cxl_iscsi/usr.sbin/sysrc/sysrc.8
Directory Properties:
  projects/cxl_iscsi/   (props changed)
  projects/cxl_iscsi/contrib/tzdata/   (props changed)
  projects/cxl_iscsi/lib/libc/   (props changed)
  projects/cxl_iscsi/sbin/   (props changed)
  projects/cxl_iscsi/share/   (props changed)
  projects/cxl_iscsi/sys/   (props changed)
  projects/cxl_iscsi/sys/amd64/vmm/   (props changed)
  projects/cxl_iscsi/sys/boot/   (props changed)
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/   (props changed)
  projects/cxl_iscsi/usr.bin/calendar/   (props changed)
  projects/cxl_iscsi/usr.sbin/bhyve/   (props changed)

Modified: projects/cxl_iscsi/bin/rcp/Makefile
==============================================================================

--- projects/cxl_iscsi/bin/rcp/Makefile	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/bin/rcp/Makefile	Fri Mar  6 23:55:36 2015	(r279717)
@@ -7,6 +7,5 @@ CFLAGS+=-DBINDIR=${BINDIR}
 
 BINOWN=	root
 BINMODE=4555
-PRECIOUSPROG=
 
 .include <bsd.prog.mk>

Modified: projects/cxl_iscsi/bin/sh/error.c
==============================================================================
--- projects/cxl_iscsi/bin/sh/error.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/bin/sh/error.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "shell.h"
+#include "eval.h"
 #include "main.h"
 #include "options.h"
 #include "output.h"
@@ -64,7 +65,6 @@ struct jmploc *handler;
 volatile sig_atomic_t exception;
 volatile sig_atomic_t suppressint;
 volatile sig_atomic_t intpending;
-char *commandname;
 
 
 static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2;

Modified: projects/cxl_iscsi/bin/sh/mknodes.c
==============================================================================
--- projects/cxl_iscsi/bin/sh/mknodes.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/bin/sh/mknodes.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -204,7 +204,7 @@ parsefield(void)
 }
 
 
-char writer[] = "\
+static const char writer[] = "\
 /*\n\
  * This file was generated by the mknodes program.\n\
  */\n\

Modified: projects/cxl_iscsi/bin/sh/mksyntax.c
==============================================================================
--- projects/cxl_iscsi/bin/sh/mksyntax.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/bin/sh/mksyntax.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -60,7 +60,7 @@ struct synclass {
 };
 
 /* Syntax classes */
-struct synclass synclass[] = {
+static const struct synclass synclass[] = {
 	{ "CWORD",	"character is nothing special" },
 	{ "CNL",	"newline character" },
 	{ "CBACK",	"a backslash character" },
@@ -85,7 +85,7 @@ struct synclass synclass[] = {
  * Syntax classes for is_ functions.  Warning:  if you add new classes
  * you may have to change the definition of the is_in_name macro.
  */
-struct synclass is_entry[] = {
+static const struct synclass is_entry[] = {
 	{ "ISDIGIT",	"a digit" },
 	{ "ISUPPER",	"an upper case letter" },
 	{ "ISLOWER",	"a lower case letter" },
@@ -94,7 +94,7 @@ struct synclass is_entry[] = {
 	{ NULL, 	NULL }
 };
 
-static char writer[] = "\
+static const char writer[] = "\
 /*\n\
  * This file was generated by the mksyntax program.\n\
  */\n\

Modified: projects/cxl_iscsi/bin/sh/var.c
==============================================================================
--- projects/cxl_iscsi/bin/sh/var.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/bin/sh/var.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -94,6 +94,7 @@ struct var vps4;
 static struct var voptind;
 struct var vdisvfork;
 
+struct localvar *localvars;
 int forcelocal;
 
 static const struct varinit varinit[] = {

Modified: projects/cxl_iscsi/bin/sh/var.h
==============================================================================
--- projects/cxl_iscsi/bin/sh/var.h	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/bin/sh/var.h	Fri Mar  6 23:55:36 2015	(r279717)
@@ -68,7 +68,7 @@ struct localvar {
 };
 
 
-struct localvar *localvars;
+extern struct localvar *localvars;
 extern int forcelocal;
 
 extern struct var vifs;

Modified: projects/cxl_iscsi/contrib/tzdata/antarctica
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/antarctica	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/antarctica	Fri Mar  6 23:55:36 2015	(r279717)
@@ -47,8 +47,8 @@ Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00
 Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
-Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
+Rule	ChileAQ	2012	2015	-	Apr	Sun>=23	3:00u	0	-
+Rule	ChileAQ	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -354,9 +354,10 @@ Zone Antarctica/Rothera	0	-	zzz	1976 Dec
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Palmer	0	-	zzz	1965
-			-4:00	ArgAQ	AR%sT	1969 Oct 5
+			-4:00	ArgAQ	AR%sT	1969 Oct  5
 			-3:00	ArgAQ	AR%sT	1982 May
-			-4:00	ChileAQ	CL%sT
+			-4:00	ChileAQ	CL%sT	2015 Apr 26 3:00u
+			-3:00	-	CLT
 #
 #
 # McMurdo Station, Ross Island, since 1955-12

Modified: projects/cxl_iscsi/contrib/tzdata/asia
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/asia	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/asia	Fri Mar  6 23:55:36 2015	(r279717)
@@ -145,10 +145,7 @@ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 			4:00	Azer	AZ%sT
 
 # Bahrain
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
-			4:00	-	GST	1972 Jun
-			3:00	-	AST
+# See Asia/Qatar.
 
 # Bangladesh
 # From Alexander Krivenyshev (2009-05-13):
@@ -1731,9 +1728,7 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 A
 ###############################################################################
 
 # Kuwait
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Kuwait	3:11:56 -	LMT	1950
-			3:00	-	AST
+# See Asia/Riyadh.
 
 # Laos
 # See Asia/Bangkok.
@@ -1954,12 +1949,7 @@ Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
 			5:45	-	NPT	# Nepal Time
 
 # Oman
-
-# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Muscat	3:54:24 -	LMT	1920
-			4:00	-	GST
+# See Asia/Dubai.
 
 # Pakistan
 
@@ -2453,6 +2443,7 @@ Zone	Asia/Manila	-15:56:00 -	LMT	1844 De
 Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
+Link Asia/Qatar Asia/Bahrain
 
 # Saudi Arabia
 #
@@ -2479,6 +2470,8 @@ Zone	Asia/Qatar	3:26:08 -	LMT	1920     #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
 			3:00	-	AST
+Link Asia/Riyadh Asia/Aden	# Yemen
+Link Asia/Riyadh Asia/Kuwait
 
 # Singapore
 # taken from Mok Ly Yng (2003-10-30)
@@ -2767,6 +2760,7 @@ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 Ma
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dubai	3:41:12 -	LMT	1920
 			4:00	-	GST
+Link Asia/Dubai Asia/Muscat	# Oman
 
 # Uzbekistan
 # Byalokoz 1919 says Uzbekistan was 4:27:53.
@@ -2851,10 +2845,4 @@ Zone Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906
 			7:00	-	ICT
 
 # Yemen
-
-# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
-# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Aden	2:59:54	-	LMT	1950
-			3:00	-	AST
+# See Asia/Riyadh.

Modified: projects/cxl_iscsi/contrib/tzdata/backward
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/backward	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/backward	Fri Mar  6 23:55:36 2015	(r279717)
@@ -5,7 +5,7 @@
 # and their old names.  Many names changed in late 1993.
 
 # Link	TARGET			LINK-NAME
-Link	Africa/Asmara		Africa/Asmera
+Link	Africa/Nairobi		Africa/Asmera
 Link	Africa/Abidjan		Africa/Timbuktu
 Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
 Link	America/Adak		America/Atka

Modified: projects/cxl_iscsi/contrib/tzdata/europe
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/europe	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/europe	Fri Mar  6 23:55:36 2015	(r279717)
@@ -1407,35 +1407,32 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 
 # might be a reference to the Julian calendar as opposed to Gregorian, or it
 # might mean something else (???).
 #
-# From Paul Eggert (2006-03-22):
-# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points.
-# We go with the Almanak, except for one claim from Shanks & Pottenger, namely
-# that Reykavik was 21W57 from 1837 to 1908, local mean time before that.
+# From Paul Eggert (2014-11-22):
+# The information below is taken from the 1988 Almanak; see
+# http://www.almanak.hi.is/klukkan.html
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iceland	1917	1918	-	Feb	19	23:00	1:00	S
+Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	S
 Rule	Iceland	1917	only	-	Oct	21	 1:00	0	-
-Rule	Iceland	1918	only	-	Nov	16	 1:00	0	-
+Rule	Iceland	1918	1919	-	Nov	16	 1:00	0	-
+Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	S
+Rule	Iceland	1921	only	-	Jun	23	 1:00	0	-
 Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	S
-Rule	Iceland	1939	only	-	Nov	29	 2:00	0	-
+Rule	Iceland	1939	only	-	Oct	29	 2:00	0	-
 Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	S
-Rule	Iceland	1940	only	-	Nov	 3	 2:00	0	-
-Rule	Iceland	1941	only	-	Mar	 2	 1:00s	1:00	S
-Rule	Iceland	1941	only	-	Nov	 2	 1:00s	0	-
-Rule	Iceland	1942	only	-	Mar	 8	 1:00s	1:00	S
-Rule	Iceland	1942	only	-	Oct	25	 1:00s	0	-
+Rule	Iceland	1940	1941	-	Nov	Sun>=2	 1:00s	0	-
+Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	S
 # 1943-1946 - first Sunday in March until first Sunday in winter
 Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	S
-Rule	Iceland	1943	1948	-	Oct	Sun>=22	 1:00s	0	-
+Rule	Iceland	1942	1948	-	Oct	Sun>=22	 1:00s	0	-
 # 1947-1967 - first Sunday in April until first Sunday in winter
 Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	S
-# 1949 Oct transition delayed by 1 week
+# 1949 and 1967 Oct transitions delayed by 1 week
 Rule	Iceland	1949	only	-	Oct	30	 1:00s	0	-
 Rule	Iceland	1950	1966	-	Oct	Sun>=22	 1:00s	0	-
 Rule	Iceland	1967	only	-	Oct	29	 1:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
-			-1:27:48 -	RMT	1908 # Reykjavik Mean Time?
+Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
 			-1:00	Iceland	IS%sT	1968 Apr  7  1:00s
 			 0:00	-	GMT
 

Modified: projects/cxl_iscsi/contrib/tzdata/leap-seconds.list
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/leap-seconds.list	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/leap-seconds.list	Fri Mar  6 23:55:36 2015	(r279717)
@@ -47,7 +47,7 @@
 #	and can be ignored for many purposes. These differences
 #	are tabulated in Circular T, which is published monthly
 #	by the International Bureau of Weights and Measures
-#	(BIPM). See www.bipm.fr for more information.
+#	(BIPM). See www.bipm.org for more information.
 #
 #	3. The current definition of the relationship between UTC
 #	and TAI dates from 1 January 1972. A number of different
@@ -127,6 +127,15 @@
 #	with, since the difficulty of unambiguously representing the epoch
 #	during the leap second does not arise.
 #
+#	Some systems implement leap seconds by amortizing the leap second
+#	over the last few minutes of the day. The frequency of the local
+#	clock is decreased (or increased) to realize the positive (or
+#	negative) leap second. This method removes the time step described
+#	above. Although the long-term behavior of the time scale is correct 
+#	in this case, this method introduces an error during the adjustment 
+#	period both in time and in frequency with respect to the official 
+#	defintion of UTC.
+#
 #	Questions or comments to:
 #		Judah Levine
 #		Time and Frequency Division
@@ -134,7 +143,7 @@
 #		Boulder, Colorado
 #		Judah.Levine at nist.gov
 #
-#	Last Update of leap second values:   11 January 2012
+#	Last Update of leap second values:   5 January 2015
 #
 #	The following line shows this last update date in NTP timestamp
 #	format. This is the date on which the most recent change to
@@ -142,7 +151,7 @@
 #	be identified by the unique pair of characters in the first two
 #	columns as shown below.
 #
-#$	 3535228800
+#$	 3629404800
 #
 #	The NTP timestamps are in units of seconds since the NTP epoch,
 #	which is 1 January 1900, 00:00:00. The Modified Julian Day number
@@ -190,10 +199,10 @@
 #	current -- the update time stamp, the data and the name of the file
 #	will not change.
 #
-#	Updated through IERS Bulletin C48
-#	File expires on:  28 June 2015
+#	Updated through IERS Bulletin C49
+#	File expires on:  28 December 2015
 #
-#@	3644438400
+#@	3660249600
 #
 2272060800	10	# 1 Jan 1972
 2287785600	11	# 1 Jul 1972
@@ -221,6 +230,7 @@
 3345062400	33	# 1 Jan 2006
 3439756800	34	# 1 Jan 2009
 3550089600	35	# 1 Jul 2012
+3644697600	36	# 1 Jul 2015
 #
 #	the following special comment contains the
 #	hash value of the data in this file computed
@@ -236,4 +246,4 @@
 #	the hash line is also ignored in the
 #	computation.
 #
-#h	a4862ccd c6f43c6 964f3604 85944a26 b5cfad4e
+#h	45e70fa7 a9df2033 f4a49ab0 ec648273 7b6c22c

Modified: projects/cxl_iscsi/contrib/tzdata/northamerica
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/northamerica	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/northamerica	Fri Mar  6 23:55:36 2015	(r279717)
@@ -124,7 +124,7 @@ Rule	US	1918	1919	-	Mar	lastSun	2:00	1:0
 Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
 Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
 Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	US	1945	only	-	Sep	30	2:00	0	S
+Rule	US	1945	only	-	Sep	lastSun	2:00	0	S
 Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
 Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
 Rule	US	1974	only	-	Jan	6	2:00	1:00	D
@@ -2124,11 +2124,11 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 
 
 # Mexico
 
-# From Paul Eggert (2001-03-05):
+# From Paul Eggert (2014-12-07):
 # The Investigation and Analysis Service of the
 # Mexican Library of Congress (MLoC) has published a
 # history of Mexican local time (in Spanish)
-# http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/
+# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm
 #
 # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
 # (In all cases we go with the MLoC.)
@@ -2297,6 +2297,24 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 
 # efecto desde las dos horas del segundo domingo de marzo y concluirá a
 # las dos horas del primer domingo de noviembre.
 
+# From Steffen Thorsen (2014-12-08), translated by Gwillim Law:
+# The Mexican state of Quintana Roo will likely change to EST in 2015.
+#
+# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo
+# "With this change, the time conflict that has existed between the municipios
+# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an
+# end. The latter declared itself in rebellion 15 years ago when a time change
+# was initiated in Mexico, and since then it has refused to change its time
+# zone along with the rest of the country."
+#
+# From Steffen Thorsen (2015-01-14), translated by Gwillim Law:
+# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html
+# "...the new time zone will come into effect at two o'clock on the first Sunday
+# of February, when we will have to advance the clock one hour from its current
+# time..."
+#
+# Also, the new zone will not use DST.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
 Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
@@ -2317,7 +2335,8 @@ Rule	Mexico	2002	max	-	Oct	lastSun	2:00	
 Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  0:12:56
 			-6:00	-	CST	1981 Dec 23
 			-5:00	Mexico	E%sT	1998 Aug  2  2:00
-			-6:00	Mexico	C%sT
+			-6:00	Mexico	C%sT	2015 Feb  1  2:00
+			-5:00	-	EST
 # Campeche, Yucatán; represented by Mérida
 Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
 			-6:00	-	CST	1981 Dec 23

Modified: projects/cxl_iscsi/contrib/tzdata/southamerica
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/southamerica	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/southamerica	Fri Mar  6 23:55:36 2015	(r279717)
@@ -1206,6 +1206,11 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1
 # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
 # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
 
+# From Juan Correa (2015-01-28):
+# ... today the Ministry of Energy announced that Chile will drop DST, will keep
+# "summer time" (UTC -3 / UTC -5) all year round....
+# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html
+
 # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
 # 'antarctica' file.
 
@@ -1247,8 +1252,8 @@ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	
 Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	Chile	2012	max	-	Apr	Sun>=23	3:00u	0	-
-Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
+Rule	Chile	2012	2015	-	Apr	Sun>=23	3:00u	0	-
+Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1259,11 +1264,13 @@ Zone America/Santiago	-4:42:46 -	LMT	189
 			-4:00	-	CLT	1919 Jul  1 # Chile Time
 			-4:42:46 -	SMT	1927 Sep  1 # Santiago Mean Time
 			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
-			-4:00	Chile	CL%sT
+			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
+			-3:00	-	CLT
 Zone Pacific/Easter	-7:17:44 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
-			-7:00	Chile	EAS%sT	1982 Mar 13 21:00 # Easter Time
-			-6:00	Chile	EAS%sT
+			-7:00	Chile	EAS%sT	1982 Mar 13 3:00u # Easter Time
+			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
+			-5:00	-	EAST
 #
 # Salas y Gómez Island is uninhabited.
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,

Modified: projects/cxl_iscsi/contrib/tzdata/zone.tab
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/zone.tab	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/zone.tab	Fri Mar  6 23:55:36 2015	(r279717)
@@ -274,7 +274,7 @@ MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
 MW	-1547+03500	Africa/Blantyre
 MX	+1924-09909	America/Mexico_City	Central Time - most locations
-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
 MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
 MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border

Modified: projects/cxl_iscsi/contrib/tzdata/zone1970.tab
==============================================================================
--- projects/cxl_iscsi/contrib/tzdata/zone1970.tab	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/contrib/tzdata/zone1970.tab	Fri Mar  6 23:55:36 2015	(r279717)
@@ -234,7 +234,7 @@ MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
 MX	+1924-09909	America/Mexico_City	Central Time - most locations
-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
 MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
 MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border

Modified: projects/cxl_iscsi/lib/libc/gen/getpwent.c
==============================================================================
--- projects/cxl_iscsi/lib/libc/gen/getpwent.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/lib/libc/gen/getpwent.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -1942,7 +1942,7 @@ docompat:
 			break;
 	}
 fin:
-	if (!stayopen && st->db != NULL) {
+	if (st->db != NULL && !stayopen) {
 		(void)st->db->close(st->db);
 		st->db = NULL;
 	}

Modified: projects/cxl_iscsi/lib/libc/stdlib/qsort.c
==============================================================================
--- projects/cxl_iscsi/lib/libc/stdlib/qsort.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/lib/libc/stdlib/qsort.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -41,47 +41,55 @@ typedef int		 cmp_t(void *, const void *
 typedef int		 cmp_t(const void *, const void *);
 #endif
 static inline char	*med3(char *, char *, char *, cmp_t *, void *);
-static inline void	 swapfunc(char *, char *, int, int);
+static inline void	 swapfunc(char *, char *, int, int, int);
 
-#define min(a, b)	(a) < (b) ? a : b
+#define	MIN(a, b)	((a) < (b) ? a : b)
 
 /*
  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
  */
-#define swapcode(TYPE, parmi, parmj, n) { 		\
-	long i = (n) / sizeof (TYPE); 			\
-	TYPE *pi = (TYPE *) (parmi); 		\
-	TYPE *pj = (TYPE *) (parmj); 		\
+#define	swapcode(TYPE, parmi, parmj, n) {		\
+	long i = (n) / sizeof (TYPE);			\
+	TYPE *pi = (TYPE *) (parmi);		\
+	TYPE *pj = (TYPE *) (parmj);		\
 	do { 						\
 		TYPE	t = *pi;		\
 		*pi++ = *pj;				\
 		*pj++ = t;				\
-        } while (--i > 0);				\
+	} while (--i > 0);				\
 }
 
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
+#define	SWAPINIT(TYPE, a, es) swaptype_ ## TYPE =	\
+	((char *)a - (char *)0) % sizeof(TYPE) ||	\
+	es % sizeof(TYPE) ? 2 : es == sizeof(TYPE) ? 0 : 1;
 
 static inline void
-swapfunc(a, b, n, swaptype)
+swapfunc(a, b, n, swaptype_long, swaptype_int)
 	char *a, *b;
-	int n, swaptype;
+	int n, swaptype_long, swaptype_int;
 {
-	if(swaptype <= 1)
+	if (swaptype_long <= 1)
 		swapcode(long, a, b, n)
+	else if (swaptype_int <= 1)
+		swapcode(int, a, b, n)
 	else
 		swapcode(char, a, b, n)
 }
 
-#define swap(a, b)					\
-	if (swaptype == 0) {				\
+#define	swap(a, b)					\
+	if (swaptype_long == 0) {			\
 		long t = *(long *)(a);			\
 		*(long *)(a) = *(long *)(b);		\
 		*(long *)(b) = t;			\
+	} else if (swaptype_int == 0) {			\
+		int t = *(int *)(a);			\
+		*(int *)(a) = *(int *)(b);		\
+		*(int *)(b) = t;			\
 	} else						\
-		swapfunc(a, b, es, swaptype)
+		swapfunc(a, b, es, swaptype_long, swaptype_int)
 
-#define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
+#define	vecswap(a, b, n)				\
+	if ((n) > 0) swapfunc(a, b, n, swaptype_long, swaptype_int)
 
 #ifdef I_AM_QSORT_R
 #define	CMP(t, x, y) (cmp((t), (x), (y)))
@@ -98,14 +106,14 @@ __unused
 {
 	return CMP(thunk, a, b) < 0 ?
 	       (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
-              :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
+	      :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
 }
 
 #ifdef I_AM_QSORT_R
 void
 qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
 #else
-#define thunk NULL
+#define	thunk NULL
 void
 qsort(void *a, size_t n, size_t es, cmp_t *cmp)
 #endif
@@ -113,9 +121,10 @@ qsort(void *a, size_t n, size_t es, cmp_
 	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
 	size_t d, r;
 	int cmp_result;
-	int swaptype, swap_cnt;
+	int swaptype_long, swaptype_int, swap_cnt;
 
-loop:	SWAPINIT(a, es);
+loop:	SWAPINIT(long, a, es);
+	SWAPINIT(int, a, es);
 	swap_cnt = 0;
 	if (n < 7) {
 		for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
@@ -175,9 +184,9 @@ loop:	SWAPINIT(a, es);
 	}
 
 	pn = (char *)a + n * es;
-	r = min(pa - (char *)a, pb - pa);
+	r = MIN(pa - (char *)a, pb - pa);
 	vecswap(a, pb - r, r);
-	r = min(pd - pc, pn - pd - es);
+	r = MIN(pd - pc, pn - pd - es);
 	vecswap(pb, pn - r, r);
 	if ((r = pb - pa) > es)
 #ifdef I_AM_QSORT_R

Modified: projects/cxl_iscsi/lib/libc/sys/cap_ioctls_limit.2
==============================================================================
--- projects/cxl_iscsi/lib/libc/sys/cap_ioctls_limit.2	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/lib/libc/sys/cap_ioctls_limit.2	Fri Mar  6 23:55:36 2015	(r279717)
@@ -61,6 +61,8 @@ argument specifies the number of element
 There can be up to
 .Va 256
 elements in the array.
+Including an element that has been previously revoked will generate an error.
+After a successful call only those listed in the array may be used.
 .Pp
 The list of allowed ioctl commands for a given file descriptor can be obtained
 with the

Modified: projects/cxl_iscsi/lib/libmt/mtlib.c
==============================================================================
--- projects/cxl_iscsi/lib/libmt/mtlib.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/lib/libmt/mtlib.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -568,6 +568,15 @@ static struct densities {
 	 *
 	 * IBM 3592 definitions obtained from second edition of the IBM
 	 * System Storage Tape Drive 3592 SCSI Reference (May 25, 2012).
+	 *
+	 * DAT-72 and DAT-160 bpi values taken from "HP StorageWorks DAT160
+	 * tape drive white paper", dated June 2007.
+	 *
+	 * DAT-160 / SDLT220 density code (0x48) conflict information
+	 * found here:
+	 *
+	 * http://h20564.www2.hp.com/hpsc/doc/public/display?docId=emr_na-c01065117&sp4ts.oid=429311
+ 	 * (Document ID c01065117)
 	 */
 	/*Num.  bpmm    bpi     Reference     */
 	{ 0x1,	32,	800,	"X3.22-1983" },
@@ -613,6 +622,14 @@ static struct densities {
 	{ 0x42, 7398,   187909, "LTO-2" },
 	{ 0x44, 9638,   244805, "LTO-3" }, 
 	{ 0x46, 12725,  323215, "LTO-4" }, 
+	{ 0x47, 6417,   163000, "DAT-72" },
+	/*
+	 * XXX KDM note that 0x48 is also the density code for DAT-160.
+	 * For some reason they used overlapping density codes.
+	 */
+#if 0
+	{ 0x48, 6870,   174500, "DAT-160" },
+#endif
 	{ 0x48, 5236,   133000, "SDLTapeI(110)" },
 	{ 0x49, 7598,   193000, "SDLTapeI(160)" },
 	{ 0x4a,     0,       0, "T10000A" },

Modified: projects/cxl_iscsi/lib/libucl/Makefile
==============================================================================
--- projects/cxl_iscsi/lib/libucl/Makefile	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/lib/libucl/Makefile	Fri Mar  6 23:55:36 2015	(r279717)
@@ -18,7 +18,7 @@ SRCS=		ucl_emitter_streamline.c \
 
 LIBADD=		m
 
-WARNS=		2
+WARNS=		1
 CFLAGS+=	-I${LIBUCL}/include \
 		-I${LIBUCL}/src \
 		-I${LIBUCL}/uthash \

Modified: projects/cxl_iscsi/sbin/ifconfig/af_inet6.c
==============================================================================
--- projects/cxl_iscsi/sbin/ifconfig/af_inet6.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sbin/ifconfig/af_inet6.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -485,6 +485,10 @@ static struct cmd inet6_cmds[] = {
 	DEF_CMD("-auto_linklocal",-ND6_IFF_AUTO_LINKLOCAL,setnd6flags),
 	DEF_CMD("no_prefer_iface",ND6_IFF_NO_PREFER_IFACE,setnd6flags),
 	DEF_CMD("-no_prefer_iface",-ND6_IFF_NO_PREFER_IFACE,setnd6flags),
+	DEF_CMD("no_dad",	ND6_IFF_NO_DAD,		setnd6flags),
+	DEF_CMD("-no_dad",	-ND6_IFF_NO_DAD,	setnd6flags),
+	DEF_CMD("ignoreloop",	ND6_IFF_IGNORELOOP,	setnd6flags),
+	DEF_CMD("-ignoreloop",	-ND6_IFF_IGNORELOOP,	setnd6flags),
 	DEF_CMD_ARG("pltime",        			setip6pltime),
 	DEF_CMD_ARG("vltime",        			setip6vltime),
 	DEF_CMD("eui64",	0,			setip6eui64),

Modified: projects/cxl_iscsi/sbin/ifconfig/af_nd6.c
==============================================================================
--- projects/cxl_iscsi/sbin/ifconfig/af_nd6.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sbin/ifconfig/af_nd6.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -58,7 +58,8 @@ static const char rcsid[] =
 #define	MAX_SYSCTL_TRY	5
 #define	ND6BITS	"\020\001PERFORMNUD\002ACCEPT_RTADV\003PREFER_SOURCE" \
 		"\004IFDISABLED\005DONT_SET_IFROUTE\006AUTO_LINKLOCAL" \
-		"\007NO_RADR\010NO_PREFER_IFACE\020DEFAULTIF"
+		"\007NO_RADR\010NO_PREFER_IFACE\011IGNORELOOP\012NO_DAD" \
+		"\020DEFAULTIF"
 
 static int isnd6defif(int);
 void setnd6flags(const char *, int, int, const struct afswtch *);

Modified: projects/cxl_iscsi/sbin/ifconfig/ifconfig.8
==============================================================================
--- projects/cxl_iscsi/sbin/ifconfig/ifconfig.8	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sbin/ifconfig/ifconfig.8	Fri Mar  6 23:55:36 2015	(r279717)
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
 .\" $FreeBSD$
 .\"
-.Dd December 16, 2014
+.Dd March 6, 2015
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -687,6 +687,20 @@ policy table, configurable with
 .It Cm -no_prefer_iface
 Clear a flag
 .Cm no_prefer_iface .
+.It Cm no_dad
+Set a flag to disable Duplicate Address Detection.
+.It Cm -no_dad
+Clear a flag
+.Cm no_dad .
+.It Cm ignoreloop
+Set a flag to disable loopback detection in Enhanced Duplicate Address
+Detection Algorithm.
+When this flag is set,
+Duplicate Address Detection will stop in a finite number of probings
+even if a loopback configuration is detected.
+.It Cm -ignoreloop
+Clear a flag
+.Cm ignoreloop .
 .El
 .Pp
 The following parameters are specific for IPv6 addresses.

Modified: projects/cxl_iscsi/share/misc/committers-src.dot
==============================================================================
--- projects/cxl_iscsi/share/misc/committers-src.dot	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/share/misc/committers-src.dot	Fri Mar  6 23:55:36 2015	(r279717)
@@ -300,6 +300,7 @@ vanhu [label="Yvan Vanhullebus\nvanhu at Fr
 versus [label="Konrad Jankowski\nversus at FreeBSD.org\n2008/10/27"]
 weongyo [label="Weongyo Jeong\nweongyo at FreeBSD.org\n2007/12/21"]
 wes [label="Wes Peters\nwes at FreeBSD.org\n1998/11/25"]
+whu [label="Wei Hu\nwhu at FreeBSD.org\n2015/02/11"]
 wkoszek [label="Wojciech A. Koszek\nwkoszek at FreeBSD.org\n2006/02/21"]
 wollman [label="Garrett Wollman\nwollman at FreeBSD.org\n????/??/??"]
 wsalamon [label="Wayne Salamon\nwsalamon at FreeBSD.org\n2005/06/25"]
@@ -430,6 +431,7 @@ gavin -> versus
 gibbs -> mjacob
 gibbs -> njl
 gibbs -> royger
+gibbs -> whu
 
 glebius -> mav
 
@@ -631,6 +633,8 @@ rgrimes -> markm
 
 rmacklem -> jwd
 
+royger -> whu
+
 rpaulo -> avg
 rpaulo -> bschmidt
 rpaulo -> dim

Modified: projects/cxl_iscsi/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/cxl_iscsi/sys/amd64/amd64/mp_machdep.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/amd64/amd64/mp_machdep.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -828,8 +828,8 @@ set_interrupt_apic_ids(void)
 			continue;
 
 		/* Don't let hyperthreads service interrupts. */
-		if (hyperthreading_cpus > 1 &&
-		    apic_id % hyperthreading_cpus != 0)
+		if (cpu_logical > 1 &&
+		    apic_id % cpu_logical != 0)
 			continue;
 
 		intr_add_cpu(i);

Modified: projects/cxl_iscsi/sys/amd64/vmm/io/vatpic.c
==============================================================================
--- projects/cxl_iscsi/sys/amd64/vmm/io/vatpic.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/amd64/vmm/io/vatpic.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -275,6 +275,7 @@ vatpic_icw1(struct vatpic *vatpic, struc
 	atpic->ready = false;
 
 	atpic->icw_num = 1;
+	atpic->request = 0;
 	atpic->mask = 0;
 	atpic->lowprio = 7;
 	atpic->rd_cmd_reg = 0;

Modified: projects/cxl_iscsi/sys/arm/arm/db_trace.c
==============================================================================
--- projects/cxl_iscsi/sys/arm/arm/db_trace.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/arm/arm/db_trace.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -66,7 +66,7 @@ db_stack_trace_cmd(struct unwind_state *
 
 	finished = false;
 	while (!finished) {
-		finished = unwind_stack_one(state, 0);
+		finished = unwind_stack_one(state, 1);
 
 		/* Print the frame details */
 		sym = db_search_symbol(state->start_pc, DB_STGY_ANY, &offset);

Modified: projects/cxl_iscsi/sys/arm/arm/exception.S
==============================================================================
--- projects/cxl_iscsi/sys/arm/arm/exception.S	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/arm/arm/exception.S	Fri Mar  6 23:55:36 2015	(r279717)
@@ -57,11 +57,6 @@ __FBSDID("$FreeBSD$");
 #ifdef KDTRACE_HOOKS
 	.bss
 	.align 4
-	.global	_C_LABEL(dtrace_invop_jump_addr)
-_C_LABEL(dtrace_invop_jump_addr):
-	.word 0
-	.word 0
-
 	.global	_C_LABEL(dtrace_invop_calltrap_addr)
 _C_LABEL(dtrace_invop_calltrap_addr):
 	.word 0
@@ -162,7 +157,8 @@ _C_LABEL(dtrace_invop_calltrap_addr):
 	msr	cpsr_c, r2;		/* Punch into SVC mode */	   \
 	mov	r2, sp;			/* Save	SVC sp */		   \
 	bic	sp, sp, #7;		/* Align sp to an 8-byte addrress */  \
-	sub	sp, sp, #4;		/* Pad trapframe to keep alignment */ \
+	sub	sp, sp, #(4 * 17);	/* Pad trapframe to keep alignment */ \
+				    /* and for dtrace to emulate push/pop */  \
 	str	r0, [sp, #-4]!;		/* Push return address */	   \
 	str	lr, [sp, #-4]!;		/* Push SVC lr */		   \
 	str	r2, [sp, #-4]!;		/* Push SVC sp */		   \
@@ -199,7 +195,8 @@ _C_LABEL(dtrace_invop_calltrap_addr):
 	msr	cpsr_c, r2;		/* Punch into SVC mode */	   \
 	mov	r2, sp;			/* Save	SVC sp */		   \
 	bic	sp, sp, #7;		/* Align sp to an 8-byte addrress */  \
-	sub	sp, sp, #4;		/* Pad trapframe to keep alignment */ \
+	sub	sp, sp, #(4 * 17);	/* Pad trapframe to keep alignment */ \
+				    /* and for dtrace to emulate push/pop */  \
 	str	r0, [sp, #-4]!;		/* Push return address */	   \
 	str	lr, [sp, #-4]!;		/* Push SVC lr */		   \
 	str	r2, [sp, #-4]!;		/* Push SVC sp */		   \

Modified: projects/cxl_iscsi/sys/arm/arm/physmem.c
==============================================================================
--- projects/cxl_iscsi/sys/arm/arm/physmem.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/arm/arm/physmem.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -153,7 +153,7 @@ arm_physmem_print_tables()
  * Walk the list of hardware regions, processing it against the list of
  * exclusions that contain the given exflags, and generating an "avail list".
  *
- * Updates the kernel global 'realmem' with the sum of all pages in hw regions.
+ * Updates the value at *pavail with the sum of all pages in all hw regions.
  *
  * Returns the number of pages of non-excluded memory added to the avail list.
  */

Modified: projects/cxl_iscsi/sys/arm/arm/undefined.c
==============================================================================
--- projects/cxl_iscsi/sys/arm/arm/undefined.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/arm/arm/undefined.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -86,6 +86,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/db_machdep.h>
 #endif
 
+#ifdef KDTRACE_HOOKS
+int (*dtrace_invop_jump_addr)(struct trapframe *);
+#endif
+
 static int gdb_trapper(u_int, u_int, struct trapframe *, int);
 
 LIST_HEAD(, undefined_handler) undefined_handlers[MAX_COPROCS];
@@ -286,7 +290,14 @@ undefinedinstruction(struct trapframe *f
 			printf("No debugger in kernel.\n");
 #endif
 			return;
-		} else
+		}
+#ifdef KDTRACE_HOOKS
+		else if (dtrace_invop_jump_addr != 0) {
+			dtrace_invop_jump_addr(frame);
+			return;
+		}
+#endif
+		else
 			panic("Undefined instruction in kernel.\n");
 	}
 

Modified: projects/cxl_iscsi/sys/arm/conf/BEAGLEBONE
==============================================================================
--- projects/cxl_iscsi/sys/arm/conf/BEAGLEBONE	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/arm/conf/BEAGLEBONE	Fri Mar  6 23:55:36 2015	(r279717)
@@ -28,10 +28,10 @@ include		"../ti/am335x/std.am335x"
 makeoptions	WITHOUT_MODULES="ahc"
 
 # DTrace support
-options         KDTRACE_HOOKS                # Kernel DTrace hooks
-options                DDB_CTF                      # all architectures - kernel ELF linker loads CTF data
-makeoptions         WITH_CTF=1
-makeoptions     MODULES_OVERRIDE="opensolaris dtrace dtrace/lockstat dtrace/profile dtrace/fbt"
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
+makeoptions	WITH_CTF=1
+makeoptions	MODULES_OVERRIDE="opensolaris dtrace dtrace/lockstat dtrace/profile dtrace/fbt"
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler

Modified: projects/cxl_iscsi/sys/arm/xilinx/zy7_devcfg.c
==============================================================================
--- projects/cxl_iscsi/sys/arm/xilinx/zy7_devcfg.c	Fri Mar  6 23:17:18 2015	(r279716)
+++ projects/cxl_iscsi/sys/arm/xilinx/zy7_devcfg.c	Fri Mar  6 23:55:36 2015	(r279717)
@@ -72,10 +72,23 @@ struct zy7_devcfg_softc {
 	bus_dmamap_t	dma_map;
 
 	int		is_open;
+
+	struct sysctl_ctx_list sysctl_tree;
+	struct sysctl_oid *sysctl_tree_top;
 };
 
 static struct zy7_devcfg_softc *zy7_devcfg_softc_p;
 
+#define	FCLK_NUM	4
+
+struct zy7_fclk_config {
+	int		source;
+	int		frequency;
+	int		actual_frequency;
+};
+
+static struct zy7_fclk_config fclk_configs[FCLK_NUM];
+
 #define DEVCFG_SC_LOCK(sc)		mtx_lock(&(sc)->sc_mtx)
 #define	DEVCFG_SC_UNLOCK(sc)		mtx_unlock(&(sc)->sc_mtx)
 #define DEVCFG_SC_LOCK_INIT(sc) \
@@ -103,13 +116,17 @@ static int zy7_ps_vers = 0;
 SYSCTL_INT(_hw, OID_AUTO, ps_vers, CTLFLAG_RD, &zy7_ps_vers, 0,
 	   "Zynq-7000 PS version");
 
+static int zy7_devcfg_fclk_sysctl_level_shifters(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_hw_fpga, OID_AUTO, level_shifters, 
+		    CTLFLAG_RW | CTLTYPE_INT, 
+		    NULL, 0, zy7_devcfg_fclk_sysctl_level_shifters,
+		    "I", "Enable/disable level shifters");
 
 /* cdev entry points. */
 static int zy7_devcfg_open(struct cdev *, int, int, struct thread *);
 static int zy7_devcfg_write(struct cdev *, struct uio *, int);
 static int zy7_devcfg_close(struct cdev *, int, int, struct thread *);
 
-
 struct cdevsw zy7_devcfg_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	zy7_devcfg_open,
@@ -230,6 +247,151 @@ struct cdevsw zy7_devcfg_cdevsw = {
 #define ZY7_DEVCFG_XADCIF_RD_FIFO	0x114
 #define ZY7_DEVCFG_XADCIF_MCTL		0x118
 
+static int
+zy7_devcfg_fclk_sysctl_source(SYSCTL_HANDLER_ARGS)
+{
+	char buf[4];
+	struct zy7_fclk_config *cfg;
+	int unit;
+	int error;
+
+	cfg = arg1;
+	unit = arg2;
+
+	switch (cfg->source) {
+		case ZY7_PL_FCLK_SRC_IO:
+		case ZY7_PL_FCLK_SRC_IO_ALT:
+			strncpy(buf, "IO", sizeof(buf));
+			break;
+		case ZY7_PL_FCLK_SRC_DDR:
+			strncpy(buf, "DDR", sizeof(buf));
+			break;
+		case ZY7_PL_FCLK_SRC_ARM:
+			strncpy(buf, "ARM", sizeof(buf));
+			break;
+		default:
+			strncpy(buf, "???", sizeof(buf));
+			break;
+	}
+
+	error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	if (strcasecmp(buf, "io") == 0)
+		cfg->source = ZY7_PL_FCLK_SRC_IO;
+	else if (strcasecmp(buf, "ddr") == 0)
+		cfg->source = ZY7_PL_FCLK_SRC_DDR;
+	else if (strcasecmp(buf, "arm") == 0)
+		cfg->source = ZY7_PL_FCLK_SRC_ARM;
+	else
+		return (EINVAL);
+
+	zy7_pl_fclk_set_source(unit, cfg->source);
+	if (cfg->frequency > 0)
+		cfg->actual_frequency = zy7_pl_fclk_get_freq(unit);
+
+	return (0);
+}
+
+static int
+zy7_devcfg_fclk_sysctl_freq(SYSCTL_HANDLER_ARGS)
+{
+	struct zy7_fclk_config *cfg;
+	int unit;
+	int error;
+	int freq;
+	int new_actual_freq;
+
+	cfg = arg1;
+	unit = arg2;
+
+	freq = cfg->frequency;
+
+	error = sysctl_handle_int(oidp, &freq, 0, req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	if (freq > 0) {
+		new_actual_freq = zy7_pl_fclk_set_freq(unit, freq);
+		if (new_actual_freq < 0)
+			return (EINVAL);
+		if (!zy7_pl_fclk_enabled(unit))
+			zy7_pl_fclk_enable(unit);
+	}
+	else {
+		zy7_pl_fclk_disable(unit);
+		new_actual_freq = 0;
+	}
+
+	cfg->frequency = freq;
+	cfg->actual_frequency = new_actual_freq;
+
+	return (0);
+}
+
+static int
+zy7_devcfg_fclk_sysctl_level_shifters(SYSCTL_HANDLER_ARGS)
+{
+	int error, enabled;
+
+	enabled = zy7_pl_level_shifters_enabled();
+
+	error = sysctl_handle_int(oidp, &enabled, 0, req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	if (enabled)
+		zy7_pl_level_shifters_enable();
+	else
+		zy7_pl_level_shifters_disable();
+
+	return (0);
+}
+
+static int
+zy7_devcfg_init_fclk_sysctl(struct zy7_devcfg_softc *sc)
+{
+	struct sysctl_oid *fclk_node;
+	char fclk_num[4];
+	int i;
+
+	sysctl_ctx_init(&sc->sysctl_tree);
+	sc->sysctl_tree_top = SYSCTL_ADD_NODE(&sc->sysctl_tree,

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
