Commit 9fb16955 authored by David S. Miller's avatar David S. Miller
Browse files

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



Overlapping header include additions in macsec.c

A bug fix in 'net' overlapping with the removal of 'version'
string in ena_netdev.c

Overlapping test additions in selftests Makefile

Overlapping PCI ID table adjustments in iwlwifi driver.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f074e67 1b649e0b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com> 
Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajesh Shah <rajesh.shah@intel.com>

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154        |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX GICv3  | #38539          | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456        |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX Core   | #30115          | CAVIUM_ERRATUM_30115        |

Documentation/driver-api/dmaengine/provider.rst

+10 −2
Original line number Diff line number Diff line
@@ -266,11 +266,15 @@ to use. 
  attached (via the dmaengine_desc_attach_metadata() helper to the descriptor.



  From the DMA driver the following is expected for this mode:



  - DMA_MEM_TO_DEV / DEV_MEM_TO_MEM



    The data from the provided metadata buffer should be prepared for the DMA

    controller to be sent alongside of the payload data. Either by copying to a

    hardware descriptor, or highly coupled packet.



  - DMA_DEV_TO_MEM



    On transfer completion the DMA driver must copy the metadata to the client

    provided metadata buffer before notifying the client about the completion.

    After the transfer completion, DMA drivers must not touch the metadata
@@ -284,10 +288,14 @@ to use. 
  and dmaengine_desc_set_metadata_len() is provided as helper functions.



  From the DMA driver the following is expected for this mode:

  - get_metadata_ptr



  - get_metadata_ptr()



    Should return a pointer for the metadata buffer, the maximum size of the

    metadata buffer and the currently used / valid (if any) bytes in the buffer.

  - set_metadata_len



  - set_metadata_len()



    It is called by the clients after it have placed the metadata to the buffer

    to let the DMA driver know the number of valid bytes provided.

Documentation/filesystems/zonefs.txt

+13 −5
Original line number Diff line number Diff line
@@ -258,11 +258,11 @@ conditions. 
    |    option    | condition | size     read    write    read    write |

    +--------------+-----------+-----------------------------------------+

    |              | good      | fixed    yes     no       yes     yes   |

    | remount-ro   | read-only | fixed    yes     no       yes     no    |

    | remount-ro   | read-only | as is    yes     no       yes     no    |

    | (default)    | offline   |   0      no      no       no      no    |

    +--------------+-----------+-----------------------------------------+

    |              | good      | fixed    yes     no       yes     yes   |

    | zone-ro      | read-only | fixed    yes     no       yes     no    |

    | zone-ro      | read-only | as is    yes     no       yes     no    |

    |              | offline   |   0      no      no       no      no    |

    +--------------+-----------+-----------------------------------------+

    |              | good      |   0      no      no       yes     yes   |
@@ -270,7 +270,7 @@ conditions. 
    |              | offline   |   0      no      no       no      no    |

    +--------------+-----------+-----------------------------------------+

    |              | good      | fixed    yes     yes      yes     yes   |

    | repair       | read-only | fixed    yes     no       yes     no    |

    | repair       | read-only | as is    yes     no       yes     no    |

    |              | offline   |   0      no      no       no      no    |

    +--------------+-----------+-----------------------------------------+
@@ -307,8 +307,16 @@ condition changes. The defined behaviors are as follow: 
* zone-offline

* repair



The I/O error actions defined for each behavior are detailed in the previous

section.

The run-time I/O error actions defined for each behavior are detailed in the

previous section. Mount time I/O errors will cause the mount operation to fail.

The handling of read-only zones also differs between mount-time and run-time.

If a read-only zone is found at mount time, the zone is always treated in the

same manner as offline zones, that is, all accesses are disabled and the zone

file size set to 0. This is necessary as the write pointer of read-only zones

is defined as invalib by the ZBC and ZAC standards, making it impossible to

discover the amount of data that has been written to the zone. In the case of a

read-only zone discovered at run-time, as indicated in the previous section.

the size of the zone file is left unchanged from its last updated value.



Zonefs User Space Tools

=======================

Documentation/kbuild/kbuild.rst

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ This is solely useful to speed up test compiles. 
KBUILD_EXTRA_SYMBOLS

--------------------

For modules that use symbols from other modules.

See more details in modules.txt.

See more details in modules.rst.



ALLSOURCE_ARCHS

---------------

CRA Git | Maintained and supported by SUSTech CRA and CCSE