diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2020-09-17 20:12:22 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-09-18 15:31:45 +0200 |
| commit | 5dee5872f87552cfb173c899d35fc1413c2aa77f (patch) | |
| tree | 273a8551247785dbec22d1e7c55e2b636e1c9e8e /Documentation/sound/cards/sb-live-mixer.rst | |
| parent | RDMA: Convert RWQ table logic to ib_core allocation scheme (diff) | |
| parent | RDMA: Fix link active_speed size (diff) | |
| download | linux-5dee5872f87552cfb173c899d35fc1413c2aa77f.tar.xz linux-5dee5872f87552cfb173c899d35fc1413c2aa77f.zip | |
Merge branch 'mlx5_active_speed' into rdma.git for-next
Leon Romanovsky says:
====================
IBTA declares speed as 16 bits, but kernel stores it in u8. This series
fixes in-kernel declaration while keeping external interface intact.
====================
Based on the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.
* branch 'mlx5_active_speed':
RDMA: Fix link active_speed size
RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
net/mlx5: Refactor query port speed functions
Diffstat (limited to 'Documentation/sound/cards/sb-live-mixer.rst')
| -rw-r--r-- | Documentation/sound/cards/sb-live-mixer.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/cards/sb-live-mixer.rst b/Documentation/sound/cards/sb-live-mixer.rst index eccb0f0ffd0f..2ce41d3822d8 100644 --- a/Documentation/sound/cards/sb-live-mixer.rst +++ b/Documentation/sound/cards/sb-live-mixer.rst @@ -337,7 +337,7 @@ WO 9901953 (A1) US Patents (https://www.uspto.gov/) ----------------------------------- +----------------------------------- US 5925841 Digital Sampling Instrument employing cache memory (Jul. 20, 1999) |