[PC-BSD Commits] [pcbsd/freebsd] 7fcf87: MFC r257109:

GitHub noreply at github.com
Wed Nov 6 07:45:14 PST 2013


  Branch: refs/heads/stable/10
  Home:   https://github.com/pcbsd/freebsd
  Commit: 7fcf8773f447dccc87ae37d4b3792e7343167707
      https://github.com/pcbsd/freebsd/commit/7fcf8773f447dccc87ae37d4b3792e7343167707
  Author: smh <smh at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M contrib/llvm/tools/clang/tools/driver/driver.cpp

  Log Message:
  -----------
  MFC r257109:
Add clang-CC and CC to list of hints allowing clang to identify its operating
mode as c++ instead of defaulting to c for the binary names CC and clang-CC.

This fixes builds that use cmake which automatically sets CXX to
/usr/bin/CC by default.

PR:		bin/182442
Approved by:	re (glebius)


  Commit: b8f1640fa056402fce0911df2228e42d9b90a2f5
      https://github.com/pcbsd/freebsd/commit/b8f1640fa056402fce0911df2228e42d9b90a2f5
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M usr.sbin/pkg/config.c
    M usr.sbin/pkg/config.h
    M usr.sbin/pkg/pkg.c

  Log Message:
  -----------
  MFC r257051:

  Add support for using "pkg+http://" for the PACKAGESITE.

  pkg 1.2 is adding this support as well. This should help
  lessen the confusion on why the default SRV PACKAGESITE
  does not load in a browser.

Approved by:	bapt
Approved by:	re (glebius)


  Commit: c259ad5c52d8c181fa6db5c04f87dc66435b54a5
      https://github.com/pcbsd/freebsd/commit/c259ad5c52d8c181fa6db5c04f87dc66435b54a5
  Author: melifaro <melifaro at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sys/net/radix.c
    M sys/net/radix.h

  Log Message:
  -----------
  MFC r256624:

Fix long-standing issue with incorrect radix mask calculation.

Usual symptoms are messages like
rn_delete: inconsistent annotation
rn_addmask: mask impossibly already in tree
routing daemon constantly deleting IPv6 default route
or inability to flush/delete particular prefix in ipfw table.

Changes:
* Assume 32 bytes as maximum radix key length
* Remove rn_init()
* Statically allocate rn_ones/rn_zeroes
* Make separate mask tree for each "normal" tree instead of system
global one
* Remove "optimization" on masks reusage and key zeroying
* Change rn_addmask() arguments to accept tree pointer (no users in base)

MFC changes:
* keep rn_init()
* create global mask tree, protected with mutex, for old rn_addmask
users (currently 0 in base)
* Add new rn_addmask_r() function (rn_addmask in head) with additional
argument to accept tree pointer

PR:		kern/182851, kern/169206, kern/135476, kern/134531
Found by:	Slawa Olhovchenkov <slw at zxy.spb.ru>
Reviewed by:	glebius (previous versions)
Sponsored by:	Yandex LLC
Approved by:	re (glebius)


  Commit: 2d60d1851a80cfae2603a0ed8a5b19372d8b77ba
      https://github.com/pcbsd/freebsd/commit/2d60d1851a80cfae2603a0ed8a5b19372d8b77ba
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sys/dev/iscsi/icl.c

  Log Message:
  -----------
  MFC r257061:

Don't spin with mutex hold when there is not enough room in the send socket
buffer.  While here, make the code flow somewhat nicer.

Thanks to mav@ for tracking it down.

Approved by:	re (glebius)


  Commit: 7046958142fcbc1e0f447f73cf6049ffc395b5ca
      https://github.com/pcbsd/freebsd/commit/7046958142fcbc1e0f447f73cf6049ffc395b5ca
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M etc/Makefile
    A etc/keys/Makefile
    A etc/keys/pkg/Makefile
    A etc/keys/pkg/trusted/Makefile
    A etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
    M etc/mtree/BSD.root.dist
    A etc/pkg/FreeBSD.conf
    A etc/pkg/Makefile
    M share/man/man7/hier.7
    M usr.sbin/pkg/Makefile
    M usr.sbin/pkg/config.c
    M usr.sbin/pkg/config.h
    M usr.sbin/pkg/pkg.c

  Log Message:
  -----------
  MFC: r256770,r257142,r257145,r257146,r257147,r257148,
     r257149,r257150,r257158,r257159,r257164,r257168,
     r257193

  - Support checking signature for pkg bootstrap from remote
    and for 'pkg add ./pkg.txz'

  - Be verbose on where pkg is being bootstrapped from.

  - Add support for reading configuration files from /etc/pkg.
    For now only /etc/pkg/FreeBSD.conf is supported.

  - Add test package signing key fingerprint into /etc/keys/pkg/trusted.

  - Disable fingerprint checking by default for now as the official
    packages are not yet signed.

Approved by:	bapt
Approved by:	re (glebius)


  Commit: 46ae5525e3e5f10c4c9bc3a404439c8d51b9c8ef
      https://github.com/pcbsd/freebsd/commit/46ae5525e3e5f10c4c9bc3a404439c8d51b9c8ef
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M share/man/man7/hier.7

  Log Message:
  -----------
  MFC r257151:

  Document /var/cache/pkg into hier(7) which pkg(8) uses.

Approved by:	bapt
Approved by:	re (glebius)


  Commit: 0d7fc2d68776ba1b8c68702bf2ddc0b3dcc7404e
      https://github.com/pcbsd/freebsd/commit/0d7fc2d68776ba1b8c68702bf2ddc0b3dcc7404e
  Author: dumbbell <dumbbell at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sys/dev/drm2/radeon/radeon_drv.c

  Log Message:
  -----------
  MFC r256771:

drm/radeon: radeonkms depends on firmware(9)

Submitted by:	tijl@
Approved by:	re (kib)


  Commit: 82fad41b08ce33288400daf41003952c88585a31
      https://github.com/pcbsd/freebsd/commit/82fad41b08ce33288400daf41003952c88585a31
  Author: andre <andre at FreeBSD.org>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sys/netinet/tcp_input.c

  Log Message:
  -----------
  MFC r256920:

  The TCP delayed ACK logic isn't aware of LRO passing up large aggregated
  segments thinking it received only one segment. This causes it to enable
  the delay the ACK for 100ms to wait for another segment which may never
  come because all the data was received already.

  Doing delayed ACK for LRO segments is bogus for two reasons: a) it pushes
  us further away from acking every other packet; b) it introduces additional
  delay in responding to the sender.  The latter is especially bad because it
  is in the nature of LRO to aggregated all segments of a burst with no more
  coming until an ACK is sent back.

  Change the delayed ACK logic to detect LRO segments by being larger than
  the MSS for this connection and issuing an immediate ACK for them to keep
  the ACK clock ticking without interruption.

  Reported by:  julian, cperciva
  Tested by:    cperciva
  Reviewed by:  lstewart

Approved by:    re (glebius)


  Commit: 9a9c7f1310dd0c292ea36a425791d1f18b4644db
      https://github.com/pcbsd/freebsd/commit/9a9c7f1310dd0c292ea36a425791d1f18b4644db
  Author: hselasky <hselasky at FreeBSD.org>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M sys/dev/usb/usb_dev.c
    M sys/dev/usb/usb_device.h
    M sys/dev/usb/usb_generic.c
    M sys/dev/usb/usb_hub.c

  Log Message:
  -----------
  MFC r257206:
Fix a deadlock when trying to power off a USB device. The deadlock
happens because the code in question is trying to modify the parent
USB port registers outside the USB explore thread.

Approved by:	re (glebius)


  Commit: 249db5aac359e977e2e92a1e27132c9d3037f3dd
      https://github.com/pcbsd/freebsd/commit/249db5aac359e977e2e92a1e27132c9d3037f3dd
  Author: neel <neel at FreeBSD.org>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M share/examples/bhyve/vmrun.sh
    M usr.sbin/bhyve/Makefile
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/inout.c
    M usr.sbin/bhyve/inout.h
    A usr.sbin/bhyve/legacy_irq.c
    A usr.sbin/bhyve/legacy_irq.h
    M usr.sbin/bhyve/pci_emul.c
    M usr.sbin/bhyve/pci_emul.h
    A usr.sbin/bhyve/pci_lpc.c
    A usr.sbin/bhyve/pci_lpc.h
    M usr.sbin/bhyve/pci_uart.c
    A usr.sbin/bhyve/uart_emul.c
    A usr.sbin/bhyve/uart_emul.h

  Log Message:
  -----------
  MFC r257293.

Add support for PCI-to-ISA LPC bridge emulation. If the LPC bus is attached
to a virtual machine then we implicitly create COM1 and COM2 ISA devices.

Prior to this change the only way of attaching a COM port to the virtual
machine was by presenting it as a PCI device that is mapped at the legacy
I/O address 0x3F8 or 0x2F8.

There were some issues with the original approach:
- It did not work at all with UEFI because UEFI will reprogram the PCI device
  BARs and remap the COM1/COM2 ports at non-legacy addresses.
- OpenBSD GENERIC kernel does not create a /dev/console because it expects
  the uart device at the legacy 0x3F8/0x2F8 address to be an ISA device.
- It was functional with a FreeBSD guest but caused the console to appear
  on /dev/ttyu2 which was not intuitive.

The uart emulation is now independent of the bus on which it resides. Thus it
is possible to have uart devices on the PCI bus in addition to the legacy
COM1/COM2 devices behind the LPC bus.

The command line option to attach ISA COM1/COM2 ports to a virtual machine is
"-s <bus>,lpc -l com1,stdio".

The command line option to create a PCI-attached uart device is:
"-s <bus>,uart[,stdio]"

The command line option to create PCI-attached COM1/COM2 device is:
"-S <bus>,uart[,stdio]". This style of creating COM ports is deprecated.

Approved by:	re (glebius)


  Commit: 382c31019068aa68cea45143a9a64793b18c0967
      https://github.com/pcbsd/freebsd/commit/382c31019068aa68cea45143a9a64793b18c0967
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M usr.sbin/bhyve/ioapic.c

  Log Message:
  -----------
  MFC r257092

  Fix bug in the ioapic emulation for level-triggered interrupts,
  where a pin assertion while a source was masked would result in
  the interrupt being lost, with the symptom being a console hang.
  The condition is now recorded, and the interrupt generated when
  the source is unmasked.

Approved by:  re (glebius)


  Commit: c291b4b61fbe9eb6c0b70cd0c40adfb144d17431
      https://github.com/pcbsd/freebsd/commit/c291b4b61fbe9eb6c0b70cd0c40adfb144d17431
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/kern/subr_param.c

  Log Message:
  -----------
  MFC r257221:
Fix typo.

Approved by:	re (glebius)


  Commit: 01a0280e092297cd5e8debd6c8df9def66d08ca7
      https://github.com/pcbsd/freebsd/commit/01a0280e092297cd5e8debd6c8df9def66d08ca7
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/conf/options
    M sys/dev/altera/sdcard/altera_sdcard.c
    M sys/dev/altera/sdcard/altera_sdcard_io.c

  Log Message:
  -----------
  MFC: r256743, r256744
MFP4:
Change 227594 by brooks at brooks_zenith on 2013/04/11 17:10:14

	When we fail, print the error that occurred if we are giving
	up or if bootverbose is set.

MFP4 (driver change only):
Change 231100 by brooks at brooks_zenith on 2013/07/12 21:01:31

	Add a new option ALTERA_SDCARD_FAST_SIM which checks immediately
	for success of I/O operations rather than queuing a task.

Sponsored by:   DARPA/AFRL
Approved by:	re (glebius)


  Commit: 1fe9c90df1d9c0f555cf343210da749b63df14e2
      https://github.com/pcbsd/freebsd/commit/1fe9c90df1d9c0f555cf343210da749b63df14e2
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    A sys/dev/altera/atse/a_api.h
    A sys/dev/altera/atse/if_atse.c
    A sys/dev/altera/atse/if_atse_fdt.c
    A sys/dev/altera/atse/if_atse_nexus.c
    A sys/dev/altera/atse/if_atsereg.h
    M sys/mips/beri/files.beri
    A tools/tools/atsectl/Makefile
    A tools/tools/atsectl/atsectl.c

  Log Message:
  -----------
  MFC r256752, r256946

MFP4: 221483, 221567, 221568, 221670, 221677, 221678, 221800, 221801,
221804, 221805, 222004, 222006, 222055, 222820, 1135077, 1135118,
1136259

Add atse(4), a driver for the Altera Triple Speed Ethernet MegaCore.

The current driver support gigabit Ethernet speeds only and works with
the MegaCore only in the internal FIFO configuration in the soon to be
open sourced BERI CPU configuration.

MFP4: 1187103, 222076, 222057, 222051, 221799

Add atsectl, a simple utility to read and update MAC addresses stored in

the default flash location on Altera DE4 boards.  Typically used once
when setting up a board so leaving in tools rather than inflicting on
all users.

To build with world add LOCAL_DIRS=tools/tools/atsectl to the make
command line.

Submitted by:	bz
Sponsored by:	DARPA/AFRL
Approved by:	re (glebius)


  Commit: c8322d287bbd0b68a2e93cc9c2a070c11fb49560
      https://github.com/pcbsd/freebsd/commit/c8322d287bbd0b68a2e93cc9c2a070c11fb49560
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M Makefile.inc1
    M share/mk/bsd.own.mk

  Log Message:
  -----------
  MFC r256915

Stop conflating WITHOUT_CLANG with WITHOUT_CLANG_IS_CC.  This allows
bootstrapping a copy of clang without building clang for the base system

which is useful for nanobsd and similar setups.  It's still probably
wrong to conflate what is installed as /usr/bin/cc with the selection
of a bootstrap compiler under WITH*_CLANG_IS_CC, but that's for another
day.

Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: 02057ca62a0610b2b66422bb169f379c8e725bc6
      https://github.com/pcbsd/freebsd/commit/02057ca62a0610b2b66422bb169f379c8e725bc6
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M share/man/man5/src.conf.5

  Log Message:
  -----------
  Notional MFC of r257057:

Regen documentation post r257449:

Stop conflating WITHOUT_CLANG with WITHOUT_CLANG_IS_CC.  This allows
bootstrapping a copy of clang without building clang for the base system
which is useful for nanobsd and similar setups.  It's still probably
wrong to conflate what is installed as /usr/bin/cc with the selection
of a bootstrap compiler under WITH*_CLANG_IS_CC, but that's for another
day.

Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: 8b58367431f0c0ea5889dee10a939c56c516b590
      https://github.com/pcbsd/freebsd/commit/8b58367431f0c0ea5889dee10a939c56c516b590
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M share/man/man4/Makefile
    R share/man/man4/isf.4
    M sys/conf/files
    R sys/dev/isf/isf.c
    R sys/dev/isf/isf.h
    R sys/dev/isf/isf_fdt.c
    R sys/dev/isf/isf_nexus.c
    M sys/mips/conf/BERI_DE4.hints
    M sys/mips/conf/BERI_DE4_MDROOT
    M sys/mips/conf/BERI_DE4_SDROOT
    M usr.sbin/Makefile
    R usr.sbin/isfctl/Makefile
    R usr.sbin/isfctl/isfctl.8
    R usr.sbin/isfctl/isfctl.c

  Log Message:
  -----------
  MFC r256865

Remove the isf(4) driver.  It was created by accident and is subset of
the cfi(4) driver.  It remained in the tree longer than would be ideal
due to the time required to bring cfi(4) to feature parity.

Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: 7e2e9ae1af9f1eeef71d67a4beb036f54fdf9406
      https://github.com/pcbsd/freebsd/commit/7e2e9ae1af9f1eeef71d67a4beb036f54fdf9406
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/conf/files
    M sys/dev/fdt/fdt_common.c
    M sys/dev/fdt/fdt_common.h
    A sys/dev/fdt/fdt_ic_if.m
    M sys/dev/fdt/simplebus.c

  Log Message:
  -----------
  MFC r256861:

MFP4: 223121 (FDT infrastructure portion)

Implement support for interrupt-parent nodes in simplebus.  The current
implementation requires that device declarations have an interrupt-parent
node and that it point to a device that has registered itself as a
interrupt controller in fdt_ic_list_head and implements the fdt_ic
interface.

Sponsored by:   DARPA/AFRL
Approved by:    re (gjb)


  Commit: 5ed44e47ad17c901cd693cf1e9e67f073fae9bfa
      https://github.com/pcbsd/freebsd/commit/5ed44e47ad17c901cd693cf1e9e67f073fae9bfa
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M gnu/usr.bin/binutils/ld/Makefile

  Log Message:
  -----------
  MFC r257268:

Enable the --sysroot=/foo option in ld by always building with a sysroot
defined. When not building as a cross linker, the sysroot is set to "/".

Exp-run by:	bdrewery (ports/183206)
Approved by:	re (gjb)


  Commit: ec13d5fe2b3e60fe788a02d8ff978e26b48cebe3
      https://github.com/pcbsd/freebsd/commit/ec13d5fe2b3e60fe788a02d8ff978e26b48cebe3
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M UPDATING
    M share/mk/bsd.own.mk
    A tools/build/options/WITHOUT_NMTREE
    R tools/build/options/WITH_NMTREE

  Log Message:
  -----------
  MFC r257138:

Switch the default mtree to nmtree our new NetBSD derived mtree.

Exp-runs by:	bdrewery (ports/182438)
Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: 5c41fcfa5521670510fc367a534a8f723e479804
      https://github.com/pcbsd/freebsd/commit/5c41fcfa5521670510fc367a534a8f723e479804
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M share/man/man5/src.conf.5

  Log Message:
  -----------
  Notional MFC of r257139:

Regerate after r257460 swapped the default to WITH_NMTREE.

Approved by:	re (gjb)


  Commit: 69528385720f530d530392d3bdd4fa0ebcbdc8ad
      https://github.com/pcbsd/freebsd/commit/69528385720f530d530392d3bdd4fa0ebcbdc8ad
  Author: trociny <trociny at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sbin/hastd/primary.c

  Log Message:
  -----------
  MFC r257154:

Merging local and remote bitmaps must be protected by hr_amp lock.

This is believed to fix hastd crashes, which might occur during
synchronization, triggered by the failed assertion:

 Assertion failed: (amp->am_memtab[ext] > 0),
 function activemap_write_complete, file activemap.c, line 351.

Approved by:	re (glebius)


  Commit: 71633650c458fcf506640c2785080027c5ac975d
      https://github.com/pcbsd/freebsd/commit/71633650c458fcf506640c2785080027c5ac975d
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/dev/random/ivy.c

  Log Message:
  -----------
  MFC r256670:
Rewrite RDRAND support:
Remove the excessive memory accesses to temporary buffer.
Streamline the assembly and unify it between i386 and amd64.

Approved by:	re (glebius)


  Commit: 0c11a37a6f26bfa1623b2d9ed34c295be02c1f30
      https://github.com/pcbsd/freebsd/commit/0c11a37a6f26bfa1623b2d9ed34c295be02c1f30
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/x86/x86/io_apic.c

  Log Message:
  -----------
  MFC r257069:
Add ddb 'show ioapic' and 'show all ioapics' commands.

Approved by:	re (glebius)


  Commit: e31542bdb57e185d2629a8bcbb249018e3c863f6
      https://github.com/pcbsd/freebsd/commit/e31542bdb57e185d2629a8bcbb249018e3c863f6
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/dev/pci/pci.c
    M sys/dev/pci/pcivar.h

  Log Message:
  -----------
  MFC r257070:
Move the PCI_DMA_BOUNDARY definition into the pcivar.h.

Approved by:	re (glebius)


  Commit: a9830491c8d02d2a4d288cdc5d819c8b4db3b64d
      https://github.com/pcbsd/freebsd/commit/a9830491c8d02d2a4d288cdc5d819c8b4db3b64d
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/dev/pci/pcireg.h

  Log Message:
  -----------
  MFC r257071:
Add some definitions for the bits in root control and status PCIe cap
registers.

Approved by:	re (glebius)


  Commit: 7933da6e9aa7e2b125493a74c863397987681991
      https://github.com/pcbsd/freebsd/commit/7933da6e9aa7e2b125493a74c863397987681991
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M sys/dev/pci/pci.c
    M sys/dev/pci/pci_private.h

  Log Message:
  -----------
  MFC r257072:
Make pci_get_dma_tag() non-static.

Approved by:	re (glebius)


  Commit: 8141a12b1dd663deb4a5f3e46f436ecd7953a5c7
      https://github.com/pcbsd/freebsd/commit/8141a12b1dd663deb4a5f3e46f436ecd7953a5c7
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M usr.sbin/bsdinstall/scripts/zfsboot

  Log Message:
  -----------
  MFC r256540, r256544:

 r256540 (dteske):
 Add loader.conf(5) entries to import bootpool after boot when
 using full-disk encryption and ZFS.

 r256544 (dteske):
 Fix loader.conf(5) entries from r256540.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation


  Commit: bc89db057bab6d4c7215396b2a1ba84629d42e3d
      https://github.com/pcbsd/freebsd/commit/bc89db057bab6d4c7215396b2a1ba84629d42e3d
  Author: jlh <jlh at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M etc/defaults/periodic.conf

  Log Message:
  -----------
  MFC r257361:
  Fix compatibility function for old daily_status_security_${name}_enable
  variables.

  PR:           conf/183137

MFC r257364:
  Fix indentation.

Approved by:	re (gjb)


  Commit: d1f5c9bfc2856b6b40e631c5e1281faae9c9633c
      https://github.com/pcbsd/freebsd/commit/d1f5c9bfc2856b6b40e631c5e1281faae9c9633c
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  MFC r257329 (nyan):
 Fix build, both clang and gcc are required on pc98.

Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation


  Commit: 03c171750ec54c302bf622324731a2cf5c8dd63f
      https://github.com/pcbsd/freebsd/commit/03c171750ec54c302bf622324731a2cf5c8dd63f
  Author: delphij <delphij at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c

  Log Message:
  -----------
  MFC r257369:

Don't reference pointer before testing whether it is
NULL.

Submitted by:	Clement Lecigne <clecigne google com>
Reviewed by:	grehan
Approved by:	re (kib)


  Commit: 3ef292db627eef7e9e4ec2b81ad9ccb286301470
      https://github.com/pcbsd/freebsd/commit/3ef292db627eef7e9e4ec2b81ad9ccb286301470
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M sys/dev/fdt/fdt_mips.c
    A sys/mips/beri/beri_pic.c
    M sys/mips/beri/files.beri

  Log Message:
  -----------
  MFC r256911, r256936

MFP4: 223121 (PIC portion), 225861, 227822, 229692 (PIC only), 229693,
230523, 1123614

Implement a driver for Robert Norton's PIC as an FDT interrupt
controller.  Devices whose interrupt-parent property points to a beripic

device will have their interrupt allocation, activation, and setup
operations routed through the IC rather than down the traditional bus
hierarchy.

This driver largely abstracts the underlying CPU away allowing the
PIC to be implemented on CPU's other than BERI.  Due to insufficient
abstractions a small amount of MIPS specific code is currently required
in fdt_mips.c and to implement counters.

Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: abc4d8de522229bd713dfb557bb5c700418cf06c
      https://github.com/pcbsd/freebsd/commit/abc4d8de522229bd713dfb557bb5c700418cf06c
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M sys/mips/include/pte.h

  Log Message:
  -----------
  MFC r256934, r256963, r256972, r257017

MFP4:
Change 221534 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2013/01/27
16:05:30

	FreeBSD/mips stores page-table entries in a near-identical format
	to MIPS TLB entries -- only it overrides certain "reserved" bits
	in the MIPS-defined EntryLo register to hold software-defined bits
	(swbits) to avoid significantly increasing the page table memory
	footprint.  On n32 and n64, these bits were (a) colliding with
	MIPS64r2 physical memory extensions and (b) being improperly
	cleared.

	Attempt to fix both of these problems by pushing swbits further
	along 64-bit EntryLo registers into the reserved space, and
	improving consistency between C-based and assembly-based clearing
	of swbits -- in particular, to use the same definition.  This
	should stop swbits from leaking into TLB entries -- while ignored
	by most current MIPS hardware, this would cause a problem with
	(much) larger physical memory sizes, and also leads to confusing
	hardware-level tracing as physical addresses contain unexpected
	(and inconsistent) higher bits.

	Discussed with: imp, jmallett

Change 1187301 by brooks at brooks_zenith on 2013/10/23 14:40:10
	Loop back the initial commit of 221534 to HEAD.  Correct its
	implementation for mips32.

Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: 0375b5a0cf32c64b36575562a323ac987f5ad82f
      https://github.com/pcbsd/freebsd/commit/0375b5a0cf32c64b36575562a323ac987f5ad82f
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M sys/conf/options
    M sys/dev/cfi/cfi_core.c

  Log Message:
  -----------
  MFC r256753

MFP4: 1136252

Add an option ATSE_CFI_HACK to allow memory mapped CFI devices to have
their address range allocated sharable so that atse(4) can find it's
Ethernet address in the expected location.

We intend to remove this hack once the BERI platform has a loader.

Sponsored by:	DARPA/AFRL
Approved by:	re (gjb)


  Commit: 9f85db3b595d9f3835c9e15267b9e9d4a1a14b74
      https://github.com/pcbsd/freebsd/commit/9f85db3b595d9f3835c9e15267b9e9d4a1a14b74
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    A sys/boot/fdt/dts/beri-sim.dts
    A sys/boot/fdt/dts/beripad-de4.dts
    M sys/mips/conf/BERI_DE4.hints
    A sys/mips/conf/BERI_DE4_BASE
    M sys/mips/conf/BERI_DE4_MDROOT
    M sys/mips/conf/BERI_DE4_SDROOT
    R sys/mips/conf/BERI_SIM.hints
    A sys/mips/conf/BERI_SIM_BASE
    M sys/mips/conf/BERI_SIM_MDROOT
    A sys/mips/conf/BERI_SIM_SDROOT
    M sys/mips/conf/BERI_TEMPLATE

  Log Message:
  -----------
  MFC r256912, r256931, r256977

Sync BERI kernel configs with P4:

Switch the majority of device configuration to FDT from hints.

Add BERI_*_BASE configs to reduce duplication in the MDROOT and SDROOT
kernels.

Add NFS and GSSAPI support by default.

Enable ATSE_CFI_HACK in BERI configs, stable MAC addresses are useful.

BERI_SIM.hint is no longer used, remove it.

Sponsored by:	DARPA/AFRL
Approved by:	re (delphij)


  Commit: 45a606d1102ff82798f3f84d55b9a225a951edff
      https://github.com/pcbsd/freebsd/commit/45a606d1102ff82798f3f84d55b9a225a951edff
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M sys/conf/options.mips
    M sys/mips/beri/std.beri
    M sys/mips/include/cpufunc.h
    M sys/mips/mips/cpu.c

  Log Message:
  -----------
  MFC r256935

MFP4:
Change 228019 by bz at bz_zenith on 2013/04/23 13:55:30

	Add kernel side support for large TLB on BERI/CHERI.
	Modelled similar to NLM

Sponsored by:	DAPRA/AFRL
Approved by:	re (delphij)


  Commit: baae40831df2ab7a71d9ed4b37cd15e07eb04ab2
      https://github.com/pcbsd/freebsd/commit/baae40831df2ab7a71d9ed4b37cd15e07eb04ab2
  Author: trasz <trasz at FreeBSD.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M usr.bin/iscsictl/iscsictl.8
    M usr.bin/iscsictl/iscsictl.c
    M usr.sbin/ctladm/ctladm.8
    M usr.sbin/ctladm/ctladm.c

  Log Message:
  -----------
  MFC r257379:

Rename '-h' option to '-p', and use "portal" instead of "host" or "address",
in order to be consistent with iSCSI terminology.  Besides, calling the
option '-h' was just wrong.

This changes usage for newly added iscsictl(8), and two newly added
subcommands to ctladm(8).  This breaks POLA between CURRENT and 10,
but since 10.0 has not been released yet, it's still ok to do.

MFC r257380:

Bump .Dd after r257379.

Approved by:	re (glebius)
Sponsored by:	The FreeBSD Foundation


  Commit: bce61ff508aed35c64d3060d1db5a8b1f92d7e2f
      https://github.com/pcbsd/freebsd/commit/bce61ff508aed35c64d3060d1db5a8b1f92d7e2f
  Author: delphij <delphij at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  MFC r257350:

In r257079, SRCDIR is pointed to ${.CURDIR} when not set.  However,
Makefile.inc1 is being called in sub-make's where make(1) would,
by default, implicitly chdir(2) to ${.OBJDIR} before executing any
targets.  This would make some targets, like delete-old, when trying
to derive various variables introduced by change r256921 using
``make -f Makefile.inc1'' that also rely on SRCDIR to fail.

This changeset adds an explicit cd ${.CURDIR} before these unwrapped
make calls, making them in line with the other ones that are already
being wrapped with the explicit chdir's.

Approved by:	re (hrs)


  Commit: eb6fbdd1a6fed9a988ce49c82cbb5b7871bb866a
      https://github.com/pcbsd/freebsd/commit/eb6fbdd1a6fed9a988ce49c82cbb5b7871bb866a
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M usr.sbin/pkg/pkg.c

  Log Message:
  -----------
  MFC r257377:

  Add a 'pkg bootstrap' command which will bootstrap pkg(8) without
  forwarding any command to it after installation.

Approved by:	bapt
Approved by:	re (gjb)


  Commit: 6de2c936259a5e18aa8a335646d3928ab70c754b
      https://github.com/pcbsd/freebsd/commit/6de2c936259a5e18aa8a335646d3928ab70c754b
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M etc/Makefile
    R etc/keys/Makefile
    R etc/keys/pkg/Makefile
    R etc/keys/pkg/trusted/Makefile
    R etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
    M etc/mtree/BSD.root.dist
    M etc/mtree/BSD.usr.dist
    M etc/pkg/FreeBSD.conf
    M share/Makefile
    A share/keys/Makefile
    A share/keys/pkg/Makefile
    A share/keys/pkg/trusted/Makefile
    A share/keys/pkg/trusted/pkg.freebsd.org.2013102301
    M share/man/man7/hier.7

  Log Message:
  -----------
  MFC r257344,r257403:

  Move /etc/keys to /usr/share/keys where users are less likely to modify them.

Approved by:	bapt
Approved by:	re (gjb)


  Commit: 5dcfadbc545bcfef466a9dbf448ed034d10d9448
      https://github.com/pcbsd/freebsd/commit/5dcfadbc545bcfef466a9dbf448ed034d10d9448
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M tools/build/mk/OptionalObsoleteFiles.inc
    M tools/build/options/WITHOUT_PKGBOOTSTRAP
    M usr.sbin/pkg/Makefile
    A usr.sbin/pkg/pkg.7

  Log Message:
  -----------
  MFC r257378,r257400,r257402,r257440:

  Add a pkg(7) manpage for bootstrap

Approved by:	bapt
Approved by:	re (gjb)


  Commit: a2c021b32c7c075288fbc3192a675eabb0395bc6
      https://github.com/pcbsd/freebsd/commit/a2c021b32c7c075288fbc3192a675eabb0395bc6
  Author: kib <kib at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/amd64/amd64/minidump_machdep.c

  Log Message:
  -----------
  MFC r257216:
Several small fixes for the amd64 minidump code.

Approved by:	re (gjb)


  Commit: a5c953ba7b7c37f60afb4ec81e97f72eacd8ec8c
      https://github.com/pcbsd/freebsd/commit/a5c953ba7b7c37f60afb4ec81e97f72eacd8ec8c
  Author: kib <kib at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/kern/subr_kdb.c

  Log Message:
  -----------
  MFC r257214:
Inform about the kdb re-entry.

Approved by:	re (gjb)


  Commit: 8d04fd770e70886229f4b7137495a86968603a66
      https://github.com/pcbsd/freebsd/commit/8d04fd770e70886229f4b7137495a86968603a66
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/conf/newvers.sh

  Log Message:
  -----------
  Update stable/10 to BETA3 as part of the 10.0-RELEASE cycle.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


  Commit: 50abdc63fc75ec902f990c6bde7d03aa9ab25172
      https://github.com/pcbsd/freebsd/commit/50abdc63fc75ec902f990c6bde7d03aa9ab25172
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/dev/re/if_re.c
    M sys/pci/if_rlreg.h

  Log Message:
  -----------
  r256827:
  Correct MAC revision bits. Previously it always cleared bit 20 and
  bit 21.
Approved by:	re (delphij)


  Commit: 821219af32e4fc45dac87d189de5f22e6524199d
      https://github.com/pcbsd/freebsd/commit/821219af32e4fc45dac87d189de5f22e6524199d
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/dev/re/if_re.c
    M sys/pci/if_rlreg.h

  Log Message:
  -----------
  MFC r256828:
  Add preliminary support for RTL8106E PCIe FastEthernet.
Approved by:	re (delphij)


  Commit: 2d1cef2d8318a9a31c0c1a73707ecf3f043568e1
      https://github.com/pcbsd/freebsd/commit/2d1cef2d8318a9a31c0c1a73707ecf3f043568e1
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/dev/mii/miidevs
    M sys/dev/mii/rgephy.c

  Log Message:
  -----------
  MFC r257304:
  Add support for new Gigabit PHY of RealTek.
  I don't have a copy of data sheet so I'm not sure exact PHY model
  name. Vendor's web page indicates RTL8251 is latest PHY so I used
  the name. This PHY is used with RTL8168G, RTL8168GU and RTL8411B.
Approved by:	re (delphij)


  Commit: a23f29cf609aad19c131c079deec7d25ac39dc64
      https://github.com/pcbsd/freebsd/commit/a23f29cf609aad19c131c079deec7d25ac39dc64
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/dev/re/if_re.c
    M sys/pci/if_rlreg.h

  Log Message:
  -----------
  MFC r257305:
  Add preliminary support for RTL8168G, RTL8168GU and RTL8411B.
  RTL8168GU has two variants(GMII and MII) but it uses the same chip
  revision id.  Driver checks PCI device id of controller and
  sets internal capability flag(i.e. jumbo frame and link speed down
  in WOL).
Approved by:	re (delphij)


  Commit: 1c088d0f336cef1df380287b75851e69ffcd4525
      https://github.com/pcbsd/freebsd/commit/1c088d0f336cef1df380287b75851e69ffcd4525
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M sys/dev/re/if_re.c
    M sys/pci/if_rlreg.h

  Log Message:
  -----------
  MFC r257306:
  Add preliminary support for RTL8168EP.
Approved by:	re (delphij)


  Commit: dda2180ec107d166442a8d866dc3c9724ec24a84
      https://github.com/pcbsd/freebsd/commit/dda2180ec107d166442a8d866dc3c9724ec24a84
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sys/dev/bce/if_bce.c

  Log Message:
  -----------
  MFC r257307:
  Fix regression introduced in r235816.
  r235816 triggered kernel panic or hang after warm boot.
  Don't blindly restore BCE_EMAC_MODE media configuration in
  bce_reset().  If driver is about to shutdown it will invoke
  bce_reset() which in turn results in restoring BCE_EMAC_MODE
  media configuration.  This operation seems to confuse controller
  firmware.
Approved by:	re (glebius)


  Commit: 8ca6127d10dff45a340b873604b1b68240a255d8
      https://github.com/pcbsd/freebsd/commit/8ca6127d10dff45a340b873604b1b68240a255d8
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M usr.sbin/pkg/pkg.7
    M usr.sbin/pkg/pkg.c

  Log Message:
  -----------
  MFC r257505:

  Add -f support to 'pkg bootstrap' and 'pkg add' to force installation
  of pkg(8) even if already installed.

  This is useful if you somehow messup pkg(8) and need to reinstall from
  remote with it already being registered in the pkg(8) /var/db/pkg database.

  Also add some sanity checks to 'pkg add'.

Approved by:	bapt
Approved by:	re (glebius)


  Commit: fe917e2f9d1832d92298ca01a86fcac01b206d1a
      https://github.com/pcbsd/freebsd/commit/fe917e2f9d1832d92298ca01a86fcac01b206d1a
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M gnu/usr.bin/binutils/ld/Makefile

  Log Message:
  -----------
  MFC r257530

Reimplement r257525 such that it work with the historic FreeBSD make
implementation.  This fixes the toolchain and kernel-toolchain targets
when building from older FreeBSD versions where make is fmake.

Sponsored by:	DARPA/AFRL
Approved by:	re (glebius)


  Commit: 6db24298695ea5b1803ca4b81e339434bfd060d1
      https://github.com/pcbsd/freebsd/commit/6db24298695ea5b1803ca4b81e339434bfd060d1
  Author: markj <markj at FreeBSD.org>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M usr.bin/procstat/procstat.1

  Log Message:
  -----------
  MFC r257234:
With r247602, the "c" flag is no longer printed as a file descriptor flag.

Approved by:	re (gjb)


  Commit: 3a014860fee3f962c848987210b061313458f14a
      https://github.com/pcbsd/freebsd/commit/3a014860fee3f962c848987210b061313458f14a
  Author: yongari <yongari at FreeBSD.org>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sys/dev/msk/if_msk.c

  Log Message:
  -----------
  MFC r257490:
  Perform media change after setting IFF_DRV_RUNNING flag. Without it,
  driver would ignore the first link state update if controller
  already established a link.
Approved by:	re (glebius)


  Commit: 46533baffa016b991addde56036a57c2257f3578
      https://github.com/pcbsd/freebsd/commit/46533baffa016b991addde56036a57c2257f3578
  Author: edwin <edwin at FreeBSD.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M contrib/tzdata/africa
    M contrib/tzdata/antarctica
    M contrib/tzdata/asia
    M contrib/tzdata/australasia
    M contrib/tzdata/backward
    M contrib/tzdata/etcetera
    M contrib/tzdata/europe
    A contrib/tzdata/leap-seconds.list
    M contrib/tzdata/northamerica
    M contrib/tzdata/southamerica
    M contrib/tzdata/zone.tab

  Log Message:
  -----------
  MFC of 257681

tzdata2013f
- Jordan goes to winter time on the last Friday in October.
- Tocantins in Brazil will not go into summer time in October.
- Indonesian time zones renames.
- Lots of cleanups in with regarding to links and historical data.

tzdata2013h
- Libya didn't go back to DST.
- Fix Morocco 2038 issue.
- Brazil/Acre and ?Western Amazonas are chaning timezones.

Approved by:	re (Gleb)


  Commit: e0562150fc1b95c93fd8f4cf4d578c184b61ec77
      https://github.com/pcbsd/freebsd/commit/e0562150fc1b95c93fd8f4cf4d578c184b61ec77
  Author: jimharris <jimharris at FreeBSD.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M sbin/nvmecontrol/perftest.c

  Log Message:
  -----------
  MFC r257531:

Do not exit with error status after printing data for perftest.

Sponsored by:	Intel
Approved by:	re (glebius)


  Commit: 76e64e88a61d81b3667d049cb17dda24961289b3
      https://github.com/pcbsd/freebsd/commit/76e64e88a61d81b3667d049cb17dda24961289b3
  Author: jimharris <jimharris at FreeBSD.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M sys/dev/nvme/nvme_ctrlr.c
    M sys/dev/nvme/nvme_ns.c

  Log Message:
  -----------
  MFC r257534:

Create a unique unit number for each controller and namespace cdev.

Sponsored by:	Intel
Approved by:	re (glebius)


  Commit: 5b5f66ad93249a89d38204b30c5c2a557f1b0e06
      https://github.com/pcbsd/freebsd/commit/5b5f66ad93249a89d38204b30c5c2a557f1b0e06
  Author: delphij <delphij at FreeBSD.org>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M sys/geom/eli/g_eli_ctl.c

  Log Message:
  -----------
  MFC r257539:

When zero'ing out a buffer, make sure we are using right size.

Without this change, in the worst but unlikely case scenario, certain
administrative operations, including change of configuration, set or
delete key from a GEOM ELI provider, may leave potentially sensitive
information in buffer allocated from kernel memory.

We believe that it is not possible to actively exploit these issues, nor
does it impact the security of normal usage of GEOM ELI providers when
these operations are not performed after system boot.

Security:	possible sensitive information disclosure
Submitted by:	Clement Lecigne <clecigne google com>
Approved by:	re (glebius)


  Commit: d11e2d3d82bdc8452c78ec7e9afeb738bf092d4a
      https://github.com/pcbsd/freebsd/commit/d11e2d3d82bdc8452c78ec7e9afeb738bf092d4a
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M share/man/man5/src.conf.5

  Log Message:
  -----------
  Regenerate src.conf(5) after r257573

Direct commit to stable/10 with no mergeinfo as the head
change to regenerate src.conf(5) for this was missed after
r257440 until r257444 which brought in unrelated changes.

Discussed with:		gjb
Approved by:		re (gjb, implicit)


  Commit: fe4c9909b962664e454d8b4a3b09397b796cc7f9
      https://github.com/pcbsd/freebsd/commit/fe4c9909b962664e454d8b4a3b09397b796cc7f9
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M Makefile.inc1
    M ObsoleteFiles.inc
    M UPDATING
    M contrib/llvm/tools/clang/tools/driver/driver.cpp
    M contrib/tzdata/africa
    M contrib/tzdata/antarctica
    M contrib/tzdata/asia
    M contrib/tzdata/australasia
    M contrib/tzdata/backward
    M contrib/tzdata/etcetera
    M contrib/tzdata/europe
    A contrib/tzdata/leap-seconds.list
    M contrib/tzdata/northamerica
    M contrib/tzdata/southamerica
    M contrib/tzdata/zone.tab
    M etc/Makefile
    M etc/defaults/periodic.conf
    M etc/mtree/BSD.root.dist
    M etc/mtree/BSD.usr.dist
    A etc/pkg/FreeBSD.conf
    A etc/pkg/Makefile
    M gnu/usr.bin/binutils/ld/Makefile
    M sbin/hastd/primary.c
    M sbin/nvmecontrol/perftest.c
    M share/Makefile
    M share/examples/bhyve/vmrun.sh
    A share/keys/Makefile
    A share/keys/pkg/Makefile
    A share/keys/pkg/trusted/Makefile
    A share/keys/pkg/trusted/pkg.freebsd.org.2013102301
    M share/man/man4/Makefile
    R share/man/man4/isf.4
    M share/man/man5/src.conf.5
    M share/man/man7/hier.7
    M share/mk/bsd.own.mk
    M sys/amd64/amd64/minidump_machdep.c
    A sys/boot/fdt/dts/beri-sim.dts
    A sys/boot/fdt/dts/beripad-de4.dts
    M sys/conf/files
    M sys/conf/newvers.sh
    M sys/conf/options
    M sys/conf/options.mips
    A sys/dev/altera/atse/a_api.h
    A sys/dev/altera/atse/if_atse.c
    A sys/dev/altera/atse/if_atse_fdt.c
    A sys/dev/altera/atse/if_atse_nexus.c
    A sys/dev/altera/atse/if_atsereg.h
    M sys/dev/altera/sdcard/altera_sdcard.c
    M sys/dev/altera/sdcard/altera_sdcard_io.c
    M sys/dev/bce/if_bce.c
    M sys/dev/cfi/cfi_core.c
    M sys/dev/drm2/radeon/radeon_drv.c
    M sys/dev/fdt/fdt_common.c
    M sys/dev/fdt/fdt_common.h
    A sys/dev/fdt/fdt_ic_if.m
    M sys/dev/fdt/fdt_mips.c
    M sys/dev/fdt/simplebus.c
    M sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
    M sys/dev/iscsi/icl.c
    R sys/dev/isf/isf.c
    R sys/dev/isf/isf.h
    R sys/dev/isf/isf_fdt.c
    R sys/dev/isf/isf_nexus.c
    M sys/dev/mii/miidevs
    M sys/dev/mii/rgephy.c
    M sys/dev/msk/if_msk.c
    M sys/dev/nvme/nvme_ctrlr.c
    M sys/dev/nvme/nvme_ns.c
    M sys/dev/pci/pci.c
    M sys/dev/pci/pci_private.h
    M sys/dev/pci/pcireg.h
    M sys/dev/pci/pcivar.h
    M sys/dev/random/ivy.c
    M sys/dev/re/if_re.c
    M sys/dev/usb/usb_dev.c
    M sys/dev/usb/usb_device.h
    M sys/dev/usb/usb_generic.c
    M sys/dev/usb/usb_hub.c
    M sys/geom/eli/g_eli_ctl.c
    M sys/kern/subr_kdb.c
    M sys/kern/subr_param.c
    A sys/mips/beri/beri_pic.c
    M sys/mips/beri/files.beri
    M sys/mips/beri/std.beri
    M sys/mips/conf/BERI_DE4.hints
    A sys/mips/conf/BERI_DE4_BASE
    M sys/mips/conf/BERI_DE4_MDROOT
    M sys/mips/conf/BERI_DE4_SDROOT
    R sys/mips/conf/BERI_SIM.hints
    A sys/mips/conf/BERI_SIM_BASE
    M sys/mips/conf/BERI_SIM_MDROOT
    A sys/mips/conf/BERI_SIM_SDROOT
    M sys/mips/conf/BERI_TEMPLATE
    M sys/mips/include/cpufunc.h
    M sys/mips/include/pte.h
    M sys/mips/mips/cpu.c
    M sys/net/radix.c
    M sys/net/radix.h
    M sys/netinet/tcp_input.c
    M sys/pci/if_rlreg.h
    M sys/x86/x86/io_apic.c
    M tools/build/mk/OptionalObsoleteFiles.inc
    A tools/build/options/WITHOUT_NMTREE
    M tools/build/options/WITHOUT_PKGBOOTSTRAP
    R tools/build/options/WITH_NMTREE
    A tools/tools/atsectl/Makefile
    A tools/tools/atsectl/atsectl.c
    M usr.bin/iscsictl/iscsictl.8
    M usr.bin/iscsictl/iscsictl.c
    M usr.bin/procstat/procstat.1
    M usr.sbin/Makefile
    M usr.sbin/bhyve/Makefile
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/inout.c
    M usr.sbin/bhyve/inout.h
    M usr.sbin/bhyve/ioapic.c
    A usr.sbin/bhyve/legacy_irq.c
    A usr.sbin/bhyve/legacy_irq.h
    M usr.sbin/bhyve/pci_emul.c
    M usr.sbin/bhyve/pci_emul.h
    A usr.sbin/bhyve/pci_lpc.c
    A usr.sbin/bhyve/pci_lpc.h
    M usr.sbin/bhyve/pci_uart.c
    A usr.sbin/bhyve/uart_emul.c
    A usr.sbin/bhyve/uart_emul.h
    M usr.sbin/bsdinstall/scripts/zfsboot
    M usr.sbin/ctladm/ctladm.8
    M usr.sbin/ctladm/ctladm.c
    R usr.sbin/isfctl/Makefile
    R usr.sbin/isfctl/isfctl.8
    R usr.sbin/isfctl/isfctl.c
    M usr.sbin/pkg/Makefile
    M usr.sbin/pkg/config.c
    M usr.sbin/pkg/config.h
    A usr.sbin/pkg/pkg.7
    M usr.sbin/pkg/pkg.c

  Log Message:
  -----------
  Merge branch 'stable/10' of https://github.com/freebsd/freebsd into stable/10

Conflicts:
	sys/conf/newvers.sh


Compare: https://github.com/pcbsd/freebsd/compare/776f506f5539...fe4c9909b962


More information about the Commits mailing list