From owner-svn-src-releng@freebsd.org Sun Aug 14 16:32:25 2016 Return-Path: Delivered-To: svn-src-releng@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 22603BB9CDD; Sun, 14 Aug 2016 16:32:25 +0000 (UTC) (envelope-from ae@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 D045B1D08; Sun, 14 Aug 2016 16:32:24 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7EGWOpv091261; Sun, 14 Aug 2016 16:32:24 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7EGWNEv091251; Sun, 14 Aug 2016 16:32:23 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201608141632.u7EGWNEv091251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Sun, 14 Aug 2016 16:32:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304084 - in releng/11.0: sbin/ipfw sys/netinet sys/netpfil/ipfw X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 16:32:25 -0000 Author: ae Date: Sun Aug 14 16:32:23 2016 New Revision: 304084 URL: https://svnweb.freebsd.org/changeset/base/304084 Log: Merge from stable/11 r304079: Restore "nat global" support. Now zero value of arg1 used to specify "tablearg", use the old "tablearg" value for "nat global". Introduce new macro IP_FW_NAT44_GLOBAL to replace hardcoded magic number to specify "nat global". Also replace 65535 magic number with corresponding macro. Fix typo in comments. PR: 211256 Approved by: re (kib) Modified: releng/11.0/sbin/ipfw/ipfw2.c releng/11.0/sys/netinet/ip_fw.h releng/11.0/sys/netpfil/ipfw/ip_fw2.c releng/11.0/sys/netpfil/ipfw/ip_fw_sockopt.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sbin/ipfw/ipfw2.c ============================================================================== --- releng/11.0/sbin/ipfw/ipfw2.c Sun Aug 14 15:52:00 2016 (r304083) +++ releng/11.0/sbin/ipfw/ipfw2.c Sun Aug 14 16:32:23 2016 (r304084) @@ -1575,7 +1575,7 @@ show_static_rule(struct cmdline_opts *co break; case O_NAT: - if (cmd->arg1 != 0) + if (cmd->arg1 != IP_FW_NAT44_GLOBAL) bprint_uint_arg(bp, "nat ", cmd->arg1); else bprintf(bp, "nat global"); @@ -3733,7 +3733,7 @@ compile_rule(char *av[], uint32_t *rbuf, action->len = F_INSN_SIZE(ipfw_insn_nat); CHECK_ACTLEN; if (*av != NULL && _substrcmp(*av, "global") == 0) { - action->arg1 = 0; + action->arg1 = IP_FW_NAT44_GLOBAL; av++; break; } else Modified: releng/11.0/sys/netinet/ip_fw.h ============================================================================== --- releng/11.0/sys/netinet/ip_fw.h Sun Aug 14 15:52:00 2016 (r304083) +++ releng/11.0/sys/netinet/ip_fw.h Sun Aug 14 16:32:23 2016 (r304084) @@ -60,6 +60,7 @@ #define IPFW_ARG_MAX 65534 #define IP_FW_TABLEARG 65535 /* Compat value for old clients */ #define IP_FW_TARG 0 /* Current tablearg value */ +#define IP_FW_NAT44_GLOBAL 65535 /* arg1 value for "nat global" */ /* * Number of entries in the call stack of the call/return commands. Modified: releng/11.0/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- releng/11.0/sys/netpfil/ipfw/ip_fw2.c Sun Aug 14 15:52:00 2016 (r304083) +++ releng/11.0/sys/netpfil/ipfw/ip_fw2.c Sun Aug 14 16:32:23 2016 (r304084) @@ -2489,7 +2489,7 @@ do { \ set_match(args, f_pos, chain); /* Check if this is 'global' nat rule */ - if (cmd->arg1 == 0) { + if (cmd->arg1 == IP_FW_NAT44_GLOBAL) { retval = ipfw_nat_ptr(args, NULL, m); break; } Modified: releng/11.0/sys/netpfil/ipfw/ip_fw_sockopt.c ============================================================================== --- releng/11.0/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Aug 14 15:52:00 2016 (r304083) +++ releng/11.0/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Aug 14 16:32:23 2016 (r304084) @@ -524,9 +524,11 @@ import_rule0(struct rule_check_info *ci) /* * Alter opcodes: - * 1) convert tablearg value from 65335 to 0 - * 2) Add high bit to O_SETFIB/O_SETDSCP values (to make room for targ). + * 1) convert tablearg value from 65535 to 0 + * 2) Add high bit to O_SETFIB/O_SETDSCP values (to make room + * for targ). * 3) convert table number in iface opcodes to u16 + * 4) convert old `nat global` into new 65535 */ l = krule->cmd_len; cmd = krule->cmd; @@ -548,19 +550,21 @@ import_rule0(struct rule_check_info *ci) case O_NETGRAPH: case O_NGTEE: case O_NAT: - if (cmd->arg1 == 65535) + if (cmd->arg1 == IP_FW_TABLEARG) cmd->arg1 = IP_FW_TARG; + else if (cmd->arg1 == 0) + cmd->arg1 = IP_FW_NAT44_GLOBAL; break; case O_SETFIB: case O_SETDSCP: - if (cmd->arg1 == 65535) + if (cmd->arg1 == IP_FW_TABLEARG) cmd->arg1 = IP_FW_TARG; else cmd->arg1 |= 0x8000; break; case O_LIMIT: lcmd = (ipfw_insn_limit *)cmd; - if (lcmd->conn_limit == 65535) + if (lcmd->conn_limit == IP_FW_TABLEARG) lcmd->conn_limit = IP_FW_TARG; break; /* Interface tables */ @@ -606,7 +610,7 @@ export_rule0(struct ip_fw *krule, struct /* * Alter opcodes: - * 1) convert tablearg value from 0 to 65335 + * 1) convert tablearg value from 0 to 65535 * 2) Remove highest bit from O_SETFIB/O_SETDSCP values. * 3) convert table number in iface opcodes to int */ @@ -631,19 +635,21 @@ export_rule0(struct ip_fw *krule, struct case O_NGTEE: case O_NAT: if (cmd->arg1 == IP_FW_TARG) - cmd->arg1 = 65535; + cmd->arg1 = IP_FW_TABLEARG; + else if (cmd->arg1 == IP_FW_NAT44_GLOBAL) + cmd->arg1 = 0; break; case O_SETFIB: case O_SETDSCP: if (cmd->arg1 == IP_FW_TARG) - cmd->arg1 = 65535; + cmd->arg1 = IP_FW_TABLEARG; else cmd->arg1 &= ~0x8000; break; case O_LIMIT: lcmd = (ipfw_insn_limit *)cmd; if (lcmd->conn_limit == IP_FW_TARG) - lcmd->conn_limit = 65535; + lcmd->conn_limit = IP_FW_TABLEARG; break; /* Interface tables */ case O_XMIT: From owner-svn-src-releng@freebsd.org Sun Aug 14 18:30:31 2016 Return-Path: Delivered-To: svn-src-releng@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 E6564BB94BD; Sun, 14 Aug 2016 18:30:31 +0000 (UTC) (envelope-from karels@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 B67FD1F85; Sun, 14 Aug 2016 18:30:31 +0000 (UTC) (envelope-from karels@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7EIUUbk032201; Sun, 14 Aug 2016 18:30:30 GMT (envelope-from karels@FreeBSD.org) Received: (from karels@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7EIUU4r032200; Sun, 14 Aug 2016 18:30:30 GMT (envelope-from karels@FreeBSD.org) Message-Id: <201608141830.u7EIUU4r032200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: karels set sender to karels@FreeBSD.org using -f From: Mike Karels Date: Sun, 14 Aug 2016 18:30:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304088 - releng/11.0/sys/netinet X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 18:30:32 -0000 Author: karels Date: Sun Aug 14 18:30:30 2016 New Revision: 304088 URL: https://svnweb.freebsd.org/changeset/base/304088 Log: MFC r303978: Fix kernel build with TCP_RFC7413 option The current in_pcb.h includes route.h, which includes sockaddr structures. Including should require ; add it in the appropriate place. PR: 211385 Submitted by: Sergey Kandaurov and iron at mail.ua Reviewed by: gnn Approved by: gnn (mentor) Approved by: re (gjb) Modified: releng/11.0/sys/netinet/tcp_fastopen.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/netinet/tcp_fastopen.c ============================================================================== --- releng/11.0/sys/netinet/tcp_fastopen.c Sun Aug 14 18:05:41 2016 (r304087) +++ releng/11.0/sys/netinet/tcp_fastopen.c Sun Aug 14 18:30:30 2016 (r304088) @@ -108,6 +108,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From owner-svn-src-releng@freebsd.org Mon Aug 15 05:07:04 2016 Return-Path: Delivered-To: svn-src-releng@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 0B4A8BBA0DA; Mon, 15 Aug 2016 05:07:04 +0000 (UTC) (envelope-from tuexen@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 DA7661911; Mon, 15 Aug 2016 05:07:03 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7F573rF070796; Mon, 15 Aug 2016 05:07:03 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7F573MQ070795; Mon, 15 Aug 2016 05:07:03 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201608150507.u7F573MQ070795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Mon, 15 Aug 2016 05:07:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304110 - releng/11.0/sys/netinet X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 05:07:04 -0000 Author: tuexen Date: Mon Aug 15 05:07:02 2016 New Revision: 304110 URL: https://svnweb.freebsd.org/changeset/base/304110 Log: MFC r304082: Improve a consistency check to not detect valid cases for unordered user messages using DATA chunks as invalid ones. While there, ensure that error causes are provided when sending ABORT chunks in case of reassembly problems detected. Thanks to Taylor Brandstetter for making me aware of this problem. Approved by: re (gjb) Modified: releng/11.0/sys/netinet/sctp_indata.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/netinet/sctp_indata.c ============================================================================== --- releng/11.0/sys/netinet/sctp_indata.c Mon Aug 15 05:00:37 2016 (r304109) +++ releng/11.0/sys/netinet/sctp_indata.c Mon Aug 15 05:07:02 2016 (r304110) @@ -1747,21 +1747,27 @@ sctp_process_a_data_chunk(struct sctp_tc * If its a fragmented message, lets see if we can find the control * on the reassembly queues. */ - if ((chtype == SCTP_IDATA) && ((chunk_flags & SCTP_DATA_FIRST_FRAG) == 0) && (fsn == 0)) { + if ((chtype == SCTP_IDATA) && + ((chunk_flags & SCTP_DATA_FIRST_FRAG) == 0) && + (fsn == 0)) { /* * The first *must* be fsn 0, and other (middle/end) pieces - * can *not* be fsn 0. + * can *not* be fsn 0. XXX: This can happen in case of a + * wrap around. Ignore is for now. */ + snprintf(msg, sizeof(msg), "FSN zero for MID=%8.8x, but flags=%2.2x", + msg_id, chunk_flags); goto err_out; } + control = sctp_find_reasm_entry(strm, msg_id, ordered, old_data); + SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags:0x%x look for control on queues %p\n", + chunk_flags, control); if ((chunk_flags & SCTP_DATA_NOT_FRAG) != SCTP_DATA_NOT_FRAG) { /* See if we can find the re-assembly entity */ - control = sctp_find_reasm_entry(strm, msg_id, ordered, old_data); - SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags:0x%x look for control on queues %p\n", - chunk_flags, control); - if (control) { + if (control != NULL) { /* We found something, does it belong? */ if (ordered && (msg_id != control->sinfo_ssn)) { + snprintf(msg, sizeof(msg), "Reassembly problem (MID=%8.8x)", msg_id); err_out: op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg); stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA + SCTP_LOC_15; @@ -1774,6 +1780,8 @@ sctp_process_a_data_chunk(struct sctp_tc * We can't have a switched order with an * unordered chunk */ + snprintf(msg, sizeof(msg), "All fragments of a user message must be ordered or unordered (TSN=%8.8x)", + tsn); goto err_out; } if (!ordered && (((control->sinfo_flags >> 8) & SCTP_DATA_UNORDERED) == 0)) { @@ -1781,6 +1789,8 @@ sctp_process_a_data_chunk(struct sctp_tc * We can't have a switched unordered with a * ordered chunk */ + snprintf(msg, sizeof(msg), "All fragments of a user message must be ordered or unordered (TSN=%8.8x)", + tsn); goto err_out; } } @@ -1790,14 +1800,21 @@ sctp_process_a_data_chunk(struct sctp_tc * re-assembly going on with the same Stream/Seq (for * ordered) or in the same Stream for unordered. */ - SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags:0x%x look for msg in case we have dup\n", - chunk_flags); - if (sctp_find_reasm_entry(strm, msg_id, ordered, old_data)) { - SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags: 0x%x dup detected on msg_id: %u\n", - chunk_flags, - msg_id); - - goto err_out; + if (control != NULL) { + if (ordered || (old_data == 0)) { + SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags: 0x%x dup detected on msg_id: %u\n", + chunk_flags, msg_id); + snprintf(msg, sizeof(msg), "Duplicate MID=%8.8x detected.", msg_id); + goto err_out; + } else { + if ((tsn == control->fsn_included + 1) && + (control->end_added == 0)) { + snprintf(msg, sizeof(msg), "Illegal message sequence, missing end for MID: %8.8x", control->fsn_included); + goto err_out; + } else { + control = NULL; + } + } } } /* now do the tests */ From owner-svn-src-releng@freebsd.org Mon Aug 15 08:07:09 2016 Return-Path: Delivered-To: svn-src-releng@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 35DC9BBA881; Mon, 15 Aug 2016 08:07:09 +0000 (UTC) (envelope-from smh@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 E82F41D20; Mon, 15 Aug 2016 08:07:08 +0000 (UTC) (envelope-from smh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7F8783U037341; Mon, 15 Aug 2016 08:07:08 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7F877Un037339; Mon, 15 Aug 2016 08:07:07 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201608150807.u7F877Un037339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Mon, 15 Aug 2016 08:07:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304112 - releng/11.0/sys/dev/virtio/network X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 08:07:09 -0000 Author: smh Date: Mon Aug 15 08:07:07 2016 New Revision: 304112 URL: https://svnweb.freebsd.org/changeset/base/304112 Log: MFS r304067: Fix vtnet hang with max_virtqueue_pairs > VTNET_MAX_QUEUE_PAIR Approved by: re (gjb) Sponsored by: Multiplay Modified: releng/11.0/sys/dev/virtio/network/if_vtnet.c releng/11.0/sys/dev/virtio/network/if_vtnetvar.h Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- releng/11.0/sys/dev/virtio/network/if_vtnet.c Mon Aug 15 05:08:41 2016 (r304111) +++ releng/11.0/sys/dev/virtio/network/if_vtnet.c Mon Aug 15 08:07:07 2016 (r304112) @@ -230,18 +230,32 @@ static void vtnet_disable_interrupts(str static int vtnet_tunable_int(struct vtnet_softc *, const char *, int); /* Tunables. */ +static SYSCTL_NODE(_hw, OID_AUTO, vtnet, CTLFLAG_RD, 0, "VNET driver parameters"); static int vtnet_csum_disable = 0; TUNABLE_INT("hw.vtnet.csum_disable", &vtnet_csum_disable); +SYSCTL_INT(_hw_vtnet, OID_AUTO, csum_disable, CTLFLAG_RDTUN, + &vtnet_csum_disable, 0, "Disables receive and send checksum offload"); static int vtnet_tso_disable = 0; TUNABLE_INT("hw.vtnet.tso_disable", &vtnet_tso_disable); +SYSCTL_INT(_hw_vtnet, OID_AUTO, tso_disable, CTLFLAG_RDTUN, &vtnet_tso_disable, + 0, "Disables TCP Segmentation Offload"); static int vtnet_lro_disable = 0; TUNABLE_INT("hw.vtnet.lro_disable", &vtnet_lro_disable); +SYSCTL_INT(_hw_vtnet, OID_AUTO, lro_disable, CTLFLAG_RDTUN, &vtnet_lro_disable, + 0, "Disables TCP Large Receive Offload"); static int vtnet_mq_disable = 0; TUNABLE_INT("hw.vtnet.mq_disable", &vtnet_mq_disable); -static int vtnet_mq_max_pairs = 0; +SYSCTL_INT(_hw_vtnet, OID_AUTO, mq_disable, CTLFLAG_RDTUN, &vtnet_mq_disable, + 0, "Disables Multi Queue support"); +static int vtnet_mq_max_pairs = VTNET_MAX_QUEUE_PAIRS; TUNABLE_INT("hw.vtnet.mq_max_pairs", &vtnet_mq_max_pairs); +SYSCTL_INT(_hw_vtnet, OID_AUTO, mq_max_pairs, CTLFLAG_RDTUN, + &vtnet_mq_max_pairs, 0, "Sets the maximum number of Multi Queue pairs"); static int vtnet_rx_process_limit = 512; TUNABLE_INT("hw.vtnet.rx_process_limit", &vtnet_rx_process_limit); +SYSCTL_INT(_hw_vtnet, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN, + &vtnet_rx_process_limit, 0, + "Limits the number RX segments processed in a single pass"); static uma_zone_t vtnet_tx_header_zone; @@ -597,7 +611,6 @@ static void vtnet_setup_features(struct vtnet_softc *sc) { device_t dev; - int max_pairs, max; dev = sc->vtnet_dev; @@ -646,32 +659,31 @@ vtnet_setup_features(struct vtnet_softc if (virtio_with_feature(dev, VIRTIO_NET_F_MQ) && sc->vtnet_flags & VTNET_FLAG_CTRL_VQ) { - max_pairs = virtio_read_dev_config_2(dev, + sc->vtnet_max_vq_pairs = virtio_read_dev_config_2(dev, offsetof(struct virtio_net_config, max_virtqueue_pairs)); - if (max_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN || - max_pairs > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX) - max_pairs = 1; } else - max_pairs = 1; + sc->vtnet_max_vq_pairs = 1; - if (max_pairs > 1) { + if (sc->vtnet_max_vq_pairs > 1) { /* - * Limit the maximum number of queue pairs to the number of - * CPUs or the configured maximum. The actual number of - * queues that get used may be less. + * Limit the maximum number of queue pairs to the lower of + * the number of CPUs and the configured maximum. + * The actual number of queues that get used may be less. */ + int max; + max = vtnet_tunable_int(sc, "mq_max_pairs", vtnet_mq_max_pairs); - if (max > 0 && max_pairs > max) - max_pairs = max; - if (max_pairs > mp_ncpus) - max_pairs = mp_ncpus; - if (max_pairs > VTNET_MAX_QUEUE_PAIRS) - max_pairs = VTNET_MAX_QUEUE_PAIRS; - if (max_pairs > 1) - sc->vtnet_flags |= VTNET_FLAG_MULTIQ; + if (max > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN) { + if (max > mp_ncpus) + max = mp_ncpus; + if (max > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX) + max = VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX; + if (max > 1) { + sc->vtnet_requested_vq_pairs = max; + sc->vtnet_flags |= VTNET_FLAG_MULTIQ; + } + } } - - sc->vtnet_max_vq_pairs = max_pairs; } static int @@ -2982,13 +2994,11 @@ vtnet_set_active_vq_pairs(struct vtnet_s dev = sc->vtnet_dev; if ((sc->vtnet_flags & VTNET_FLAG_MULTIQ) == 0) { - MPASS(sc->vtnet_max_vq_pairs == 1); sc->vtnet_act_vq_pairs = 1; return; } - /* BMV: Just use the maximum configured for now. */ - npairs = sc->vtnet_max_vq_pairs; + npairs = sc->vtnet_requested_vq_pairs; if (vtnet_ctrl_mq_cmd(sc, npairs) != 0) { device_printf(dev, @@ -3852,6 +3862,9 @@ vtnet_setup_sysctl(struct vtnet_softc *s SYSCTL_ADD_INT(ctx, child, OID_AUTO, "max_vq_pairs", CTLFLAG_RD, &sc->vtnet_max_vq_pairs, 0, "Maximum number of supported virtqueue pairs"); + SYSCTL_ADD_INT(ctx, child, OID_AUTO, "requested_vq_pairs", + CTLFLAG_RD, &sc->vtnet_requested_vq_pairs, 0, + "Requested number of virtqueue pairs"); SYSCTL_ADD_INT(ctx, child, OID_AUTO, "act_vq_pairs", CTLFLAG_RD, &sc->vtnet_act_vq_pairs, 0, "Number of active virtqueue pairs"); Modified: releng/11.0/sys/dev/virtio/network/if_vtnetvar.h ============================================================================== --- releng/11.0/sys/dev/virtio/network/if_vtnetvar.h Mon Aug 15 05:08:41 2016 (r304111) +++ releng/11.0/sys/dev/virtio/network/if_vtnetvar.h Mon Aug 15 08:07:07 2016 (r304112) @@ -155,6 +155,7 @@ struct vtnet_softc { int vtnet_if_flags; int vtnet_act_vq_pairs; int vtnet_max_vq_pairs; + int vtnet_requested_vq_pairs; struct virtqueue *vtnet_ctrl_vq; struct vtnet_mac_filter *vtnet_mac_filter; From owner-svn-src-releng@freebsd.org Mon Aug 15 08:20:39 2016 Return-Path: Delivered-To: svn-src-releng@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 5E72DBBACB2; Mon, 15 Aug 2016 08:20:39 +0000 (UTC) (envelope-from bapt@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 316DD1456; Mon, 15 Aug 2016 08:20:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7F8KcGi041519; Mon, 15 Aug 2016 08:20:38 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7F8KcHS041518; Mon, 15 Aug 2016 08:20:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201608150820.u7F8KcHS041518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 15 Aug 2016 08:20:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304113 - releng/11.0/usr.bin/truss X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 08:20:39 -0000 Author: bapt Date: Mon Aug 15 08:20:37 2016 New Revision: 304113 URL: https://svnweb.freebsd.org/changeset/base/304113 Log: MFC: r303685 truss: fix uninitialized trussinfo->curthread in add_threads()/enter_syscall trussinfo->curthread must be initialized before calling enter_syscall(), it is used by t->proc->abi->fetch_args(). Without that truss is segfaulting and the attached program also crash. Submitted by: Nikita Kozlov (nikita@gandi.net) Reviewed by: jhb Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7399 Modified: releng/11.0/usr.bin/truss/setup.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/usr.bin/truss/setup.c ============================================================================== --- releng/11.0/usr.bin/truss/setup.c Mon Aug 15 08:07:07 2016 (r304112) +++ releng/11.0/usr.bin/truss/setup.c Mon Aug 15 08:20:37 2016 (r304113) @@ -223,8 +223,10 @@ add_threads(struct trussinfo *info, stru t = new_thread(p, lwps[i]); if (ptrace(PT_LWPINFO, lwps[i], (caddr_t)&pl, sizeof(pl)) == -1) err(1, "ptrace(PT_LWPINFO)"); - if (pl.pl_flags & PL_FLAG_SCE) + if (pl.pl_flags & PL_FLAG_SCE) { + info->curthread = t; enter_syscall(info, t, &pl); + } } free(lwps); } From owner-svn-src-releng@freebsd.org Mon Aug 15 17:58:13 2016 Return-Path: Delivered-To: svn-src-releng@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 D9AF5BBB4F2; Mon, 15 Aug 2016 17:58:13 +0000 (UTC) (envelope-from ed@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 A92251DBE; Mon, 15 Aug 2016 17:58:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7FHwCmK065807; Mon, 15 Aug 2016 17:58:12 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FHwCMG065806; Mon, 15 Aug 2016 17:58:12 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201608151758.u7FHwCMG065806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Mon, 15 Aug 2016 17:58:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304172 - releng/11.0/sys/arm64/arm64 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 17:58:14 -0000 Author: ed Date: Mon Aug 15 17:58:12 2016 New Revision: 304172 URL: https://svnweb.freebsd.org/changeset/base/304172 Log: MFC r303923: Make cpu_set_user_tls() work when called on the running thread. On all the other architectures, this function can also be called on the currently running thread. In this case, we shouldn't fix up the address in the PCB, but also patch up the register itself. Otherwise it will not become active and will simply become overwritten by the next switch. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D7437 Approved by: re Modified: releng/11.0/sys/arm64/arm64/vm_machdep.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/arm64/arm64/vm_machdep.c ============================================================================== --- releng/11.0/sys/arm64/arm64/vm_machdep.c Mon Aug 15 17:55:56 2016 (r304171) +++ releng/11.0/sys/arm64/arm64/vm_machdep.c Mon Aug 15 17:58:12 2016 (r304172) @@ -201,6 +201,8 @@ cpu_set_user_tls(struct thread *td, void pcb = td->td_pcb; pcb->pcb_tpidr_el0 = (register_t)tls_base; + if (td == curthread) + WRITE_SPECIALREG(tpidr_el0, tls_base); return (0); } From owner-svn-src-releng@freebsd.org Mon Aug 15 19:18:11 2016 Return-Path: Delivered-To: svn-src-releng@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 98B5EBBAC6A; Mon, 15 Aug 2016 19:18:11 +0000 (UTC) (envelope-from rstone@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 68C9114A2; Mon, 15 Aug 2016 19:18:11 +0000 (UTC) (envelope-from rstone@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7FJIACZ095746; Mon, 15 Aug 2016 19:18:10 GMT (envelope-from rstone@FreeBSD.org) Received: (from rstone@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FJIA5A095745; Mon, 15 Aug 2016 19:18:10 GMT (envelope-from rstone@FreeBSD.org) Message-Id: <201608151918.u7FJIA5A095745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rstone set sender to rstone@FreeBSD.org using -f From: Ryan Stone Date: Mon, 15 Aug 2016 19:18:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304179 - releng/11.0/sys/dev/bxe X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 19:18:11 -0000 Author: rstone Date: Mon Aug 15 19:18:10 2016 New Revision: 304179 URL: https://svnweb.freebsd.org/changeset/base/304179 Log: MFC r304163 Don't enqueue NULL on a drbr In one corner case in the bxe TX path, a NULL mbuf could be enqueued onto a drbr queue. This could cause a KASSERT to fire with INVARIANTS enabled, or the processing of packets from the queue to be prematurely ended later on. Submitted by: Matt Joras (matt.joras AT isilon.com) Reviewed by: davidcs Sponsored by: EMC / Isilon Storage Division Approved by: re (kib) Differential Revision: https://reviews.freebsd.org/D7041 Modified: releng/11.0/sys/dev/bxe/bxe.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/dev/bxe/bxe.c ============================================================================== --- releng/11.0/sys/dev/bxe/bxe.c Mon Aug 15 19:17:00 2016 (r304178) +++ releng/11.0/sys/dev/bxe/bxe.c Mon Aug 15 19:18:10 2016 (r304179) @@ -5624,7 +5624,8 @@ bxe_tx_mq_start_locked(struct bxe_softc if (!sc->link_vars.link_up || (if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING) { - rc = drbr_enqueue(ifp, tx_br, m); + if (m != NULL) + rc = drbr_enqueue(ifp, tx_br, m); goto bxe_tx_mq_start_locked_exit; } From owner-svn-src-releng@freebsd.org Wed Aug 17 07:07:30 2016 Return-Path: Delivered-To: svn-src-releng@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 81466BBDEE9; Wed, 17 Aug 2016 07:07:30 +0000 (UTC) (envelope-from dim@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 4E3331F1E; Wed, 17 Aug 2016 07:07:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7H77TKX099918; Wed, 17 Aug 2016 07:07:29 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7H77TV2099916; Wed, 17 Aug 2016 07:07:29 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201608170707.u7H77TV2099916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 17 Aug 2016 07:07:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304261 - releng/11.0/lib/clang X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 07:07:30 -0000 Author: dim Date: Wed Aug 17 07:07:29 2016 New Revision: 304261 URL: https://svnweb.freebsd.org/changeset/base/304261 Log: Similar to r256297, disable assertions in llvm and clang for the releng/11.0 branch. This reduces the size of the clang executable, and improves its performance. Also bump FREEBSD_CC_VERSION. Approved by: re (gjb) Modified: releng/11.0/lib/clang/clang.build.mk releng/11.0/lib/clang/freebsd_cc_version.h Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/lib/clang/clang.build.mk ============================================================================== --- releng/11.0/lib/clang/clang.build.mk Wed Aug 17 07:07:24 2016 (r304260) +++ releng/11.0/lib/clang/clang.build.mk Wed Aug 17 07:07:29 2016 (r304261) @@ -8,7 +8,7 @@ CFLAGS+= -I${LLVM_SRCS}/include -I${CLAN -I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \ -I${LLVM_SRCS}/../../lib/clang/include \ -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \ - -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG + -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG .if ${MK_CLANG_FULL} != "no" CFLAGS+= -DCLANG_ENABLE_ARCMT \ Modified: releng/11.0/lib/clang/freebsd_cc_version.h ============================================================================== --- releng/11.0/lib/clang/freebsd_cc_version.h Wed Aug 17 07:07:24 2016 (r304260) +++ releng/11.0/lib/clang/freebsd_cc_version.h Wed Aug 17 07:07:29 2016 (r304261) @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define FREEBSD_CC_VERSION 1100004 +#define FREEBSD_CC_VERSION 1100005 From owner-svn-src-releng@freebsd.org Thu Aug 18 19:18:41 2016 Return-Path: Delivered-To: svn-src-releng@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 873DFBBEB89; Thu, 18 Aug 2016 19:18:41 +0000 (UTC) (envelope-from tuexen@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 4A3BA1014; Thu, 18 Aug 2016 19:18:41 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7IJIe56019687; Thu, 18 Aug 2016 19:18:40 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7IJIeUV019686; Thu, 18 Aug 2016 19:18:40 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201608181918.u7IJIeUV019686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Thu, 18 Aug 2016 19:18:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304432 - releng/11.0/sys/netinet X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2016 19:18:41 -0000 Author: tuexen Date: Thu Aug 18 19:18:40 2016 New Revision: 304432 URL: https://svnweb.freebsd.org/changeset/base/304432 Log: MFC r304428: Ensure that sctp_it_ctl.cur_it does not point to a free object (during a small time window). Thanks to Byron Campen for reporting the issue and suggesting a fix. Approved by: re (kib) Modified: releng/11.0/sys/netinet/sctputil.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/netinet/sctputil.c ============================================================================== --- releng/11.0/sys/netinet/sctputil.c Thu Aug 18 17:27:58 2016 (r304431) +++ releng/11.0/sys/netinet/sctputil.c Thu Aug 18 19:18:40 2016 (r304432) @@ -1280,6 +1280,7 @@ sctp_iterator_work(struct sctp_iterator SCTP_INP_INFO_RLOCK(); SCTP_ITERATOR_LOCK(); + sctp_it_ctl.cur_it = it; if (it->inp) { SCTP_INP_RLOCK(it->inp); SCTP_INP_DECR_REF(it->inp); @@ -1287,6 +1288,7 @@ sctp_iterator_work(struct sctp_iterator if (it->inp == NULL) { /* iterator is complete */ done_with_iterator: + sctp_it_ctl.cur_it = NULL; SCTP_ITERATOR_UNLOCK(); SCTP_INP_INFO_RUNLOCK(); if (it->function_atend != NULL) { @@ -1427,13 +1429,11 @@ sctp_iterator_worker(void) sctp_it_ctl.iterator_running = 1; TAILQ_FOREACH_SAFE(it, &sctp_it_ctl.iteratorhead, sctp_nxt_itr, nit) { - sctp_it_ctl.cur_it = it; /* now lets work on this one */ TAILQ_REMOVE(&sctp_it_ctl.iteratorhead, it, sctp_nxt_itr); SCTP_IPI_ITERATOR_WQ_UNLOCK(); CURVNET_SET(it->vn); sctp_iterator_work(it); - sctp_it_ctl.cur_it = NULL; CURVNET_RESTORE(); SCTP_IPI_ITERATOR_WQ_LOCK(); /* sa_ignore FREED_MEMORY */ From owner-svn-src-releng@freebsd.org Thu Aug 18 22:01:53 2016 Return-Path: Delivered-To: svn-src-releng@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 976FFBBE2D6; Thu, 18 Aug 2016 22:01:53 +0000 (UTC) (envelope-from vangyzen@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 54EB31571; Thu, 18 Aug 2016 22:01:53 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7IM1qxv082061; Thu, 18 Aug 2016 22:01:52 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7IM1qhx082060; Thu, 18 Aug 2016 22:01:52 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201608182201.u7IM1qhx082060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Thu, 18 Aug 2016 22:01:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304434 - releng/11.0/sys/dev/pci X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2016 22:01:53 -0000 Author: vangyzen Date: Thu Aug 18 22:01:52 2016 New Revision: 304434 URL: https://svnweb.freebsd.org/changeset/base/304434 Log: MFC r304433 PCIe HotPlug: Detect bridges that are not really HotPlug capable Some devices report that they have an MRL when they actually do not. Since they always report that the MRL is open, child devices would be ignored. Try to detect these devices and ignore their claim of HotPlug support. Specifically, if there is an open MRL but the Data Link Layer is active, the MRL is not real. Revert r303645 to re-enable HotPlug support for slots with power controllers, since it works correctly in my testing. Start the DLL state-change timer if Presence /or/ MRL state changes, along with other conditions. Previously, we started the timer iff Presence changed. If there is an MRL, it must be closed for power to be turned on, so Presence is unlikely to change on an MRL-close event. Add a printf() of interesting registers on HotPlug interrupts and commands (one from erj@). These were very useful for debugging. Guard them with bootverbose, since they're spam in normal operation. In collaboration with: jhb Relnotes: yes (re-enable HotPlug support for slots with power controllers) Approved by: re (gjb) Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D7509 Modified: releng/11.0/sys/dev/pci/pci_pci.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/dev/pci/pci_pci.c ============================================================================== --- releng/11.0/sys/dev/pci/pci_pci.c Thu Aug 18 21:47:00 2016 (r304433) +++ releng/11.0/sys/dev/pci/pci_pci.c Thu Aug 18 22:01:52 2016 (r304434) @@ -918,6 +918,7 @@ static void pcib_probe_hotplug(struct pcib_softc *sc) { device_t dev; + uint16_t link_sta, slot_sta; if (!pci_enable_pcie_hp) return; @@ -932,15 +933,29 @@ pcib_probe_hotplug(struct pcib_softc *sc sc->pcie_link_cap = pcie_read_config(dev, PCIER_LINK_CAP, 4); sc->pcie_slot_cap = pcie_read_config(dev, PCIER_SLOT_CAP, 4); + if ((sc->pcie_slot_cap & PCIEM_SLOT_CAP_HPC) == 0) + return; + /* - * XXX: Handling of slots with a power controller needs to be - * reexamined. Ignore hotplug on such slots for now. + * Some devices report that they have an MRL when they actually + * do not. Since they always report that the MRL is open, child + * devices would be ignored. Try to detect these devices and + * ignore their claim of HotPlug support. + * + * If there is an open MRL but the Data Link Layer is active, + * the MRL is not real. */ - if (sc->pcie_slot_cap & PCIEM_SLOT_CAP_PCP) - return; - - if (sc->pcie_slot_cap & PCIEM_SLOT_CAP_HPC) - sc->flags |= PCIB_HOTPLUG; + if ((sc->pcie_slot_cap & PCIEM_SLOT_CAP_MRLSP) != 0 && + (sc->pcie_link_cap & PCIEM_LINK_CAP_DL_ACTIVE) != 0) { + link_sta = pcie_read_config(dev, PCIER_LINK_STA, 2); + slot_sta = pcie_read_config(dev, PCIER_SLOT_STA, 2); + if ((slot_sta & PCIEM_SLOT_STA_MRLSS) != 0 && + (link_sta & PCIEM_LINK_STA_DL_ACTIVE) != 0) { + return; + } + } + + sc->flags |= PCIB_HOTPLUG; } /* @@ -966,6 +981,8 @@ pcib_pcie_hotplug_command(struct pcib_so new = (ctl & ~mask) | val; if (new == ctl) return; + if (bootverbose) + device_printf(dev, "HotPlug command: %04x -> %04x\n", ctl, new); pcie_write_config(dev, PCIER_SLOT_CTL, new, 2); if (!(sc->pcie_slot_cap & PCIEM_SLOT_CAP_NCCS) && (ctl & new) & PCIEM_SLOT_CTL_CCIE) { @@ -1028,9 +1045,6 @@ pcib_hotplug_inserted(struct pcib_softc static int pcib_hotplug_present(struct pcib_softc *sc) { - device_t dev; - - dev = sc->dev; /* Card must be inserted. */ if (!pcib_hotplug_inserted(sc)) @@ -1059,7 +1073,7 @@ pcib_pcie_hotplug_update(struct pcib_sof { bool card_inserted, ei_engaged; - /* Clear DETACHING if Present Detect has cleared. */ + /* Clear DETACHING if Presence Detect has cleared. */ if ((sc->pcie_slot_sta & (PCIEM_SLOT_STA_PDC | PCIEM_SLOT_STA_PDS)) == PCIEM_SLOT_STA_PDC) sc->flags &= ~PCIB_DETACHING; @@ -1101,14 +1115,15 @@ pcib_pcie_hotplug_update(struct pcib_sof /* * Start a timer to see if the Data Link Layer times out. - * Note that we only start the timer if Presence Detect + * Note that we only start the timer if Presence Detect or MRL Sensor * changed on this interrupt. Stop any scheduled timer if * the Data Link Layer is active. */ if (sc->pcie_link_cap & PCIEM_LINK_CAP_DL_ACTIVE) { if (card_inserted && !(sc->pcie_link_sta & PCIEM_LINK_STA_DL_ACTIVE) && - sc->pcie_slot_sta & PCIEM_SLOT_STA_PDC) { + sc->pcie_slot_sta & + (PCIEM_SLOT_STA_MRLSC | PCIEM_SLOT_STA_PDC)) { if (cold) device_printf(sc->dev, "Data Link Layer inactive\n"); @@ -1144,6 +1159,10 @@ pcib_pcie_intr(void *arg) /* Clear the events just reported. */ pcie_write_config(dev, PCIER_SLOT_STA, sc->pcie_slot_sta, 2); + if (bootverbose) + device_printf(dev, "HotPlug interrupt: %#x\n", + sc->pcie_slot_sta); + if (sc->pcie_slot_sta & PCIEM_SLOT_STA_ABP) { if (sc->flags & PCIB_DETACH_PENDING) { device_printf(dev, @@ -1165,7 +1184,7 @@ pcib_pcie_intr(void *arg) sc->pcie_slot_sta & PCIEM_SLOT_STA_MRLSS ? "open" : "closed"); if (bootverbose && sc->pcie_slot_sta & PCIEM_SLOT_STA_PDC) - device_printf(dev, "Present Detect Changed to %s\n", + device_printf(dev, "Presence Detect Changed to %s\n", sc->pcie_slot_sta & PCIEM_SLOT_STA_PDS ? "card present" : "empty"); if (sc->pcie_slot_sta & PCIEM_SLOT_STA_CC) @@ -1234,7 +1253,7 @@ pcib_pcie_cc_timeout(void *arg) sta = pcie_read_config(dev, PCIER_SLOT_STA, 2); if (!(sta & PCIEM_SLOT_STA_CC)) { device_printf(dev, - "Hotplug Command Timed Out - forcing detach\n"); + "HotPlug Command Timed Out - forcing detach\n"); sc->flags &= ~(PCIB_HOTPLUG_CMD_PENDING | PCIB_DETACH_PENDING); sc->flags |= PCIB_DETACHING; pcib_pcie_hotplug_update(sc, 0, 0, true); From owner-svn-src-releng@freebsd.org Fri Aug 19 08:44:38 2016 Return-Path: Delivered-To: svn-src-releng@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 76386BBE4D9; Fri, 19 Aug 2016 08:44:38 +0000 (UTC) (envelope-from kib@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 37DF0124B; Fri, 19 Aug 2016 08:44:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7J8ibwl021522; Fri, 19 Aug 2016 08:44:37 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7J8ib6s021521; Fri, 19 Aug 2016 08:44:37 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201608190844.u7J8ib6s021521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 19 Aug 2016 08:44:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304456 - releng/11.0/libexec/rtld-elf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 08:44:38 -0000 Author: kib Date: Fri Aug 19 08:44:37 2016 New Revision: 304456 URL: https://svnweb.freebsd.org/changeset/base/304456 Log: MFC r304011: Remove all remaining uses of TAILQ_FOREACH_FROM() from rtld-elf. MFC r304012: Fill phdr and phsize for rtld object. Approved by: re (gjb) Modified: releng/11.0/libexec/rtld-elf/rtld.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/libexec/rtld-elf/rtld.c ============================================================================== --- releng/11.0/libexec/rtld-elf/rtld.c Fri Aug 19 08:07:04 2016 (r304455) +++ releng/11.0/libexec/rtld-elf/rtld.c Fri Aug 19 08:44:37 2016 (r304456) @@ -1916,6 +1916,7 @@ static void init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) { Obj_Entry objtmp; /* Temporary rtld object */ + const Elf_Ehdr *ehdr; const Elf_Dyn *dyn_rpath; const Elf_Dyn *dyn_soname; const Elf_Dyn *dyn_runpath; @@ -1954,6 +1955,9 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo * relocate_objects(&objtmp, true, &objtmp, 0, NULL); } + ehdr = (Elf_Ehdr *)mapbase; + objtmp.phdr = (Elf_Phdr *)((char *)mapbase + ehdr->e_phoff); + objtmp.phsize = ehdr->e_phnum * sizeof(objtmp.phdr[0]); /* Initialize the object list. */ TAILQ_INIT(&obj_list); @@ -2164,8 +2168,7 @@ load_needed_objects(Obj_Entry *first, in { Obj_Entry *obj; - obj = first; - TAILQ_FOREACH_FROM(obj, &obj_list, next) { + for (obj = first; obj != NULL; obj = TAILQ_NEXT(obj, next)) { if (obj->marker) continue; if (process_needed(obj, obj->needed, flags) == -1) @@ -2769,9 +2772,8 @@ relocate_objects(Obj_Entry *first, bool Obj_Entry *obj; int error; - error = 0; - obj = first; - TAILQ_FOREACH_FROM(obj, &obj_list, next) { + for (error = 0, obj = first; obj != NULL; + obj = TAILQ_NEXT(obj, next)) { if (obj->marker) continue; error = relocate_object(obj, bind_now, rtldobj, flags, @@ -2811,8 +2813,7 @@ resolve_objects_ifunc(Obj_Entry *first, { Obj_Entry *obj; - obj = first; - TAILQ_FOREACH_FROM(obj, &obj_list, next) { + for (obj = first; obj != NULL; obj = TAILQ_NEXT(obj, next)) { if (obj->marker) continue; if (resolve_object_ifunc(obj, bind_now, flags, lockstate) == -1) @@ -4316,7 +4317,7 @@ trace_loaded_objects(Obj_Entry *obj) list_containers = getenv(_LD("TRACE_LOADED_OBJECTS_ALL")); - TAILQ_FOREACH_FROM(obj, &obj_list, next) { + for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) { Needed_Entry *needed; char *name, *path; bool is_lib; @@ -4661,8 +4662,7 @@ allocate_tls(Obj_Entry *objs, void *oldt */ free_tls(oldtls, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); } else { - obj = objs; - TAILQ_FOREACH_FROM(obj, &obj_list, next) { + for (obj = objs; obj != NULL; obj = TAILQ_NEXT(obj, next)) { if (obj->marker || obj->tlsoffset == 0) continue; addr = segbase - obj->tlsoffset; From owner-svn-src-releng@freebsd.org Fri Aug 19 09:11:51 2016 Return-Path: Delivered-To: svn-src-releng@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 E6211BBF1EA; Fri, 19 Aug 2016 09:11:51 +0000 (UTC) (envelope-from des@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 9C64B1A59; Fri, 19 Aug 2016 09:11:51 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7J9BoLb032103; Fri, 19 Aug 2016 09:11:50 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7J9Boh4032102; Fri, 19 Aug 2016 09:11:50 GMT (envelope-from des@FreeBSD.org) Message-Id: <201608190911.u7J9Boh4032102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 19 Aug 2016 09:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304457 - releng/11.0/usr.sbin/bsdinstall/partedit X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 09:11:52 -0000 Author: des Date: Fri Aug 19 09:11:50 2016 New Revision: 304457 URL: https://svnweb.freebsd.org/changeset/base/304457 Log: MFH (r304142): ensure stripe size is non-zero multiple of 4096 PR: 211361 Approved by: re (gjb) Modified: releng/11.0/usr.sbin/bsdinstall/partedit/gpart_ops.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/usr.sbin/bsdinstall/partedit/gpart_ops.c ============================================================================== --- releng/11.0/usr.sbin/bsdinstall/partedit/gpart_ops.c Fri Aug 19 08:44:37 2016 (r304456) +++ releng/11.0/usr.sbin/bsdinstall/partedit/gpart_ops.c Fri Aug 19 09:11:50 2016 (r304457) @@ -795,6 +795,7 @@ gpart_max_free(struct ggeom *geom, intma { struct gconfig *gc; struct gprovider *pp, **providers; + intmax_t sectorsize, stripesize, offset; intmax_t lastend; intmax_t start, end; intmax_t maxsize, maxstart; @@ -845,12 +846,25 @@ gpart_max_free(struct ggeom *geom, intma pp = LIST_FIRST(&geom->lg_consumer)->lg_provider; - /* Compute beginning of new partition and maximum available space */ - if (pp->lg_stripesize > 0 && - (maxstart*pp->lg_sectorsize % pp->lg_stripesize) != 0) { - intmax_t offset = (pp->lg_stripesize - - ((maxstart*pp->lg_sectorsize) % pp->lg_stripesize)) / - pp->lg_sectorsize; + /* + * Round the start and size of the largest available space up to + * the nearest multiple of the adjusted stripe size. + * + * The adjusted stripe size is the least common multiple of the + * actual stripe size, or the sector size if no stripe size was + * reported, and 4096. The reason for this is that contemporary + * disks often have 4096-byte physical sectors but report 512 + * bytes instead for compatibility with older / broken operating + * systems and BIOSes. For the same reasons, virtualized storage + * may also report a 512-byte stripe size, or none at all. + */ + sectorsize = pp->lg_sectorsize; + if ((stripesize = pp->lg_stripesize) == 0) + stripesize = sectorsize; + while (stripesize % 4096 != 0) + stripesize *= 2; + if ((offset = maxstart * sectorsize % stripesize) != 0) { + offset = (stripesize - offset) / sectorsize; maxstart += offset; maxsize -= offset; } From owner-svn-src-releng@freebsd.org Fri Aug 19 17:48:48 2016 Return-Path: Delivered-To: svn-src-releng@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 E77C4BBFABE; Fri, 19 Aug 2016 17:48:48 +0000 (UTC) (envelope-from bdrewery@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 B33101DC6; Fri, 19 Aug 2016 17:48:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JHmloX026194; Fri, 19 Aug 2016 17:48:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JHml3I026193; Fri, 19 Aug 2016 17:48:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191748.u7JHml3I026193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 17:48:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304477 - releng/11.0/usr.bin/truss X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 17:48:49 -0000 Author: bdrewery Date: Fri Aug 19 17:48:47 2016 New Revision: 304477 URL: https://svnweb.freebsd.org/changeset/base/304477 Log: MFS r304143: MFC r303934,r303937,r303942: r303934: Support rmdir(2). r303937: Use proper argument length for rmdir(2) for r303934. r303942: Fix sorting in r303934. Approved by: re (gjb) Modified: releng/11.0/usr.bin/truss/syscalls.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/usr.bin/truss/syscalls.c ============================================================================== --- releng/11.0/usr.bin/truss/syscalls.c Fri Aug 19 17:37:32 2016 (r304476) +++ releng/11.0/usr.bin/truss/syscalls.c Fri Aug 19 17:48:47 2016 (r304477) @@ -281,6 +281,8 @@ static struct syscall decoded_syscalls[] .args = { { Atfd, 0 }, { Name, 1 }, { Atfd, 2 }, { Name, 3 } } }, { .name = "rfork", .ret_type = 1, .nargs = 1, .args = { { Rforkflags, 0 } } }, + { .name = "rmdir", .ret_type = 1, .nargs = 1, + .args = { { Name, 0 } } }, { .name = "select", .ret_type = 1, .nargs = 5, .args = { { Int, 0 }, { Fd_set, 1 }, { Fd_set, 2 }, { Fd_set, 3 }, { Timeval, 4 } } }, From owner-svn-src-releng@freebsd.org Fri Aug 19 18:09:01 2016 Return-Path: Delivered-To: svn-src-releng@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 8ED1CBC0223; Fri, 19 Aug 2016 18:09:01 +0000 (UTC) (envelope-from bdrewery@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 53E601B41; Fri, 19 Aug 2016 18:09:01 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JI90Ev034205; Fri, 19 Aug 2016 18:09:00 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JI8xJo034199; Fri, 19 Aug 2016 18:08:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191808.u7JI8xJo034199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 18:08:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304489 - releng/11.0/share/mk X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 18:09:01 -0000 Author: bdrewery Date: Fri Aug 19 18:08:59 2016 New Revision: 304489 URL: https://svnweb.freebsd.org/changeset/base/304489 Log: MFS r304144: MFC r303964: PROGS: Support INTERNALPROG.prog=yes to not install it. Approved by: re (gjb) Modified: releng/11.0/share/mk/bsd.README releng/11.0/share/mk/bsd.progs.mk Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/share/mk/bsd.README ============================================================================== --- releng/11.0/share/mk/bsd.README Fri Aug 19 18:02:36 2016 (r304488) +++ releng/11.0/share/mk/bsd.README Fri Aug 19 18:08:59 2016 (r304489) @@ -331,6 +331,7 @@ PROGS_CXX PROG and PROGS_CXX in one Make - DEBUG_FLAGS - DPADD - DPSRCS + - INTERNALPROG (no installation) - LDADD - LDFLAGS - LIBADD Modified: releng/11.0/share/mk/bsd.progs.mk ============================================================================== --- releng/11.0/share/mk/bsd.progs.mk Fri Aug 19 18:02:36 2016 (r304488) +++ releng/11.0/share/mk/bsd.progs.mk Fri Aug 19 18:08:59 2016 (r304489) @@ -24,8 +24,8 @@ PROGS += ${PROGS_CXX} # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ PROGNAME SRCS STRIP WARNS -PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD LDADD LIBADD LINKS \ - LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} +PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \ + LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v}) .if defined(${v}.${PROG}) From owner-svn-src-releng@freebsd.org Fri Aug 19 18:14:35 2016 Return-Path: Delivered-To: svn-src-releng@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 2470CBC043F; Fri, 19 Aug 2016 18:14:35 +0000 (UTC) (envelope-from bdrewery@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 EB8A612F1; Fri, 19 Aug 2016 18:14:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JIEYSf037691; Fri, 19 Aug 2016 18:14:34 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JIEY3E037690; Fri, 19 Aug 2016 18:14:34 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191814.u7JIEY3E037690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 18:14:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304490 - releng/11.0/usr.bin/xinstall X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 18:14:35 -0000 Author: bdrewery Date: Fri Aug 19 18:14:33 2016 New Revision: 304490 URL: https://svnweb.freebsd.org/changeset/base/304490 Log: MFS r304469: MFC r303929,r303930,r303931,r303932,r303933: r303929: Fix -S with -b not atomically updating the destination file. r303930: Support -v for -l. r303931: Fix -S with -l not being atomic. r303932: Fix -b failure not restoring flags on the destination file. r303933: Squelch a false-positive Clang static analyzer warning. Approved by: re (gjb) Modified: releng/11.0/usr.bin/xinstall/xinstall.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/usr.bin/xinstall/xinstall.c ============================================================================== --- releng/11.0/usr.bin/xinstall/xinstall.c Fri Aug 19 18:08:59 2016 (r304489) +++ releng/11.0/usr.bin/xinstall/xinstall.c Fri Aug 19 18:14:33 2016 (r304490) @@ -149,6 +149,7 @@ main(int argc, char *argv[]) char *p; const char *to_name; + fset = 0; iflags = 0; group = owner = NULL; while ((ch = getopt(argc, argv, "B:bCcD:df:g:h:l:M:m:N:o:pSsT:Uv")) != @@ -533,7 +534,9 @@ do_link(const char *from_name, const cha if (target_sb->st_flags & NOCHANGEBITS) (void)chflags(to_name, target_sb->st_flags & ~NOCHANGEBITS); - unlink(to_name); + if (verbose) + printf("install: link %s -> %s\n", + from_name, to_name); ret = rename(tmpl, to_name); /* * If rename has posix semantics, then the temporary @@ -543,8 +546,12 @@ do_link(const char *from_name, const cha (void)unlink(tmpl); } return (ret); - } else + } else { + if (verbose) + printf("install: link %s -> %s\n", + from_name, to_name); return (link(from_name, to_name)); + } } /* @@ -573,14 +580,18 @@ do_symlink(const char *from_name, const if (target_sb->st_flags & NOCHANGEBITS) (void)chflags(to_name, target_sb->st_flags & ~NOCHANGEBITS); - unlink(to_name); - + if (verbose) + printf("install: symlink %s -> %s\n", + from_name, to_name); if (rename(tmpl, to_name) == -1) { /* Remove temporary link before exiting. */ (void)unlink(tmpl); err(EX_OSERR, "%s: rename", to_name); } } else { + if (verbose) + printf("install: symlink %s -> %s\n", + from_name, to_name); if (symlink(from_name, to_name) == -1) err(EX_OSERR, "symlink %s -> %s", from_name, to_name); } @@ -886,11 +897,21 @@ install(const char *from_name, const cha } if (verbose) (void)printf("install: %s -> %s\n", to_name, backup); - if (rename(to_name, backup) < 0) { + if (unlink(backup) < 0 && errno != ENOENT) { + serrno = errno; + if (to_sb.st_flags & NOCHANGEBITS) + (void)chflags(to_name, to_sb.st_flags); + unlink(tempfile); + errno = serrno; + err(EX_OSERR, "unlink: %s", backup); + } + if (link(to_name, backup) < 0) { serrno = errno; unlink(tempfile); + if (to_sb.st_flags & NOCHANGEBITS) + (void)chflags(to_name, to_sb.st_flags); errno = serrno; - err(EX_OSERR, "rename: %s to %s", to_name, + err(EX_OSERR, "link: %s to %s", to_name, backup); } } @@ -1111,16 +1132,26 @@ create_newfile(const char *path, int tar if (dobackup) { if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix) != strlen(path) + strlen(suffix)) + path, suffix) != strlen(path) + strlen(suffix)) { + saved_errno = errno; + if (sbp->st_flags & NOCHANGEBITS) + (void)chflags(path, sbp->st_flags); + errno = saved_errno; errx(EX_OSERR, "%s: backup filename too long", path); + } (void)snprintf(backup, MAXPATHLEN, "%s%s", path, suffix); if (verbose) (void)printf("install: %s -> %s\n", path, backup); - if (rename(path, backup) < 0) + if (rename(path, backup) < 0) { + saved_errno = errno; + if (sbp->st_flags & NOCHANGEBITS) + (void)chflags(path, sbp->st_flags); + errno = saved_errno; err(EX_OSERR, "rename: %s to %s", path, backup); + } } else if (unlink(path) < 0) saved_errno = errno; From owner-svn-src-releng@freebsd.org Fri Aug 19 18:40:48 2016 Return-Path: Delivered-To: svn-src-releng@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 4C2FCBC08BA; Fri, 19 Aug 2016 18:40:48 +0000 (UTC) (envelope-from bdrewery@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 1EEC8143B; Fri, 19 Aug 2016 18:40:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JIelj2046419; Fri, 19 Aug 2016 18:40:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JIelkV046418; Fri, 19 Aug 2016 18:40:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191840.u7JIelkV046418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 18:40:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304491 - releng/11.0/sys/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 18:40:48 -0000 Author: bdrewery Date: Fri Aug 19 18:40:47 2016 New Revision: 304491 URL: https://svnweb.freebsd.org/changeset/base/304491 Log: MFS r304470: MFC r304005: PORTS_MODULES: Don't leak in CC/CXX/CPP. Approved by: re (gjb) Modified: releng/11.0/sys/conf/kern.post.mk Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/conf/kern.post.mk ============================================================================== --- releng/11.0/sys/conf/kern.post.mk Fri Aug 19 18:14:33 2016 (r304490) +++ releng/11.0/sys/conf/kern.post.mk Fri Aug 19 18:40:47 2016 (r304491) @@ -65,6 +65,10 @@ OSRELDATE!= awk '/^\#define[[:space:]]*_ # Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF} PORTSMODULESENV=\ + env \ + -u CC \ + -u CXX \ + -u CPP \ PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \ SRC_BASE=${SRC_BASE} \ OSVERSION=${OSRELDATE} \ From owner-svn-src-releng@freebsd.org Fri Aug 19 19:02:20 2016 Return-Path: Delivered-To: svn-src-releng@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 8894CBC0C65; Fri, 19 Aug 2016 19:02:20 +0000 (UTC) (envelope-from sbruno@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 599C91FAD; Fri, 19 Aug 2016 19:02:20 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JJ2JSl056877; Fri, 19 Aug 2016 19:02:19 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JJ2IfX056871; Fri, 19 Aug 2016 19:02:18 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201608191902.u7JJ2IfX056871@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 19 Aug 2016 19:02:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304493 - releng/11.0/sys/dev/e1000 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 19:02:20 -0000 Author: sbruno Date: Fri Aug 19 19:02:18 2016 New Revision: 304493 URL: https://svnweb.freebsd.org/changeset/base/304493 Log: MF stable11 r304337 e1000: Add support for Kaby Lake IDs Fixup some errors when transitioning to/from low power states. Approved by: re (kib) Modified: releng/11.0/sys/dev/e1000/e1000_api.c releng/11.0/sys/dev/e1000/e1000_hw.h releng/11.0/sys/dev/e1000/e1000_ich8lan.c releng/11.0/sys/dev/e1000/e1000_ich8lan.h releng/11.0/sys/dev/e1000/e1000_phy.c releng/11.0/sys/dev/e1000/if_em.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/dev/e1000/e1000_api.c ============================================================================== --- releng/11.0/sys/dev/e1000/e1000_api.c Fri Aug 19 18:45:42 2016 (r304492) +++ releng/11.0/sys/dev/e1000/e1000_api.c Fri Aug 19 19:02:18 2016 (r304493) @@ -304,6 +304,10 @@ s32 e1000_set_mac_type(struct e1000_hw * case E1000_DEV_ID_PCH_SPT_I219_LM2: case E1000_DEV_ID_PCH_SPT_I219_V2: case E1000_DEV_ID_PCH_LBG_I219_LM3: + case E1000_DEV_ID_PCH_SPT_I219_LM4: + case E1000_DEV_ID_PCH_SPT_I219_V4: + case E1000_DEV_ID_PCH_SPT_I219_LM5: + case E1000_DEV_ID_PCH_SPT_I219_V5: mac->type = e1000_pch_spt; break; case E1000_DEV_ID_82575EB_COPPER: Modified: releng/11.0/sys/dev/e1000/e1000_hw.h ============================================================================== --- releng/11.0/sys/dev/e1000/e1000_hw.h Fri Aug 19 18:45:42 2016 (r304492) +++ releng/11.0/sys/dev/e1000/e1000_hw.h Fri Aug 19 19:02:18 2016 (r304493) @@ -142,6 +142,10 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_SPT_I219_LM2 0x15B7 /* Sunrise Point-H PCH */ #define E1000_DEV_ID_PCH_SPT_I219_V2 0x15B8 /* Sunrise Point-H PCH */ #define E1000_DEV_ID_PCH_LBG_I219_LM3 0x15B9 /* LEWISBURG PCH */ +#define E1000_DEV_ID_PCH_SPT_I219_LM4 0x15D7 +#define E1000_DEV_ID_PCH_SPT_I219_V4 0x15D8 +#define E1000_DEV_ID_PCH_SPT_I219_LM5 0x15E3 +#define E1000_DEV_ID_PCH_SPT_I219_V5 0x15D6 #define E1000_DEV_ID_82576 0x10C9 #define E1000_DEV_ID_82576_FIBER 0x10E6 #define E1000_DEV_ID_82576_SERDES 0x10E7 @@ -957,9 +961,13 @@ struct e1000_dev_spec_ich8lan { E1000_MUTEX nvm_mutex; E1000_MUTEX swflag_mutex; bool nvm_k1_enabled; + bool disable_k1_off; bool eee_disable; u16 eee_lp_ability; enum e1000_ulp_state ulp_state; + bool ulp_capability_disabled; + bool during_suspend_flow; + bool during_dpg_exit; }; struct e1000_dev_spec_82575 { Modified: releng/11.0/sys/dev/e1000/e1000_ich8lan.c ============================================================================== --- releng/11.0/sys/dev/e1000/e1000_ich8lan.c Fri Aug 19 18:45:42 2016 (r304492) +++ releng/11.0/sys/dev/e1000/e1000_ich8lan.c Fri Aug 19 19:02:18 2016 (r304493) @@ -288,7 +288,7 @@ static void e1000_toggle_lanphypc_pch_lp mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE; E1000_WRITE_REG(hw, E1000_CTRL, mac_reg); E1000_WRITE_FLUSH(hw); - usec_delay(10); + msec_delay(1); mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE; E1000_WRITE_REG(hw, E1000_CTRL, mac_reg); E1000_WRITE_FLUSH(hw); @@ -1625,7 +1625,17 @@ static s32 e1000_check_for_copper_link_i hw->phy.ops.write_reg_locked(hw, I217_PLL_CLOCK_GATE_REG, phy_reg); - } + + if (speed == SPEED_1000) { + hw->phy.ops.read_reg_locked(hw, HV_PM_CTRL, + &phy_reg); + + phy_reg |= HV_PM_CTRL_K1_CLK_REQ; + + hw->phy.ops.write_reg_locked(hw, HV_PM_CTRL, + phy_reg); + } + } hw->phy.ops.release(hw); if (ret_val) @@ -1718,7 +1728,8 @@ static s32 e1000_check_for_copper_link_i u32 pcieanacfg = E1000_READ_REG(hw, E1000_PCIEANACFG); u32 fextnvm6 = E1000_READ_REG(hw, E1000_FEXTNVM6); - if (pcieanacfg & E1000_FEXTNVM6_K1_OFF_ENABLE) + if ((pcieanacfg & E1000_FEXTNVM6_K1_OFF_ENABLE) && + (hw->dev_spec.ich8lan.disable_k1_off == FALSE)) fextnvm6 |= E1000_FEXTNVM6_K1_OFF_ENABLE; else fextnvm6 &= ~E1000_FEXTNVM6_K1_OFF_ENABLE; Modified: releng/11.0/sys/dev/e1000/e1000_ich8lan.h ============================================================================== --- releng/11.0/sys/dev/e1000/e1000_ich8lan.h Fri Aug 19 18:45:42 2016 (r304492) +++ releng/11.0/sys/dev/e1000/e1000_ich8lan.h Fri Aug 19 19:02:18 2016 (r304493) @@ -239,7 +239,7 @@ /* PHY Power Management Control */ #define HV_PM_CTRL PHY_REG(770, 17) -#define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA 0x100 +#define HV_PM_CTRL_K1_CLK_REQ 0x200 #define HV_PM_CTRL_K1_ENABLE 0x4000 #define I217_PLL_CLOCK_GATE_REG PHY_REG(772, 28) Modified: releng/11.0/sys/dev/e1000/e1000_phy.c ============================================================================== --- releng/11.0/sys/dev/e1000/e1000_phy.c Fri Aug 19 18:45:42 2016 (r304492) +++ releng/11.0/sys/dev/e1000/e1000_phy.c Fri Aug 19 19:02:18 2016 (r304493) @@ -4146,12 +4146,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000 *data = E1000_READ_REG(hw, E1000_MPHY_DATA); /* Disable access to mPHY if it was originally disabled */ - if (locked) { + if (locked) ready = e1000_is_mphy_ready(hw); - if (!ready) - return -E1000_ERR_PHY; - } - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); + return E1000_SUCCESS; } @@ -4210,12 +4211,13 @@ s32 e1000_write_phy_reg_mphy(struct e100 E1000_WRITE_REG(hw, E1000_MPHY_DATA, data); /* Disable access to mPHY if it was originally disabled */ - if (locked) { + if (locked) ready = e1000_is_mphy_ready(hw); - if (!ready) - return -E1000_ERR_PHY; - } - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); + return E1000_SUCCESS; } Modified: releng/11.0/sys/dev/e1000/if_em.c ============================================================================== --- releng/11.0/sys/dev/e1000/if_em.c Fri Aug 19 18:45:42 2016 (r304492) +++ releng/11.0/sys/dev/e1000/if_em.c Fri Aug 19 19:02:18 2016 (r304493) @@ -193,6 +193,12 @@ static em_vendor_info_t em_vendor_info_a { 0x8086, E1000_DEV_ID_PCH_SPT_I219_V2, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_PCH_LBG_I219_LM3, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_PCH_SPT_I219_LM4, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_PCH_SPT_I219_V4, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_PCH_SPT_I219_LM5, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_PCH_SPT_I219_V5, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} }; From owner-svn-src-releng@freebsd.org Fri Aug 19 19:16:12 2016 Return-Path: Delivered-To: svn-src-releng@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 2ECBCBC0F7C; Fri, 19 Aug 2016 19:16:12 +0000 (UTC) (envelope-from bdrewery@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 014E818B1; Fri, 19 Aug 2016 19:16:11 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JJGBEL060768; Fri, 19 Aug 2016 19:16:11 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JJGB3E060766; Fri, 19 Aug 2016 19:16:11 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191916.u7JJGB3E060766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 19:16:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304494 - releng/11.0 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 19:16:12 -0000 Author: bdrewery Date: Fri Aug 19 19:16:10 2016 New Revision: 304494 URL: https://svnweb.freebsd.org/changeset/base/304494 Log: MFS r304472: MFC r304006: Avoid showing the bootstrap make command for check-old, etc. Approved by: re (gjb) Modified: releng/11.0/Makefile releng/11.0/Makefile.inc1 Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/Makefile ============================================================================== --- releng/11.0/Makefile Fri Aug 19 19:02:18 2016 (r304493) +++ releng/11.0/Makefile Fri Aug 19 19:16:10 2016 (r304494) @@ -209,7 +209,8 @@ SUB_MAKE= `test -x ${MYMAKE} && echo ${M SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk .endif -_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} +_MAKE= PATH=${PATH} MAKE_CMD=${MAKE} ${SUB_MAKE} -f Makefile.inc1 \ + TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} # Only allow meta mode for the whitelisted targets. See META_TGT_WHITELIST # above. Modified: releng/11.0/Makefile.inc1 ============================================================================== --- releng/11.0/Makefile.inc1 Fri Aug 19 19:02:18 2016 (r304493) +++ releng/11.0/Makefile.inc1 Fri Aug 19 19:16:10 2016 (r304494) @@ -2372,11 +2372,11 @@ check-old-dirs: .PHONY done delete-old: delete-old-files delete-old-dirs .PHONY - @echo "To remove old libraries run '${MAKE} delete-old-libs'." + @echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'." check-old: check-old-files check-old-libs check-old-dirs .PHONY - @echo "To remove old files and directories run '${MAKE} delete-old'." - @echo "To remove old libraries run '${MAKE} delete-old-libs'." + @echo "To remove old files and directories run '${MAKE_CMD} delete-old'." + @echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'." .endif From owner-svn-src-releng@freebsd.org Fri Aug 19 19:19:18 2016 Return-Path: Delivered-To: svn-src-releng@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 3F553BC0FF9; Fri, 19 Aug 2016 19:19:18 +0000 (UTC) (envelope-from bdrewery@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 0F38E1AA6; Fri, 19 Aug 2016 19:19:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JJJH8H060910; Fri, 19 Aug 2016 19:19:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JJJHs6060909; Fri, 19 Aug 2016 19:19:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191919.u7JJJHs6060909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 19:19:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304495 - releng/11.0/sys/dev/filemon X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 19:19:18 -0000 Author: bdrewery Date: Fri Aug 19 19:19:17 2016 New Revision: 304495 URL: https://svnweb.freebsd.org/changeset/base/304495 Log: MFS r304474: MFC r304008: Avoid taking PROC_LOCK in syscalls if not being traced. Approved by: re (XXX) Modified: releng/11.0/sys/dev/filemon/filemon.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/sys/dev/filemon/filemon.c ============================================================================== --- releng/11.0/sys/dev/filemon/filemon.c Fri Aug 19 19:16:10 2016 (r304494) +++ releng/11.0/sys/dev/filemon/filemon.c Fri Aug 19 19:19:17 2016 (r304495) @@ -137,6 +137,8 @@ filemon_proc_get(struct proc *p) { struct filemon *filemon; + if (p->p_filemon == NULL) + return (NULL); PROC_LOCK(p); filemon = filemon_acquire(p->p_filemon); PROC_UNLOCK(p); From owner-svn-src-releng@freebsd.org Fri Aug 19 19:21:03 2016 Return-Path: Delivered-To: svn-src-releng@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 C370CBBF0E6; Fri, 19 Aug 2016 19:21:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A25F01CF7; Fri, 19 Aug 2016 19:21:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 983C0134E; Fri, 19 Aug 2016 19:21:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 5344A2108A; Fri, 19 Aug 2016 19:21:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id XUFOEirdjEwE; Fri, 19 Aug 2016 19:21:00 +0000 (UTC) Subject: Re: svn commit: r304495 - releng/11.0/sys/dev/filemon DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 7A12221085 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org References: <201608191919.u7JJJHs6060909@repo.freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: Date: Fri, 19 Aug 2016 12:20:59 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <201608191919.u7JJJHs6060909@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RQRpIeaVuXMDG2Pc2714O8GkTTUEr29Wl" X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 19:21:03 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --RQRpIeaVuXMDG2Pc2714O8GkTTUEr29Wl Content-Type: multipart/mixed; boundary="CM64hcCWfGbg3PC0klX7bdi5MPORCAWLH" From: Bryan Drewery To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Message-ID: Subject: Re: svn commit: r304495 - releng/11.0/sys/dev/filemon References: <201608191919.u7JJJHs6060909@repo.freebsd.org> In-Reply-To: <201608191919.u7JJJHs6060909@repo.freebsd.org> --CM64hcCWfGbg3PC0klX7bdi5MPORCAWLH Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/19/16 12:19 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Fri Aug 19 19:19:17 2016 > New Revision: 304495 > URL: https://svnweb.freebsd.org/changeset/base/304495 >=20 > Log: > MFS r304474: > =20 > MFC r304008: > =20 > Avoid taking PROC_LOCK in syscalls if not being traced. > =20 > Approved by: re (XXX) Woops, Approved by gjb. --=20 Regards, Bryan Drewery --CM64hcCWfGbg3PC0klX7bdi5MPORCAWLH-- --RQRpIeaVuXMDG2Pc2714O8GkTTUEr29Wl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJXt1wbAAoJEDXXcbtuRpfPII8H/j6s98RF4ved0665jM0V9ezh KUXs4Q+z5BIfX9l/Sr4+zlS+ovamyqDH6Vd42sFdUWylwGv1WcIoJ1HH5iQBn6QI GBc2Fhc4NHarwRZkY9GfnszcOv/Ew/ylytmol2TNCA/XkwZ4MedQN0c5iMp8nXaH /JcYwg8FmIvuLO3kHhJYAiqE95v4yI7vdB8Z0LCmo1/bcF3fGhHAu1UDSQPP/dqv CWZt3vGxGikc64eYYXdmUKOwSBlOQXEZvJmHi8RWS+98KiA/bpuTaxPpGpfxqq9E XQ6rO4X2V9RRdFN76dNwS1C6glNCuQox6nZjfL7H75Emheu7wBLPYXxg5660baY= =kkUr -----END PGP SIGNATURE----- --RQRpIeaVuXMDG2Pc2714O8GkTTUEr29Wl-- From owner-svn-src-releng@freebsd.org Fri Aug 19 19:30:01 2016 Return-Path: Delivered-To: svn-src-releng@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 309B2BBF56B; Fri, 19 Aug 2016 19:30:01 +0000 (UTC) (envelope-from bdrewery@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 0347A1594; Fri, 19 Aug 2016 19:30:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JJU0T6064905; Fri, 19 Aug 2016 19:30:00 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JJU0JX064904; Fri, 19 Aug 2016 19:30:00 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608191930.u7JJU0JX064904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 19 Aug 2016 19:30:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304497 - releng/11.0 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 19:30:01 -0000 Author: bdrewery Date: Fri Aug 19 19:30:00 2016 New Revision: 304497 URL: https://svnweb.freebsd.org/changeset/base/304497 Log: MFS r304475: MFC r304217: Trim unneeded bootstrap after r301470 made 9.1 the minimum supported release. Approved by: re (gjb) Modified: releng/11.0/Makefile.inc1 Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/Makefile.inc1 ============================================================================== --- releng/11.0/Makefile.inc1 Fri Aug 19 19:26:16 2016 (r304496) +++ releng/11.0/Makefile.inc1 Fri Aug 19 19:30:00 2016 (r304497) @@ -1579,10 +1579,6 @@ _groff= gnu/usr.bin/groff \ _vtfontcvt= usr.bin/vtfontcvt .endif -.if ${BOOTSTRAPPING} < 900002 -_sed= usr.bin/sed -.endif - .if ${BOOTSTRAPPING} < 1000033 _libopenbsd= lib/libopenbsd _m4= usr.bin/m4 @@ -1621,10 +1617,6 @@ _crunchide= usr.sbin/crunch/crunchide _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 -_awk= usr.bin/awk -.endif - # r296926 -P keymap search path, MFC to stable/10 in r298297 .if ${BOOTSTRAPPING} < 1003501 || \ (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) @@ -1692,7 +1684,6 @@ bootstrap-tools: .PHONY ${_gperf} \ ${_groff} \ ${_dtc} \ - ${_awk} \ ${_cat} \ ${_dd} \ ${_kbdcontrol} \ @@ -1700,7 +1691,6 @@ bootstrap-tools: .PHONY ${_libopenbsd} \ ${_makewhatis} \ usr.bin/rpcgen \ - ${_sed} \ ${_yacc} \ ${_m4} \ ${_lex} \ From owner-svn-src-releng@freebsd.org Fri Aug 19 20:37:37 2016 Return-Path: Delivered-To: svn-src-releng@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 66459BBEECB; Fri, 19 Aug 2016 20:37:37 +0000 (UTC) (envelope-from bapt@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 09C3A11B0; Fri, 19 Aug 2016 20:37:36 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JKbaGO090847; Fri, 19 Aug 2016 20:37:36 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JKbWVC090809; Fri, 19 Aug 2016 20:37:32 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201608192037.u7JKbWVC090809@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 19 Aug 2016 20:37:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304500 - releng/11.0/share/timedef X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 20:37:37 -0000 Author: bapt Date: Fri Aug 19 20:37:32 2016 New Revision: 304500 URL: https://svnweb.freebsd.org/changeset/base/304500 Log: MFC r303354,303373,303404,304045,304192 Set date and time formats back to what they were before CLDR While CLDR brings us a good and up to date source data to generate locales for all databses we are using for locales, it is not the case of LC_TIME. Where it does not defines the informations we need. Put back all the date and time formats from the old locales. Make it statically for now (in order to be able to merge it now into 11.0-RELEASE). The generation tools will be updated soon. That gives us time to properly work on LC_TIME during the 12 timeframe. While here fix abbreviated month for af_ZA (which are already fixed in CLDR data upstream) In locales where AP/PM was not defined before CLDR data, remove again the AP/PM informations For locales where AP/PM was defined before CLDR data, keep the CLDR information which was properly translated. r303354,303373 by kevlo r303404,304192 by jkim Approved by: re (gjb) Modified: releng/11.0/share/timedef/af_ZA.UTF-8.src releng/11.0/share/timedef/am_ET.UTF-8.src releng/11.0/share/timedef/ar_JO.UTF-8.src releng/11.0/share/timedef/ar_MA.UTF-8.src releng/11.0/share/timedef/ar_SA.UTF-8.src releng/11.0/share/timedef/be_BY.CP1131.src releng/11.0/share/timedef/be_BY.CP1251.src releng/11.0/share/timedef/be_BY.ISO8859-5.src releng/11.0/share/timedef/be_BY.UTF-8.src releng/11.0/share/timedef/bg_BG.CP1251.src releng/11.0/share/timedef/bg_BG.UTF-8.src releng/11.0/share/timedef/ca_IT.ISO8859-15.src releng/11.0/share/timedef/ca_IT.UTF-8.src releng/11.0/share/timedef/cs_CZ.ISO8859-2.src releng/11.0/share/timedef/cs_CZ.UTF-8.src releng/11.0/share/timedef/da_DK.ISO8859-15.src releng/11.0/share/timedef/da_DK.UTF-8.src releng/11.0/share/timedef/de_AT.ISO8859-15.src releng/11.0/share/timedef/de_AT.UTF-8.src releng/11.0/share/timedef/de_DE.ISO8859-15.src releng/11.0/share/timedef/de_DE.UTF-8.src releng/11.0/share/timedef/el_GR.ISO8859-7.src releng/11.0/share/timedef/el_GR.UTF-8.src releng/11.0/share/timedef/en_CA.UTF-8.src releng/11.0/share/timedef/en_GB.UTF-8.src releng/11.0/share/timedef/en_IE.UTF-8.src releng/11.0/share/timedef/en_PH.UTF-8.src releng/11.0/share/timedef/en_SG.UTF-8.src releng/11.0/share/timedef/en_US.UTF-8.src releng/11.0/share/timedef/en_ZA.UTF-8.src releng/11.0/share/timedef/es_AR.ISO8859-1.src releng/11.0/share/timedef/es_CR.UTF-8.src releng/11.0/share/timedef/es_ES.ISO8859-15.src releng/11.0/share/timedef/es_ES.UTF-8.src releng/11.0/share/timedef/es_MX.ISO8859-1.src releng/11.0/share/timedef/es_MX.UTF-8.src releng/11.0/share/timedef/et_EE.ISO8859-15.src releng/11.0/share/timedef/eu_ES.UTF-8.src releng/11.0/share/timedef/fi_FI.ISO8859-15.src releng/11.0/share/timedef/fi_FI.UTF-8.src releng/11.0/share/timedef/fr_BE.ISO8859-15.src releng/11.0/share/timedef/fr_BE.UTF-8.src releng/11.0/share/timedef/fr_CA.ISO8859-15.src releng/11.0/share/timedef/fr_CA.UTF-8.src releng/11.0/share/timedef/fr_CH.ISO8859-15.src releng/11.0/share/timedef/fr_CH.UTF-8.src releng/11.0/share/timedef/fr_FR.ISO8859-15.src releng/11.0/share/timedef/fr_FR.UTF-8.src releng/11.0/share/timedef/he_IL.UTF-8.src releng/11.0/share/timedef/hi_IN.ISCII-DEV.src releng/11.0/share/timedef/hi_IN.UTF-8.src releng/11.0/share/timedef/hr_HR.ISO8859-2.src releng/11.0/share/timedef/hr_HR.UTF-8.src releng/11.0/share/timedef/hu_HU.ISO8859-2.src releng/11.0/share/timedef/hu_HU.UTF-8.src releng/11.0/share/timedef/hy_AM.ARMSCII-8.src releng/11.0/share/timedef/hy_AM.UTF-8.src releng/11.0/share/timedef/is_IS.ISO8859-15.src releng/11.0/share/timedef/is_IS.UTF-8.src releng/11.0/share/timedef/it_CH.ISO8859-15.src releng/11.0/share/timedef/it_CH.UTF-8.src releng/11.0/share/timedef/it_IT.ISO8859-15.src releng/11.0/share/timedef/it_IT.UTF-8.src releng/11.0/share/timedef/ja_JP.SJIS.src releng/11.0/share/timedef/ja_JP.UTF-8.src releng/11.0/share/timedef/ja_JP.eucJP.src releng/11.0/share/timedef/kk_KZ.UTF-8.src releng/11.0/share/timedef/ko_KR.UTF-8.src releng/11.0/share/timedef/ko_KR.eucKR.src (contents, props changed) releng/11.0/share/timedef/lt_LT.ISO8859-13.src releng/11.0/share/timedef/lt_LT.UTF-8.src releng/11.0/share/timedef/lv_LV.ISO8859-13.src releng/11.0/share/timedef/lv_LV.UTF-8.src releng/11.0/share/timedef/mn_MN.UTF-8.src releng/11.0/share/timedef/nb_NO.ISO8859-15.src releng/11.0/share/timedef/nb_NO.UTF-8.src releng/11.0/share/timedef/nl_BE.UTF-8.src releng/11.0/share/timedef/nl_NL.UTF-8.src releng/11.0/share/timedef/nn_NO.ISO8859-15.src releng/11.0/share/timedef/nn_NO.UTF-8.src releng/11.0/share/timedef/pl_PL.ISO8859-2.src releng/11.0/share/timedef/pl_PL.UTF-8.src releng/11.0/share/timedef/pt_BR.ISO8859-1.src releng/11.0/share/timedef/pt_BR.UTF-8.src releng/11.0/share/timedef/pt_PT.ISO8859-15.src releng/11.0/share/timedef/pt_PT.UTF-8.src releng/11.0/share/timedef/ro_RO.ISO8859-2.src releng/11.0/share/timedef/ro_RO.UTF-8.src releng/11.0/share/timedef/ru_RU.CP1251.src releng/11.0/share/timedef/ru_RU.CP866.src releng/11.0/share/timedef/ru_RU.ISO8859-5.src releng/11.0/share/timedef/ru_RU.KOI8-R.src releng/11.0/share/timedef/ru_RU.UTF-8.src releng/11.0/share/timedef/se_FI.UTF-8.src releng/11.0/share/timedef/se_NO.UTF-8.src releng/11.0/share/timedef/sk_SK.ISO8859-2.src releng/11.0/share/timedef/sk_SK.UTF-8.src releng/11.0/share/timedef/sl_SI.ISO8859-2.src releng/11.0/share/timedef/sl_SI.UTF-8.src releng/11.0/share/timedef/sr_RS.ISO8859-2.src releng/11.0/share/timedef/sr_RS.ISO8859-5.src releng/11.0/share/timedef/sr_RS.UTF-8.src releng/11.0/share/timedef/sr_RS.UTF-8@latin.src releng/11.0/share/timedef/sv_FI.ISO8859-15.src releng/11.0/share/timedef/sv_SE.ISO8859-15.src releng/11.0/share/timedef/sv_SE.UTF-8.src releng/11.0/share/timedef/tr_TR.ISO8859-9.src releng/11.0/share/timedef/tr_TR.UTF-8.src releng/11.0/share/timedef/uk_UA.CP1251.src releng/11.0/share/timedef/uk_UA.ISO8859-5.src releng/11.0/share/timedef/uk_UA.KOI8-U.src releng/11.0/share/timedef/uk_UA.UTF-8.src releng/11.0/share/timedef/zh_CN.GB2312.src (contents, props changed) releng/11.0/share/timedef/zh_CN.GBK.src (contents, props changed) releng/11.0/share/timedef/zh_CN.UTF-8.src releng/11.0/share/timedef/zh_CN.eucCN.src (contents, props changed) releng/11.0/share/timedef/zh_HK.UTF-8.src (contents, props changed) releng/11.0/share/timedef/zh_TW.Big5.src (contents, props changed) releng/11.0/share/timedef/zh_TW.UTF-8.src (contents, props changed) Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/share/timedef/af_ZA.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/af_ZA.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/af_ZA.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -7,15 +7,15 @@ Jan. Feb. Mrt. -Apr +Apr. Mei -Jun -Jul -Aug -Sep -Okt -Nov -Des +Jun. +Jul. +Aug. +Sep. +Okt. +Nov. +Des. # # Long month names (as in a date) Januarie @@ -50,20 +50,20 @@ Vrydag Saterdag # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%Y-%m-%d +%m/%d/%Y # # c_fmt -%d %B %Y %I:%M:%S %p +%a %b %e %X %Y # # AM/PM vm. nm. # # date_fmt -%d %B %Y %I:%M:%S %p %Z +%a %b %e %X %Z %Y # # Long month names (without case ending) Januarie Modified: releng/11.0/share/timedef/am_ET.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/ar_JO.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/ar_MA.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/ar_SA.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/be_BY.CP1131.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/be_BY.CP1251.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/be_BY.ISO8859-5.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/be_BY.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/bg_BG.CP1251.src ============================================================================== --- releng/11.0/share/timedef/bg_BG.CP1251.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/bg_BG.CP1251.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ %H:%M:%S # # x_fmt -%d.%m.%y г. +%d.%m.%y # # c_fmt -%A %e %B %Y ã. %H:%M:%S +%a %e %b %X %Y # # AM/PM ïð.îá. ñë.îá. # # date_fmt -%A %e %B %Y ã. %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) ÿíóàðè Modified: releng/11.0/share/timedef/bg_BG.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/ca_IT.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/ca_IT.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/ca_IT.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ dissabte %H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%A %e %B de %Y, %H:%M:%S +%a %e %b %X %Y # # AM/PM a. m. p. m. # # date_fmt -%A %e %B de %Y, %H:%M:%S %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) de gener Modified: releng/11.0/share/timedef/ca_IT.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/ca_IT.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/ca_IT.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ dissabte %H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%A %e %B de %Y, %H:%M:%S +%a %e %b %X %Y # # AM/PM a. m. p. m. # # date_fmt -%A %e %B de %Y, %H:%M:%S %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) de gener Modified: releng/11.0/share/timedef/cs_CZ.ISO8859-2.src ============================================================================== --- releng/11.0/share/timedef/cs_CZ.ISO8859-2.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/cs_CZ.ISO8859-2.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ sobota %H:%M:%S # # x_fmt -%d.%m.%y +%Y/%m/%d # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM dopoledne odpoledne # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e. %B %Y %X %Z # # Long month names (without case ending) leden Modified: releng/11.0/share/timedef/cs_CZ.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/cs_CZ.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/cs_CZ.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ sobota %H:%M:%S # # x_fmt -%d.%m.%y +%Y/%m/%d # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM dopoledne odpoledne # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e. %B %Y %X %Z # # Long month names (without case ending) leden Modified: releng/11.0/share/timedef/da_DK.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/da_DK.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/da_DK.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ fredag lørdag # # X_fmt -%H.%M.%S +%H:%M:%S # # x_fmt -%d/%m/%Y +%d.%m.%Y # # c_fmt -%A %e %B %Y kl. %H.%M.%S +%a %e %b %X %Y # # AM/PM AM PM # # date_fmt -%A %e %B %Y kl. %H.%M.%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) januar Modified: releng/11.0/share/timedef/da_DK.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/da_DK.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/da_DK.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ fredag lørdag # # X_fmt -%H.%M.%S +%H:%M:%S # # x_fmt -%d/%m/%Y +%d.%m.%Y # # c_fmt -%A %e %B %Y kl. %H.%M.%S +%a %e %b %X %Y # # AM/PM AM PM # # date_fmt -%A %e %B %Y kl. %H.%M.%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) januar Modified: releng/11.0/share/timedef/de_AT.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/de_AT.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/de_AT.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ Samstag %H:%M:%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y um %H:%M:%S +%a %e %b %X %Y # # AM/PM vorm. nachm. # # date_fmt -%A %e %B %Y um %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) Jänner Modified: releng/11.0/share/timedef/de_AT.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/de_AT.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/de_AT.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ Samstag %H:%M:%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y um %H:%M:%S +%a %e %b %X %Y # # AM/PM vorm. nachm. # # date_fmt -%A %e %B %Y um %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) Jänner Modified: releng/11.0/share/timedef/de_DE.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/de_DE.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/de_DE.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ Samstag %H:%M:%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y um %H:%M:%S +%a %e %b %X %Y # # AM/PM vorm. nachm. # # date_fmt -%A %e %B %Y um %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) Januar Modified: releng/11.0/share/timedef/de_DE.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/de_DE.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/de_DE.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ Samstag %H:%M:%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y um %H:%M:%S +%a %e %b %X %Y # # AM/PM vorm. nachm. # # date_fmt -%A %e %B %Y um %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) Januar Modified: releng/11.0/share/timedef/el_GR.ISO8859-7.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/el_GR.UTF-8.src ============================================================================== Binary file (source and/or target). No diff available. Modified: releng/11.0/share/timedef/en_CA.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_CA.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_CA.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ Friday Saturday # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%Y-%m-%d +%d/%m/%Y # # c_fmt -%A, %B %e, %Y at %I:%M:%S %p +%a %e %b %X %Y # # AM/PM AM PM # # date_fmt -%A, %B %e, %Y at %I:%M:%S %p %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/en_GB.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_GB.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_GB.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -56,14 +56,14 @@ Saturday %d/%m/%Y # # c_fmt -%A %e %B %Y at %H:%M:%S +%a %e %b %X %Y # # AM/PM a.m. p.m. # # date_fmt -%A %e %B %Y at %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/en_IE.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_IE.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_IE.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ Friday Saturday # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt %d/%m/%Y # # c_fmt -%A %e %B %Y at %I:%M:%S %p +%a %e %b %X %Y # # AM/PM a.m. p.m. # # date_fmt -%A %e %B %Y at %I:%M:%S %p %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/en_PH.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_PH.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_PH.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ Friday Saturday # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt %d/%m/%Y # # c_fmt -%A %e %B %Y at %I:%M:%S %p +%a %e %b %X %Y # # AM/PM AM PM # # date_fmt -%A %e %B %Y at %I:%M:%S %p %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/en_SG.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_SG.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_SG.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ Friday Saturday # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%A %e %B %Y at %I:%M:%S %p +%a %e %b %X %Y # # AM/PM AM PM # # date_fmt -%A %e %B %Y at %I:%M:%S %p %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/en_US.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_US.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_US.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ Friday Saturday # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%m/%d/%y +%m/%d/%Y # # c_fmt -%A, %B %e, %Y at %I:%M:%S %p +%a %b %e %X %Y # # AM/PM AM PM # # date_fmt -%A, %B %e, %Y at %I:%M:%S %p %Z +%a %b %e %X %Z %Y # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/en_ZA.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/en_ZA.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/en_ZA.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ Friday Saturday # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%Y/%m/%d +%d/%m/%Y # # c_fmt -%d %B %Y at %I:%M:%S %p +%a %e %b %X %Y # # AM/PM AM PM # # date_fmt -%d %B %Y at %I:%M:%S %p %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) January Modified: releng/11.0/share/timedef/es_AR.ISO8859-1.src ============================================================================== --- releng/11.0/share/timedef/es_AR.ISO8859-1.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/es_AR.ISO8859-1.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ viernes sábado # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%e de %B de %Y, %I:%M:%S %p +%a %e %b %X %Y # # AM/PM a. m. p. m. # # date_fmt -%e de %B de %Y, %I:%M:%S %p %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) enero Modified: releng/11.0/share/timedef/es_CR.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/es_CR.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/es_CR.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ viernes sábado # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%e de %B de %Y, %I:%M:%S %p +%a %e %b %X %Y # # AM/PM a. m. p. m. # # date_fmt -%e de %B de %Y, %I:%M:%S %p %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) enero Modified: releng/11.0/share/timedef/es_ES.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/es_ES.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/es_ES.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ sábado %H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%e de %B de %Y, %H:%M:%S +%a %e %b %X %Y # # AM/PM a. m. p. m. # # date_fmt -%e de %B de %Y, %H:%M:%S %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) enero Modified: releng/11.0/share/timedef/es_ES.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/es_ES.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/es_ES.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ sábado %H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%e de %B de %Y, %H:%M:%S +%a %e %b %X %Y # # AM/PM a. m. p. m. # # date_fmt -%e de %B de %Y, %H:%M:%S %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) enero Modified: releng/11.0/share/timedef/es_MX.ISO8859-1.src ============================================================================== --- releng/11.0/share/timedef/es_MX.ISO8859-1.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/es_MX.ISO8859-1.src Fri Aug 19 20:37:32 2016 (r304500) @@ -4,18 +4,18 @@ # ----------------------------------------------------------------------------- # # Short month names -ene -feb -mar -abr -may -jun -jul -ago -sep -oct -nov -dic +ene. +feb. +mar. +abr. +may. +jun. +jul. +ago. +sep. +oct. +nov. +dic. # # Long month names (as in a date) enero @@ -50,20 +50,20 @@ viernes sábado # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%e de %B de %Y, %I:%M:%S %p +%a %e %b %X %Y # # AM/PM a.m. p.m. # # date_fmt -%e de %B de %Y, %I:%M:%S %p %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) enero Modified: releng/11.0/share/timedef/es_MX.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/es_MX.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/es_MX.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ viernes sábado # # X_fmt -%I:%M:%S %p +%H:%M:%S # # x_fmt -%d/%m/%y +%d/%m/%Y # # c_fmt -%e de %B de %Y, %I:%M:%S %p +%a %e %b %X %Y # # AM/PM a.m. p.m. # # date_fmt -%e de %B de %Y, %I:%M:%S %p %Z +%A, %e de %B de %Y, %X %Z # # Long month names (without case ending) enero Modified: releng/11.0/share/timedef/et_EE.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/et_EE.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/et_EE.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ laupäev %H:%M.%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M.%S +%a %d %b %Y %X # # AM/PM AM PM # # date_fmt -%A %e %B %Y %H:%M.%S %Z +%a %d %b %Y %X %Z # # Long month names (without case ending) jaanuar Modified: releng/11.0/share/timedef/eu_ES.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/eu_ES.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/eu_ES.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -56,14 +56,14 @@ larunbata %Y/%m/%d # # c_fmt -%Y(e)ko %B %e %H:%M:%S (%Z) +%Y - %b - %e %a %X # # AM/PM AM PM # # date_fmt -%Y(e)ko %B %e %H:%M:%S (%Z) +%Y(e)ko %B-ren %ea, %X %Z # # Long month names (without case ending) urtarrilak Modified: releng/11.0/share/timedef/fi_FI.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/fi_FI.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fi_FI.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ perjantaina lauantaina # # X_fmt -%H.%M.%S +%H:%M:%S # # x_fmt %d.%m.%Y # # c_fmt -%A %e %B %Y klo %H.%M.%S +%a %e %b %X %Y # # AM/PM ap. ip. # # date_fmt -%A %e %B %Y klo %H.%M.%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) tammikuuta Modified: releng/11.0/share/timedef/fi_FI.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/fi_FI.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fi_FI.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -50,20 +50,20 @@ perjantaina lauantaina # # X_fmt -%H.%M.%S +%H:%M:%S # # x_fmt %d.%m.%Y # # c_fmt -%A %e %B %Y klo %H.%M.%S +%a %e %b %X %Y # # AM/PM ap. ip. # # date_fmt -%A %e %B %Y klo %H.%M.%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) tammikuuta Modified: releng/11.0/share/timedef/fr_BE.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/fr_BE.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_BE.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%d/%m/%y +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre dm # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_BE.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/fr_BE.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_BE.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%d/%m/%y +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre dm # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_CA.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/fr_CA.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_CA.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%y-%m-%d +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre md # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_CA.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/fr_CA.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_CA.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%y-%m-%d +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre md # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_CH.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/fr_CH.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_CH.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre dm # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_CH.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/fr_CH.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_CH.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%d.%m.%y +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre dm # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_FR.ISO8859-15.src ============================================================================== --- releng/11.0/share/timedef/fr_FR.ISO8859-15.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_FR.ISO8859-15.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt -%d/%m/%Y +%d.%m.%Y # # c_fmt -%A %e %B %Y %H:%M:%S +%a %e %b %X %Y # # AM/PM -AM -PM + + # # date_fmt -%A %e %B %Y %H:%M:%S %Z +%a %e %b %Y %X %Z # # Long month names (without case ending) janvier @@ -83,5 +83,5 @@ décembre dm # # ampm_fmt -%I:%M:%S %p + # EOF Modified: releng/11.0/share/timedef/fr_FR.UTF-8.src ============================================================================== --- releng/11.0/share/timedef/fr_FR.UTF-8.src Fri Aug 19 20:17:57 2016 (r304499) +++ releng/11.0/share/timedef/fr_FR.UTF-8.src Fri Aug 19 20:37:32 2016 (r304500) @@ -53,17 +53,17 @@ samedi %H:%M:%S # # x_fmt *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-releng@freebsd.org Sat Aug 20 11:42:09 2016 Return-Path: Delivered-To: svn-src-releng@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 9B8F8BBAEAA; Sat, 20 Aug 2016 11:42:09 +0000 (UTC) (envelope-from tuexen@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 6D7C91697; Sat, 20 Aug 2016 11:42:09 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7KBg8iT027464; Sat, 20 Aug 2016 11:42:08 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7KBg8Q0027463; Sat, 20 Aug 2016 11:42:08 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201608201142.u7KBg8Q0027463@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sat, 20 Aug 2016 11:42:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304522 - releng/11.0/usr.bin/netstat X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Aug 2016 11:42:09 -0000 Author: tuexen Date: Sat Aug 20 11:42:08 2016 New Revision: 304522 URL: https://svnweb.freebsd.org/changeset/base/304522 Log: MFC r304519: * Use names for SCTP and UDPLite when reporting the input histogram. * Fix the output for scope statistics. Approved by: re (kib) Modified: releng/11.0/usr.bin/netstat/inet6.c Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/usr.bin/netstat/inet6.c ============================================================================== --- releng/11.0/usr.bin/netstat/inet6.c Sat Aug 20 09:13:14 2016 (r304521) +++ releng/11.0/usr.bin/netstat/inet6.c Sat Aug 20 11:42:08 2016 (r304522) @@ -207,11 +207,11 @@ static const char *ip6nh[] = { "#129", "#130", "#131", - "#132", + "SCTP", "#133", "#134", "#135", - "#136", + "UDPLite", "#137", "#138", "#139", @@ -488,8 +488,8 @@ ip6_stats(u_long off, const char *name, "{N:/global%s}\n");\ break;\ default:\ - xo_emit("\t\t{qke:name/%x}{:count/%ju} " \ - "addresses scope=%x\n",\ + xo_emit("\t\t{qke:name/%#x}{:count/%ju} " \ + "{N:/addresses scope=%#x}\n",\ i, (uintmax_t)ip6stat.s, i); \ }\ } while (0); From owner-svn-src-releng@freebsd.org Sat Aug 20 11:59:20 2016 Return-Path: Delivered-To: svn-src-releng@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 EC775BBF37D; Sat, 20 Aug 2016 11:59:20 +0000 (UTC) (envelope-from bdrewery@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 BB8A51391; Sat, 20 Aug 2016 11:59:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7KBxJN7033554; Sat, 20 Aug 2016 11:59:19 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7KBxJPw033552; Sat, 20 Aug 2016 11:59:19 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608201159.u7KBxJPw033552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 20 Aug 2016 11:59:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304525 - in releng/11.0: lib/libc/sys sys/kern X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Aug 2016 11:59:21 -0000 Author: bdrewery Date: Sat Aug 20 11:59:19 2016 New Revision: 304525 URL: https://svnweb.freebsd.org/changeset/base/304525 Log: MFS r304512: MFC r304288: Garbage collect _umtx_lock(2)/_umtx_unlock(2) references removed in r263318. Approved by: re (gjb) Modified: releng/11.0/lib/libc/sys/Symbol.map releng/11.0/sys/kern/capabilities.conf Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/lib/libc/sys/Symbol.map ============================================================================== --- releng/11.0/lib/libc/sys/Symbol.map Sat Aug 20 11:58:23 2016 (r304524) +++ releng/11.0/lib/libc/sys/Symbol.map Sat Aug 20 11:59:19 2016 (r304525) @@ -34,9 +34,7 @@ FBSD_1.0 { __setugid; __syscall; __sysctl; - _umtx_lock; _umtx_op; - _umtx_unlock; abort2; accept; access; @@ -455,12 +453,8 @@ FBSDprivate_1.0 { __sys___syscall; ___sysctl; __sys___sysctl; - __umtx_lock; - __sys__umtx_lock; __umtx_op; __sys__umtx_op; - __umtx_unlock; - __sys__umtx_unlock; _abort2; __sys_abort2; _accept; Modified: releng/11.0/sys/kern/capabilities.conf ============================================================================== --- releng/11.0/sys/kern/capabilities.conf Sat Aug 20 11:58:23 2016 (r304524) +++ releng/11.0/sys/kern/capabilities.conf Sat Aug 20 11:59:19 2016 (r304525) @@ -64,9 +64,7 @@ __sysctl ## ## XXRW: Need to check this very carefully. ## -_umtx_lock _umtx_op -_umtx_unlock ## ## Allow process termination using abort2(2). From owner-svn-src-releng@freebsd.org Sat Aug 20 13:30:00 2016 Return-Path: Delivered-To: svn-src-releng@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 45DC8BC04A2; Sat, 20 Aug 2016 13:30:00 +0000 (UTC) (envelope-from dim@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 EEE1B1813; Sat, 20 Aug 2016 13:29:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7KDTxJx067448; Sat, 20 Aug 2016 13:29:59 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7KDTw38067445; Sat, 20 Aug 2016 13:29:58 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201608201329.u7KDTw38067445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 20 Aug 2016 13:29:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r304529 - in releng/11.0: contrib/llvm/lib/Target/X86 contrib/llvm/tools/clang/lib/Basic lib/clang X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Aug 2016 13:30:00 -0000 Author: dim Date: Sat Aug 20 13:29:58 2016 New Revision: 304529 URL: https://svnweb.freebsd.org/changeset/base/304529 Log: MFC r304319: Pull in r262772 from upstream clang trunk (by Simon Pilgrim): [X86] AMD Bobcat CPU (btver1) doesn't support XSAVE btver1 is a SSSE3/SSE4a only CPU - it doesn't have AVX and doesn't support XSAVE. Differential Revision: http://reviews.llvm.org/D17682 Pull in r262782 from upstream llvm trunk (by Simon Pilgrim): [X86] AMD Bobcat CPU (btver1) doesn't support XSAVE btver1 is a SSSE3/SSE4a only CPU - it doesn't have AVX and doesn't support XSAVE. Differential Revision: http://reviews.llvm.org/D17683 This ensures clang does not emit AVX instructions for CPUTYPE=btver1. Approved by: re (kib) Reported by: Michel Depeige PR: 211864 Modified: releng/11.0/contrib/llvm/lib/Target/X86/X86.td releng/11.0/contrib/llvm/tools/clang/lib/Basic/Targets.cpp releng/11.0/lib/clang/freebsd_cc_version.h Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/contrib/llvm/lib/Target/X86/X86.td ============================================================================== --- releng/11.0/contrib/llvm/lib/Target/X86/X86.td Sat Aug 20 12:49:05 2016 (r304528) +++ releng/11.0/contrib/llvm/lib/Target/X86/X86.td Sat Aug 20 13:29:58 2016 (r304529) @@ -576,7 +576,6 @@ def : Proc<"btver1", [ FeaturePRFCHW, FeatureLZCNT, FeaturePOPCNT, - FeatureXSAVE, FeatureSlowSHLD, FeatureLAHFSAHF ]>; Modified: releng/11.0/contrib/llvm/tools/clang/lib/Basic/Targets.cpp ============================================================================== --- releng/11.0/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Sat Aug 20 12:49:05 2016 (r304528) +++ releng/11.0/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Sat Aug 20 13:29:58 2016 (r304529) @@ -2731,7 +2731,6 @@ bool X86TargetInfo::initFeatureMap( setFeatureEnabledImpl(Features, "prfchw", true); setFeatureEnabledImpl(Features, "cx16", true); setFeatureEnabledImpl(Features, "fxsr", true); - setFeatureEnabledImpl(Features, "xsave", true); break; case CK_BDVER4: setFeatureEnabledImpl(Features, "avx2", true); Modified: releng/11.0/lib/clang/freebsd_cc_version.h ============================================================================== --- releng/11.0/lib/clang/freebsd_cc_version.h Sat Aug 20 12:49:05 2016 (r304528) +++ releng/11.0/lib/clang/freebsd_cc_version.h Sat Aug 20 13:29:58 2016 (r304529) @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define FREEBSD_CC_VERSION 1100005 +#define FREEBSD_CC_VERSION 1100006