Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Documentation/bpf/bpf_devel_QA.rst
  b7abcd9c656b ("bpf, doc: Link to submitting-patches.rst for general patch submission info")
  d56b0c461d19 ("bpf, docs: Fix link to netdev-FAQ target")
https://lore.kernel.org/all/20230307095812.236eb1be@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <[email protected]>

diff --cc Documentation/bpf/bpf_devel_QA.rst
index 5f5f9ccc3862b4f9966581fe86fc078b6d4fbba1,b421d94dc9f216ab44e44f8eed0035c6e796df3f..7403f81c995cf9acd3a1234a18150dce6494e7cc
--- 1/Documentation/bpf/bpf_devel_QA.rst
--- 2/Documentation/bpf/bpf_devel_QA.rst
+++ b/Documentation/bpf/bpf_devel_QA.rst
@@@ -684,12 -684,8 +684,8 @@@ when
  
  
  .. Links
- .. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
 -.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
 +.. _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!

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/riscv/net/bpf_jit_comp64.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/phy/smsc.c
Simple merge

diff --cc io_uring/rsrc.c
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc net/bpf/test_run.c
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
Simple merge