Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  Documentation/bpf/bpf_devel_QA.rst

between commit:

  d0ddf5065ffe ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")

from the net-next tree and commit:

  0f10f647f455 ("bpf, docs: Use internal linking for link to netdev subsystem doc")

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 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!

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