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)
| Delta | File |
|---|
| +71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
| +52,834 | -0 | contrib/terminus/ter-u32n.bdf |
| +52,834 | -0 | contrib/terminus/ter-u32b.bdf |
| +0 | -49,485 | contrib/binutils/Makefile.in |
| +47,418 | -0 | contrib/terminus/ter-u28b.bdf |
| +47,418 | -0 | contrib/terminus/ter-u28n.bdf |
| +272,094 | -49,917 | 25,491 files not shown |
| +3,013,181 | -3,285,385 | 25,497 files |
Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
| Delta | File |
|---|
| +0 | -111,817 | contrib/libstdc++/configure |
| +72,183 | -0 | lib/clang/liblldb/LLDBWrapLua.cpp |
| +71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
| +31,726 | -39,305 | share/ctypedef/ja_JP.eucJP.src |
| +59,521 | -0 | sys/contrib/dev/iwm/iwm-9000-34.fw.uu |
| +59,517 | -0 | sys/contrib/dev/iwm/iwm-9260-34.fw.uu |
| +294,537 | -151,554 | 60,534 files not shown |
| +10,288,584 | -10,879,881 | 60,540 files |
Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master
Conflicts:
sys/conf/files.i386 (unresolved)
Remove parallel SCSI and 1/2Gb FC support from isp(4).
This removes 288KB (36%) of the driver code and zillions of hacks and
workarounds, making single driver uniformly support several different
generations of hardware interfaces, not counting minor card variations.
After years of the hopeless fight, I don't think it worth to continue
support for hardware obsolete for 15-20 years. Instead much cleaner
now code should allow to move forward toward better locking, multiple
queues and other cool features.
All the remaining Qlogic cards starting from 4Gb 24xx to 32Gb 27xx use
the same hardware/firmware interface with minor incremental improvements,
so it seems to be a good new starting point. Except one PCI-X model all
all of them are PCIe and so still usable in modern systems.
Discussed with: ken, scottl, jpaetzel, imp
Relnotes: yes
Remove parallel SCSI and 1/2Gb FC support from isp(4).
This removes 288KB (36%) of the driver code and zillions of hacks and
workarounds, making single driver uniformly support several different
generations of hardware interfaces, not counting minor card variations.
After years of the hopeless fight, I don't think it worth to continue
support for hardware obsolete for 15-20 years. Instead much cleaner
now code should allow to move forward toward better locking, multiple
queues and other cool features.
All the remaining Qlogic cards starting from 4Gb 24xx to 32Gb 27xx use
the same hardware/firmware interface with minor incremental improvements,
so it seems to be a good new starting point. Except one PCI-X model all
all of them are PCIe and so still usable in modern systems.
Discussed with: ken, scottl, jpaetzel, imp
Relnotes: yes
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
HardenedBSD/src 8e5db8d — contrib/ofed/libcxgb4/src t4_regs.h, share/colldef zh_CN.GB18030.src zh_CN.UTF-8.src
Merge remote-tracking branch 'upstream/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
share/mk/src.opts.mk (unresolved)
| Delta | File |
|---|
| +39,091 | -38,998 | share/colldef/zh_CN.GB18030.src |
| +35,281 | -35,290 | share/colldef/zh_CN.UTF-8.src |
| +0 | -62,873 | contrib/ofed/libcxgb4/src/t4_regs.h |
| +29,823 | -29,813 | share/colldef/zh_CN.GBK.src |
| +0 | -59,053 | usr.bin/fortune/datfiles/fortunes |
| +13,278 | -13,184 | share/colldef/zh_TW.Big5.src |
| +117,473 | -239,211 | 17,335 files not shown |
| +951,145 | -1,027,669 | 17,341 files |
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.
| Delta | File |
|---|
| +0 | -250,654 | tools/tools/locale/etc/final-maps/map.UTF-8 |
| +0 | -235,924 | share/dict/web2 |
| +0 | -209,729 | contrib/ntp/CommitLog |
| +0 | -189,304 | contrib/sqlite3/sqlite3.c |
| +0 | -148,958 | sys/dev/qlxgbe/ql_fw.c |
| +0 | -131,072 | crypto/heimdal/lib/sqlite/sqlite3.c |
| +0 | -1,165,641 | 69,516 files not shown |
| +19,947 | -30,627,908 | 69,522 files |
MFH r289384-r293170
Sponsored by: The FreeBSD Foundation
| Delta | File |
|---|
| +250,654 | -0 | tools/tools/locale/etc/final-maps/map.UTF-8 |
| +71,629 | -0 | share/colldef/zh_Hans_CN.UTF-8.src |
| +63,490 | -0 | tools/tools/locale/etc/charmaps/GB18030.TXT |
| +59,905 | -0 | tools/tools/locale/etc/final-maps/map.GB18030 |
| +42,878 | -0 | tools/tools/locale/etc/final-maps/widths.txt |
| +14,251 | -28,449 | sys/dev/ispfw/asm_2400.h |
| +502,807 | -28,449 | 7,052 files not shown |
| +1,398,688 | -268,000 | 7,058 files |
MFH r289384-r293170
Sponsored by: The FreeBSD Foundation
| Delta | File |
|---|
| +250,654 | -0 | tools/tools/locale/etc/final-maps/map.UTF-8 |
| +71,629 | -0 | share/colldef/zh_Hans_CN.UTF-8.src |
| +63,490 | -0 | tools/tools/locale/etc/charmaps/GB18030.TXT |
| +59,905 | -0 | tools/tools/locale/etc/final-maps/map.GB18030 |
| +42,878 | -0 | tools/tools/locale/etc/final-maps/widths.txt |
| +14,251 | -28,449 | sys/dev/ispfw/asm_2400.h |
| +502,807 | -28,449 | 7,052 files not shown |
| +1,398,688 | -268,000 | 7,058 files |
Merge remote-tracking branch 'origin/hardened/10-stable/master' into hardened/experimental/10-stable
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10-stable/master
MFC r291188: Rip off target mode support for parallel SCSI QLogic adapters.
Hacks to enable target mode there complicated code, while didn't really
work. And for outdated hardware fixing it is not really interesting.
Initiator mode tested with Qlogic 1080 adapter is still working fine.
Catch up with head.
| Delta | File |
|---|
| +7,488 | -7,467 | sys/dev/ispfw/asm_2322.h |
| +7,626 | -6,903 | sys/dev/ispfw/asm_2300.h |
| +5,182 | -4,722 | sys/dev/ispfw/asm_2200.h |
| +0 | -2,554 | sys/dev/ispfw/asm_1080.h |
| +0 | -2,545 | sys/dev/ispfw/asm_12160.h |
| +0 | -2,072 | sys/dev/ispfw/asm_1040.h |
| +20,296 | -26,263 | 702 files not shown |
| +29,171 | -32,753 | 708 files |
MFhead @ r291235
| Delta | File |
|---|
| +7,488 | -7,467 | sys/dev/ispfw/asm_2322.h |
| +7,626 | -6,903 | sys/dev/ispfw/asm_2300.h |
| +5,182 | -4,722 | sys/dev/ispfw/asm_2200.h |
| +0 | -2,554 | sys/dev/ispfw/asm_1080.h |
| +0 | -2,545 | sys/dev/ispfw/asm_12160.h |
| +0 | -2,072 | sys/dev/ispfw/asm_1040.h |
| +20,296 | -26,263 | 332 files not shown |
| +27,545 | -31,868 | 338 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
HardenedBSD/src 3e6deb3 (r291188) — sys/dev/isp isp_freebsd.c isp_target.c, sys/dev/ispfw asm_1080.h asm_12160.h
Rip off target mode support for parallel SCSI QLogic adapters.
Hacks to enable target mode there complicated code, while didn't really
work. And for outdated hardware fixing it is not really interesting.
Initiator mode tested with Qlogic 1080 adapter is still working fine.
