BSD Commit Log Search

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master: (23 commits)
  VFS_QUOTACTL: Remove needless casts of arg
  net tests: Re-enable most if_clone tests
  Fix f_pkt_into_t typo.
  Use __containerof() instead of home-rolled versions.
  Describe the commit message template our git hook script produces
  Use a template assembly file for firmware object files.
  Cleanups to *ERR* compat shims.
  chmod +x the git commit message prep hook
  Add initial version of git commit message preparation hook
  Fix a race in tty_signal_sessleader() with unlocked read of s_leader.
  Update the unbound version number from r368478.
  fd: reimplement close_range to avoid spurious relocking
  audit: rework AUDIT_SYSCLOSE
  fd: refactor closefp in preparation for close_range rework
  lualoader: fix lua-lint run
  lualoader: cli: provide a show-module-options loader command

    [5 lines not shown]

arm: Remove samsung exnynos port

Remove the exynos SoC support, this haven't been updated in a while,
isn't present in GENERIC and nobody is motivated to resurect it.

Differential Revision:  https://reviews.freebsd.org/D24444

arm: Remove samsung exnynos port

Remove the exynos SoC support, this haven't been updated in a while,
isn't present in GENERIC and nobody is motivated to resurect it.

Differential Revision:  https://reviews.freebsd.org/D24444

Merge remote-tracking branch 'upstream/hardened/current/master' into hardened/current/safestack-arm64

Conflicts:
        contrib/llvm/tools/clang/lib/Driver/ToolChains/FreeBSD.cpp (unresolved)
        lib/libclang_rt/Makefile (unresolved)

Merge remote-tracking branch 'freebsd/projects/clang700-import' into hardened/current/cross-dso-cfi

Conflicts:
        etc/Makefile (unresolved)
        sbin/init/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
        usr.sbin/services_mkdb/Makefile (unresolved)

Merge ^/head r338026 through r338297, and resolve conflicts.

Merge ^/head r338026 through r338297, and resolve conflicts.

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable

* origin/hardened/current/master: (24 commits)
  efidev.4: Improve formatting.
  config(8): Allow escape-quoted empty strings
  cxgbe/tom: Provide the hardware tid in tcp_info.
  TRIM consolodation is supposed to be off by default
  Fix incorrect output when printing block lists for files small enough to fit in only direct blocks whose size is exactly a multiple of the filesystem block size.
  Move options INTRNG into std.armv6 and std.armv7
  GC inc_isipv6; it was added for "temp" compatibility in 2001, r86764 and does not seem to be used.
  mergemaster: better defaults for SOURCEDIR
  Update comment about ABI of flush_l1s_sw to match the reality.
  Always initialize PCPU kcr3 for vmspace0 pmap.
  [ig4] add ACPI Device HID for AMD platforms
  In r324732 sysinstall was replaced by bsdinstall. However, for post-install configuration, bsdinstall is not of much use. Point the user to bsdconfig instead.
  Serial console menus for lua.
  Eliminate kmem_alloc_contig()'s unused arena parameter.
  Remove extra M_ZERO from NG_MKRESPONSE() argument.
  iostat: update man page for r277566

    [5 lines not shown]

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

* origin/freebsd/current/master:
  Eliminate kmem_alloc_contig()'s unused arena parameter.
  Remove extra M_ZERO from NG_MKRESPONSE() argument.
  iostat: update man page for r277566
  This change represents a substantial restructure of the way we reassembly inbound tcp segments. The old algorithm just blindly dropped in segments without coalescing. This meant that every segment could take up greater and greater room on the linked list of segments. This of course is now subject to a tighter limit (100) of segments which in a high BDP situation will cause us to be a lot more in-efficent as we drop segments beyond 100 entries that we receive. What this restructure does is cause the reassembly buffer to coalesce segments putting an emphasis on the two common cases (which avoid walking the list of segments) i.e. where we add to the back of the queue of segments and where we add to the front. We also have the reassembly buffer supporting a couple of debug options (black box logging as well as counters for code coverage). These are compiled out by default but can be added by uncommenting the defines.
  Merge amd64 and i386 <machine/intr_machdep.h> headers.
  Create a manual page for beinstall.sh.
  Don't rebuild ioctl.c and relink libsysdecode if there are no changes
  Don't create directories in ${WORLDTMP}/legacy with mtree
  Allow bootstrapping libmd on MacOS
  Avoid depending on system headers from the source tree during bootstrap
  Make mkioctls script work on Linux and MacOS

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Eliminate kmem_alloc_contig()'s unused arena parameter.
  Remove extra M_ZERO from NG_MKRESPONSE() argument.
  iostat: update man page for r277566
  This change represents a substantial restructure of the way we reassembly inbound tcp segments. The old algorithm just blindly dropped in segments without coalescing. This meant that every segment could take up greater and greater room on the linked list of segments. This of course is now subject to a tighter limit (100) of segments which in a high BDP situation will cause us to be a lot more in-efficent as we drop segments beyond 100 entries that we receive. What this restructure does is cause the reassembly buffer to coalesce segments putting an emphasis on the two common cases (which avoid walking the list of segments) i.e. where we add to the back of the queue of segments and where we add to the front. We also have the reassembly buffer supporting a couple of debug options (black box logging as well as counters for code coverage). These are compiled out by default but can be added by uncommenting the defines.
  Merge amd64 and i386 <machine/intr_machdep.h> headers.
  Create a manual page for beinstall.sh.
  Don't rebuild ioctl.c and relink libsysdecode if there are no changes
  Don't create directories in ${WORLDTMP}/legacy with mtree
  Allow bootstrapping libmd on MacOS
  Avoid depending on system headers from the source tree during bootstrap
  Make mkioctls script work on Linux and MacOS

Eliminate kmem_alloc_contig()'s unused arena parameter.

Reviewed by:    hselasky, kib, markj
Discussed with: jeff
Differential Revision:  https://reviews.freebsd.org/D16799

Eliminate kmem_alloc_contig()'s unused arena parameter.

Reviewed by:    hselasky, kib, markj
Discussed with: jeff
Differential Revision:  https://reviews.freebsd.org/D16799

Create branch for bhyve graphics import.

Merge from head at 274682

Merge from head at 274682

IFC @r269962

Submitted by:   Anish Gupta (akgupt3 at gmail.com)

IFC @r269962

Submitted by:   Anish Gupta (akgupt3 at gmail.com)

Sync to HEAD at r269943.

Sync to HEAD at r269943.

Merge remote-tracking branch 'freebsd/master' into hardened/current/aslr

Use OF_getencprop() in preference to OF_getprop() and manual byte-swapping.

Use OF_getencprop() in preference to OF_getprop() and manual byte-swapping.

MFC @ r266724

An SVM update will follow this.

MFC @ r266724

An SVM update will follow this.

MFC 264150:  Exynos: Correct the end address of the video frame buffer.

MFC 263910, 263913, 263914, 263933, 263934, 263935, 263936, 263981, 263982,

  Add more flags for the fpexc register from the ARM1176JZF-S Manual

  Initialise fpscr to a sane value when we create the pcb. This sets NaNs to
  be the default NaN and for denormalised numbers to be flushed to zero.

  VFP fixes/cleanups for ARM11:
   * Save the required VFP registers on context switch. If the exception bit
     is set we need to save and restore the FPINST register, and if the fp2v
     bit is also set we need to save and restore FPINST2.
   * Move saving and restoring the floating point control registers to C.
   * Clear the fpexc exception and fp2v flags on a floating-point exception.
   * Signal a SIGFPE if the fpexc exception flag is set on an undefined
     instruction. This is how the ARM core signals to software there is a
     floating-point exception.

  Add Cortex-A15 cpu id revisions.


    [16 lines not shown]

MFC 263250, 263251, 263424, 263425, 263426, 263427, 263430, 263431

  Use the same cache terminology as the ARM docs in comments. No
  functional changes.

  Use armv7 TLB flush code, not arm11, for cortex-a processors.

  Exynos/ Arndale...
  - Disable debugging by default.
  - Add display-related and clk devices to the tree
  - Prevent resources intersection with EHCI driver
  - Add display-related and clk devices to the tree
  - Prevent resources intersection with EHCI driver
  - Add driver for Display Controller.
  - Add support for Samsung Chromebook (ARM Cortex A15 machine).
  - Rename mct and ehci drivers files to match common naming.

Merge head