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:
  ndis(4): expand deprecation to the whole driver
  Note removal of hme(4)
  hme(4): Remove as previous announced
  riscv: small counter(9) improvements
  vnet.9: Use correct location of vnet.h.
  lock(1): Add EXAMPLES section
  caroot: update bundle

hme(4): Remove as previous announced

The hme (Happy Meal Ethernet) driver was the onboard NIC in most
supported sparc64 platforms. A few PCI NICs do exist, but we have seen
no evidence of use on non-sparc systems.

Reviewed by:    imp, emaste, bcr
Sponsored by:   DARPA

hme(4): Remove as previous announced

The hme (Happy Meal Ethernet) driver was the onboard NIC in most
supported sparc64 platforms. A few PCI NICs do exist, but we have seen
no evidence of use on non-sparc systems.

Reviewed by:    imp, emaste, bcr
Sponsored by:   DARPA

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

Conflicts:
        gnu/lib/libgcc/Makefile (deleted)
        share/man/man5/src.conf.5 (unresolved)
        usr.bin/clang/lld/Makefile (unresolved)
        usr.sbin/rpc.statd/Makefile (unresolved)

Merge ^/head r357408 through r357661.

Merge ^/head r357408 through r357661.

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

Conflicts:
        sys/conf/files.sparc64 (deleted)
        sys/conf/options.sparc64 (deleted)
        sys/sparc64/sparc64/elf_machdep.c (deleted)
        sys/sparc64/sparc64/machdep.c (deleted)

Remove sparc64 kernel support

Remove all sparc64 specific files
Remove all sparc64 ifdefs
Removee indireeect sparc64 ifdefs

Remove sparc64 kernel support

Remove all sparc64 specific files
Remove all sparc64 ifdefs
Removee indireeect sparc64 ifdefs

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

* origin/hardened/11-stable/master:
  MFC r331375: Do not send signals to init directly from shutdown_nice(9), do it from the task context.
  MFC r331374: Fixes for ptrace(PT_GETXSTATE_INFO) related to the padding in struct ptrace_xstate_info).
  MFC 331345:
  HBSD: Resolve merge conflict
  MFC kernel build-id support
  MFC r305860, r306371
  MFC r329817:
  MFC r325621, r325622, r331227
  Revert r330897:
  MFC r329738: MFV r329736: 8969 Cannot boot from RAIDZ with parity > 1
  MFC r331559:  Escape trailing newlines in a long variable list for consistency.

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

Conflicts:
        sys/i386/ibcs2/coff.h (deleted)
        sys/i386/ibcs2/ibcs2_dirent.h (deleted)
        sys/i386/ibcs2/ibcs2_errno.c (deleted)
        sys/i386/ibcs2/ibcs2_errno.h (deleted)
        sys/i386/ibcs2/ibcs2_fcntl.c (deleted)
        sys/i386/ibcs2/ibcs2_fcntl.h (deleted)
        sys/i386/ibcs2/ibcs2_ioctl.c (deleted)
        sys/i386/ibcs2/ibcs2_ipc.c (deleted)
        sys/i386/ibcs2/ibcs2_ipc.h (deleted)
        sys/i386/ibcs2/ibcs2_isc.c (deleted)
        sys/i386/ibcs2/ibcs2_misc.c (deleted)
        sys/i386/ibcs2/ibcs2_mount.h (deleted)
        sys/i386/ibcs2/ibcs2_msg.c (deleted)
        sys/i386/ibcs2/ibcs2_other.c (deleted)
        sys/i386/ibcs2/ibcs2_signal.c (deleted)
        sys/i386/ibcs2/ibcs2_signal.h (deleted)

    [21 lines not shown]

Revert r330897:

This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.

Revert with prejudice.

This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.

Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.

Requested by: gjb (re)

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

* origin/hardened/11-stable/master: (36 commits)
  Document SA-18:03.speculative_execution.
  HBSD: Resolve merge conflict
  MFC r314624:
  MFC r302452:
  MFC r302509:
  MFC r322663:
  MFC r330834:
  MFC r316636,r316642,r316675,r316733,r316737,r316741,r316827,r316830,r316865,r316878:
  MFC r316136:
  MFC r315984:
  MFC r317174:
  MFC r315418,r315480,r316019:
  MFC r315003,r315065,r315066:
  MFC r315000:
  MFC r314641,r314646,r314997,r315390:
  MFC r305121,r305231:

    [5 lines not shown]

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

Conflicts:
        sys/i386/ibcs2/coff.h (deleted)
        sys/i386/ibcs2/ibcs2_dirent.h (deleted)
        sys/i386/ibcs2/ibcs2_errno.c (deleted)
        sys/i386/ibcs2/ibcs2_errno.h (deleted)
        sys/i386/ibcs2/ibcs2_fcntl.c (deleted)
        sys/i386/ibcs2/ibcs2_fcntl.h (deleted)
        sys/i386/ibcs2/ibcs2_ioctl.c (deleted)
        sys/i386/ibcs2/ibcs2_ipc.c (deleted)
        sys/i386/ibcs2/ibcs2_ipc.h (deleted)
        sys/i386/ibcs2/ibcs2_isc.c (deleted)
        sys/i386/ibcs2/ibcs2_misc.c (deleted)
        sys/i386/ibcs2/ibcs2_mount.h (deleted)
        sys/i386/ibcs2/ibcs2_msg.c (deleted)
        sys/i386/ibcs2/ibcs2_other.c (deleted)
        sys/i386/ibcs2/ibcs2_signal.c (deleted)
        sys/i386/ibcs2/ibcs2_signal.h (deleted)

    [21 lines not shown]

Partial merge of the SPDX changes

These changes are incomplete but are making it difficult
to determine what other changes can/should be merged.

No objections from:     pfg

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

Conflicts:
        share/mk/src.opts.mk (unresolved)

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

* origin/hardened/current/master: (46 commits)
  siba(4): fix workaround for BCM4312 D11 core backplane timeouts
  bhnd(4): Print the core's hardware revision in bhnd(4)'s BUS_PROBE_NOMATCH().
  bhnd(4): Fix bcma/siba core reset behavior
  bhnd(4) update inline documentation comments and man pages.
  diskinfo(8): Delete dead code in slog test
  Add basic tests for ctfconvert(1), fold(1) and rs(1)
  Fix integer overflow in SLOG test.
  efivar: add missing getopt 'u' option
  Don't use pcpu_find() to determine if a CPU ID is valid.
  Revert r326181 for now.
  Avoid unnecessary lookups when initializing the vm_page array.
  HBSD: Resolve merge conflict
  netconfig.h: sync with upstream.
  Remap ENOATTR to ENODATA in the linuxulator. In the linux ENOADATA is frequently #defined as ENOATTR. The change is required for an xattrs support implementation.
  Add vmm(4) man page
  Set the kernel file name so the kern.bootfile sysctl is set. This allows for the creation of kernel.old when running installkernel.

    [5 lines not shown]

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

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

Conflicts:
        crypto/libressl/apps/nc/atomicio.c (unresolved)
        crypto/libressl/apps/nc/atomicio.h (unresolved)
        sys/i386/ibcs2/coff.h (deleted)
        sys/i386/ibcs2/ibcs2_dirent.h (deleted)
        sys/i386/ibcs2/ibcs2_errno.c (deleted)
        sys/i386/ibcs2/ibcs2_errno.h (deleted)
        sys/i386/ibcs2/ibcs2_fcntl.c (deleted)
        sys/i386/ibcs2/ibcs2_fcntl.h (deleted)
        sys/i386/ibcs2/ibcs2_ioctl.c (deleted)
        sys/i386/ibcs2/ibcs2_ipc.c (deleted)
        sys/i386/ibcs2/ibcs2_ipc.h (deleted)
        sys/i386/ibcs2/ibcs2_isc.c (deleted)
        sys/i386/ibcs2/ibcs2_mount.h (deleted)
        sys/i386/ibcs2/ibcs2_msg.c (deleted)
        sys/i386/ibcs2/ibcs2_other.c (deleted)
        sys/i386/ibcs2/ibcs2_signal.c (deleted)

    [20 lines not shown]

sys/dev: further adoption of SPDX licensing ID tags.

Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.

The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.

sys/dev: further adoption of SPDX licensing ID tags.

Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.

The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.

Create branch for bhyve graphics import.

Merge head

Merge head

IFC @264767

Move ^/user/gjb/hacking/release-embedded up one directory, and remove
^/user/gjb/hacking since this is likely to be merged to head/ soon.

Sponsored by:   The FreeBSD Foundation

MFC @ r259205 in preparation for some SVM updates. (for real this time)

MFC @ r259205 in preparation for some SVM updates. (for real this time)