Re: linux-next: manual merge of the bpf-next tree with the net-next tree

[Bagas Sanjaya]

On Mon, Mar 20, 2023 at 10:09:22AM +1100, Stephen Rothwell wrote:
> diff --cc Documentation/bpf/bpf_devel_QA.rst
> index 7403f81c995c,e151e61dff38..000000000000
> --- a/Documentation/bpf/bpf_devel_QA.rst
> +++ b/Documentation/bpf/bpf_devel_QA.rst
> @@@ -684,8 -689,11 +689,7 @@@ when
>   
>   
>   .. Links
> - .. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
>  -.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
>   .. _selftests:
>      https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
>  -.. _Documentation/dev-tools/kselftest.rst:
>  -   https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
>  -.. _Documentation/bpf/btf.rst: btf.rst
>   
>   Happy BPF hacking!

The resolution LGTM, thanks!

-- 
An old man doll... just what I always wanted! - Clara

Attachment: signature.asc
Description: PGP signature