git: 36c970ed985f - main - zfs: merge openzfs/zfs@5605a6d79

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=36c970ed985ff3dd5443db4bf2aa58799028512c commit 36c970ed985ff3dd5443db4bf2aa58799028512c Merge: 0242d4c3aea4 5605a6d79b35 Author: Martin Matuska AuthorDate: 2025-10-05 06:51:00 + Commit: Martin

git: 70999532eea5 - main - zfs: merge openzfs/zfs@7939bad5e

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=70999532eea52da609e90c003b583ee0bfa5246b commit 70999532eea52da609e90c003b583ee0bfa5246b Merge: 5f9a05e57405 7939bad5e792 Author: Martin Matuska AuthorDate: 2025-09-10 15:28:34 + Commit: Martin

git: dd32d6b29d49 - main - zfs: merge openzfs/zfs@3f4312a0a

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=dd32d6b29d49838c99d38ba30846ade210b2e6f7 commit dd32d6b29d49838c99d38ba30846ade210b2e6f7 Merge: e0eaabb80d17 3f4312a0a428 Author: Martin Matuska AuthorDate: 2025-09-13 20:54:32 + Commit: Martin

git: 5e2fc2c3c594 - main - zfs: merge openzfs/zfs@00dfa094a

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5e2fc2c3c59455ddd6354e765ca474182d90ba28 commit 5e2fc2c3c59455ddd6354e765ca474182d90ba28 Merge: 3eeeaf9cfbc1 00dfa094ac35 Author: Martin Matuska AuthorDate: 2025-08-24 21:40:10 + Commit: Martin

Re: git: 53a2e2635ab2 - main - zfs: merge openzfs/zfs@a9410ccbd

Hi I have committed a fix one minute before Dag's email. I don't understand why my make universe on a amd64 with a clean obj could pass without that fix. On 20. 8. 2025 15:50, John Baldwin wrote: On 8/20/25 09:44, Dag-Erling Smørgrav wrote: Martin Matuska writes: zfs: mer

git: 94ca18c18bb0 - main - zfs: fix build issues from 53a2e2635

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=94ca18c18bb0d231c66f146704d9233da48bc84e commit 94ca18c18bb0d231c66f146704d9233da48bc84e Author: Martin Matuska AuthorDate: 2025-08-20 12:57:36 + Commit: Martin Matuska CommitDate: 2025-08-20 13

git: 53a2e2635ab2 - main - zfs: merge openzfs/zfs@a9410ccbd

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=53a2e2635ab2d17bed1de7b4e0d782dd23ceb6ea commit 53a2e2635ab2d17bed1de7b4e0d782dd23ceb6ea Merge: 7acae33bc950 a9410ccbd9f0 Author: Martin Matuska AuthorDate: 2025-08-20 08:57:58 + Commit: Martin

git: 6188ca6a9d72 - main - zfs: add workaround to unbreak kernel compilation on MacOS

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6188ca6a9d72af9be987e1aedc345210f834ad80 commit 6188ca6a9d72af9be987e1aedc345210f834ad80 Author: Martin Matuska AuthorDate: 2025-08-11 21:16:24 + Commit: Martin Matuska CommitDate: 2025-08-12 13

git: d0abb9a6399a - main - zfs: merge openzfs/zfs@1d0b94c4e

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d0abb9a6399accc9053e2808052be00a6754ecef commit d0abb9a6399accc9053e2808052be00a6754ecef Merge: 18a9f83630a7 1d0b94c4e73d Author: Martin Matuska AuthorDate: 2025-08-12 13:20:09 + Commit: Martin

git: df58e8b1506f - main - zfs: merge openzfs/zfs@8302b6e32

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=df58e8b1506f241670be86a560fb6e8432043aee commit df58e8b1506f241670be86a560fb6e8432043aee Merge: 02f394281fd6 8302b6e32bb1 Author: Martin Matuska AuthorDate: 2025-08-07 07:06:31 + Commit: Martin

git: 0df1ee76950f - main - zfs: merge openzfs/zfs@69ee01aa4

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0df1ee76950fc28c3c90a8aa85534fd44641c425 commit 0df1ee76950fc28c3c90a8aa85534fd44641c425 Merge: 24ebe9fa0ec1 69ee01aa4b10 Author: Martin Matuska AuthorDate: 2025-06-28 00:24:57 + Commit: Martin

git: 3a8960711f43 - main - zfs: merge openzfs/zfs@8170eb6eb

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3a8960711f4319f9b894ea2453c89065ee1b3a10 commit 3a8960711f4319f9b894ea2453c89065ee1b3a10 Merge: 07313e0f710b 8170eb6ebcf2 Author: Martin Matuska AuthorDate: 2025-06-21 22:41:07 + Commit: Martin

git: 331f2c1c4658 - main - libarchive: fix duplicate entry in tests Makefile

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=331f2c1c46584510fa9104c86f31f44ece3838c5 commit 331f2c1c46584510fa9104c86f31f44ece3838c5 Author: Martin Matuska AuthorDate: 2025-06-02 12:55:00 + Commit: Martin Matuska CommitDate: 2025-06-02 12

git: 2e113ef82465 - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2e113ef82465598b8c26e0ca415fbe90677fbd47 commit 2e113ef82465598b8c26e0ca415fbe90677fbd47 Merge: 4bf049bfeefd 76141d3306de Author: Martin Matuska AuthorDate: 2025-06-01 20:16:26 + Commit: Martin

git: 3747329b7864 - main - zfs: merge openzfs/zfs@e8e602d98

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3747329b7864d0f98a0e34dda0113804ab3a2dce commit 3747329b7864d0f98a0e34dda0113804ab3a2dce Merge: d00a98d639ca e8e602d987b0 Author: Martin Matuska AuthorDate: 2025-05-31 15:41:12 + Commit: Martin

git: b1c1ee4429fc - main - zfs: merge openzfs/zfs@3084336ae

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b1c1ee4429fcca8f69873a8be66184e68e1b19d7 commit b1c1ee4429fcca8f69873a8be66184e68e1b19d7 Merge: 955ab1a8f21e 3084336ae4a4 Author: Martin Matuska AuthorDate: 2025-05-30 07:59:22 + Commit: Martin

Re: git: 071ab5a1f3cb - main - zfs: merge openzfs/zfs@246e5883b

ports, which I maintain. Cheers, mm P.S: I should rather look into updating libarchive with all its fixed CVEs not yet backported to FreeBSD ... On 5. 5. 2025 0:19, Colin Percival wrote: Is there anything in here which wants to land in 14.3? Colin Percival On 5/4/25 15:08, Martin Matuska

git: 61145dc2b94f - main - zfs: merge openzfs/zfs@4abc21b28

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=61145dc2b94f12f6a47344fb9aac702321880e43 commit 61145dc2b94f12f6a47344fb9aac702321880e43 Merge: d342ae67192f 4abc21b28c22 Author: Martin Matuska AuthorDate: 2025-03-27 07:50:36 + Commit: Martin

git: 641794f94f4d - main - zfs: update zfs_config.h and zfs_gitref.h to catch up with 61145dc2b

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=641794f94f4df1e229ed776f5dfdf0d6e8055db8 commit 641794f94f4df1e229ed776f5dfdf0d6e8055db8 Author: Martin Matuska AuthorDate: 2025-03-27 08:14:14 + Commit: Martin Matuska CommitDate: 2025-03-27 08

git: d2a8fad35797 - main - zfs: merge openzfs/zfs@fe674998b

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d2a8fad3579763bd288260c8c465ab9eb448d465 commit d2a8fad3579763bd288260c8c465ab9eb448d465 Merge: 1016b3c34435 fe674998bb2d Author: Martin Matuska AuthorDate: 2025-03-09 09:24:49 + Commit: Martin

git: b59a0cde6a52 - main - zfs: merge openzfs/zfs@6a2f7b384

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b59a0cde6a5253f94494397ce5b18dbfa071e08c commit b59a0cde6a5253f94494397ce5b18dbfa071e08c Merge: 7f9ef5c75fd1 6a2f7b38442b Author: Martin Matuska AuthorDate: 2025-02-20 16:39:54 + Commit: Martin

git: c6767dc1f236 - main - zfs: merge openzfs/zfs@34205715e

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c6767dc1f236f20eecd75790afd42829345153da commit c6767dc1f236f20eecd75790afd42829345153da Merge: 0eacc5c43321 34205715e154 Author: Martin Matuska AuthorDate: 2025-01-27 07:21:29 + Commit: Martin

git: 9d6043f980a2 - main - zfs: merge openzfs/zfs@fae4c664a

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=9d6043f980a2ee424976c71c437888c9095f8142 commit 9d6043f980a2ee424976c71c437888c9095f8142 Merge: 6bfe9a1393dd fae4c664a4a6 Author: Martin Matuska AuthorDate: 2025-01-11 09:42:32 + Commit: Martin

git: 6bfe9a1393dd - main - zfs: update configs after merging openzfs/zfs@b8e09c700

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6bfe9a1393ddcc4c41c8bf0ef8a5c4ef43eaebd4 commit 6bfe9a1393ddcc4c41c8bf0ef8a5c4ef43eaebd4 Author: Martin Matuska AuthorDate: 2025-01-11 09:38:14 + Commit: Martin Matuska CommitDate: 2025-01-11 09

git: dd21556857e8 - main - zfs: merge openzfs/zfs@b8e09c700

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=dd21556857e8d40f66bf5ad54754d9d52669ebf7 commit dd21556857e8d40f66bf5ad54754d9d52669ebf7 Merge: 3ce003c8b615 b8e09c7007a0 Author: Martin Matuska AuthorDate: 2025-01-11 09:00:12 + Commit: Martin

git: 17aab35a77a1 - main - zfs: merge openzfs/zfs@e0039c705

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=17aab35a77a1b1bf02fc85bb8ffadccb0ca5006d commit 17aab35a77a1b1bf02fc85bb8ffadccb0ca5006d Merge: 977679d651de e0039c70573e Author: Martin Matuska AuthorDate: 2024-12-07 13:04:59 + Commit: Martin

git: 718519f4efc7 - main - zfs: merge openzfs/zfs@d0a91b9f8

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=718519f4efc71096422fc71dab90b2a3369871ff commit 718519f4efc71096422fc71dab90b2a3369871ff Merge: a46c121db4a5 d0a91b9f88a4 Author: Martin Matuska AuthorDate: 2024-11-24 09:04:11 + Commit: Martin

git: 5c65a0a9163c - main - zfs: merge openzfs/zfs@1c9a4c8cb

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5c65a0a9163cc00389d8527ee12c4e69df07ea42 commit 5c65a0a9163cc00389d8527ee12c4e69df07ea42 Merge: 3b337076ba61 1c9a4c8cb44d Author: Martin Matuska AuthorDate: 2024-11-13 10:40:48 + Commit: Martin

git: 6c40282284d6 - main - libarchive: backport PR #2386 (fixes output of one test)

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c40282284d6eab20256914648cdec39acb2c52a commit 6c40282284d6eab20256914648cdec39acb2c52a Author: Martin Matuska AuthorDate: 2024-10-21 12:35:18 + Commit: Martin Matuska CommitDate: 2024-10-21 12

git: 87bf66d4a748 - main - zfs: merge openzfs/zfs@b2f6de7b5

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=87bf66d4a7488c496af110d4d05cc0273d49f82e commit 87bf66d4a7488c496af110d4d05cc0273d49f82e Merge: 6244b9dc4a03 b2f6de7b58f8 Author: Martin Matuska AuthorDate: 2024-10-20 18:08:55 + Commit: Martin

git: bd66c1b43e33 - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=bd66c1b43e33540205dbc1187c2f2a15c58b57ba commit bd66c1b43e33540205dbc1187c2f2a15c58b57ba Merge: 5ca8c28cd8c7 eff4ff4791c8 Author: Martin Matuska AuthorDate: 2024-10-20 08:22:09 + Commit: Martin

git: 73c7cb57a4d7 - main - depend-cleanup.sh: Add a rule to work around zfs arc_os.c dependency changes

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=73c7cb57a4d79caa1c6b3f27b49a623d16490b7a commit 73c7cb57a4d79caa1c6b3f27b49a623d16490b7a Author: Martin Matuska AuthorDate: 2024-10-11 07:22:15 + Commit: Martin Matuska CommitDate: 2024-10-11 07

Re: git: 7a7741af18d6 - main - zfs: merge openzfs/zfs@b10992582

It builds fine with me. Looks like arc_os.c is read from the wrong place if depend is not cleaned and has to be added to tools/build/depend-cleanup.sh as well On 11. 10. 2024 9:12, FreeBSD User wrote: Am Fri, 11 Oct 2024 06:48:36 GMT Martin Matuska schrieb: This commit break buildworld

git: 7a7741af18d6 - main - zfs: merge openzfs/zfs@b10992582

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 commit 7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 Merge: 3e501ef89667 3a9fca901b44 Author: Martin Matuska AuthorDate: 2024-10-11 06:39:18 + Commit: Martin

git: e2df9bb44109 - main - zfs: merge openzfs/zfs@b10992582

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e2df9bb44109577475aeb186e7186ac040f9bde1 commit e2df9bb44109577475aeb186e7186ac040f9bde1 Merge: f05795e3f65f b109925820fb Author: Martin Matuska AuthorDate: 2024-09-09 16:13:02 + Commit: Martin

git: 29dc93491496 - main - zfs: merge openzfs/zfs@d2ccc2155

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=29dc9349149657d6f00f1f5fc3ade589525e0d38 commit 29dc9349149657d6f00f1f5fc3ade589525e0d38 Merge: 9aeee9486a07 d2ccc2155217 Author: Martin Matuska AuthorDate: 2024-08-15 11:24:01 + Commit: Martin

git: ce4dcb97ca43 - main - zfs: merge openzfs/zfs@9c56b8ec7

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51 commit ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51 Merge: 54a543d5ea3a 9c56b8ec7855 Author: Martin Matuska AuthorDate: 2024-08-10 09:15:30 + Commit: Martin

git: 75e1fea68aaa - main - zfs: merge openzfs/zfs@1147a2797

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=75e1fea68aaa613a20dfdcd0c59dd403aca02c49 commit 75e1fea68aaa613a20dfdcd0c59dd403aca02c49 Merge: a4469a0d19b6 1147a2797853 Author: Martin Matuska AuthorDate: 2024-07-18 07:44:47 + Commit: Martin

git: aca928a50a42 - main - zfs: merge openzfs/zfs@e2357561b

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=aca928a50a42f00f344df934005b09dbcb4e2f77 commit aca928a50a42f00f344df934005b09dbcb4e2f77 Merge: d28bbfa2715a e2357561b949 Author: Martin Matuska AuthorDate: 2024-05-31 07:31:58 + Commit: Martin

git: 3c1be0b2615e - main - zfs: unbreak macOS bootstrap

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1be0b2615e7bd6b8107f62f9ad625871397786 commit 3c1be0b2615e7bd6b8107f62f9ad625871397786 Author: Martin Matuska AuthorDate: 2024-05-03 23:52:56 + Commit: Martin Matuska CommitDate: 2024-05-03 23

git: b985c9cafd2a - main - zfs: merge openzfs/zfs@8f1b7a6fa

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b985c9cafd2aedac5cf92428c0211485ea4ede24 commit b985c9cafd2aedac5cf92428c0211485ea4ede24 Merge: 04ea5e9f84e2 8f1b7a6fa676 Author: Martin Matuska AuthorDate: 2024-05-03 15:56:40 + Commit: Martin

git: c0b58e65deca - main - libarchive: merge bugfixes from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c0b58e65deca1e5e2c434ede7e64f03af6044be8 commit c0b58e65deca1e5e2c434ede7e64f03af6044be8 Merge: b91f2954bdc9 ed3e9886422f Author: Martin Matuska AuthorDate: 2024-04-30 09:53:06 + Commit: Martin

git: 13d826ff947d - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=13d826ff947d9026f98e317e7385b22abfc0eace commit 13d826ff947d9026f98e317e7385b22abfc0eace Merge: d289382897e7 51c823ac2777 Author: Martin Matuska AuthorDate: 2024-04-29 08:15:04 + Commit: Martin

git: 0d4ad64077bc - main - zfs: merge openzfs/zfs@1f940de07

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0d4ad64077bcddcff5a170ee97273db95b9cab55 commit 0d4ad64077bcddcff5a170ee97273db95b9cab55 Merge: cf04a7775a4e 1f940de07224 Author: Martin Matuska AuthorDate: 2024-04-23 21:57:56 + Commit: Martin

git: 7d03ec330684 - main - libarchive: add two missing package files to libarchive tests

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7d03ec330684a4e82e6113df3f40305849e5fb6c commit 7d03ec330684a4e82e6113df3f40305849e5fb6c Author: Martin Matuska AuthorDate: 2024-04-17 07:58:32 + Commit: Martin Matuska CommitDate: 2024-04-17 07

git: 701d0666c03d - main - libarchive: fix null format string error in tests (unbreaks gcc13 build)

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=701d0666c03dacba9b73d91dff2a6140e157bdc4 commit 701d0666c03dacba9b73d91dff2a6140e157bdc4 Author: Martin Matuska AuthorDate: 2024-04-17 07:33:13 + Commit: Martin Matuska CommitDate: 2024-04-17 07

git: b9dee1dca2d7 - main - zfs: unbreak aarch64 build with non-gcc compilers

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b9dee1dca2d74e12e867fd29d2d584fc385078eb commit b9dee1dca2d74e12e867fd29d2d584fc385078eb Author: Martin Matuska AuthorDate: 2024-04-16 23:34:25 + Commit: Martin Matuska CommitDate: 2024-04-17 04

git: b9128a37faaf - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b9128a37faafede823eb456aa65a11ac69997284 commit b9128a37faafede823eb456aa65a11ac69997284 Merge: e0919a4bac2b a509d68f27b9 Author: Martin Matuska AuthorDate: 2024-04-16 21:39:31 + Commit: Martin

git: 1719886f6d08 - main - zfs: merge openzfs/zfs@90ba19eb7

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1719886f6d08408b834d270c59ffcfd821c8f63a commit 1719886f6d08408b834d270c59ffcfd821c8f63a Merge: e4a0c92e7aea 90ba19eb7b81 Author: Martin Matuska AuthorDate: 2024-04-16 20:52:34 + Commit: Martin

git: 783d3ff6d7fa - main - zfs: merge openzfs/zfs@39be46f43

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=783d3ff6d7fae619db8a7990b8a6387de0c677b5 commit 783d3ff6d7fae619db8a7990b8a6387de0c677b5 Merge: e0388a906ca7 39be46f43f96 Author: Martin Matuska AuthorDate: 2024-03-30 21:14:52 + Commit: Martin

git: 4fefe1b76357 - main - zfs: merge openzfs/zfs@8f2f6cd2a

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=4fefe1b763573c873bf3dbf3b6f28c22de0ffada commit 4fefe1b763573c873bf3dbf3b6f28c22de0ffada Merge: cbddb2f02c76 8f2f6cd2ac68 Author: Martin Matuska AuthorDate: 2024-03-07 09:49:48 + Commit: Martin

git: e2257b3168fc - main - zfs: merge openzfs/zfs@e0bd8118d

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e2257b3168fc1697518265527e5d817eca6c43b8 commit e2257b3168fc1697518265527e5d817eca6c43b8 Merge: 3733d82c4deb e0bd8118d04b Author: Martin Matuska AuthorDate: 2024-02-15 09:21:13 + Commit: Martin

git: a4e5e0106ac7 - main - zfs: merge openzfs/zfs@229b9f4ed

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a4e5e0106ac7145f56eb39a691e302cabb4635be commit a4e5e0106ac7145f56eb39a691e302cabb4635be Merge: 4594eb454891 229b9f4ed05e Author: Martin Matuska AuthorDate: 2024-02-08 12:39:04 + Commit: Martin

git: fd45b686f9d9 - main - zfs: merge openzfs/zfs@2e6b3c4d9

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=fd45b686f9d92f583366c75b22c04c7ee49709c0 commit fd45b686f9d92f583366c75b22c04c7ee49709c0 Merge: f76cb7bd08e0 2e6b3c4d9453 Author: Martin Matuska AuthorDate: 2024-01-30 22:52:29 + Commit: Martin

git: fedf5b965fd6 - main - zfs: merge openzfs/zfs@a4bf6baae

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=fedf5b965fd623957a9b851418ba3301ac122e27 commit fedf5b965fd623957a9b851418ba3301ac122e27 Merge: 95bf75895ddc a4bf6baaeb70 Author: Martin Matuska AuthorDate: 2024-01-24 11:41:22 + Commit: Martin

git: 78ae60b447eb - main - zfs: merge openzfs/zfs@a0b2a93c4

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=78ae60b447ebf420dd5cebfec30480866fd5cef4 commit 78ae60b447ebf420dd5cebfec30480866fd5cef4 Merge: 41ac0b4ce00b a0b2a93c41b0 Author: Martin Matuska AuthorDate: 2024-01-17 21:08:01 + Commit: Martin

git: 0e1d8481f93c - main - ktls: fix vnet-related panic in ktls_reset_receive_tag()

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0e1d8481f93c58008c5a2ef68c3a46a0da83644a commit 0e1d8481f93c58008c5a2ef68c3a46a0da83644a Author: Martin Matuska AuthorDate: 2024-01-11 20:31:15 + Commit: Martin Matuska CommitDate: 2024-01-11 20

git: f552d7adebb1 - main - zfs: merge openzfs/zfs@a382e2119

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f552d7adebb13e24f65276a6c4822bffeeac3993 commit f552d7adebb13e24f65276a6c4822bffeeac3993 Merge: 13720136fbf9 a382e21194c1 Author: Martin Matuska AuthorDate: 2024-01-10 08:07:45 + Commit: Martin

git: b356da806b52 - main - zfs: merge openzfs/zfs@233d34e47

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b356da806b5207833324a7cdd863adc72189fa58 commit b356da806b5207833324a7cdd863adc72189fa58 Merge: 61e2161367bb 07e95b4670dc Author: Martin Matuska AuthorDate: 2023-12-27 21:51:21 + Commit: Martin

git: 188408da9f7c - main - zfs: merge openzfs/zfs@dbda45160

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=188408da9f7c19f476c1afe9becb0d373088da31 commit 188408da9f7c19f476c1afe9becb0d373088da31 Merge: 45835894bd98 dbda45160ffa Author: Martin Matuska AuthorDate: 2023-12-19 22:17:48 + Commit: Martin

git: 5fb307d29b36 - main - zfs: merge openzfs/zfs@86e115e21

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5fb307d29b364982acbde82cbf77db3cae486f8c commit 5fb307d29b364982acbde82cbf77db3cae486f8c Merge: c2e340452c14 86e115e21e5b Author: Martin Matuska AuthorDate: 2023-12-15 13:17:23 + Commit: Martin

git: 3494f7c019fc - main - Notable upstream pull request merges: #15539 687e4d7f9 Extend import_progress kstat with a notes field #15544 c7b611926 Allow block cloning across encrypted datasets #155

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3494f7c019fc6558a99f63b7f647373b89bcde92 commit 3494f7c019fc6558a99f63b7f647373b89bcde92 Merge: 1f36ca5de596 450f2d0b08e7 Author: Martin Matuska AuthorDate: 2023-12-08 08:32:30 + Commit: Martin

git: 525fe93dc748 - main - zfs: merge openzfs/zfs@a03ebd9be

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=525fe93dc7487a1e63a90f6a2b956abc601963c1 commit 525fe93dc7487a1e63a90f6a2b956abc601963c1 Merge: b70e57be2cfe a03ebd9beec6 Author: Martin Matuska AuthorDate: 2023-11-29 22:07:33 + Commit: Martin

git: 2276e53940c2 - main - zfs: merge openzfs/zfs@688514e47

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2 commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2 Merge: cd201c090858 688514e4704b Author: Martin Matuska AuthorDate: 2023-11-28 20:35:02 + Commit: Martin

git: a2b560cc69eb - main - zfs: merge openzfs/zfs@a94860a6d

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b560cc69eb254c92caf2027a69cadf9865d273 commit a2b560cc69eb254c92caf2027a69cadf9865d273 Merge: bbde5c0725a5 a94860a6dee1 Author: Martin Matuska AuthorDate: 2023-11-21 00:39:04 + Commit: Martin

git: 3c773cad5706 - main - cat: fallback on EISDIR with copy_file_range(2)

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3c773cad57064c23873f286fbec69f6f0305b889 commit 3c773cad57064c23873f286fbec69f6f0305b889 Author: Martin Matuska AuthorDate: 2023-11-19 01:09:34 + Commit: Martin Matuska CommitDate: 2023-11-19 01

git: cf0ad6fd642d - main - zfs: update zfs_config.h and zfs_gitrev.h missed in 47bb16f8f0

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=cf0ad6fd642d0d6ab0c3b164677a26030df39618 commit cf0ad6fd642d0d6ab0c3b164677a26030df39618 Author: Martin Matuska AuthorDate: 2023-11-17 09:00:16 + Commit: Martin Matuska CommitDate: 2023-11-17 09

git: 47bb16f8f092 - main - zfs: merge openzfs/zfs@03e9caaec

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=47bb16f8f09238e8d46e9e441a837e4bb28f6a00 commit 47bb16f8f09238e8d46e9e441a837e4bb28f6a00 Merge: 70e30addafe4 03e9caaec006 Author: Martin Matuska AuthorDate: 2023-11-17 08:39:42 + Commit: Martin

git: a592812327de - main - mlx5_core: fix deadlock when using RXTLS

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a592812327deaf69ab226afc5c8a01af43dc03c2 commit a592812327deaf69ab226afc5c8a01af43dc03c2 Author: Martin Matuska AuthorDate: 2023-11-13 13:29:27 + Commit: Martin Matuska CommitDate: 2023-11-16 11

git: e716630d4cf8 - main - zfs: merge openzfs/zfs@887a3c533

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e716630d4cf89e69ec3f675ebfceee09f1a85e05 commit e716630d4cf89e69ec3f675ebfceee09f1a85e05 Merge: f5b3e686292b 887a3c533b94 Author: Martin Matuska AuthorDate: 2023-11-09 10:42:33 + Commit: Martin

git: 14c2e0a0c57e - main - zfs: merge openzfs/zfs@9198de8f1

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=14c2e0a0c57e48a41433fdca668fac8882fb04df commit 14c2e0a0c57e48a41433fdca668fac8882fb04df Merge: f25b0d6dd75d 9198de8f1079 Author: Martin Matuska AuthorDate: 2023-11-08 08:16:01 + Commit: Martin

git: f8b1db88b827 - main - zfs: merge openzfs/zfs@41e55b476

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b1db88b827cf24ae14c55a2e762313f0f9911c commit f8b1db88b827cf24ae14c55a2e762313f0f9911c Merge: 0c5cd045bfb8 41e55b476bcf Author: Martin Matuska AuthorDate: 2023-11-01 09:12:47 + Commit: Martin

git: 6c1e79df8c65 - main - zfs: merge openzfs/zfs@043c6ee3b

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c1e79df8c651b31ca4f656336e6c5ac29a66482 commit 6c1e79df8c651b31ca4f656336e6c5ac29a66482 Merge: 87c503235310 043c6ee3b6bf Author: Martin Matuska AuthorDate: 2023-10-30 20:28:03 + Commit: Martin

git: 22b267e82371 - main - zfs: merge openzfs/zfs@797f55ef1

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=22b267e823719ef22790ed548fb11da8aa81d1ae commit 22b267e823719ef22790ed548fb11da8aa81d1ae Merge: 63f537551380 797f55ef12d7 Author: Martin Matuska AuthorDate: 2023-10-22 16:25:23 + Commit: Martin

git: 23cf27db2cc4 - main - zfs: merge openzfs/zfs@8a7407012

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=23cf27db2cc4b0208a35b009f873971a7bb4a6bb commit 23cf27db2cc4b0208a35b009f873971a7bb4a6bb Merge: ab393e9548f8 8a7407012834 Author: Martin Matuska AuthorDate: 2023-10-13 07:45:15 + Commit: Martin

git: 26103ccba8b7 - main - zfs: enable block cloning by default

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=26103ccba8b75038bd83773268524ac814bfa334 commit 26103ccba8b75038bd83773268524ac814bfa334 Author: Martin Matuska AuthorDate: 2023-10-10 22:43:35 + Commit: Martin Matuska CommitDate: 2023-10-10 22

git: 9aa71bad2180 - main - zfs: update zfs_config.h and zfs_gitrev.h missing in b2526e8bfe51

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=9aa71bad2180d3903175d9d19c47f1076637eb25 commit 9aa71bad2180d3903175d9d19c47f1076637eb25 Author: Martin Matuska AuthorDate: 2023-10-08 07:55:29 + Commit: Martin Matuska CommitDate: 2023-10-08 07

git: b2526e8bfe51 - main - zfs: merge openzfs/zfs@66b81b349

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b2526e8bfe513b7d11f4aa0b7a581a17be74374e commit b2526e8bfe513b7d11f4aa0b7a581a17be74374e Merge: 2821a7498f65 66b81b349749 Author: Martin Matuska AuthorDate: 2023-10-08 07:43:15 + Commit: Martin

git: f7f4bd06a8d4 - main - zfs: merge openzfs/zfs@f795e90a1

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f7f4bd06a8d4e5d1e92d0d2905a68a2a03ed9c0c commit f7f4bd06a8d4e5d1e92d0d2905a68a2a03ed9c0c Merge: f06c92854474 f795e90a11c6 Author: Martin Matuska AuthorDate: 2023-10-04 12:02:37 + Commit: Martin

git: f7a5903de272 - main - zfs: merge openzfs/zfs@e13538856

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f7a5903de272db58b2b9164c1219fc2d5b757654 commit f7a5903de272db58b2b9164c1219fc2d5b757654 Merge: e47381c9fc72 e13538856479 Author: Martin Matuska AuthorDate: 2023-09-29 23:21:44 + Commit: Martin

git: abcdc1b9aed7 - main - zfs: merge openzfs/zfs@2e2a46e0a

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=abcdc1b9aed7e0b7b07b47ae14c960c9cefe882f commit abcdc1b9aed7e0b7b07b47ae14c960c9cefe882f Merge: 0a5d2802b41f 2e2a46e0a597 Author: Martin Matuska AuthorDate: 2023-09-24 21:32:11 + Commit: Martin

git: 7a0e9e3f8f3a - main - zfs: update share/zfs/compatibility.d to match current ZFS code

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7a0e9e3f8f3a9379df793284f719f1a7ee5734c2 commit 7a0e9e3f8f3a9379df793284f719f1a7ee5734c2 Author: Martin Matuska AuthorDate: 2023-09-21 23:34:47 + Commit: Martin Matuska CommitDate: 2023-09-21 23

git: cbfe997563d2 - main - zfs: merge openzfs/zfs@4647353c8

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=cbfe997563d24cdbfe77d1763f2582fbace3ee2f commit cbfe997563d24cdbfe77d1763f2582fbace3ee2f Merge: c0e249d32c78 4647353c8b2b Author: Martin Matuska AuthorDate: 2023-09-21 09:25:53 + Commit: Martin

git: 3159b89b6198 - main - zfs: merge openzfs/zfs@0ee9b0239

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3159b89b6198c9a1d903c9de6654c6d863728617 commit 3159b89b6198c9a1d903c9de6654c6d863728617 Merge: a494d30465f2 0ee9b02390d5 Author: Martin Matuska AuthorDate: 2023-09-11 07:13:30 + Commit: Martin

git: f10f65999fe5 - main - libarchive: merge security fix from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f10f65999fe56e92f00b5bc5d27ac342cfea5364 commit f10f65999fe56e92f00b5bc5d27ac342cfea5364 Merge: 2afef29b2c0b a5913a473bb0 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 + Commit: Martin

git: 969071be938c - main - vfs: copy_file_range() between multiple mountpoints of the same fs type

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=969071be938ca9b96f8dff003c7b43d6308849f1 commit 969071be938ca9b96f8dff003c7b43d6308849f1 Author: Martin Matuska AuthorDate: 2023-09-06 11:58:10 + Commit: Martin Matuska CommitDate: 2023-09-06 12

git: 2ad756a6bbb3 - main - zfs: merge openzfs/zfs@95f71c019

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2ad756a6bbb30fc98ee9000fba5bceec916a6c70 commit 2ad756a6bbb30fc98ee9000fba5bceec916a6c70 Merge: f4296cfb409a 95f71c019d7c Author: Martin Matuska AuthorDate: 2023-09-02 10:32:48 + Commit: Martin

git: 315ee00fa961 - main - zfs: merge openzfs/zfs@804414aad

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=315ee00fa9616b0a192b6834911f98bcf5316a6b commit 315ee00fa9616b0a192b6834911f98bcf5316a6b Merge: b3a714652ff0 804414aad224 Author: Martin Matuska AuthorDate: 2023-08-26 21:20:04 + Commit: Martin

Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs

If there are any cherry-pick candidates from OpenZFS that have been already merged to zfs-2.2-release and fix serious bugs please report them to me so I can include them before stable/14 gets branched. Thanks, mm On 10. 8. 2023 17:55, Martin Matuska wrote: Hi Mateusz, I am very sorry but we

Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs

that fix serious issues everything else will make the merge management unnecessarily complicated. Cheers, mm On 10. 8. 2023 16:23, Mateusz Guzik wrote: On 8/10/23, Martin Matuska wrote: The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id

git: 28d2e3b5dedf - main - zfs: cherry-pick fix from openzfs

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=28d2e3b5dedf24938e5ec0806084941510621f13 commit 28d2e3b5dedf24938e5ec0806084941510621f13 Author: Martin Matuska AuthorDate: 2023-08-10 07:59:39 + Commit: Martin Matuska CommitDate: 2023-08-10 08

git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 commit cd25b0f740f8c846562fd66e7380437eb898c875 Author: Martin Matuska AuthorDate: 2023-08-10 07:55:42 + Commit: Martin Matuska CommitDate: 2023-08-10 07

git: b5a3a89c5067 - main - unzip: swtich to bsdunzip from libarchive

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a3a89c50671a1ad29e7c43fe15e7b16feac239 commit b5a3a89c50671a1ad29e7c43fe15e7b16feac239 Author: Martin Matuska AuthorDate: 2023-07-31 11:54:58 + Commit: Martin Matuska CommitDate: 2023-08-04 10

git: 058ab969fd2f - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=058ab969fd2f7a8d04240d1e9bc9d63918480226 commit 058ab969fd2f7a8d04240d1e9bc9d63918480226 Merge: 0588819779cd 80517d0d48d9 Author: Martin Matuska AuthorDate: 2023-08-03 23:04:14 + Commit: Martin

git: d91bfe0fb7fa - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 commit d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 Merge: 896809e29675 f8035ed8e513 Author: Martin Matuska AuthorDate: 2023-07-31 11:13:30 + Commit: Martin

git: 64884e0d4ce7 - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=64884e0d4ce7ed57c970e1b34f93e3754c656900 commit 64884e0d4ce7ed57c970e1b34f93e3754c656900 Merge: 382af2f8d7bf 70968ea087e7 Author: Martin Matuska AuthorDate: 2023-07-29 20:43:36 + Commit: Martin

git: e64fe029e9d3 - main - libarchive: merge from vendor branch

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e64fe029e9d3ce476e77a478318e0c3cd201ff08 commit e64fe029e9d3ce476e77a478318e0c3cd201ff08 Merge: 7f9318a022ef 14b646f7c3f7 Author: Martin Matuska AuthorDate: 2023-07-24 05:42:43 + Commit: Martin

git: e64780fbc394 - main - xinstall: do not use copy_file_range(2) when BOOTSTRAPPING

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e64780fbc394b10581e50a850cc06c1c12a8e4f9 commit e64780fbc394b10581e50a850cc06c1c12a8e4f9 Author: Martin Matuska AuthorDate: 2023-07-08 23:24:38 + Commit: Martin Matuska CommitDate: 2023-07-08 23

git: 055f920ebe21 - main - cat: fallback on EBADF with copy_file_range(2)

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=055f920ebe21b8e05235363bc11a83cc649cdc6a commit 055f920ebe21b8e05235363bc11a83cc649cdc6a Author: Martin Matuska AuthorDate: 2023-07-08 23:04:25 + Commit: Martin Matuska CommitDate: 2023-07-08 23

git: 5a50d52f112a - main - xinstall: use copy_file_range(2) with fallback to previous behavior

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5a50d52f112a86ebd0696da6564c7c7befa27f5d commit 5a50d52f112a86ebd0696da6564c7c7befa27f5d Author: Martin Matuska AuthorDate: 2023-07-08 19:46:46 + Commit: Martin Matuska CommitDate: 2023-07-08 19

  1   2   >