Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +0 | -496 | sys/dev/bhnd/cores/usb/bhnd_usb.c |
| +255 | -151 | sys/dev/pci/pci_host_generic.c |
| +0 | -278 | share/man/man4/twe.4 |
| +0 | -258 | sys/dev/bhnd/cores/usb/bhnd_ehci.c |
| +98 | -124 | sys/arm/arm/nexus.c |
| +0 | -220 | sys/dev/bhnd/cores/usb/bhnd_ohci.c |
| +353 | -1,527 | 97 files not shown |
| +3,040 | -2,989 | 103 files |
powerpc: Fix bus_space_unmap Previously it failed to compile since the macro passed too many arguments to the function. Fix by adding the bus handle to the function and adding an implementation that calls pmap_unmapdev. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43440 (cherry picked from commit a3d6e0de1c89c145b40ed80fe54c6bad1abbf416)
| Delta | File | |
|---|---|---|
| +6 | -1 | sys/powerpc/powerpc/bus_machdep.c |
| +1 | -1 | sys/powerpc/include/bus.h |
| +7 | -2 | 2 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +98 | -124 | sys/arm/arm/nexus.c |
| +124 | -93 | sys/dev/ofw/ofw_pcib.c |
| +127 | -85 | sys/arm64/cavium/thunder_pcie_pem.c |
| +133 | -71 | sys/powerpc/powermac/uninorth.c |
| +133 | -64 | sys/powerpc/powermac/macio.c |
| +142 | -53 | sys/powerpc/mpc85xx/lbc.c |
| +757 | -490 | 27 files not shown |
| +1,470 | -844 | 33 files |
Merge branch 'freebsd/current/main' into hardened/current/master
| Delta | File | |
|---|---|---|
| +98 | -124 | sys/arm/arm/nexus.c |
| +124 | -93 | sys/dev/ofw/ofw_pcib.c |
| +127 | -85 | sys/arm64/cavium/thunder_pcie_pem.c |
| +133 | -71 | sys/powerpc/powermac/uninorth.c |
| +133 | -64 | sys/powerpc/powermac/macio.c |
| +142 | -53 | sys/powerpc/mpc85xx/lbc.c |
| +757 | -490 | 27 files not shown |
| +1,470 | -844 | 33 files |
powerpc: Fix bus_space_unmap Previously it failed to compile since the macro passed too many arguments to the function. Fix by adding the bus handle to the function and adding an implementation that calls pmap_unmapdev. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43440
| Delta | File | |
|---|---|---|
| +6 | -1 | sys/powerpc/powerpc/bus_machdep.c |
| +1 | -1 | sys/powerpc/include/bus.h |
| +7 | -2 | 2 files |
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]| Delta | File | |
|---|---|---|
| +175 | -44 | sys/vm/vm_map.c |
| +97 | -38 | sys/kern/vfs_subr.c |
| +64 | -0 | tests/sys/vm/stack/stack_dlopen_exec_test.c |
| +57 | -0 | tests/sys/vm/stack/stack_mprotect_exec_test.c |
| +42 | -11 | contrib/less/screen.c |
| +51 | -0 | tests/sys/vm/mmap_map_32bit_helper.c |
| +486 | -93 | 31,889 files not shown |
| +1,170 | -49,853 | 31,895 files |
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)
| Delta | File | |
|---|---|---|
| +697 | -0 | sys/dev/virtio/gpu/virtio_gpu.c |
| +454 | -0 | sys/dev/virtio/gpu/virtio_gpu.h |
| +153 | -0 | sys/arm64/arm64/pl031_rtc.c |
| +80 | -52 | sys/compat/linux/linux_socket.c |
| +107 | -0 | tools/build/freebsd-yeet.pl |
| +87 | -11 | sys/dev/ixl/ixl_pf_main.c |
| +1,578 | -63 | 31,042 files not shown |
| +2,188 | -48,405 | 31,048 files |
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]| Delta | File | |
|---|---|---|
| +697 | -0 | sys/dev/virtio/gpu/virtio_gpu.c |
| +454 | -0 | sys/dev/virtio/gpu/virtio_gpu.h |
| +153 | -0 | sys/arm64/arm64/pl031_rtc.c |
| +80 | -52 | sys/compat/linux/linux_socket.c |
| +107 | -0 | tools/build/freebsd-yeet.pl |
| +87 | -11 | sys/dev/ixl/ixl_pf_main.c |
| +1,578 | -63 | 31,044 files not shown |
| +2,304 | -48,375 | 31,050 files |
sys: Remove $FreeBSD$: one-line .c pattern
Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
Conflicts:
sys/i386/linux/imgact_linux.c (deleted)
sys/kern/imgact_aout.c (deleted)
| Delta | File | |
|---|---|---|
| +1 | -3 | sys/xen/xenbus/xenbusb.h |
| +1 | -3 | sys/dev/qlxge/qls_isr.c |
| +1 | -1 | sys/sys/_bus_dma.h |
| +1 | -1 | bin/cp/tests/cp_test.sh |
| +1 | -1 | bin/pkill/pkill.c |
| +1 | -1 | bin/timeout/timeout.1 |
| +6 | -10 | 5,655 files not shown |
| +5,661 | -5,665 | 5,661 files |
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b)
Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
share/man/man5/src.conf.5 (unresolved)
| Delta | File | |
|---|---|---|
| +8,669 | -0 | sys/contrib/dev/athk/ath11k/mac.c |
| +8,286 | -0 | sys/contrib/dev/athk/ath11k/wmi.c |
| +5,662 | -0 | sys/contrib/dev/athk/ath11k/dp_rx.c |
| +5,585 | -0 | sys/contrib/dev/athk/ath11k/wmi.h |
| +4,704 | -0 | sys/contrib/dev/athk/ath11k/debugfs_htt_stats.c |
| +3,063 | -0 | sys/contrib/dev/athk/ath11k/qmi.c |
| +35,969 | -0 | 6,232 files not shown |
| +89,418 | -15,489 | 6,238 files |
Merge remote-tracking branch 'freebsd/main' into hardened/current/master
Conflicts:
lib/csu/common/csu_common.h (deleted)
share/man/man5/src.conf.5 (unresolved)
sys/i386/linux/imgact_linux.c (deleted)
sys/kern/imgact_aout.c (deleted)
| Delta | File | |
|---|---|---|
| +267 | -0 | contrib/xz/ChangeLog |
| +66 | -0 | share/mk/local.sys.dirdeps.env.mk |
| +0 | -66 | share/mk/local.meta.sys.env.mk |
| +17 | -0 | stand/efi/libefi/devpath.c |
| +14 | -0 | tools/build/options/WITH_META_ERROR_TARGET |
| +12 | -1 | contrib/xz/src/liblzma/common/memcmplen.h |
| +376 | -67 | 5,795 files not shown |
| +6,208 | -5,896 | 5,801 files |
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix
| Delta | File | |
|---|---|---|
| +2 | -2 | sys/xen/xenbus/xenbusb.h |
| +2 | -2 | sys/dev/qlxge/qls_isr.c |
| +1 | -1 | sys/dev/adb/adb_kbd.c |
| +1 | -1 | sys/dev/adb/adbvar.h |
| +1 | -1 | sys/dev/ae/if_ae.c |
| +1 | -1 | sys/dev/ae/if_aereg.h |
| +8 | -8 | 5,571 files not shown |
| +5,579 | -5,579 | 5,577 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/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)
| Delta | File | |
|---|---|---|
| +95,073 | -589 | share/man/man5/src.conf.5 |
| +35,376 | -0 | sys/contrib/openzfs/include/sys/u8_textprep_data.h |
| +32,634 | -0 | contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt |
| +27,826 | -0 | sys/contrib/openzfs/module/zstd/lib/zstd.c |
| +9,980 | -9,250 | contrib/sqlite3/sqlite3.c |
| +10,609 | -0 | sys/contrib/openzfs/module/zfs/arc.c |
| +211,498 | -9,839 | 18,438 files not shown |
| +1,674,079 | -664,953 | 18,444 files |
Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master
Conflicts:
Makefile.inc1 (unresolved)
| Delta | File | |
|---|---|---|
| +162 | -124 | sys/powerpc/powerpc/bus_machdep.c |
| +85 | -0 | sys/kern/subr_bus_dma.c |
| +64 | -5 | sys/sys/bus_dma.h |
| +24 | -28 | sys/dev/mpr/mpr.c |
| +46 | -5 | share/man/man9/bus_dma.9 |
| +20 | -25 | sys/dev/mps/mps.c |
| +401 | -187 | 16 files not shown |
| +448 | -406 | 22 files |
Merge branch 'freebsd/current/master' into hardened/current/master * freebsd/current/master: [PowerPC] bus_space cleanup part 1 - rename bs_be / bs_le functions [PowerPC64LE] Bus space prep for LE Spawn the DHCPv6 client in EC2 instances via rtsold. Bump the size of EC2 AMIs up to 5 GB. [PowerPC64LE] Ensure nvram is built on powerpc64le. [PowerPC64LE] Adjust ELF definitions for LE. Remove WITHOUT_BMAKE description [PowerPC] Implement pmap_mincore() for moea [PowerPC64] Implement pmap_mincore() for moea64
| Delta | File | |
|---|---|---|
| +186 | -178 | sys/powerpc/powerpc/bus_machdep.c |
| +49 | -1 | sys/powerpc/aim/mmu_oea.c |
| +49 | -0 | sys/powerpc/aim/mmu_oea64.c |
| +15 | -5 | release/tools/ec2.conf |
| +0 | -8 | tools/build/options/WITHOUT_BMAKE |
| +5 | -2 | sys/powerpc/include/elf.h |
| +304 | -194 | 3 files not shown |
| +311 | -196 | 9 files |
[PowerPC] bus_space cleanup part 2: Convert to c99 initializers. To make it easier to work with this in the future, convert to c99 designated initializer syntax. Tested on powerpc, powerpc64, and powerpc64le. No functional change. Sponsored by: Tag1 Consulting, Inc.
| Delta | File | |
|---|---|---|
| +162 | -124 | sys/powerpc/powerpc/bus_machdep.c |
| +162 | -124 | 1 files |
[PowerPC] bus_space cleanup part 2: Convert to c99 initializers. To make it easier to work with this in the future, convert to c99 designated initializer syntax. Tested on powerpc, powerpc64, and powerpc64le. No functional change. Sponsored by: Tag1 Consulting, Inc.
| Delta | File | |
|---|---|---|
| +162 | -124 | sys/powerpc/powerpc/bus_machdep.c |
| +162 | -124 | 1 files |
[PowerPC] bus_space cleanup part 1 - rename bs_be / bs_le functions The intention of the bus_be naming was for those to be the no-endian-swapping and for the bus_le to be endian-swapping in all the functions. This naming breaks down when we're actually are running in LE and need to use the opposite sense. As such, rename bs_be_* to native_bs_* and rename bs_le_* to swapped_bs_*. No functional change. Sponsored by: Tag1 Consulting, Inc.
| Delta | File | |
|---|---|---|
| +178 | -178 | sys/powerpc/powerpc/bus_machdep.c |
| +178 | -178 | 1 files |
[PowerPC] bus_space cleanup part 1 - rename bs_be / bs_le functions The intention of the bus_be naming was for those to be the no-endian-swapping and for the bus_le to be endian-swapping in all the functions. This naming breaks down when we're actually are running in LE and need to use the opposite sense. As such, rename bs_be_* to native_bs_* and rename bs_le_* to swapped_bs_*. No functional change. Sponsored by: Tag1 Consulting, Inc.
| Delta | File | |
|---|---|---|
| +178 | -178 | sys/powerpc/powerpc/bus_machdep.c |
| +178 | -178 | 1 files |
[PowerPC64LE] Bus space prep for LE Swap the BE and LE bus_space tags when on LE, and adjust the nexus tag to match. This is prep for a a followup that makes the powerpc bus_space macros easier to maintain in the future. Sponsored by: Tag1 Consulting, Inc.
| Delta | File | |
|---|---|---|
| +8 | -0 | sys/powerpc/powerpc/bus_machdep.c |
| +5 | -0 | sys/powerpc/powerpc/nexus.c |
| +13 | -0 | 2 files |
[PowerPC64LE] Bus space prep for LE Swap the BE and LE bus_space tags when on LE, and adjust the nexus tag to match. This is prep for a a followup that makes the powerpc bus_space macros easier to maintain in the future. Sponsored by: Tag1 Consulting, Inc.
| Delta | File | |
|---|---|---|
| +8 | -0 | sys/powerpc/powerpc/bus_machdep.c |
| +5 | -0 | sys/powerpc/powerpc/nexus.c |
| +13 | -0 | 2 files |
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]| Delta | File | |
|---|---|---|
| +680 | -0 | sys/dev/sdhci/sdhci_fsl_fdt.c |
| +0 | -254 | sys/dev/sfxge/common/efx_regs_mcdi.h |
| +0 | -155 | sys/dev/sfxge/common/efx_regs.h |
| +0 | -134 | sys/dev/sfxge/common/efx_regs_pci.h |
| +41 | -51 | sys/arm/ti/omap4/omap4_prcm_clks.c |
| +5 | -74 | sys/netinet/libalias/alias_db.c |
| +726 | -668 | 1,646 files not shown |
| +1,750 | -6,852 | 1,652 files |
powerpc: clean up empty lines in .c and .h files
| Delta | File | |
|---|---|---|
| +7 | -19 | sys/powerpc/booke/pmap.c |
| +4 | -16 | sys/powerpc/powermac/macio.c |
| +8 | -12 | sys/powerpc/powermac/pmu.c |
| +0 | -17 | sys/powerpc/aim/mmu_radix.c |
| +3 | -14 | sys/powerpc/psim/iobus.c |
| +7 | -10 | sys/powerpc/powermac/smu.c |
| +29 | -88 | 142 files not shown |
| +163 | -417 | 148 files |
powerpc: clean up empty lines in .c and .h files
| Delta | File | |
|---|---|---|
| +7 | -19 | sys/powerpc/booke/pmap.c |
| +4 | -16 | sys/powerpc/powermac/macio.c |
| +8 | -12 | sys/powerpc/powermac/pmu.c |
| +3 | -14 | sys/powerpc/psim/iobus.c |
| +7 | -10 | sys/powerpc/powermac/smu.c |
| +0 | -17 | sys/powerpc/aim/mmu_radix.c |
| +29 | -88 | 142 files not shown |
| +163 | -417 | 148 files |
Merge remote-tracking branch 'upstream/hardened/current/master' into hardened/current/safestack-arm64
| Delta | File | |
|---|---|---|
| +148,809 | -148,750 | sys/dev/qlxgbe/ql_fw.c |
| +51,685 | -49,575 | sys/dev/qlnx/qlnxe/ecore_init_values.h |
| +14,979 | -14,981 | sys/dev/ispfw/asm_2500.h |
| +0 | -29,957 | sys/dev/vxge/vxge-firmware.h |
| +14,379 | -13,376 | contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c |
| +13,798 | -13,507 | sys/dev/ispfw/asm_2400.h |
| +243,650 | -270,146 | 13,300 files not shown |
| +1,468,758 | -867,915 | 13,306 files |
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.
| Delta | File | |
|---|---|---|
| +555 | -222 | sys/mips/beri/beri_pic.c |
| +26 | -212 | sys/dev/altera/avgen/altera_avgen.c |
| +68 | -129 | sys/dev/sound/pci/hdspe-pcm.c |
| +42 | -116 | sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c |
| +16 | -109 | sys/dev/cfe/cfe_ioctl.h |
| +47 | -56 | sys/dev/altera/atse/if_atse.c |
| +754 | -844 | 6,790 files not shown |
| +2,355 | -15,684 | 6,796 files |