[PC-BSD Commits] [pcbsd/freebsd] 4c5162: Tidy up kmeminit(): Since r245575, 'nmbclusters' i...

GitHub noreply at github.com
Mon Oct 7 07:41:00 PDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/pcbsd/freebsd
  Commit: 4c5162818b555752118dc7e7a0600e412cd8a833
      https://github.com/pcbsd/freebsd/commit/4c5162818b555752118dc7e7a0600e412cd8a833
  Author: alc <alc at FreeBSD.org>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M sys/kern/kern_malloc.c

  Log Message:
  -----------
  Tidy up kmeminit(): Since r245575, 'nmbclusters' is calculated after
kmeminit() runs, so it contributes nothing to 'vm_kmem_size'; update a
comment to reflect that r254025 replaced the kmem submap with the kmem
arena.

Reviewed by:	kib
Approved by:	re (gjb)
Sponsored by:	EMC / Isilon Storage Division


  Commit: e6885256cdc6759add16ed571a19768419ac65ef
      https://github.com/pcbsd/freebsd/commit/e6885256cdc6759add16ed571a19768419ac65ef
  Author: hiren <hiren at FreeBSD.org>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M sys/dev/e1000/if_igb.c
    M sys/dev/ixgbe/ixgbe.c

  Log Message:
  -----------
  Expose system level ixgbe sysctls.
Device level sysctls are already exposed as dev.ix.<device>

Fixing the case where number of queues for igb is auto-tuned and
hw.igb.num_queues does not return current/updated value.

Reviewed by:	jfv
Approved by:	re (delphij)
MFC after:	2 weeks


  Commit: 716c2031c71f1b1fbd78da6494f5c5e2a5115e9b
      https://github.com/pcbsd/freebsd/commit/716c2031c71f1b1fbd78da6494f5c5e2a5115e9b
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M sys/dev/hyperv/vmbus/hv_hv.c
    M sys/x86/xen/hvm.c

  Log Message:
  -----------
  Correct panic caused by attaching both Xen PV and HyperV virtualization
aware drivers on Xen hypervisors that advertise support for some
HyperV features.

x86/xen/hvm.c:
	When running in HVM mode on a Xen hypervisor, set vm_guest
	to VM_GUEST_XEN so other virtualization aware components in
	the FreeBSD kernel can detect this mode is active.

dev/hyperv/vmbus/hv_hv.c:
	Use vm_guest to ignore Xen's HyperV emulation when Xen is
	detected and Xen PV drivers are active.

Reported by:	Shanker Balan
Submitted by:	Roger Pau Monné
Sponsored by:	Citrix Systems R&D
Reviewed by:	gibbs
Approved by:	re (Xen blanket)


  Commit: aed205d5cd3901acd2a0cf583e44ec166d99191a
      https://github.com/pcbsd/freebsd/commit/aed205d5cd3901acd2a0cf583e44ec166d99191a
  Author: neel <neel at FreeBSD.org>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M lib/libvmmapi/vmmapi.c
    M lib/libvmmapi/vmmapi.h
    M sys/amd64/amd64/machdep.c
    M sys/amd64/amd64/pmap.c
    M sys/amd64/amd64/trap.c
    M sys/amd64/include/pmap.h
    M sys/amd64/include/vmm.h
    M sys/amd64/include/vmm_dev.h
    M sys/amd64/include/vmm_instruction_emul.h
    M sys/amd64/vmm/amd/amdv.c
    M sys/amd64/vmm/intel/ept.c
    M sys/amd64/vmm/intel/ept.h
    M sys/amd64/vmm/intel/vmcs.c
    M sys/amd64/vmm/intel/vmcs.h
    M sys/amd64/vmm/intel/vmx.c
    M sys/amd64/vmm/intel/vmx.h
    M sys/amd64/vmm/intel/vmx_genassym.c
    M sys/amd64/vmm/intel/vmx_support.S
    M sys/amd64/vmm/io/ppt.c
    M sys/amd64/vmm/io/ppt.h
    M sys/amd64/vmm/vmm.c
    M sys/amd64/vmm/vmm_dev.c
    M sys/amd64/vmm/vmm_instruction_emul.c
    M sys/amd64/vmm/vmm_mem.c
    M sys/amd64/vmm/vmm_mem.h
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/pci_emul.c
    M usr.sbin/bhyve/rtc.c
    M usr.sbin/bhyvectl/bhyvectl.c
    M usr.sbin/bhyveload/bhyveload.c

  Log Message:
  -----------
  Merge projects/bhyve_npt_pmap into head.

Make the amd64/pmap code aware of nested page table mappings used by bhyve
guests. This allows bhyve to associate each guest with its own vmspace and
deal with nested page faults in the context of that vmspace. This also
enables features like accessed/dirty bit tracking, swapping to disk and
transparent superpage promotions of guest memory.

Guest vmspace:
Each bhyve guest has a unique vmspace to represent the physical memory
allocated to the guest. Each memory segment allocated by the guest is
mapped into the guest's address space via the 'vmspace->vm_map' and is
backed by an object of type OBJT_DEFAULT.

pmap types:
The amd64/pmap now understands two types of pmaps: PT_X86 and PT_EPT.

The PT_X86 pmap type is used by the vmspace associated with the host kernel
as well as user processes executing on the host. The PT_EPT pmap is used by
the vmspace associated with a bhyve guest.

Page Table Entries:
The EPT page table entries as mostly similar in functionality to regular
page table entries although there are some differences in terms of what
bits are used to express that functionality. For e.g. the dirty bit is
represented by bit 9 in the nested PTE as opposed to bit 6 in the regular
x86 PTE. Therefore the bitmask representing the dirty bit is now computed
at runtime based on the type of the pmap. Thus PG_M that was previously a
macro now becomes a local variable that is initialized at runtime using
'pmap_modified_bit(pmap)'.

An additional wrinkle associated with EPT mappings is that older Intel
processors don't have hardware support for tracking accessed/dirty bits in
the PTE. This means that the amd64/pmap code needs to emulate these bits to
provide proper accounting to the VM subsystem. This is achieved by using
the following mapping for EPT entries that need emulation of A/D bits:
         Bit Position           Interpreted By
PG_V               52                 software (accessed bit emulation handler)
PG_RW              53                 software (dirty bit emulation handler)
PG_A               0                  hardware (aka EPT_PG_RD)
PG_M               1                  hardware (aka EPT_PG_WR)

The idea to use the mapping listed above for A/D bit emulation came from
Alan Cox (alc@).

The final difference with respect to x86 PTEs is that some EPT implementations
do not support superpage mappings. This is recorded in the 'pm_flags' field
of the pmap.

TLB invalidation:
The amd64/pmap code has a number of ways to do invalidation of mappings
that may be cached in the TLB: single page, multiple pages in a range or the
entire TLB. All of these funnel into a single EPT invalidation routine called
'pmap_invalidate_ept()'. This routine bumps up the EPT generation number and
sends an IPI to the host cpus that are executing the guest's vcpus. On a
subsequent entry into the guest it will detect that the EPT has changed and
invalidate the mappings from the TLB.

Guest memory access:
Since the guest memory is no longer wired we need to hold the host physical
page that backs the guest physical page before we can access it. The helper
functions 'vm_gpa_hold()/vm_gpa_release()' are available for this purpose.

PCI passthru:
Guest's with PCI passthru devices will wire the entire guest physical address
space. The MMIO BAR associated with the passthru device is backed by a
vm_object of type OBJT_SG. An IOMMU domain is created only for guest's that
have one or more PCI passthru devices attached to them.

Limitations:
There isn't a way to map a guest physical page without execute permissions.
This is because the amd64/pmap code interprets the guest physical mappings as
user mappings since they are numerically below VM_MAXUSER_ADDRESS. Since PG_U
shares the same bit position as EPT_PG_EXECUTE all guest mappings become
automatically executable.

Thanks to Alan Cox and Konstantin Belousov for their rigorous code reviews
as well as their support and encouragement.

Thanks for John Baldwin for reviewing the use of OBJT_SG as the backing
object for pci passthru mmio regions.

Special thanks to Peter Holm for testing the patch on short notice.

Approved by:	re
Discussed with:	grehan
Reviewed by:	alc, kib
Tested by:	pho


  Commit: 9c8c76f921175f7cebcd3cd61d9086c333b96e35
      https://github.com/pcbsd/freebsd/commit/9c8c76f921175f7cebcd3cd61d9086c333b96e35
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M sys/amd64/include/pcpu.h
    M sys/dev/xen/timer/timer.c
    M sys/i386/include/pcpu.h
    M sys/i386/xen/mp_machdep.c
    M sys/i386/xen/mptable.c
    M sys/x86/acpica/madt.c
    M sys/x86/xen/hvm.c
    M sys/x86/xen/xen_intr.c

  Log Message:
  -----------
  Formalize the concept of virtual CPU ids by adding a per-cpu vcpu_id
field.  Perform vcpu enumeration for Xen PV and HVM environments
and convert all Xen drivers to use vcpu_id instead of a hard coded
assumption of the mapping algorithm (acpi or apic ID) in use.

Submitted by:	Roger Pau Monné
Sponsored by:	Citrix Systems R&D
Reviewed by:	gibbs
Approved by:	re (blanket Xen)

amd64/include/pcpu.h:
i386/include/pcpu.h:
	Add vcpu_id to the amd64 and i386 pcpu structures.

dev/xen/timer/timer.c
x86/xen/xen_intr.c
	Use new vcpu_id instead of assuming acpi_id == vcpu_id.

i386/xen/mp_machdep.c:
i386/xen/mptable.c
x86/xen/hvm.c:
	Perform Xen HVM and Xen full PV vcpu_id mapping.

x86/xen/hvm.c:
x86/acpica/madt.c
	Change SYSINIT ordering of acpi CPU enumeration so that it
	is guaranteed to be available at the time of Xen HVM vcpu
	id mapping.


  Commit: 1a04bcfbb69c67f949cb1426a4031cdb4033c568
      https://github.com/pcbsd/freebsd/commit/1a04bcfbb69c67f949cb1426a4031cdb4033c568
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M sys/conf/files
    R sys/kern/uipc_cow.c

  Log Message:
  -----------
  Remove the uipc_cow.c file, which is not used since the zero copy
sockets removal.

Noted by:	alc
Sponsored by:	The FreeBSD Foundation
Approved by:	re (delphij)


  Commit: cd8e388205dab0c6cdfbd5884ca0f3127fe71ed5
      https://github.com/pcbsd/freebsd/commit/cd8e388205dab0c6cdfbd5884ca0f3127fe71ed5
  Author: decke <decke at FreeBSD.org>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M contrib/libc++/include/memory

  Log Message:
  -----------
  ename internal function test() to avoid name clashes with
common macros. This fixes ports like mysql 5.6 which has an
internal macro called test.

Approved by:	re (gjb)
Discussed with:	theraven


  Commit: 71eaa9969e6656920856b321be3430c54dea31fc
      https://github.com/pcbsd/freebsd/commit/71eaa9969e6656920856b321be3430c54dea31fc
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M share/man/man9/lock.9

  Log Message:
  -----------
  Document LK_TRYUPGRADE.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Approved by:	re (marius)


  Commit: d15691c08b59b5c5c79db30b4bb79522e27f5965
      https://github.com/pcbsd/freebsd/commit/d15691c08b59b5c5c79db30b4bb79522e27f5965
  Author: dim <dim at FreeBSD.org>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M contrib/llvm/lib/Target/X86/X86InstrInfo.cpp

  Log Message:
  -----------
  Pull in r192064 from upstream llvm trunk:

  X86: Don't fold spills into SSE operations if the stack is unaligned.

  Regalloc can emit unaligned spills nowadays, but we can't fold the
  spills into SSE ops if we can't guarantee alignment. PR12250.

This fixes unaligned SSE accesses (leading to a SIGBUS) which could
occur in the ffmpeg ports.

Approved by:	re (kib)
Reported by:	tijl
MFC after:	3 days


  Commit: 34d055e746b4dad0722315b2096024ed9e08cd69
      https://github.com/pcbsd/freebsd/commit/34d055e746b4dad0722315b2096024ed9e08cd69
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M sys/conf/newvers.sh

  Log Message:
  -----------
  Update head/ to 10.0-ALPHA5.

Approved by:	re (implicit)


  Commit: ba3f99676351684264da1513884a8aae3359a3fb
      https://github.com/pcbsd/freebsd/commit/ba3f99676351684264da1513884a8aae3359a3fb
  Author: eadler <eadler at FreeBSD.org>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M gnu/usr.bin/Makefile
    R gnu/usr.bin/rcs/CREDITS
    R gnu/usr.bin/rcs/Makefile
    R gnu/usr.bin/rcs/Makefile.inc
    R gnu/usr.bin/rcs/NEWS
    R gnu/usr.bin/rcs/REFS
    R gnu/usr.bin/rcs/ci/Makefile
    R gnu/usr.bin/rcs/ci/ci.1
    R gnu/usr.bin/rcs/ci/ci.c
    R gnu/usr.bin/rcs/co/Makefile
    R gnu/usr.bin/rcs/co/co.1
    R gnu/usr.bin/rcs/co/co.c
    R gnu/usr.bin/rcs/doc/rcs.ms
    R gnu/usr.bin/rcs/doc/rcs_func.ms
    R gnu/usr.bin/rcs/ident/Makefile
    R gnu/usr.bin/rcs/ident/ident.1
    R gnu/usr.bin/rcs/ident/ident.c
    R gnu/usr.bin/rcs/lib/Makefile
    R gnu/usr.bin/rcs/lib/conf.h
    R gnu/usr.bin/rcs/lib/maketime.c
    R gnu/usr.bin/rcs/lib/maketime.h
    R gnu/usr.bin/rcs/lib/merger.c
    R gnu/usr.bin/rcs/lib/partime.c
    R gnu/usr.bin/rcs/lib/partime.h
    R gnu/usr.bin/rcs/lib/rcsbase.h
    R gnu/usr.bin/rcs/lib/rcsedit.c
    R gnu/usr.bin/rcs/lib/rcsfcmp.c
    R gnu/usr.bin/rcs/lib/rcsfnms.c
    R gnu/usr.bin/rcs/lib/rcsgen.c
    R gnu/usr.bin/rcs/lib/rcskeep.c
    R gnu/usr.bin/rcs/lib/rcskeys.c
    R gnu/usr.bin/rcs/lib/rcslex.c
    R gnu/usr.bin/rcs/lib/rcsmap.c
    R gnu/usr.bin/rcs/lib/rcsrev.c
    R gnu/usr.bin/rcs/lib/rcssyn.c
    R gnu/usr.bin/rcs/lib/rcstime.c
    R gnu/usr.bin/rcs/lib/rcsutil.c
    R gnu/usr.bin/rcs/lib/version.c
    R gnu/usr.bin/rcs/merge/Makefile
    R gnu/usr.bin/rcs/merge/merge.1
    R gnu/usr.bin/rcs/merge/merge.c
    R gnu/usr.bin/rcs/rcs/Makefile
    R gnu/usr.bin/rcs/rcs/rcs.1
    R gnu/usr.bin/rcs/rcs/rcs.c
    R gnu/usr.bin/rcs/rcs/rcsfile.5
    R gnu/usr.bin/rcs/rcs/rcsintro.1
    R gnu/usr.bin/rcs/rcsclean/Makefile
    R gnu/usr.bin/rcs/rcsclean/rcsclean.1
    R gnu/usr.bin/rcs/rcsclean/rcsclean.c
    R gnu/usr.bin/rcs/rcsdiff/Makefile
    R gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
    R gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
    R gnu/usr.bin/rcs/rcsfreeze/Makefile
    R gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
    R gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
    R gnu/usr.bin/rcs/rcsmerge/Makefile
    R gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
    R gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
    R gnu/usr.bin/rcs/rcstest
    R gnu/usr.bin/rcs/rlog/Makefile
    R gnu/usr.bin/rcs/rlog/rlog.1
    R gnu/usr.bin/rcs/rlog/rlog.c
    R share/doc/psd/13.rcs/Makefile
    R share/doc/psd/13.rcs/Makefile.inc
    R share/doc/psd/13.rcs/rcs/Makefile
    R share/doc/psd/13.rcs/rcs_func/Makefile
    M share/doc/psd/Makefile
    M share/mk/bsd.own.mk
    M tools/build/mk/OptionalObsoleteFiles.inc
    R tools/build/options/WITHOUT_RCS

  Log Message:
  -----------
  Good bye RCS.  You will be missed.

(devel/rcs and devel/rcs57 are available as alternatives)

Approved by:	core
Approved by:	re (hrs)


  Commit: 6c56919ec3d2d45490545fd538ad24783bdb2897
      https://github.com/pcbsd/freebsd/commit/6c56919ec3d2d45490545fd538ad24783bdb2897
  Author: hiren <hiren at FreeBSD.org>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M share/man/man4/urtwn.4

  Log Message:
  -----------
  With r253139, firmware for urtwn(4) is in base system. Correct the man page to
reflect that.

Approved by:	re (blackend)


  Commit: 7279b5f034beee2a8445d0bd805a1be144a17d43
      https://github.com/pcbsd/freebsd/commit/7279b5f034beee2a8445d0bd805a1be144a17d43
  Author: des <des at FreeBSD.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M etc/ftpusers

  Log Message:
  -----------
  Add _atf and unbound and move smmsp and mailnull to where they belong.

Approved by:	re (kib)


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

  Changed paths:
    M sys/sys/elf_common.h

  Log Message:
  -----------
  Add the definition of DF_1_INTERPOSE flag.

Reviewed by:	kan
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Approved by:	re (glebius)


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

  Changed paths:
    M libexec/rtld-elf/rtld.c
    M libexec/rtld-elf/rtld.h

  Log Message:
  -----------
  Implement support for the interpose dso flag.

Requested by:	bf
Reviewed by:	kan
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Approved by:	re (glebius)


  Commit: ce42421e8d6b4bfcbbeba7c690da0f025e45fafe
      https://github.com/pcbsd/freebsd/commit/ce42421e8d6b4bfcbbeba7c690da0f025e45fafe
  Author: phk <phk at FreeBSD.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M sys/x86/include/stdarg.h

  Log Message:
  -----------
  Add a va_copy() to our fall-back stdarg implementation for use with lint(1)

Approved by:	re@ (glebius@)


  Commit: 8984ced46c19636db8da912360c2bde89cb685be
      https://github.com/pcbsd/freebsd/commit/8984ced46c19636db8da912360c2bde89cb685be
  Author: des <des at FreeBSD.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M libexec/Makefile
    A libexec/freebsd-version/Makefile
    A libexec/freebsd-version/freebsd-version.1
    A libexec/freebsd-version/freebsd-version.sh.in

  Log Message:
  -----------
  Introduce the /libexec/freebsd-version script, which is intended to be
used by auditing tools to determine the userland patch level when it
differs from what `uname -r` reports.  This can happen when the system
is kept up-to-date using freebsd-update and the last SA did not touch
the kernel, or when a new kernel has been installed but the system has
not yet rebooted.

Approved by:	re (glebius)


  Commit: 4ecb899fb0e09a90a4b490ec1146b56b16cb43c7
      https://github.com/pcbsd/freebsd/commit/4ecb899fb0e09a90a4b490ec1146b56b16cb43c7
  Author: des <des at FreeBSD.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M usr.bin/kdump/kdump.c

  Log Message:
  -----------
  When displaying a struct stat, if the -r option was not specified,
display the numeric rather than symbolic representation of st_mode.

Approved by:	re (glebius)
MFC after:	1 week


  Commit: da5a57f39d5977b6f544bb7f1bc60a8f061cf197
      https://github.com/pcbsd/freebsd/commit/da5a57f39d5977b6f544bb7f1bc60a8f061cf197
  Author: glebius <glebius at FreeBSD.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M sys/netinet6/ip6_mroute.c

  Log Message:
  -----------
  Fix mbuf leak.

Submitted by:	Loganaden Velvindron <logan elandsys.com>
Obtained from:	NetBSD
Approved by:	re (kib)


  Commit: 774f6b00bfcfed68e842dc1b0f56e6a1ddc227d4
      https://github.com/pcbsd/freebsd/commit/774f6b00bfcfed68e842dc1b0f56e6a1ddc227d4
  Author: rmh <rmh at FreeBSD.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M cddl/contrib/opensolaris/cmd/zfs/zfs_main.c

  Log Message:
  -----------
  Fix implicit declaration of jail_getid()

Approved by:	re


  Commit: 404ef10fa5c6f4218edb0fa3bc3f1901aacf9943
      https://github.com/pcbsd/freebsd/commit/404ef10fa5c6f4218edb0fa3bc3f1901aacf9943
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
    M contrib/libc++/include/memory
    M contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
    M etc/ftpusers
    M gnu/usr.bin/Makefile
    R gnu/usr.bin/rcs/CREDITS
    R gnu/usr.bin/rcs/Makefile
    R gnu/usr.bin/rcs/Makefile.inc
    R gnu/usr.bin/rcs/NEWS
    R gnu/usr.bin/rcs/REFS
    R gnu/usr.bin/rcs/ci/Makefile
    R gnu/usr.bin/rcs/ci/ci.1
    R gnu/usr.bin/rcs/ci/ci.c
    R gnu/usr.bin/rcs/co/Makefile
    R gnu/usr.bin/rcs/co/co.1
    R gnu/usr.bin/rcs/co/co.c
    R gnu/usr.bin/rcs/doc/rcs.ms
    R gnu/usr.bin/rcs/doc/rcs_func.ms
    R gnu/usr.bin/rcs/ident/Makefile
    R gnu/usr.bin/rcs/ident/ident.1
    R gnu/usr.bin/rcs/ident/ident.c
    R gnu/usr.bin/rcs/lib/Makefile
    R gnu/usr.bin/rcs/lib/conf.h
    R gnu/usr.bin/rcs/lib/maketime.c
    R gnu/usr.bin/rcs/lib/maketime.h
    R gnu/usr.bin/rcs/lib/merger.c
    R gnu/usr.bin/rcs/lib/partime.c
    R gnu/usr.bin/rcs/lib/partime.h
    R gnu/usr.bin/rcs/lib/rcsbase.h
    R gnu/usr.bin/rcs/lib/rcsedit.c
    R gnu/usr.bin/rcs/lib/rcsfcmp.c
    R gnu/usr.bin/rcs/lib/rcsfnms.c
    R gnu/usr.bin/rcs/lib/rcsgen.c
    R gnu/usr.bin/rcs/lib/rcskeep.c
    R gnu/usr.bin/rcs/lib/rcskeys.c
    R gnu/usr.bin/rcs/lib/rcslex.c
    R gnu/usr.bin/rcs/lib/rcsmap.c
    R gnu/usr.bin/rcs/lib/rcsrev.c
    R gnu/usr.bin/rcs/lib/rcssyn.c
    R gnu/usr.bin/rcs/lib/rcstime.c
    R gnu/usr.bin/rcs/lib/rcsutil.c
    R gnu/usr.bin/rcs/lib/version.c
    R gnu/usr.bin/rcs/merge/Makefile
    R gnu/usr.bin/rcs/merge/merge.1
    R gnu/usr.bin/rcs/merge/merge.c
    R gnu/usr.bin/rcs/rcs/Makefile
    R gnu/usr.bin/rcs/rcs/rcs.1
    R gnu/usr.bin/rcs/rcs/rcs.c
    R gnu/usr.bin/rcs/rcs/rcsfile.5
    R gnu/usr.bin/rcs/rcs/rcsintro.1
    R gnu/usr.bin/rcs/rcsclean/Makefile
    R gnu/usr.bin/rcs/rcsclean/rcsclean.1
    R gnu/usr.bin/rcs/rcsclean/rcsclean.c
    R gnu/usr.bin/rcs/rcsdiff/Makefile
    R gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
    R gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
    R gnu/usr.bin/rcs/rcsfreeze/Makefile
    R gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
    R gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
    R gnu/usr.bin/rcs/rcsmerge/Makefile
    R gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
    R gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
    R gnu/usr.bin/rcs/rcstest
    R gnu/usr.bin/rcs/rlog/Makefile
    R gnu/usr.bin/rcs/rlog/rlog.1
    R gnu/usr.bin/rcs/rlog/rlog.c
    M lib/libvmmapi/vmmapi.c
    M lib/libvmmapi/vmmapi.h
    M libexec/Makefile
    A libexec/freebsd-version/Makefile
    A libexec/freebsd-version/freebsd-version.1
    A libexec/freebsd-version/freebsd-version.sh.in
    M libexec/rtld-elf/rtld.c
    M libexec/rtld-elf/rtld.h
    R share/doc/psd/13.rcs/Makefile
    R share/doc/psd/13.rcs/Makefile.inc
    R share/doc/psd/13.rcs/rcs/Makefile
    R share/doc/psd/13.rcs/rcs_func/Makefile
    M share/doc/psd/Makefile
    M share/man/man4/urtwn.4
    M share/man/man9/lock.9
    M share/mk/bsd.own.mk
    M sys/amd64/amd64/machdep.c
    M sys/amd64/amd64/pmap.c
    M sys/amd64/amd64/trap.c
    M sys/amd64/include/pcpu.h
    M sys/amd64/include/pmap.h
    M sys/amd64/include/vmm.h
    M sys/amd64/include/vmm_dev.h
    M sys/amd64/include/vmm_instruction_emul.h
    M sys/amd64/vmm/amd/amdv.c
    M sys/amd64/vmm/intel/ept.c
    M sys/amd64/vmm/intel/ept.h
    M sys/amd64/vmm/intel/vmcs.c
    M sys/amd64/vmm/intel/vmcs.h
    M sys/amd64/vmm/intel/vmx.c
    M sys/amd64/vmm/intel/vmx.h
    M sys/amd64/vmm/intel/vmx_genassym.c
    M sys/amd64/vmm/intel/vmx_support.S
    M sys/amd64/vmm/io/ppt.c
    M sys/amd64/vmm/io/ppt.h
    M sys/amd64/vmm/vmm.c
    M sys/amd64/vmm/vmm_dev.c
    M sys/amd64/vmm/vmm_instruction_emul.c
    M sys/amd64/vmm/vmm_mem.c
    M sys/amd64/vmm/vmm_mem.h
    M sys/conf/files
    M sys/dev/e1000/if_igb.c
    M sys/dev/hyperv/vmbus/hv_hv.c
    M sys/dev/ixgbe/ixgbe.c
    M sys/dev/xen/timer/timer.c
    M sys/i386/include/pcpu.h
    M sys/i386/xen/mp_machdep.c
    M sys/i386/xen/mptable.c
    M sys/kern/kern_malloc.c
    R sys/kern/uipc_cow.c
    M sys/netinet6/ip6_mroute.c
    M sys/sys/elf_common.h
    M sys/x86/acpica/madt.c
    M sys/x86/include/stdarg.h
    M sys/x86/xen/hvm.c
    M sys/x86/xen/xen_intr.c
    M tools/build/mk/OptionalObsoleteFiles.inc
    R tools/build/options/WITHOUT_RCS
    M usr.bin/kdump/kdump.c
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/pci_emul.c
    M usr.sbin/bhyve/rtc.c
    M usr.sbin/bhyvectl/bhyvectl.c
    M usr.sbin/bhyveload/bhyveload.c

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/freebsd/freebsd

Conflicts:
	sys/conf/newvers.sh


Compare: https://github.com/pcbsd/freebsd/compare/5002c59e20d8...404ef10fa5c6


More information about the Commits mailing list