Move the NETLINK define into opt_global.h so we can rely on it being set correctly, without having to remember to include opt_netlink.h. This ensures that the NETLINK define is correctly set. If not we may end up with unloadable modules, due to missing symbols (such as nlmsg_get_group_writer). PR: 274306 Reviewed by: imp, markj Approved by: re (karels) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42179 (cherry picked from commit ab393e9548f8cc0ee28499c411963b798ebb38a5) (cherry picked from commit ff15498894e2546fcce7ffc24967e714de3805ed)
OpenZFS release 2.2.0 This commit adjusts the version numbers only. Obtained from: OpenZFS OpenZFS commit: 95785196f26e92d82cf4445654ba84e4a9671c57 OpenZFS tag: zfs-2.2.0 Approved by: re (gjb) (cherry picked from commit b2d6bc7597ebff8201c354a983a33149d1e1ef97)
Notable upstream pull request merges:
#15368 f6e6e77ed FreeBSD: Reduce divergence from in-tree sources
#15395 2bba9fd47 Zpool can start allocating from metaslab before
TRIMs have completed
Obtained from: OpenZFS
OpenZFS commit: 2bba9fd479f5dce01df31bceb532c5a9e9d5c5ca
Approved by: re (gjb)
(cherry picked from commit 69816d277f1621890d3964422b921ee52d75c1bf)
Notable upstream pull request merges:
#15290 33d7c2d16 import: require force when cachefile hostid doesn't
match on-disk
#15319 bcd010d3a Reduce number of metaslab preload taskq threads
#15339 1611b8e56 Add BTI landing pads to the AArch64 SHA2 assembly
#15340 bc77a0c85 ARC: Remove b_cv from struct l1arc_buf_hdr
#15347 3158b5d71 ARC: Drop different size headers for crypto
#15350 ba7797c8d ARC: Remove b_bufcnt/b_ebufcnt from ARC headers
#15353 9be8ddfb3 ZIL: Reduce maximum size of WR_COPIED to 7.5K
#15362 8495536f7 zfsconcepts: add description of block cloning
Obtained from: OpenZFS
OpenZFS commit: 2407f30bda96f7d61a32fc38c638b3eb5b216284
OpenZFS tag: zfs-2.2.0-rc5
Approved by: re (gjb)
(cherry picked from commit fdc38bc6cd28a56fbc82d6ca1d99f47569070b3a)
Notable upstream pull request merges: #15240 e9dc31c74 Update the behavior of mountpoint property #15240 c53bc3837 Improve the handling of sharesmb,sharenfs properties #15298 0ce1b2ca1 Invoke zdb by guid to avoid import errors #15301 0aabd6b48 ZIL: Avoid dbuf_read() in ztest_get_data() #15308 9e36c576f Don't allocate from new metaslabs #15312 229ca7d73 Fix ENOSPC for extended quota #15321 3079bf2e6 Restrict short block cloning requests #15322 8015e2ea6 Add '-u' - nomount flag for zfs set #15324 b34bf2d5f Tweak rebuild in-flight hard limit #15331 608741d06 Report ashift of L2ARC devices in zdb #15333 0d870a177 Fix invalid pointer access in trace_dbuf.h Obtained from: OpenZFS OpenZFS commit: 8015e2ea66b4f6233877fef29a8a35594f33558d Approved by: re (gjb) (cherry picked from commit a21cb0234b896d8e524840d8b06927f5e8ee1b13)
While the build-breaking changes were only in a smaller window further updates restored some functionality as well. Now that we are done, add iwlwifi back to the build. Sponsored by: The FreeBSD Foundation This also adds the (updated) rtw88 driver back to the build. Functionality has not been tested (much) so might not currently work but people offered to test. Approved by: re (gjb) (cherry picked from commit af6aaa90057d75644c41527acc903082104e4114) (cherry picked from commit 299e2d5724c2bc4929b6eac3258f04055e97992e) (cherry picked from commit 7ec227367ed748011a97540296b0935de877cc5a)
Firmware was obtained from linux-firmware at dfa11466cf000120d1551146fd5bf78c44941eda. Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit 027768a21217499dd85aba8608715a5bf66a7857) (cherry picked from commit e504b5da3ef2c24b4e09e7331e9628a8299540f6)
This is a combined versions of updates of the iwlwifi driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1). (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5). (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3). Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit 9af1bba44e1ce9b0296ae56760b564d67ab7a1cf) (cherry picked from commit 12d5f2e7196fc4a68833c154c74de814f770d468)
Disconnect iwlwifi/rtw88 from the build for a few commits which, due to incompatible LinuxKPI 802.11 changes would break the build for a revision. It will be re-enabled "instantly". Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit 712468443df1130db8f893a5e2ce5c6a8dbf5cde) (cherry picked from commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356) (cherry picked from commit b6fbec77eb977538ab4c353789fdb255e01e0a8e)
This is intended to be used with the upcoming updated ice(4) version 1.38.16-k. Signed-off-by: Eric Joyner <erj@FreeBSD.org> Approved by: re (cperciva) Sponsored by: Intel Corporation (cherry picked from commit e04c4b4a369df3f1dcbebbdf726193f02af60801) (cherry picked from commit 65d0d780732853b5ddb2278497d2c72b2b42d7d0)