Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +391 | -78 | sys/dev/sound/pci/hdspe-pcm.c |
| +233 | -45 | sys/dev/sound/pci/hdspe.c |
| +51 | -12 | sys/dev/sound/pci/hdspe.h |
| +49 | -1 | share/man/man4/snd_hdspe.4 |
| +28 | -15 | sys/kern/subr_bus.c |
| +1 | -25 | sys/dev/usb/usb_util.c |
| +753 | -176 | 40 files not shown |
| +863 | -274 | 46 files |
Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
periodic: Make daily diff(1) flags configurable with daily_diff_flags PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42900 (cherry picked from commit 15e35d058cff847d1a7bc671fcf48b99f5d2f73b)
periodic: Make daily diff(1) flags configurable with daily_diff_flags PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42900 (cherry picked from commit 15e35d058cff847d1a7bc671fcf48b99f5d2f73b)
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Merge branch 'freebsd/current/main' into hardened/current/master
periodic: Make daily diff(1) flags configurable with daily_diff_flags PR: 270266 Approved by: jrm (mentor), karels MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42900
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 |
Remove $FreeBSD$: one-line sh pattern Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit d0b2dbfa0ecf)
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 |
Remove $FreeBSD$: one-line sh pattern Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
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 branch 'freebsd/12-stable/master' into hardened/12-stable/master * freebsd/12-stable/master: MFC r363169 by allanjude: Actually install the new 221.backup-gpart periodic script MFC r367436 and r367443 by rew: MFC r366615: man5: Fix a few typos spotted by igor
MFC r367436 and r367443 by rew: r367436 Add a periodic script to backup output generated from `zfs list`, `zfs get`, `zpool list`, and `zpool get` commands. Disabled by default. r367443 Add a periodic script to backup output generated from `gmirror list`. Disabled by default. PR: 86388 Submitted by: Miroslav Lachman <000 dot fbsd at quip dot cz> Reported by: Seklecki <Seklecki at FreeBSD dot org> Reviewed by: allanjude, 0mp, gbe Event: July 2020 Bugathon Differential Revision: https://reviews.freebsd.org/D25638 Differential Revision: https://reviews.freebsd.org/D25631
MFC r367436 and r367443 by rew: r367436 Add a periodic script to backup output generated from `zfs list`, `zfs get`, `zpool list`, and `zpool get` commands. Disabled by default. r367443 Add a periodic script to backup output generated from `gmirror list`. Disabled by default. PR: 86388 Submitted by: Miroslav Lachman <000 dot fbsd at quip dot cz> Reported by: Seklecki <Seklecki at FreeBSD dot org> Reviewed by: allanjude, 0mp, gbe Event: July 2020 Bugathon Differential Revision: https://reviews.freebsd.org/D25638 Differential Revision: https://reviews.freebsd.org/D25631
Merge branch 'freebsd/current/master' into hardened/current/master * freebsd/current/master: Add a periodic script to backup output generated from `gmirror list`. imgact_binmisc: validate flags coming from userland binmiscctl(8): miscellaneous cleanup epoch: support non-preemptible epochs checking in_epoch() imgact_binmisc: minor re-organization of imgact_binmisc_exec exits malloc: tweak the version check in r367432 to include type name Update copies of ioctl structures to match recent changes in head. Add a periodic script to backup output generated from `zfs list`, `zfs get`, `zpool list`, and `zpool get` commands. usb_hub: giving up port reset - device vanished
| Delta | File | |
|---|---|---|
| +105 | -5 | sys/kern/subr_epoch.c |
| +78 | -0 | usr.sbin/periodic/etc/daily/223.backup-zfs |
| +72 | -0 | usr.sbin/periodic/etc/daily/222.backup-gmirror |
| +66 | -1 | share/man/man5/periodic.conf.5 |
| +24 | -22 | share/man/man4/crypto.4 |
| +11 | -11 | usr.sbin/binmiscctl/binmiscctl.c |
| +356 | -39 | 7 files not shown |
| +391 | -55 | 13 files |
Add a periodic script to backup output generated from `gmirror list`. Disabled by default. PR: 86388 Submitted by: Miroslav Lachman <000.fbsd at quip.cz> Reviewed by: allanjude, gbe Approved by: allanjude (mentor) MFC after: 4 weeks Event: July 2020 Bugathon Differential Revision: https://reviews.freebsd.org/D25631
| Delta | File | |
|---|---|---|
| +72 | -0 | usr.sbin/periodic/etc/daily/222.backup-gmirror |
| +15 | -1 | share/man/man5/periodic.conf.5 |
| +5 | -1 | usr.sbin/periodic/periodic.conf |
| +1 | -0 | usr.sbin/periodic/etc/daily/Makefile |
| +93 | -2 | 4 files |
Add a periodic script to backup output generated from `gmirror list`. Disabled by default. PR: 86388 Submitted by: Miroslav Lachman <000.fbsd at quip.cz> Reviewed by: allanjude, gbe Approved by: allanjude (mentor) MFC after: 4 weeks Event: July 2020 Bugathon Differential Revision: https://reviews.freebsd.org/D25631
| Delta | File | |
|---|---|---|
| +72 | -0 | usr.sbin/periodic/etc/daily/222.backup-gmirror |
| +15 | -1 | share/man/man5/periodic.conf.5 |
| +5 | -1 | usr.sbin/periodic/periodic.conf |
| +1 | -0 | usr.sbin/periodic/etc/daily/Makefile |
| +93 | -2 | 4 files |