BSD Commit Log Search

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]

sys: Remove $FreeBSD$: one-line .c pattern

Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/

Similar commit in current:
(cherry picked from commit 685dc743dc3b)

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

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)

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

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]

sys: Remove $FreeBSD$: one-line .c pattern

Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

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

* freebsd/current/main:
  arm64: Make sure COMPAT_FREEBSD32 handles thumb entry point.
  arm: Garbage collect _arm_memcpy/_arm_bzero.

arm: Garbage collect _arm_memcpy/_arm_bzero.

Remove any attempt to use _arm_memcpy and _arm_bzero. It was used by some
xscale platforms to provide functions to use the DMA engine for big
zeroing/copying work, but those platforms are long gone, and it's unlikely
anything else will use those.

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:
  Remove RADIX_MPATH config option.
  Import kernel WireGuard support
  Reduce MAXPHYS back to 128KB on 32bit architectures.
  Store MPIDR register in pcpu.
  iconv(1): Add EXAMPLE
  Remove unused options.
  _ARM_ARCH_5E is always defined, we not support older CPUs.

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

Conflicts:
        sys/arm/arm/elf_machdep.c (unresolved)

_ARM_ARCH_5E is always defined, we not support older CPUs.

_ARM_ARCH_5E is always defined, we not support older CPUs.

Remove the pre-ARMv6 and pre-INTRNG code.
ARM has required ARMV6+ and INTRNg for some time now, so remove
always false #ifdefs and unconditionally do always true #ifdefs.

Remove the pre-ARMv6 and pre-INTRNG code.
ARM has required ARMV6+ and INTRNg for some time now, so remove
always false #ifdefs and unconditionally do always true #ifdefs.

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

Revert r336773: it removed too much.

r336773 removed all things xscale. However, some things xscale are
really armv5. Revert that entirely. A more modest removal will follow.

Noticed by: andrew@

Revert r336773: it removed too much.

r336773 removed all things xscale. However, some things xscale are
really armv5. Revert that entirely. A more modest removal will follow.

Noticed by: andrew@

Remove xscale support

The OLD XSCALE stuff hasn't been useful in a while. The original
committer (cognet@) was the only one that had boards for it. He's
blessed this removal. Newer XSCALE (GUMSTIX) is for hardware that's
quite old. After discussion on arm@, it was clear there was no support
for keeping it.

Differential Review: https://reviews.freebsd.org/D16313

Remove xscale support

The OLD XSCALE stuff hasn't been useful in a while. The original
committer (cognet@) was the only one that had boards for it. He's
blessed this removal. Newer XSCALE (GUMSTIX) is for hardware that's
quite old. After discussion on arm@, it was clear there was no support
for keeping it.

Differential Review: https://reviews.freebsd.org/D16313

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

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

* origin/hardened/current/master: (24 commits)
  Use count(9) api for the bpf(4) statistics.
  Extend the description of ALTQ to call it a system which is a framework in altq(4) to match altq(9). This makes preserving the history section as the author of ALTQ easier in the history section, rather than calling it a framework in the description & a system in the history. Add a history section to altq(4) and extend the history section in altq(9)
  Release the "TUR" reference when clearing the TUR work flag. We mostly do this right, except when there's no BP and we do a TUR by request. In that case, we clear the flag, but don't release the reference, leaking the reference on rare occasion.
  At this point iwmesg isn't initialized yet, so print pointer to lock rather than panic before panicing.
  Push down Giant one layer. In the days of yore, back when Penitums were the new kids on the block and F00F hacks were all the rage, one needed to take out Giant to do anything moderately complicated with the VM, mappings and such. So the pccard / cardbus code held Giant for the entire insertion or removal process.
  Fix whitespace issues in r330034. No functional changes.
  Remove reference to lint. We no longer support it, so exceptions for it are no longer relevant.
  Revert part of r331264: disable interrupts before disabling WP.
  Update to include information about using SPDX-License-Identifier lines.
  Drop support for lint for cdefs.h.
  Remove obsolete lint support.
  Make use of the KPI added in r331252.
  Restore close quote lost in r331254
  Use <stdarg.h> instead of <machine/stdarg.h> in userland.
  Remove a lingering inaccuracy from mlock.2.
  lualoader: Use less atomic options for resetting colors/attributes

    [5 lines not shown]

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

* freebsd/current/master: (24 commits)
  Use count(9) api for the bpf(4) statistics.
  Extend the description of ALTQ to call it a system which is a framework in altq(4) to match altq(9). This makes preserving the history section as the author of ALTQ easier in the history section, rather than calling it a framework in the description & a system in the history. Add a history section to altq(4) and extend the history section in altq(9)
  Release the "TUR" reference when clearing the TUR work flag. We mostly do this right, except when there's no BP and we do a TUR by request. In that case, we clear the flag, but don't release the reference, leaking the reference on rare occasion.
  At this point iwmesg isn't initialized yet, so print pointer to lock rather than panic before panicing.
  Push down Giant one layer. In the days of yore, back when Penitums were the new kids on the block and F00F hacks were all the rage, one needed to take out Giant to do anything moderately complicated with the VM, mappings and such. So the pccard / cardbus code held Giant for the entire insertion or removal process.
  Fix whitespace issues in r330034. No functional changes.
  Remove reference to lint. We no longer support it, so exceptions for it are no longer relevant.
  Revert part of r331264: disable interrupts before disabling WP.
  Update to include information about using SPDX-License-Identifier lines.
  Drop support for lint for cdefs.h.
  Remove obsolete lint support.
  Make use of the KPI added in r331252.
  Restore close quote lost in r331254
  Use <stdarg.h> instead of <machine/stdarg.h> in userland.
  Remove a lingering inaccuracy from mlock.2.
  lualoader: Use less atomic options for resetting colors/attributes

    [5 lines not shown]

Rename assym.s to assym.inc

assym is only to be included by other .s files, and should never
actually be assembled by itself.

Reviewed by:    imp, bdrewery (earlier)
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D14180

Rename assym.s to assym.inc

assym is only to be included by other .s files, and should never
actually be assembled by itself.

Reviewed by:    imp, bdrewery (earlier)
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D14180

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

Create branch for bhyve graphics import.

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

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