Commit db7c9535 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Current release - regressions:

   - arm64: dts: fsl-ls1028a-kontron-sl28: specify in-band mode for
     ENETC

  Current release - bugs in new features:

   - mptcp: provide rmem[0] limit offset to fix oops

  Previous release - regressions:

   - IPv6: Set SIT tunnel hard_header_len to zero to fix path MTU
     calculations

   - lan743x: correctly handle chips with internal PHY

   - bpf: Don't rely on GCC __attribute__((optimize)) to disable GCSE

   - mlx5e: Fix VXLAN port table synchronization after function reload

  Previous release - always broken:

   - bpf: Zero-fill re-used per-cpu map element

   - fix out-of-order UDP packets when forwarding with UDP GSO fraglists
     turned on:
       - fix UDP header access on Fast/frag0 UDP GRO
       - fix IP header access and skb lookup on Fast/frag0 UDP GRO

   - ethtool: netlink: add missing netdev_features_change() call

   - net: Update window_clamp if SOCK_RCVBUF is set

   - igc: Fix returning wrong statistics

   - ch_ktls: fix multiple leaks and corner cases in Chelsio TLS offload

   - tunnels: Fix off-by-one in lower MTU bounds for ICMP/ICMPv6 replies

   - r8169: disable hw csum for short packets on all chip versions

   - vrf: Fix fast path output packet handling with async Netfilter
     rules"

* tag 'net-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (65 commits)
  lan743x: fix use of uninitialized variable
  net: udp: fix IP header access and skb lookup on Fast/frag0 UDP GRO
  net: udp: fix UDP header access on Fast/frag0 UDP GRO
  devlink: Avoid overwriting port attributes of registered port
  vrf: Fix fast path output packet handling with async Netfilter rules
  cosa: Add missing kfree in error path of cosa_write
  net: switch to the kernel.org patchwork instance
  ch_ktls: stop the txq if reaches threshold
  ch_ktls: tcb update fails sometimes
  ch_ktls/cxgb4: handle partial tag alone SKBs
  ch_ktls: don't free skb before sending FIN
  ch_ktls: packet handling prior to start marker
  ch_ktls: Correction in middle record handling
  ch_ktls: missing handling of header alone
  ch_ktls: Correction in trimmed_len calculation
  cxgb4/ch_ktls: creating skbs causes panic
  ch_ktls: Update cheksum information
  ch_ktls: Correction in finding correct length
  cxgb4/ch_ktls: decrypted bit is not enough
  net/x25: Fix null-ptr-deref in x25_connect
  ...
parents 200f9d21 edbc2111

Documentation/networking/netdev-FAQ.rst

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ Q: I sent a patch and I'm wondering what happened to it? 
Q: How can I tell whether it got merged?

A: Start by looking at the main patchworks queue for netdev:



  http://patchwork.ozlabs.org/project/netdev/list/

  https://patchwork.kernel.org/project/netdevbpf/list/



The "State" field will tell you exactly where things are at with your

patch.
@@ -152,7 +152,7 @@ networking subsystem, and then hands them off to Greg. 


There is a patchworks queue that you can see here:



  http://patchwork.ozlabs.org/bundle/davem/stable/?state=*

  https://patchwork.kernel.org/bundle/netdev/stable/?state=*



It contains the patches which Dave has selected, but not yet handed off

to Greg.  If Greg already has the patch, then it will be here:

Documentation/networking/phy.rst

+2 −2
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ Some of the interface modes are described below: 
    speeds (see below.)



``PHY_INTERFACE_MODE_2500BASEX``

    This defines a variant of 1000BASE-X which is clocked 2.5 times faster,

    than the 802.3 standard giving a fixed bit rate of 3.125Gbaud.

    This defines a variant of 1000BASE-X which is clocked 2.5 times as fast

    as the 802.3 standard, giving a fixed bit rate of 3.125Gbaud.



``PHY_INTERFACE_MODE_SGMII``

    This is used for Cisco SGMII, which is a modification of 1000BASE-X

Documentation/process/stable-kernel-rules.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Procedure for submitting patches to the -stable tree 
   submission guidelines as described in

   :ref:`Documentation/networking/netdev-FAQ.rst <netdev-FAQ>`

   after first checking the stable networking queue at

   https://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state=*&q=&archive=

   https://patchwork.kernel.org/bundle/netdev/stable/?state=*

   to ensure the requested patch is not already queued up.

 - Security patches should not be handled (solely) by the -stable review

   process but should follow the procedures in

Documentation/translations/it_IT/process/stable-kernel-rules.rst

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ Procedura per sottomettere patch per i sorgenti -stable 
   :ref:`Documentation/translations/it_IT/networking/netdev-FAQ.rst <it_netdev-FAQ>`;

   ma solo dopo aver verificato al seguente indirizzo che la patch non sia

   già in coda:

   https://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state=*&q=&archive=

   https://patchwork.kernel.org/bundle/netdev/stable/?state=*

 - Una patch di sicurezza non dovrebbero essere gestite (solamente) dal processo

   di revisione -stable, ma dovrebbe seguire le procedure descritte in

   :ref:`Documentation/translations/it_IT/admin-guide/security-bugs.rst <it_securitybugs>`.

MAINTAINERS

+12 −15
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ M: Igor Russkikh <irusskikh@marvell.com> 
L:	netdev@vger.kernel.org

S:	Supported

W:	https://www.marvell.com/

Q:	http://patchwork.ozlabs.org/project/netdev/list/

Q:	https://patchwork.kernel.org/project/netdevbpf/list/

F:	Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst

F:	drivers/net/ethernet/aquantia/atlantic/








@@ -8830,8 +8830,8 @@ S:	Supported







W:	http://www.intel.com/support/feedback.htm









W:	http://e1000.sourceforge.net/









Q:	http://patchwork.ozlabs.org/project/intel-wired-lan/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git









F:	Documentation/networking/device_drivers/ethernet/intel/









F:	drivers/net/ethernet/intel/









F:	drivers/net/ethernet/intel/*/








@@ -11174,7 +11174,7 @@ M:	Tariq Toukan <tariqt@nvidia.com>







L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	drivers/net/ethernet/mellanox/mlx4/en_*

















MELLANOX ETHERNET DRIVER (mlx5e)








@@ -11182,7 +11182,7 @@ M:	Saeed Mahameed <saeedm@nvidia.com>







L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	drivers/net/ethernet/mellanox/mlx5/core/en_*

















MELLANOX ETHERNET INNOVA DRIVERS








@@ -11190,7 +11190,7 @@ R:	Boris Pismenny <borisp@nvidia.com>







L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	drivers/net/ethernet/mellanox/mlx5/core/accel/*









F:	drivers/net/ethernet/mellanox/mlx5/core/en_accel/*









F:	drivers/net/ethernet/mellanox/mlx5/core/fpga/*








@@ -11202,7 +11202,7 @@ M:	Ido Schimmel <idosch@nvidia.com>







L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	drivers/net/ethernet/mellanox/mlxsw/









F:	tools/testing/selftests/drivers/net/mlxsw/
















@@ -11211,7 +11211,7 @@ M:	mlxsw@nvidia.com







L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	drivers/net/ethernet/mellanox/mlxfw/

















MELLANOX HARDWARE PLATFORM SUPPORT








@@ -11230,7 +11230,7 @@ L:	netdev@vger.kernel.org







L:	linux-rdma@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	drivers/net/ethernet/mellanox/mlx4/









F:	include/linux/mlx4/
















@@ -11251,7 +11251,7 @@ L:	netdev@vger.kernel.org







L:	linux-rdma@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









F:	Documentation/networking/device_drivers/ethernet/mellanox/









F:	drivers/net/ethernet/mellanox/mlx5/core/









F:	include/linux/mlx5/








@@ -12131,7 +12131,7 @@ M:	Jakub Kicinski <kuba@kernel.org>







L:	netdev@vger.kernel.org









S:	Maintained









W:	http://www.linuxfoundation.org/en/Net









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









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









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git









F:	Documentation/devicetree/bindings/net/








@@ -12176,7 +12176,7 @@ M:	Jakub Kicinski <kuba@kernel.org>







L:	netdev@vger.kernel.org









S:	Maintained









W:	http://www.linuxfoundation.org/en/Net









Q:	http://patchwork.ozlabs.org/project/netdev/list/









Q:	https://patchwork.kernel.org/project/netdevbpf/list/









B:	mailto:netdev@vger.kernel.org









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









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git








@@ -15247,7 +15247,6 @@ F:	drivers/iommu/s390-iommu.c







S390 IUCV NETWORK LAYER









M:	Julian Wiedmann <jwi@linux.ibm.com>









M:	Karsten Graul <kgraul@linux.ibm.com>









M:	Ursula Braun <ubraun@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported









W:	http://www.ibm.com/developerworks/linux/linux390/








@@ -15258,7 +15257,6 @@ F:	net/iucv/







S390 NETWORK DRIVERS









M:	Julian Wiedmann <jwi@linux.ibm.com>









M:	Karsten Graul <kgraul@linux.ibm.com>









M:	Ursula Braun <ubraun@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported









W:	http://www.ibm.com/developerworks/linux/linux390/








@@ -15829,7 +15827,6 @@ S:	Maintained







F:	drivers/misc/sgi-xp/

















SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS









M:	Ursula Braun <ubraun@linux.ibm.com>









M:	Karsten Graul <kgraul@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE