Re: git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs

2021-04-26 Thread Warner Losh
On Mon, Apr 26, 2021, 2:12 PM Martin Matuska wrote: > Hi Johh, > > thank you very much for the notice. I am going submit the change > upstream to put this in sync. > > OpenZFS is now "the source" and this file is part of OpenZFS. We may > have local changes but the idea is to push to OpenZFS firs

Re: git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs

2021-04-26 Thread Martin Matuska
Hi Johh, thank you very much for the notice. I am going submit the change upstream to put this in sync. OpenZFS is now "the source" and this file is part of OpenZFS. We may have local changes but the idea is to push to OpenZFS first, if not absolutely necessary to have it in our tree first.

Re: git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs

2021-04-26 Thread John Baldwin
On 4/25/21 6:10 PM, Martin Matuska wrote: The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=4b84b4cca472e482bc22d5e5c7928be5a1393c84 commit 4b84b4cca472e482bc22d5e5c7928be5a1393c84 Author: Martin Matuska AuthorDate: 2021-04-26 01:05:13 + Commit:

git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs

2021-04-25 Thread Martin Matuska
The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=4b84b4cca472e482bc22d5e5c7928be5a1393c84 commit 4b84b4cca472e482bc22d5e5c7928be5a1393c84 Author: Martin Matuska AuthorDate: 2021-04-26 01:05:13 + Commit: Martin Matuska CommitDate: 2021-04-26 01:05