Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: net/unix/garbage.c 47d8ac01 ("af_unix: Fix garbage collector racing against connect()") 4090fa37 ("af_unix: Replace garbage collection algorithm.") Adjacent changes: drivers/net/ethernet/broadcom/bnxt/bnxt.c faa12ca2 ("bnxt_en: Reset PTP tx_avail after possible firmware reset") b3d0083c ("bnxt_en: Support RSS contexts in ethtool .{get|set}_rxfh()") drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c 7ac10c7d ("bnxt_en: Fix possible memory leak in bnxt_rdma_aux_device_init()") 194fad5b ("bnxt_en: Refactor bnxt_rdma_aux_device_init/uninit functions") drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c 958f56e4 ("net/mlx5e: Un-expose functions in en.h") 49e6c938 ("net/mlx5e: RSS, Block XOR hash with over 128 channels") Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- .mailmap 5 additions, 0 deletions.mailmap
- Documentation/admin-guide/hw-vuln/spectre.rst 42 additions, 6 deletionsDocumentation/admin-guide/hw-vuln/spectre.rst
- Documentation/admin-guide/kernel-parameters.txt 12 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/devicetree/bindings/clock/keystone-gate.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/keystone-gate.txt
- Documentation/devicetree/bindings/clock/keystone-pll.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/keystone-pll.txt
- Documentation/devicetree/bindings/clock/ti/adpll.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/adpll.txt
- Documentation/devicetree/bindings/clock/ti/apll.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/apll.txt
- Documentation/devicetree/bindings/clock/ti/autoidle.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/autoidle.txt
- Documentation/devicetree/bindings/clock/ti/clockdomain.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/clockdomain.txt
- Documentation/devicetree/bindings/clock/ti/composite.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/composite.txt
- Documentation/devicetree/bindings/clock/ti/divider.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/divider.txt
- Documentation/devicetree/bindings/clock/ti/dpll.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/dpll.txt
- Documentation/devicetree/bindings/clock/ti/fapll.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/fapll.txt
- Documentation/devicetree/bindings/clock/ti/fixed-factor-clock.txt 0 additions, 2 deletions...ation/devicetree/bindings/clock/ti/fixed-factor-clock.txt
- Documentation/devicetree/bindings/clock/ti/gate.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/gate.txt
- Documentation/devicetree/bindings/clock/ti/interface.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/interface.txt
- Documentation/devicetree/bindings/clock/ti/mux.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/clock/ti/mux.txt
- Documentation/devicetree/bindings/dts-coding-style.rst 2 additions, 0 deletionsDocumentation/devicetree/bindings/dts-coding-style.rst
- Documentation/devicetree/bindings/remoteproc/ti,davinci-rproc.txt 0 additions, 3 deletions...ation/devicetree/bindings/remoteproc/ti,davinci-rproc.txt
- Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml 1 addition, 1 deletion...tion/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml
Loading
Please register or sign in to comment