FreeBSD/src e6f8afdlibexec/rc rc.conf

rc.conf: Fix typo in comment

The correct path is /etc/defaults/rc.conf (defaults in plural).

Reviewed by:    netchild
Fixes:          cc4eb1ea1040 ("Add support for a /etc/defaults/vendor.conf override file")
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56456

(cherry picked from commit 8e08080ee581dfd30c128d032035da7b6ae44463)
DeltaFile
+1-1libexec/rc/rc.conf
+1-11 files

FreeBSD/src f5e1bc1libexec/rc rc.conf

rc.conf: Fix typo in comment

The correct path is /etc/defaults/rc.conf (defaults in plural).

Reviewed by:    netchild
Fixes:          cc4eb1ea1040 ("Add support for a /etc/defaults/vendor.conf override file")
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56456

(cherry picked from commit 8e08080ee581dfd30c128d032035da7b6ae44463)
DeltaFile
+1-1libexec/rc/rc.conf
+1-11 files

FreeBSD/src 16719d3libexec/rc rc.conf

rc.conf: Fix typo in comment

The correct path is /etc/defaults/rc.conf (defaults in plural).

Reviewed by:    netchild
Fixes:          cc4eb1ea1040 ("Add support for a /etc/defaults/vendor.conf override file")
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56456

(cherry picked from commit 8e08080ee581dfd30c128d032035da7b6ae44463)
DeltaFile
+1-1libexec/rc/rc.conf
+1-11 files

FreeBSD/src 4a6d7fcsys/dev/dpaa2 dpaa2_frame.c dpaa2_ni.c

dpaa2: Extract checksum statuses on ingress

In order to enable RX checksum offloading we need to check the
meta-information for the (good) frames to see if the L3/4 checksums
were calculated and if there was an error.

The way the buffere are setup, the needed frame meta-information is
already requested. All we have to do is make sure it is really part
of the RX frame, that it is valid, and if the respective bits are set.

Also do not forget to set the (dummy) csum_data as otherwise upper
layers will just be cranky. An artefact of the past which likely
should disappear.

PR:             292006
Reviewed by:    bz, tuexen
Tested by:      bz, tuexen
Approved by:    tuexen
Obtained from:  bz (initial version, D55320)

    [3 lines not shown]
DeltaFile
+88-12sys/dev/dpaa2/dpaa2_frame.c
+74-2sys/dev/dpaa2/dpaa2_ni.c
+61-2sys/dev/dpaa2/dpaa2_frame.h
+4-2sys/dev/dpaa2/dpaa2_ni.h
+227-184 files

FreeBSD/src 9d39213lib/libsys pdfork.2

pdfork.2: correct pdrfork's HISTORY section

Since pdrfork will be included in FreeBSD 15.1

Reviewed by:    kib
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D56513
DeltaFile
+2-2lib/libsys/pdfork.2
+2-21 files

FreeBSD/src 5cfadb6sys/modules/ath12k Makefile

ath12k: update module Makefiles for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Handle the file changes and the extra wifi7/ subdirectory.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+12-3sys/modules/ath12k/Makefile
+12-31 files

FreeBSD/src 60bac4dsys/contrib/dev/athk/ath12k dp_mon.c dp_rx.c, sys/contrib/dev/athk/ath12k/wifi7 dp_mon.c hal_desc.h

ath12k: update Atheros/QCA's ath12k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+103-3,414sys/contrib/dev/athk/ath12k/dp_mon.c
+257-3,253sys/contrib/dev/athk/ath12k/dp_rx.c
+3,385-0sys/contrib/dev/athk/ath12k/wifi7/dp_mon.c
+0-3,045sys/contrib/dev/athk/ath12k/hal_desc.h
+2,742-0sys/contrib/dev/athk/ath12k/wifi7/hal_desc.h
+256-2,061sys/contrib/dev/athk/ath12k/hal.c
+6,743-11,77386 files not shown
+28,207-23,80192 files

FreeBSD/src 20cf118sys/modules/ath11k Makefile

ath11k: update module Makefiles for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Add optional support for the new cfr (channel frequency response)
file/option.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+7-1sys/modules/ath11k/Makefile
+7-11 files

FreeBSD/src 4ed5b94sys/contrib/dev/athk/ath11k cfr.c cfr.h

ath11k: update Atheros/QCA's ath11k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1,022-0sys/contrib/dev/athk/ath11k/cfr.c
+308-0sys/contrib/dev/athk/ath11k/cfr.h
+154-13sys/contrib/dev/athk/ath11k/wmi.c
+141-1sys/contrib/dev/athk/ath11k/debugfs_sta.c
+96-12sys/contrib/dev/athk/ath11k/core.c
+94-3sys/contrib/dev/athk/ath11k/wmi.h
+1,815-2921 files not shown
+1,999-11027 files

FreeBSD/src 634a48fsys/modules/brcm80211/brcmfmac Makefile, sys/modules/brcm80211/brcmutil Makefile

brcm80211: update module Makefiles for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/brcm80211/brcmfmac/Makefile
+1-1sys/modules/brcm80211/brcmutil/Makefile
+2-22 files

FreeBSD/src 117d933sys/contrib/dev/broadcom/brcm80211/brcmfmac cfg80211.c pcie.c, sys/contrib/dev/broadcom/brcm80211/brcmsmac main.c

brcm80211: update Broadcom wireless brcmsmac and brcmfmac drivers

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+14-15sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
+13-14sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
+7-8sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
+5-10sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
+6-7sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
+6-6sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
+51-6027 files not shown
+106-11233 files

FreeBSD/src 4546eb0sys/modules/ath10k Makefile, sys/modules/athk_common Makefile

athk_common / ath10k: update module Makefiles for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/ath10k/Makefile
+1-1sys/modules/athk_common/Makefile
+2-22 files

FreeBSD/src 02b4631sys/contrib/dev/athk/ath10k snoc.c wmi.c

ath10k: update Atheros/QCA's ath10k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+50-3sys/contrib/dev/athk/ath10k/snoc.c
+16-16sys/contrib/dev/athk/ath10k/wmi.c
+4-8sys/contrib/dev/athk/ath10k/ce.c
+5-5sys/contrib/dev/athk/ath10k/qmi.c
+8-2sys/contrib/dev/athk/ath10k/sdio.c
+4-6sys/contrib/dev/athk/ath10k/mac.c
+87-406 files not shown
+100-5112 files

FreeBSD/src ff18554sys/contrib/dev/athk dfs_pri_detector.c dfs_pattern_detector.c

ath-common: update common Atheros/QCA code

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+3-3sys/contrib/dev/athk/dfs_pri_detector.c
+2-2sys/contrib/dev/athk/dfs_pattern_detector.c
+5-52 files

FreeBSD/src 237d5b0sys/dev/acpica acpivar.h

acpi: Return "unknown D-state" in acpi_d_state_to_str() if unknown

Some ACPI debugging prints call acpi_d_state_to_str() on unset D-states
(i.e. ACPI_STATE_UNKNOWN), so return a string explicitly saying "unknown
D-state" instead of just panicking.

Fixes:          84bbfc32a3f4 ("acpi_powerres: D3cold support")
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days

(cherry picked from commit dc9ff9e5d078fd923adc3dc5426b5f219156ea43)
DeltaFile
+2-0sys/dev/acpica/acpivar.h
+2-01 files

FreeBSD/src 315f665tools/kerneldoc/subsys common-Doxyfile

Doxygen subsystem config: exclude the content of the .git directory
DeltaFile
+1-1tools/kerneldoc/subsys/common-Doxyfile
+1-11 files

FreeBSD/src ead225csys/dev/ixgbe if_ix.c if_sriov.c

ixgbe: Fix MRQC register value.

Focus on the MRQE field of the MRQC register, which is 4 bits wide,
and we use these 3 types of values.

  - IXGBE_MRQC_RSSEN 0x1  (non VF mode)
  - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs)
  - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs)

If we always take a bitwise OR with IXGBE_MRQC_RSSEN,
IXGBE_MRQC_VMDQRSS32EN will never be chosen.
Select these 3 types of values for the proper case.

Signed-off-by: Yuichiro NAITO <naito.yuichiro at gmail.com>

Pull Request:   https://github.com/freebsd/freebsd-src/pull/2132

(cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09)
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/if_sriov.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+4-43 files

FreeBSD/src d116007sys/dev/ixgbe if_ix.c if_sriov.c

ixgbe: Fix MRQC register value.

Focus on the MRQE field of the MRQC register, which is 4 bits wide,
and we use these 3 types of values.

  - IXGBE_MRQC_RSSEN 0x1  (non VF mode)
  - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs)
  - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs)

If we always take a bitwise OR with IXGBE_MRQC_RSSEN,
IXGBE_MRQC_VMDQRSS32EN will never be chosen.
Select these 3 types of values for the proper case.

Signed-off-by: Yuichiro NAITO <naito.yuichiro at gmail.com>

Pull Request:   https://github.com/freebsd/freebsd-src/pull/2132

(cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09)
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/if_sriov.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+4-43 files

FreeBSD/src 554f5aausr.sbin/service service.sh

service(8): Replace indentation in usage()

The -d option was indented with spaces instead of tabs, and this broke
formatting.

Before:

-d                Enable debugging of rc.d scripts
-j              Perform actions within the named jail

After:

-d              Enable debugging of rc.d scripts
-j              Perform actions within the named jail

MFC after:      1 week
DeltaFile
+1-1usr.sbin/service/service.sh
+1-11 files

FreeBSD/src fa3958csys/dev/ixgbe if_ix.c if_sriov.c

ixgbe: Fix MRQC register value.

Focus on the MRQE field of the MRQC register, which is 4 bits wide,
and we use these 3 types of values.

  - IXGBE_MRQC_RSSEN 0x1  (non VF mode)
  - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs)
  - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs)

If we always take a bitwise OR with IXGBE_MRQC_RSSEN,
IXGBE_MRQC_VMDQRSS32EN will never be chosen.
Select these 3 types of values for the proper case.

Signed-off-by: Yuichiro NAITO <naito.yuichiro at gmail.com>

Pull Request:   https://github.com/freebsd/freebsd-src/pull/2132

(cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09)
DeltaFile
+2-2sys/dev/ixgbe/if_ix.c
+1-1sys/dev/ixgbe/if_sriov.c
+1-1sys/dev/ixgbe/ixgbe_sriov.h
+4-43 files

FreeBSD/src 6323e2bsys/rpc/rpcsec_gss rpcsec_gss.c

rpcsec_gss(3): Fix a typo in a source code comment

- s/verfier/verifier/

MFC after:      3 days
DeltaFile
+1-1sys/rpc/rpcsec_gss/rpcsec_gss.c
+1-11 files

FreeBSD/src 33e0180sys/dev/thunderbolt nhi.c

thunderbolt: Fix a typo in a source code comment

- s/Inititalize/Initialize/

MFC after:      3 days
DeltaFile
+1-1sys/dev/thunderbolt/nhi.c
+1-11 files

FreeBSD/src 4177af3stand/powerpc/boot1.chrp Makefile

stand/powerpc: Fix a typo in a source code comment

- s/limitiations/limitations/

MFC after:      3 days
DeltaFile
+1-1stand/powerpc/boot1.chrp/Makefile
+1-11 files

FreeBSD/src 59dacd7lib/librpcsec_gss rpcsec_gss.c

librpcsec_gss: Fix a typo in a source code comment

- s/verfier/verifier/

MFC after:      3 days
DeltaFile
+1-1lib/librpcsec_gss/rpcsec_gss.c
+1-11 files

FreeBSD/src 9624633sys/fs/msdosfs msdosfs_fat.c

msdosfs(4): Fix two typos in source code comments

- s/unititialized/uninitialized/

MFC after:      3 days
DeltaFile
+2-2sys/fs/msdosfs/msdosfs_fat.c
+2-21 files

FreeBSD/src d8fbbd3sys/contrib/openzfs/module/os/linux/spl spl-zone.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

zfs: merge openzfs/zfs at 1644e2ffd

Notable upstream pull request merges:
 #18148 d1b0a6982 draid: add failure domains support
 #18167 f203fedde Add zoned_uid property with additive least privilege
                  authorization
 #18191 -multiple FreeBSD: Fix a couple of races involving zvol creation
                  and teardown
 #18213 33ed68fc2 zpool create: report which device caused failure
 #18235 931deb290 Prevent range tree corruption race by updating
                  dnode_sync()
 #18282 b44a3ecf4 zpool: Change zpool offline spares policy
 #18310 -multiple Fix s_active leak in zfsvfs_hold() when z_unmounted is
                  true
 #18351 ce837a28e Bridge speculative and prescient prefetchers
 #18380 fc659bd6d draid: fix import failure after disks replacements
 #18385 16858492e FreeBSD: Implement relatime property
 #18390 a22b3f670 abd: Fix stats asymmetry in case of Direct I/O
 #18399 7b1682a82 Add support for POSIX_FADV_DONTNEED

    [10 lines not shown]
DeltaFile
+499-10sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+343-80sys/contrib/openzfs/module/zfs/vdev_draid.c
+385-28sys/contrib/openzfs/module/os/linux/spl/spl-zone.c
+307-11sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+24-216sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+237-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/zoned_uid_common.kshlib
+1,795-345164 files not shown
+9,625-848170 files

FreeBSD/src 1c50cb1sys/modules/mt76 Makefile.inc

mt76: update module Makefile for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/mt76/Makefile.inc
+1-11 files

FreeBSD/src 63a40b6sys/contrib/dev/mediatek/mt76 scan.c agg-rx.c, sys/contrib/dev/mediatek/mt76/mt7615 mac.c

mt76: update Mediatek's mt76 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-3sys/contrib/dev/mediatek/mt76/scan.c
+1-1sys/contrib/dev/mediatek/mt76/mt7615/mac.c
+1-1sys/contrib/dev/mediatek/mt76/mt7996/main.c
+1-1sys/contrib/dev/mediatek/mt76/mt7996/mcu.c
+1-1sys/contrib/dev/mediatek/mt76/agg-rx.c
+1-0sys/contrib/dev/mediatek/mt76/mt7996/mac.c
+6-73 files not shown
+9-79 files

FreeBSD/src 3780e6fsys/modules/rtw89 Makefile

rtw89: update module Makefile for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/rtw89/Makefile
+1-11 files

FreeBSD/src 422e9c5sys/contrib/dev/rtw89 fw.c reg.h

rtw89: update Realtek's rtw89 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1,097-90sys/contrib/dev/rtw89/fw.c
+924-10sys/contrib/dev/rtw89/reg.h
+650-46sys/contrib/dev/rtw89/mac_be.c
+543-20sys/contrib/dev/rtw89/phy_be.c
+446-73sys/contrib/dev/rtw89/fw.h
+384-56sys/contrib/dev/rtw89/phy.c
+4,044-29538 files not shown
+5,680-54044 files