git: e8ff95356cea - main - diff3.1: update manual page to match code

The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=e8ff95356ceaaa941251056e9d0a4211bf428e06 commit e8ff95356ceaaa941251056e9d0a4211bf428e06 Author: Piotr Pawel Stefaniak AuthorDate: 2021-08-20 22:50:05 + Commit: Piotr Pawel Stefaniak CommitDate:

git: 54a3415cb69e - main - diff3: implement --strip-trailing-cr

The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=54a3415cb69e1ea0e6533ca3fc168deba64f249f commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f Author: Piotr Pawel Stefaniak AuthorDate: 2021-08-21 00:28:58 + Commit: Piotr Pawel Stefaniak CommitDate:

git: 702dda4368dc - main - diff3: improve style

The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=702dda4368dc2d07e8898fcfdddb12d730e6c174 commit 702dda4368dc2d07e8898fcfdddb12d730e6c174 Author: Piotr Pawel Stefaniak AuthorDate: 2021-08-20 21:50:20 + Commit: Piotr Pawel Stefaniak CommitDate:

git: 7f7b03f3897f - main - diff3: sync with upstream

The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=7f7b03f3897f0196e3cc7a3b71c7359cc206ba61 commit 7f7b03f3897f0196e3cc7a3b71c7359cc206ba61 Author: Piotr Pawel Stefaniak AuthorDate: 2021-08-20 21:35:24 + Commit: Piotr Pawel Stefaniak CommitDate:

git: f8e50dd2c67b - main - Register /usr/tests/usr.bin/diff3

The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=f8e50dd2c67baea2bbd75f94218911d5a4d39597 commit f8e50dd2c67baea2bbd75f94218911d5a4d39597 Author: Piotr Pawel Stefaniak AuthorDate: 2021-08-22 10:08:39 + Commit: Piotr Pawel Stefaniak CommitDate:

git: af2f01643184 - main - diff: don't output carriage returns that were stripped on input

The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=af2f0164318455433db95adce07af829285b78ad commit af2f0164318455433db95adce07af829285b78ad Author: Piotr Pawel Stefaniak AuthorDate: 2021-08-22 16:05:59 + Commit: Piotr Pawel Stefaniak CommitDate:

git: ddce862ad859 - main - libarchive: import changes from upstream

The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ddce862ad8594542e1fa1af9ffae7264e12ffd27 commit ddce862ad8594542e1fa1af9ffae7264e12ffd27 Merge: 62e1a437f328 9aa547618472 Author: Martin Matuska AuthorDate: 2021-08-23 00:54:15 + Commit: Martin Matu

git: 62e1a437f328 - main - routing: Allow using IPv6 next-hops for IPv4 routes (RFC 5549).

The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=62e1a437f3285e785d9b35a476d36a469a90028d commit 62e1a437f3285e785d9b35a476d36a469a90028d Author: Zhenlei Huang AuthorDate: 2021-08-22 22:28:47 + Commit: Alexander V. Chernikov CommitDate: 202

git: eccb516db8b7 - main - vm: use __func__ for the correct function name

The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eccb516db8b7fec957b139c3a9a2e16175551067 commit eccb516db8b7fec957b139c3a9a2e16175551067 Author: Bjoern A. Zeeb AuthorDate: 2021-08-22 17:21:01 + Commit: Bjoern A. Zeeb CommitDate: 2021-08-22 17:43

git: 614faa32691b - main - vfs: fix cache-relatecd LOR introduced in the previous change

The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=614faa32691bf9ccd2690624ad37470e08fd14d3 commit 614faa32691bf9ccd2690624ad37470e08fd14d3 Author: Mateusz Guzik AuthorDate: 2021-08-22 16:17:42 + Commit: Mateusz Guzik CommitDate: 2021-08-22 16:20:

Re: git: c541bd368f86 - main - lltable: Add support for "child" LLEs holding encap for IPv4oIPv6 entries.

Thank you. This fixes it. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. In message , "Alexander V. Cherni kov" writes: > > > > On 22 Aug 2021, at 06:58, Cy Schubert

Re: git: 3904e7966eb3 - main - Fix aio_readv(2), aio_writev(2) with SIGEV_THREAD.

On Sun, Aug 22, 2021 at 05:15:22PM +0300, Konstantin Belousov wrote: > On Sun, Aug 22, 2021 at 12:16:12PM +, Thomas Munro wrote: > > The branch main has been updated by tmunro: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3904e7966eb353c636c6aa638a6fdf1489ee514c > > > > commit 39

Re: git: 3904e7966eb3 - main - Fix aio_readv(2), aio_writev(2) with SIGEV_THREAD.

On Sun, Aug 22, 2021 at 12:16:12PM +, Thomas Munro wrote: > The branch main has been updated by tmunro: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3904e7966eb353c636c6aa638a6fdf1489ee514c > > commit 3904e7966eb353c636c6aa638a6fdf1489ee514c > Author: Thomas Munro > AuthorDate: 20

git: 3904e7966eb3 - main - Fix aio_readv(2), aio_writev(2) with SIGEV_THREAD.

The branch main has been updated by tmunro: URL: https://cgit.FreeBSD.org/src/commit/?id=3904e7966eb353c636c6aa638a6fdf1489ee514c commit 3904e7966eb353c636c6aa638a6fdf1489ee514c Author: Thomas Munro AuthorDate: 2021-08-22 11:34:07 + Commit: Thomas Munro CommitDate: 2021-08-22 11:49

git: f30a1ae8d529 - main - lio_listio(2): Allow LIO_READV and LIO_WRITEV.

The branch main has been updated by tmunro: URL: https://cgit.FreeBSD.org/src/commit/?id=f30a1ae8d5290a52e898279bafc38556bf16bed8 commit f30a1ae8d5290a52e898279bafc38556bf16bed8 Author: Thomas Munro AuthorDate: 2021-08-22 09:48:59 + Commit: Thomas Munro CommitDate: 2021-08-22 11:00

git: 98399ab06f6c - main - netmap: import changes from upstream

The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=98399ab06f6c6adbd795266bc8a45e3f804ac6f8 commit 98399ab06f6c6adbd795266bc8a45e3f804ac6f8 Author: Vincenzo Maffione AuthorDate: 2021-08-22 09:31:05 + Commit: Vincenzo Maffione CommitDate: 202

Re: git: c541bd368f86 - main - lltable: Add support for "child" LLEs holding encap for IPv4oIPv6 entries.

> On 22 Aug 2021, at 06:58, Cy Schubert wrote: > > In message <202108211735.17lhz0wi081...@gitrepo.freebsd.org > >, "Alexander V. > Che > rnikov" writes: >> The branch main has been updated by melifaro: >> >> URL: https://cgit.FreeBSD.

git: f8c1b1a92966 - main - lltable: fix crash introduced in c541bd368f86.

The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=f8c1b1a9296696f70ac209612a00ae0722d07ed9 commit f8c1b1a9296696f70ac209612a00ae0722d07ed9 Author: Alexander V. Chernikov AuthorDate: 2021-08-22 08:47:49 + Commit: Alexander V. Chernikov Commit