Commit 45c226dd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  c9663f79 ("ice: adjust switchdev rebuild path")
  77580179 ("ice: restore timestamp configuration after device reset")
https://lore.kernel.org/all/20231121211259.3348630-1-anthony.l.nguyen@intel.com/



Adjacent changes:

kernel/bpf/verifier.c
  bb124da6 ("bpf: keep track of max number of bpf_loop callback iterations")
  5f99f312 ("bpf: add register bounds sanity checks and sanitization")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c5b9f479 d3fa86b1

Documentation/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation): 


Documentation of LoongArch ISA:



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)



Documentation of LoongArch ELF psABI:

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ properties: 
          - qcom,sm8350-ufshc

          - qcom,sm8450-ufshc

          - qcom,sm8550-ufshc

          - qcom,sm8650-ufshc

      - const: qcom,ufshc

      - const: jedec,ufs-2.0
@@ -122,6 +123,7 @@ allOf: 
              - qcom,sm8350-ufshc

              - qcom,sm8450-ufshc

              - qcom,sm8550-ufshc

              - qcom,sm8650-ufshc

    then:

      properties:

        clocks:

Documentation/filesystems/erofs.rst

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ compatibility checking tool (fsck.erofs), and a debugging tool (dump.erofs): 


- git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git



For more information, please also refer to the documentation site:



- https://erofs.docs.kernel.org



Bugs and patches are welcome, please kindly help us and send to the following

linux-erofs mailing list:

Documentation/process/maintainer-netdev.rst

+17 −3
Original line number Diff line number Diff line
@@ -193,9 +193,23 @@ Review timelines 
Generally speaking, the patches get triaged quickly (in less than

48h). But be patient, if your patch is active in patchwork (i.e. it's

listed on the project's patch list) the chances it was missed are close to zero.

Asking the maintainer for status updates on your

patch is a good way to ensure your patch is ignored or pushed to the

bottom of the priority list.



The high volume of development on netdev makes reviewers move on

from discussions relatively quickly. New comments and replies

are very unlikely to arrive after a week of silence. If a patch

is no longer active in patchwork and the thread went idle for more

than a week - clarify the next steps and/or post the next version.



For RFC postings specifically, if nobody responded in a week - reviewers

either missed the posting or have no strong opinions. If the code is ready,

repost as a PATCH.



Emails saying just "ping" or "bump" are considered rude. If you can't figure

out the status of the patch from patchwork or where the discussion has

landed - describe your best guess and ask if it's correct. For example::



  I don't understand what the next steps are. Person X seems to be unhappy

  with A, should I do B and repost the patches?



.. _Changes requested:

Documentation/translations/zh_CN/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -338,9 +338,9 @@ Loongson与LoongArch的开发者网站（软件与文档资源）： 


LoongArch指令集架构的文档：



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf （中文版）

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf （中文版）



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf （英文版）

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf （英文版）



LoongArch的ELF psABI文档：