FreeBSD/src a40fd4eusr.bin/diff pr.h

diff: remove useless include as kevent is not used anymore

MFC After:      3 days

(cherry picked from commit c479817f30b2d2500c9663a1a07c74ba19321416)
DeltaFile
+0-2usr.bin/diff/pr.h
+0-21 files

FreeBSD/src 27bc6a3usr.bin/diff3 diff3.c

diff3: use pdwait instead of homemade one

MFC After:      3 days

(cherry picked from commit 404753664a5e145d98f1749d1c7bc046c8aa32c3)
DeltaFile
+19-37usr.bin/diff3/diff3.c
+19-371 files

FreeBSD/src a3cb42cusr.bin/diff pr.c pr.h

diff: use pdwait(2) instead of homemade one

MFC After:      3 days
Reviewed by:    des
Differential Revision:  https://reviews.freebsd.org/D55053

(cherry picked from commit 0ec58e7c2e533a15eabfe8dca4a14e9ae93de4b5)
DeltaFile
+6-13usr.bin/diff/pr.c
+1-2usr.bin/diff/pr.h
+7-152 files

FreeBSD/src c47b443usr.bin/diff diffreg_new.c diff.h

diff: fix support for -l with new diff algorithm

MFC After: 3 days
Reviewed by:    des
Differential Revision:  https://reviews.freebsd.org/D55052

(cherry picked from commit 4d73b07d02d12cdff0558d3ca6c4b3224cae831f)
DeltaFile
+7-0usr.bin/diff/diffreg_new.c
+1-0usr.bin/diff/diff.h
+1-0usr.bin/diff/diff.c
+9-03 files

FreeBSD/src f2f6f14libexec/rc/rc.d nuageinit

nuageinit: support fetching configuration on multiple iface

On some environement a VM can be connected to multiple ifaces but only
one will respond to dhcp and able to fetch the metadata.

Launch the early dhclient on all available ifaces and as soon as one
dhcp has successfully configured an iface, proceed with fetching the
metadata.

MFC After:      1 week
Reported by:    mateusz.klejn at ovhcloud.com
Tested by:      mateusz.klejn at ovhcloud.com
Sponsored by:   OVHcloud

(cherry picked from commit 90a7728cd8905cd26b90d06f7873df8bad43ae9a)
DeltaFile
+8-3libexec/rc/rc.d/nuageinit
+8-31 files

FreeBSD/src cfd1adelibexec/rc/rc.d nuageinit

nuageinit: support fetching configuration on multiple iface

On some environement a VM can be connected to multiple ifaces but only
one will respond to dhcp and able to fetch the metadata.

Launch the early dhclient on all available ifaces and as soon as one
dhcp has successfully configured an iface, proceed with fetching the
metadata.

MFC After:      1 week
Reported by:    mateusz.klejn at ovhcloud.com
Tested by:      mateusz.klejn at ovhcloud.com
Sponsored by:   OVHcloud

(cherry picked from commit 90a7728cd8905cd26b90d06f7873df8bad43ae9a)
DeltaFile
+8-3libexec/rc/rc.d/nuageinit
+8-31 files

FreeBSD/src 6415be5sys/powerpc/cpufreq pcr.c

cpufreq(4): Fix a typo in a source code comment

- s/transcation/transaction/

(cherry picked from commit 0a3e7ba466376b46672b56c991c09cde528b9729)
DeltaFile
+1-1sys/powerpc/cpufreq/pcr.c
+1-11 files

FreeBSD/src c36e227sys/dev/ath/ath_hal/ar5211 ar5211_reset.c

ath_hal(4): Fix a typo in a source code comment

- s/arithmatic/arithmetic/

(cherry picked from commit a17659fe260ce16c1e373b543ca9f13cc14340ea)
DeltaFile
+1-1sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
+1-11 files

FreeBSD/src 17d4a7csys/powerpc/cpufreq pcr.c

cpufreq(4): Fix a typo in a source code comment

- s/transcation/transaction/

(cherry picked from commit 0a3e7ba466376b46672b56c991c09cde528b9729)
DeltaFile
+1-1sys/powerpc/cpufreq/pcr.c
+1-11 files

FreeBSD/src 69e1270sys/dev/ath/ath_hal/ar5211 ar5211_reset.c

ath_hal(4): Fix a typo in a source code comment

- s/arithmatic/arithmetic/

(cherry picked from commit a17659fe260ce16c1e373b543ca9f13cc14340ea)
DeltaFile
+1-1sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
+1-11 files

FreeBSD/src b8d55a8usr.bin/touch touch.c

touch: Fix setting time of created file if fstat() fails

Previously, if creating the file and fstat() fails, we would've ended up
calling utimensat() on that file anyways with whatever was in sb.  Not
that this is an error likely to happen...

We don't check for the return value of close() as we aren't writing
anything to the file and the file is always created on success of
open().

Reviewed by:    kevans
Approved by:    kevans
Fixes:  cb54c500d0e1 ("touch: don't leak descriptor if fstat(2) fails")
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D55117
MFC after: 1 week
DeltaFile
+4-9usr.bin/touch/touch.c
+4-91 files

FreeBSD/src 484bf5asbin/ifconfig ifgre.c

ifconfig: fix gre(4) status

Set `ifr->ifr_name` to display gre options
for the interface.

Reviewed by: glebius, zlei
Approved by: glebius (mentor)
MFC after: 1 day
Differential Revision: https://reviews.freebsd.org/D55099

(cherry picked from commit c2ba906fa63982d7aa799466d83716d39fe91d2b)
DeltaFile
+2-2sbin/ifconfig/ifgre.c
+2-21 files

FreeBSD/src 6fd6fa4sbin/ifconfig ifgre.c

ifconfig: fix gre(4) status

Set `ifr->ifr_name` to display gre options
for the interface.

Reviewed by: glebius, zlei
Approved by: glebius (mentor)
MFC after: 1 day
Differential Revision: https://reviews.freebsd.org/D55099

(cherry picked from commit c2ba906fa63982d7aa799466d83716d39fe91d2b)
DeltaFile
+2-2sbin/ifconfig/ifgre.c
+2-21 files

FreeBSD/src 93fbf35release/tools azure.conf openstack.conf, stand/efi/loader main.c

loader: Prefer comma-separated list of values for "console"

PR:             292595
Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54923

(cherry picked from commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c)
DeltaFile
+2-2stand/efi/loader/main.c
+2-2stand/i386/loader/main.c
+1-1release/tools/azure.conf
+1-1release/tools/openstack.conf
+6-64 files

FreeBSD/src edde7a7release/tools openstack.conf azure.conf, stand/efi/loader main.c

loader: Prefer comma-separated list of values for "console"

PR:             292595
Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54923

(cherry picked from commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c)
DeltaFile
+2-2stand/i386/loader/main.c
+2-2stand/efi/loader/main.c
+1-1release/tools/openstack.conf
+1-1release/tools/azure.conf
+6-64 files

FreeBSD/src 8514035release/tools azure.conf openstack.conf, stand/efi/loader main.c

loader: Prefer comma-separated list of values for "console"

PR:             292595
Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54923

(cherry picked from commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c)
DeltaFile
+2-2stand/efi/loader/main.c
+2-2stand/i386/loader/main.c
+1-1release/tools/azure.conf
+1-1release/tools/openstack.conf
+6-64 files

FreeBSD/src b562bbcsys/dev/e1000 if_em.c

e1000: Fix setting the promiscuous mode

The variable reg_rctl stores the value read from reg E1000_RCTL. It
may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control
VLAN hardware filter feature. The promiscuous mode implies all tagged
or untagged packets should be accepted, so the VLAN hardware filter
feature should be disabled when enabling the promiscuous mode.
Calling em_if_vlan_filter_disable() did the task, but later writing
the value of reg_rctl back to the reg E1000_RCTL may restore the
feature.

Move the calling of em_if_vlan_filter_disable() after writing the reg
to fix that.

PR:             292759
Reviewed by:    kbowling
Tested by:      vova at zote.me
Fixes:          2796f7cab107 e1000: Fix up HW vlan ops
MFC after:      3 days

    [5 lines not shown]
DeltaFile
+1-1sys/dev/e1000/if_em.c
+1-11 files

FreeBSD/src 3cfe905sys/dev/e1000 if_em.c

e1000: Fix setting the promiscuous mode

The variable reg_rctl stores the value read from reg E1000_RCTL. It
may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control
VLAN hardware filter feature. The promiscuous mode implies all tagged
or untagged packets should be accepted, so the VLAN hardware filter
feature should be disabled when enabling the promiscuous mode.
Calling em_if_vlan_filter_disable() did the task, but later writing
the value of reg_rctl back to the reg E1000_RCTL may restore the
feature.

Move the calling of em_if_vlan_filter_disable() after writing the reg
to fix that.

PR:             292759
Reviewed by:    kbowling
Tested by:      vova at zote.me
Fixes:          2796f7cab107 e1000: Fix up HW vlan ops
MFC after:      3 days

    [4 lines not shown]
DeltaFile
+1-1sys/dev/e1000/if_em.c
+1-11 files

FreeBSD/src 8880678sys/dev/e1000 if_em.c

e1000: Fix setting the promiscuous mode

The variable reg_rctl stores the value read from reg E1000_RCTL. It
may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control
VLAN hardware filter feature. The promiscuous mode implies all tagged
or untagged packets should be accepted, so the VLAN hardware filter
feature should be disabled when enabling the promiscuous mode.
Calling em_if_vlan_filter_disable() did the task, but later writing
the value of reg_rctl back to the reg E1000_RCTL may restore the
feature.

Move the calling of em_if_vlan_filter_disable() after writing the reg
to fix that.

PR:             292759
Reviewed by:    kbowling
Tested by:      vova at zote.me
Fixes:          2796f7cab107 e1000: Fix up HW vlan ops
MFC after:      3 days

    [3 lines not shown]
DeltaFile
+1-1sys/dev/e1000/if_em.c
+1-11 files

FreeBSD/src cc702c7sys/dev/acpica acpi.c

Unbreak the build

Add the missing comma in the `device_printf` statement.

MFC after:      1 week
MFC with:       9c666de5b
Fixes:  9c666de5b ("Make message added for Darwin OSI quirk more terse")
DeltaFile
+1-1sys/dev/acpica/acpi.c
+1-11 files

FreeBSD/src abf911ausr.sbin/pkg pkg.c config.c

pkg: Fix mirror type parsing and service discovery

Signed-off-by: Pavel Knoblokh <info at software-advisory.com.au>
Reviewed by:    emaste, imp, kevans
Fixes:          dc4581589a3 ("pkg: clean support for repositories")
Closes:         https://github.com/freebsd/freebsd-src/pull/1989
DeltaFile
+6-0usr.sbin/pkg/pkg.c
+2-1usr.sbin/pkg/config.c
+8-12 files

FreeBSD/src 2e020c8lib/libbe be.c libbe.3, lib/libbe/tests target_prog.c be_create.sh

bectl: Add -E flag to create an empty boot environment

Signed-off-by: Pat Maddox <pat at patmaddox.com>
Reviewed by:    kevans
MFC after:      1 week
Closes:         https://github.com/freebsd/freebsd-src/pull/1975
DeltaFile
+50-14lib/libbe/be.c
+14-2sbin/bectl/bectl.c
+13-1sbin/bectl/bectl.8
+7-4lib/libbe/tests/target_prog.c
+9-0lib/libbe/tests/be_create.sh
+8-1lib/libbe/libbe.3
+101-223 files not shown
+111-239 files

FreeBSD/src 4f7336ausr.sbin/etcupdate etcupdate.sh, usr.sbin/etcupdate/tests empty_file_test.sh Makefile

etcupdate: Do not ignore empty files.

PR:             bin/292773
Reviewed by:    markj
MFC after:      1 week

Differential Revision: https://reviews.freebsd.org/D54935
DeltaFile
+86-0usr.sbin/etcupdate/tests/empty_file_test.sh
+0-4usr.sbin/etcupdate/etcupdate.sh
+1-0usr.sbin/etcupdate/tests/Makefile
+87-43 files

FreeBSD/src c1a339bsys/powerpc/aim moea64_native.c

powerpc64/pmap: No need to use r0 anymore in tlbie

The only use of `tlbie %rN, 0` is now explicit and covered in the block
above.  Since there's no need for an explicit `tlbie %rN, 0` now, drop
this convoluted piece and let the compiler decide.

While here, a trivial optimization of the old-style tlbie block, by
clearing tlbie_lock and returning, instead of going to the end which
checks again if the lock is needed.  Since it's already known to be
needed, there's no need to check again.
DeltaFile
+3-14sys/powerpc/aim/moea64_native.c
+3-141 files

FreeBSD/src e54a1efshare/man/man1 builtin.1 Makefile

builtin.1: Command list maintenance

+ link to return(1) like the other exclusive builtins
+ fix alphabetical sorting of list in rendered manual

MFC after:      3 days
DeltaFile
+1-1share/man/man1/builtin.1
+1-0share/man/man1/Makefile
+2-12 files

FreeBSD/src 38a4995sys/dev/tpm tpm20.c tpm20.h

tpm20: fix suspend/resume and entropy harvesting

There were a few problem here:
  - TPM2_Shutdown results in a response that we need to either process
    or ignore, otherwise any tpm20_write or tpm20_harvest call will
    trivially hang on an `sc->pending_data_length != 0`
  - We should have a matching TPM2_Startup upon resume to restore any
    state that should have persisted
  - We must drain the harvest task before we suspend to avoid problems
    there

This commit is sufficient to avoid breaking suspend/resume.

PR:             291067
Fixes:  a2d5ed9442bb ("Introduce driver for TPM 2.0 in CRB and [...]")
Fixes:  4ee7d3b0118c ("Allow using TPM as entropy source.")
Co-authored-by: markj (D53835)
Tested by:      garga
Differential Revision:  https://reviews.freebsd.org/D55074
DeltaFile
+65-0sys/dev/tpm/tpm20.c
+1-0sys/dev/tpm/tpm20.h
+1-0sys/dev/tpm/tpm_crb.c
+1-0sys/dev/tpm/tpm_tis_core.c
+68-04 files

FreeBSD/src 5c9d988tools/build/mk OptionalObsoleteFiles.inc

OptionalObsoleteFiles: Add etc/zfs/compatibility.d

If the world is built and installed with WITHOUT_ZFS, then make
-DBATCH_DELETE_OLD_FILES delete-old-dirs will give the error:

> rmdir: /etc/zfs: Directory not empty

because /etc/zfs/compatibility.d is still there.  While we're here,
clean out /usr/share/zfs as well.

Co-authored-by: kevans
Differential Revision:  https://reviews.freebsd.org/D54758
DeltaFile
+58-0tools/build/mk/OptionalObsoleteFiles.inc
+58-01 files

FreeBSD/src 9c666desys/dev/acpica acpi.c

Make message added for Darwin OSI quirk more terse

The verbose message was way too verbose. Make it terse.

MFC after:      1 week
MFC with:       052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware")
Requested by:   kib
DeltaFile
+6-8sys/dev/acpica/acpi.c
+6-81 files

FreeBSD/src 144c1edsys/fs/nfs nfsproto.h

nfs: Add some support for POSIX draft ACLs

An internet draft (expected to become an RFC someday)
https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls
describes an extension to NFSv4.2 to handle POSIX draft ACLs.

This is the final patch in the series that enables
the extension of NFSv4.2 to support POSIX draft ACLs.
At this time, only UFS mounted with the "acls" option
will work, and only for FreeBSD built with these patches.
Patches for client and server for the Linux kernel are
in the works.  (I'll admit my next little project is
cleaning the Linux patches up for submission for upstream.)

To make these changes really useful, the FreeBSD port
of OpenZFS needs to be patched to add POSIX draft ACL
support.  (Support for POSIX draft ACLs is already in
the Linux port of OpenZFS.)


    [4 lines not shown]
DeltaFile
+13-3sys/fs/nfs/nfsproto.h
+13-31 files

FreeBSD/src dccf41dsys/fs/nfs nfs_commonsubs.c nfs_var.h, sys/fs/nfsclient nfs_clrpcops.c nfs_clport.c

nfs: Add some support for POSIX draft ACLs

An internet draft (expected to become an RFC someday)
https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls
describes an extension to NFSv4.2 to handle POSIX draft ACLs.

This is the fifth of several patches that implement the
above draft.

This one mostly adds an extra argument to two functions
in nfscommon.ko.  Unfortunately, these functions are
called in many places, so the changes are numerous, but
straightforward.

Since the internal KAPI between the NFS modules is changed
by this commit, all of nfscommon.ko, nfscl.ko and nfsd.ko
must be rebuilt from sources.

There should be no semantics change for the series at

    [3 lines not shown]
DeltaFile
+22-29sys/fs/nfs/nfs_commonsubs.c
+18-14sys/fs/nfsclient/nfs_clrpcops.c
+14-14sys/fs/nfsserver/nfs_nfsdport.c
+5-5sys/fs/nfs/nfs_var.h
+2-2sys/fs/nfsserver/nfs_nfsdserv.c
+1-1sys/fs/nfsclient/nfs_clport.c
+62-653 files not shown
+65-689 files