HardenedBSD/src 34ab832contrib/binutils Makefile.in, contrib/terminus ter-u32n.bdf ter-u32b.bdf

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)
DeltaFile
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+52,834-0contrib/terminus/ter-u32n.bdf
+52,834-0contrib/terminus/ter-u32b.bdf
+0-49,485contrib/binutils/Makefile.in
+47,418-0contrib/terminus/ter-u28b.bdf
+47,418-0contrib/terminus/ter-u28n.bdf
+272,094-49,91725,491 files not shown
+3,013,181-3,285,38525,497 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src c24ee3dsys/arm/amlogic/aml8726 aml8726_sdxc-m8.c aml8726_mmc.c, sys/dev/rtsx rtsx.c rtsxreg.h

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

* freebsd/current/master:
  Remove support for SSLv3 from fetch(3).
  Update dirdeps.mk et al to latest
  Port rtsx(4) driver for Realtek SD card reader from OpenBSD.
  Do not truncate the last character from serial number.
  release: Merge the RPI2 and BEAGLEBONE image with the GENERICSD one
  Release: arm: Remove config for old boards
  arm: Remove old amlogic support
  arm: Remove old rockchip support
  Update RQSFLAG_* definitions.
  pf tests: provoke tag hashing panic
  ata(4): Release the ioport resource if device initialization fails
  ping(8): Improve parameter validation
DeltaFile
+3,893-0sys/dev/rtsx/rtsx.c
+0-1,395sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
+0-1,114sys/arm/amlogic/aml8726/aml8726_mmc.c
+0-1,082sys/arm/amlogic/aml8726/aml8726_pinctrl.h
+778-0sys/dev/rtsx/rtsxreg.h
+0-771sys/arm/amlogic/aml8726/uart_dev_aml8726.c
+4,671-4,36281 files not shown
+5,319-13,56387 files

HardenedBSD/src b307f99sys/arm/amlogic/aml8726 aml8726_sdxc-m8.c aml8726_mmc.c

arm: Remove old amlogic support

Remove the port for aml8726.
Kernel config was removed in r346096 and this port was never migrated
to GENERIC.
It is also impossible to obtain such hardware nowadays.

Reviewed by:    imp
Relnotes:       yes
Differential Revision:  https://reviews.freebsd.org/D27281
DeltaFile
+0-1,395sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
+0-1,114sys/arm/amlogic/aml8726/aml8726_mmc.c
+0-1,082sys/arm/amlogic/aml8726/aml8726_pinctrl.h
+0-771sys/arm/amlogic/aml8726/uart_dev_aml8726.c
+0-625sys/arm/amlogic/aml8726/aml8726_mp.c
+0-488sys/arm/amlogic/aml8726/aml8726_rtc.c
+0-5,47527 files not shown
+0-11,35733 files

HardenedBSD/src a2a0878 (r367993)sys/arm/amlogic/aml8726 aml8726_sdxc-m8.c aml8726_mmc.c

arm: Remove old amlogic support

Remove the port for aml8726.
Kernel config was removed in r346096 and this port was never migrated
to GENERIC.
It is also impossible to obtain such hardware nowadays.

Reviewed by:    imp
Relnotes:       yes
Differential Revision:  https://reviews.freebsd.org/D27281
DeltaFile
+0-1,395sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
+0-1,114sys/arm/amlogic/aml8726/aml8726_mmc.c
+0-1,082sys/arm/amlogic/aml8726/aml8726_pinctrl.h
+0-771sys/arm/amlogic/aml8726/uart_dev_aml8726.c
+0-625sys/arm/amlogic/aml8726/aml8726_mp.c
+0-488sys/arm/amlogic/aml8726/aml8726_rtc.c
+0-5,47527 files not shown
+0-11,35733 files

HardenedBSD/src f86c9ebcontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/sqlite3 sqlite3.c

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)
        share/mk/src.opts.mk (unresolved)
        share/mk/sys.mk (unresolved)
DeltaFile
+95,073-589share/man/man5/src.conf.5
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+9,980-9,250contrib/sqlite3/sqlite3.c
+10,609-0sys/contrib/openzfs/module/zfs/arc.c
+211,498-9,83918,438 files not shown
+1,674,079-664,95318,444 files

HardenedBSD/src 375f6acsys/arm/ti/omap4 omap4_prcm_clks.c, sys/dev/sdhci sdhci_fsl_fdt.c

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

* freebsd/current/master: (37 commits)
  twe: clean up empty lines in .c and .h files
  tws: clean up empty lines in .c and .h files
  virtio: clean up empty lines in .c and .h files
  iscsi: clean up empty lines in .c and .h files
  vmware: clean up empty lines in .c and .h files
  syscons: clean up empty lines in .c and .h files
  twa: clean up empty lines in .c and .h files
  sfxge: clean up empty lines in .c and .h files
  sound: clean up empty lines in .c and .h files
  usb: clean up empty lines in .c and .h files
  security: clean up empty lines in .c and .h files
  nfs: clean up empty lines in .c and .h files
  libkern: clean up empty lines in .c and .h files
  compat: clean up empty lines in .c and .h files
  x86: clean up empty lines in .c and .h files
  ufs: clean up empty lines in .c and .h files

    [5 lines not shown]
DeltaFile
+680-0sys/dev/sdhci/sdhci_fsl_fdt.c
+0-254sys/dev/sfxge/common/efx_regs_mcdi.h
+0-155sys/dev/sfxge/common/efx_regs.h
+0-134sys/dev/sfxge/common/efx_regs_pci.h
+41-51sys/arm/ti/omap4/omap4_prcm_clks.c
+5-74sys/netinet/libalias/alias_db.c
+726-6681,646 files not shown
+1,750-6,8521,652 files

HardenedBSD/src 6545488 (r365068)sys/arm/arm pmap-v4.c, sys/arm/ti/omap4 omap4_prcm_clks.c omap4_reg.h

arm: clean up empty lines in .c and .h files
DeltaFile
+41-51sys/arm/ti/omap4/omap4_prcm_clks.c
+0-46sys/arm/ti/omap4/omap4_reg.h
+0-44sys/arm/arm/pmap-v4.c
+7-31sys/arm/ti/twl/twl_vreg.c
+4-27sys/arm/ti/twl/twl_clks.c
+13-16sys/arm/ti/usb/omap_ehci.c
+65-215237 files not shown
+100-725243 files

HardenedBSD/src 991d7f4sys/arm/arm pmap-v4.c, sys/arm/ti/omap4 omap4_prcm_clks.c omap4_reg.h

arm: clean up empty lines in .c and .h files
DeltaFile
+41-51sys/arm/ti/omap4/omap4_prcm_clks.c
+0-46sys/arm/ti/omap4/omap4_reg.h
+0-44sys/arm/arm/pmap-v4.c
+7-31sys/arm/ti/twl/twl_vreg.c
+4-27sys/arm/ti/twl/twl_clks.c
+13-16sys/arm/ti/usb/omap_ehci.c
+65-215237 files not shown
+100-725243 files

HardenedBSD/src ec79fb1contrib/amd/doc texinfo.tex, contrib/jemalloc/include/jemalloc/internal size_classes.h

Merge remote-tracking branch 'upstream/projects/clang390-import' into hardened/current/clang390-import
DeltaFile
+17,576-0sys/dev/bnxt/hsi_struct_def.h
+5,100-5,075contrib/jemalloc/include/jemalloc/internal/size_classes.h
+4,326-1,261contrib/amd/doc/texinfo.tex
+4,768-0sys/dev/hyperv/netvsc/if_hn.c
+0-4,685sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+3,782-0contrib/tzdata/NEWS
+35,552-11,0211,216 files not shown
+103,878-29,1721,222 files

HardenedBSD/src 922643fcontrib/amd/doc texinfo.tex, contrib/amd/fsinfo null_lex.c

Merge ^/head r308491 through r308841.
DeltaFile
+17,576-0sys/dev/bnxt/hsi_struct_def.h
+4,326-1,261contrib/amd/doc/texinfo.tex
+2,360-0sys/dev/bnxt/if_bnxt.c
+2,021-43contrib/amd/libamu/xdr_func.c
+1,791-0sys/dev/hyperv/pcib/vmbus_pcib.c
+1,716-0contrib/amd/fsinfo/null_lex.c
+29,790-1,304737 files not shown
+59,355-8,447743 files

HardenedBSD/src 67bc8c8 (r308842)contrib/amd/doc texinfo.tex, contrib/amd/fsinfo null_lex.c

Merge ^/head r308491 through r308841.
DeltaFile
+17,576-0sys/dev/bnxt/hsi_struct_def.h
+4,326-1,261contrib/amd/doc/texinfo.tex
+2,360-0sys/dev/bnxt/if_bnxt.c
+2,021-43contrib/amd/libamu/xdr_func.c
+1,791-0sys/dev/hyperv/pcib/vmbus_pcib.c
+1,716-0contrib/amd/fsinfo/null_lex.c
+29,790-1,304737 files not shown
+59,355-8,447743 files

HardenedBSD/src a110c7cshare/man/man9 usbdi.9, sys/arm/freescale/vybrid vf_dcu4.c vf_sai.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable
DeltaFile
+31-51share/man/man9/usbdi.9
+15-16sys/arm/freescale/vybrid/vf_dcu4.c
+10-12sys/arm/mv/gpio.c
+11-9sys/arm/ti/ti_adc.c
+8-9sys/arm/freescale/vybrid/vf_sai.c
+6-10sys/arm/mv/mv_machdep.c
+81-107159 files not shown
+148-341165 files

HardenedBSD/src afd484bshare/man/man9 usbdi.9, sys/arm/freescale/vybrid vf_dcu4.c vf_sai.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard-ng
DeltaFile
+31-51share/man/man9/usbdi.9
+15-16sys/arm/freescale/vybrid/vf_dcu4.c
+10-12sys/arm/mv/gpio.c
+11-9sys/arm/ti/ti_adc.c
+8-9sys/arm/freescale/vybrid/vf_sai.c
+6-10sys/arm/mv/mv_machdep.c
+81-107159 files not shown
+148-341165 files

HardenedBSD/src da06ac0share/man/man9 usbdi.9, sys/arm/freescale/vybrid vf_dcu4.c vf_sai.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log
DeltaFile
+31-51share/man/man9/usbdi.9
+15-16sys/arm/freescale/vybrid/vf_dcu4.c
+10-12sys/arm/mv/gpio.c
+11-9sys/arm/ti/ti_adc.c
+8-9sys/arm/freescale/vybrid/vf_sai.c
+6-10sys/arm/mv/mv_machdep.c
+81-107159 files not shown
+148-341165 files

HardenedBSD/src cf872c3share/man/man9 usbdi.9, sys/arm/freescale/vybrid vf_dcu4.c vf_sai.c

Merge branch 'freebsd/current/master' into hardened/current/master
DeltaFile
+31-51share/man/man9/usbdi.9
+15-16sys/arm/freescale/vybrid/vf_dcu4.c
+10-12sys/arm/mv/gpio.c
+11-9sys/arm/ti/ti_adc.c
+8-9sys/arm/freescale/vybrid/vf_sai.c
+6-10sys/arm/mv/mv_machdep.c
+81-107159 files not shown
+148-341165 files

HardenedBSD/src 99881c4sys/arm/allwinner aw_machdep.c, sys/arm/freescale/vybrid vf_machdep.c

Stop including fdt_common.h from the arm code when it's unneeded.

Sponsored by:   ABT Systems Ltd
DeltaFile
+1-2sys/arm/nvidia/tegra_uart.c
+0-2sys/arm/versatile/versatile_machdep.c
+0-2sys/arm/rockchip/rk30xx_machdep.c
+0-2sys/arm/lpc/lpc_machdep.c
+0-2sys/arm/allwinner/aw_machdep.c
+0-2sys/arm/freescale/vybrid/vf_machdep.c
+1-12131 files not shown
+1-147137 files

HardenedBSD/src df76753 (r308638)sys/arm/allwinner aw_machdep.c, sys/arm/annapurna/alpine alpine_machdep.c

Stop including fdt_common.h from the arm code when it's unneeded.

Sponsored by:   ABT Systems Ltd
DeltaFile
+1-2sys/arm/nvidia/tegra_uart.c
+0-2sys/arm/xilinx/zy7_machdep.c
+0-2sys/arm/allwinner/aw_machdep.c
+0-2sys/arm/annapurna/alpine/alpine_machdep.c
+0-2sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
+0-2sys/arm/freescale/vybrid/vf_ehci.c
+1-12131 files not shown
+1-147137 files

HardenedBSD/src 00d5789contrib/ntp CommitLog, contrib/sqlite3 sqlite3.c

Create branch for bhyve graphics import.
DeltaFile
+0-250,654tools/tools/locale/etc/final-maps/map.UTF-8
+0-235,924share/dict/web2
+0-209,729contrib/ntp/CommitLog
+0-189,304contrib/sqlite3/sqlite3.c
+0-148,958sys/dev/qlxgbe/ql_fw.c
+0-131,072crypto/heimdal/lib/sqlite/sqlite3.c
+0-1,165,64169,516 files not shown
+19,947-30,627,90869,522 files

HardenedBSD/src 416ba5c (r284687)contrib/ntp CommitLog configure, contrib/ntp/sntp configure

Catch up with HEAD (r280229-r284686).
DeltaFile
+177,242-8,203contrib/ntp/CommitLog
+29,219-17,107contrib/ntp/configure
+27,253-11,174contrib/ntp/sntp/configure
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+17,937-0contrib/ntp/sntp/libevent/configure
+7,405-9,147sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
+269,779-58,69210,019 files not shown
+1,440,418-650,38610,025 files

HardenedBSD/src 98e0ffa (r283595)contrib/ntp CommitLog configure, contrib/ntp/sntp configure

Merge sync of head
DeltaFile
+177,242-8,203contrib/ntp/CommitLog
+29,219-17,107contrib/ntp/configure
+27,253-11,174contrib/ntp/sntp/configure
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+13,910-7,059contrib/sqlite3/sqlite3.c
+0-20,513contrib/texinfo/doc/texinfo.txi
+258,347-77,11719,075 files not shown
+2,720,252-1,303,07719,081 files

HardenedBSD/src 65145facontrib/ntp CommitLog configure, contrib/ntp/sntp configure

Merge sync of head
DeltaFile
+177,242-8,203contrib/ntp/CommitLog
+29,219-17,107contrib/ntp/configure
+27,253-11,174contrib/ntp/sntp/configure
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+13,910-7,059contrib/sqlite3/sqlite3.c
+0-20,513contrib/texinfo/doc/texinfo.txi
+258,347-77,11719,075 files not shown
+2,720,252-1,303,07719,081 files

HardenedBSD/src 7757a1b (r282368)contrib/gcclibs/libgomp configure, contrib/sqlite3 sqlite3.c

Merge from head
DeltaFile
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+7,405-9,147sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
+10,433-1,055contrib/gcclibs/libgomp/configure
+5,689-2,744contrib/sqlite3/sqlite3.c
+0-5,414sys/net/zlib.c
+5,414-0sys/libkern/zlib.c
+39,664-31,4212,767 files not shown
+255,795-148,0812,773 files

HardenedBSD/src b5633bacontrib/gcclibs/libgomp configure, contrib/sqlite3 sqlite3.c

Merge from head
DeltaFile
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+7,405-9,147sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
+10,433-1,055contrib/gcclibs/libgomp/configure
+5,689-2,744contrib/sqlite3/sqlite3.c
+5,414-0sys/libkern/zlib.c
+0-5,414sys/net/zlib.c
+39,664-31,4212,767 files not shown
+255,795-148,0812,773 files

HardenedBSD/src 7263c8c (r281853)contrib/ntp CommitLog configure, contrib/ntp/sntp configure

MFH: r280643-r281852

Sponsored by:   The FreeBSD Foundation
DeltaFile
+174,676-8,203contrib/ntp/CommitLog
+29,154-17,105contrib/ntp/configure
+27,229-11,174contrib/ntp/sntp/configure
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+22,030-0contrib/ntp/sntp/libevent/configure
+7,405-9,147sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
+271,217-58,6904,255 files not shown
+901,970-281,6214,261 files

HardenedBSD/src dfb432fcontrib/ntp CommitLog configure, contrib/ntp/sntp configure

MFH: r280643-r281852

Sponsored by:   The FreeBSD Foundation
DeltaFile
+174,676-8,203contrib/ntp/CommitLog
+29,154-17,105contrib/ntp/configure
+27,229-11,174contrib/ntp/sntp/configure
+10,723-13,061sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
+22,030-0contrib/ntp/sntp/libevent/configure
+7,405-9,147sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
+271,217-58,6904,255 files not shown
+901,970-281,6214,261 files

HardenedBSD/src 404afcecontrib/binutils/gas/doc as.txt, contrib/ntp CommitLog configure

Merge branch 'hardened/current/master' into hardened/current/userlandenhanced
DeltaFile
+174,676-8,203contrib/ntp/CommitLog
+29,154-17,105contrib/ntp/configure
+27,229-11,174contrib/ntp/sntp/configure
+22,030-0contrib/ntp/sntp/libevent/configure
+0-13,924contrib/binutils/gas/doc/as.txt
+6,480-3,707contrib/ntp/sntp/ltmain.sh
+259,569-54,11310,064 files not shown
+1,584,481-664,95310,070 files

HardenedBSD/src 848870dsys/dev/hwpmc hwpmc_mips74k.c pmc_events.h, sys/powerpc/aim trap.c machdep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable
DeltaFile
+816-0sys/powerpc/powerpc/trap.c
+0-752sys/powerpc/aim/trap.c
+0-519sys/powerpc/booke/trap.c
+261-0sys/dev/hwpmc/hwpmc_mips74k.c
+136-0sys/dev/hwpmc/pmc_events.h
+0-25sys/powerpc/aim/machdep.c
+1,213-1,29628 files not shown
+1,288-1,34034 files

HardenedBSD/src 87ed43fsys/dev/hwpmc hwpmc_mips74k.c pmc_events.h, sys/powerpc/aim trap.c machdep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log
DeltaFile
+816-0sys/powerpc/powerpc/trap.c
+0-752sys/powerpc/aim/trap.c
+0-519sys/powerpc/booke/trap.c
+261-0sys/dev/hwpmc/hwpmc_mips74k.c
+136-0sys/dev/hwpmc/pmc_events.h
+0-25sys/powerpc/aim/machdep.c
+1,213-1,29628 files not shown
+1,288-1,34034 files

HardenedBSD/src 2991bedsys/dev/hwpmc hwpmc_mips74k.c pmc_events.h, sys/powerpc/aim trap.c machdep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard
DeltaFile
+816-0sys/powerpc/powerpc/trap.c
+0-752sys/powerpc/aim/trap.c
+0-519sys/powerpc/booke/trap.c
+261-0sys/dev/hwpmc/hwpmc_mips74k.c
+136-0sys/dev/hwpmc/pmc_events.h
+0-25sys/powerpc/aim/machdep.c
+1,213-1,29628 files not shown
+1,288-1,34034 files