BSD Commit Log Search

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

Merge remote-tracking branch 'tor/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        etc/mtree/BSD.usr.dist (unresolved)
        secure/lib/libcrypto/Makefile (unresolved)

MFC:    r356963

Install man5 and man7 for OpenSSL.

MFC:    r356963

Install man5 and man7 for OpenSSL.

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 r356931 through r357118.

Merge ^/head r356931 through r357118.

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

Conflicts:
        etc/mtree/BSD.usr.dist (unresolved)
        secure/lib/libcrypto/Makefile (unresolved)

Install man5 and man7 for OpenSSL.

Note config.5 and crypto.7 are not installed because we have conflicts.

Requested by:   phk
MFC after:      1 month

Install man5 and man7 for OpenSSL.

Note config.5 and crypto.7 are not installed because we have conflicts.

Requested by:   phk
MFC after:      1 month

Merge branch 'freebsd/12.1-releng/master' into releng_12.1_merge

Conflicts:
        release/pkg_repos/release-dvd.conf
        share/man/man5/src.conf.5
        share/mk/bsd.lib.mk
        share/mk/bsd.opts.mk
        share/mk/bsd.prog.mk
        sys/compat/freebsd32/freebsd32_misc.c
        sys/kern/kern_fork.c
        sys/kern/kern_procctl.c
        sys/sys/proc.h
        sys/sys/procctl.h
        tools/build/options/WITHOUT_PIE
        usr.bin/proccontrol/proccontrol.c
        usr.sbin/bsdinstall/scripts/config
        usr.sbin/pkg/Makefile

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

 Conflicts:
        share/man/man5/src.conf.5 (not resolved)
        share/mk/bsd.lib.mk (not resolved)
        share/mk/bsd.opts.mk (not resolved)
        share/mk/bsd.prog.mk (not resolved)
        sys/compat/freebsd32/freebsd32_misc.c (not resolved)
        sys/kern/imgact_elf.c (not resolved)
        sys/kern/kern_fork.c (not resolved)
        sys/kern/kern_procctl.c (not resolved)
        sys/sys/proc.h (not resolved)
        sys/sys/procctl.h (not resolved)
        tools/build/options/WITHOUT_PIE (resolved)
        usr.bin/proccontrol/proccontrol.c (not resolved)
        usr.sbin/bsdinstall/scripts/config (not resolved)
        usr.sbin/pkg/Makefile (not resolved)

Merge ^/head r352105 through r352307.

Merge ^/head r352105 through r352307.

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

* freebsd/current/master:
  Fix assumptions of only one device per SES slot.
  Remove struct ata_res_pass16, unneeded after r352082.
  - fix a minor typo
  Remove unnecessary entries from the previous commit.
  In am335x_dmtpps, use a spin mutex to interlock between PPS capture and PPS ioctl(2) handling.  This allows doing the pps_event() work in the polling routine, instead of using a taskqueue task to do that work.
  loader: vidconsole should set LINES and COLUMNS
  lualoader: Revert to ASCII menu frame for serial console
  gnop: Fix initial value for the wdelayprob
  cache: avoid excessive relocking on entry removal during lookup
  cache: change the formula for calculating lock array sizes
  cache: assorted cleanups
  Import OpenSSL 1.1.1d.
  Import OpenSSL 1.1.1c.
  Import OpenSSL 1.1.1c.
  Import OpenSSL 1.1.1b.

MFC:    r352191

Merge OpenSSL 1.1.1d.

MFC:    r352191

Merge OpenSSL 1.1.1d.

Merge OpenSSL 1.1.1d.

Merge OpenSSL 1.1.1d.

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

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

MFHead @348740

Sponsored by:   The FreeBSD Foundation

MFHead @348740

Sponsored by:   The FreeBSD Foundation

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC r345405,345406,346228,346657,348195,348198: UART SPCR fixes.
  MFC:  r348340

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

* origin/hardened/current/master:
  Merge OpenSSL 1.1.1c.
  pseudofs: Ignore unsupported commands in vop_setattr.
  style.9: Correct usage's definition to match its declaration
  Fix array out of bound panic introduced in r306219.
  [ath_hal] Fix queue bits a bit

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

* freebsd/current/master:
  Merge OpenSSL 1.1.1c.
  pseudofs: Ignore unsupported commands in vop_setattr.
  style.9: Correct usage's definition to match its declaration
  Fix array out of bound panic introduced in r306219.
  [ath_hal] Fix queue bits a bit

MFC:    r348340

Merge OpenSSL 1.1.1c.

MFC:    r348340

Merge OpenSSL 1.1.1c.

Merge OpenSSL 1.1.1c.

Merge OpenSSL 1.1.1c.

MFHead at r345275