diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-12 14:02:04 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-12 14:02:04 -0800 | 
| commit | db7c953555388571a96ed8783ff6c5745ba18ab9 (patch) | |
| tree | 6eab6c28b0340841f51d8b4fbae685a2d7e84a91 /Documentation | |
| parent | 200f9d21aa92ae55390030b6c84757c2aa75bce0 (diff) | |
| parent | edbc21113bde13ca3d06eec24b621b1f628583dd (diff) | |
| download | linux-db7c953555388571a96ed8783ff6c5745ba18ab9.tar.bz2 | |
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
  ...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/netdev-FAQ.rst | 4 | ||||
| -rw-r--r-- | Documentation/networking/phy.rst | 4 | ||||
| -rw-r--r-- | Documentation/process/stable-kernel-rules.rst | 2 | ||||
| -rw-r--r-- | Documentation/translations/it_IT/process/stable-kernel-rules.rst | 2 | 
4 files changed, 6 insertions, 6 deletions
| diff --git a/Documentation/networking/netdev-FAQ.rst b/Documentation/networking/netdev-FAQ.rst index d5c9320901c3..21537766be4d 100644 --- a/Documentation/networking/netdev-FAQ.rst +++ b/Documentation/networking/netdev-FAQ.rst @@ -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: diff --git a/Documentation/networking/phy.rst b/Documentation/networking/phy.rst index 256106054c8c..b2f7ec794bc8 100644 --- a/Documentation/networking/phy.rst +++ b/Documentation/networking/phy.rst @@ -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 diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index 06f743b612c4..3973556250e1 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -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 diff --git a/Documentation/translations/it_IT/process/stable-kernel-rules.rst b/Documentation/translations/it_IT/process/stable-kernel-rules.rst index 4f206cee31a7..283d62541c4f 100644 --- a/Documentation/translations/it_IT/process/stable-kernel-rules.rst +++ b/Documentation/translations/it_IT/process/stable-kernel-rules.rst @@ -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>`. |