Hi all,
On Tue, 7 Mar 2023 09:58:12 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> Documentation/bpf/bpf_devel_QA.rst
>
> between commit:
>
> b7abcd9c656b ("bpf, doc: Link to submitting-patches.rst for general patch submission info")
>
> from the bpf tree and commit:
>
> d56b0c461d19 ("bpf, docs: Fix link to netdev-FAQ target")
>
> from the bpf-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/bpf/bpf_devel_QA.rst
> index b421d94dc9f2,5f5f9ccc3862..000000000000
> --- a/Documentation/bpf/bpf_devel_QA.rst
> +++ b/Documentation/bpf/bpf_devel_QA.rst
> @@@ -684,8 -684,12 +684,8 @@@ when
>
>
> .. Links
> - .. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
> -.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
> + .. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
> .. _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!
This is now a conflict between the net-next tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgp6kDJuz9S_7.pgp
Description: OpenPGP digital signature
