diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-27 19:38:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-27 19:38:10 +0200 |
| commit | 59c4e190b10cd2d6edccb5c238a3d2bda071a018 (patch) | |
| tree | 394e0d2a793ada03c280e066cd34f9ce7bf6633a /Documentation | |
| parent | spi: spidev: Add SPI ID table (diff) | |
| parent | Linux 5.15-rc3 (diff) | |
| download | linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.tar.xz linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.zip | |
Merge tag 'v5.15-rc3' into spi-5.15
Linux 5.15-rc3
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/core-api/irq/irq-domain.rst | 5 | ||||
| -rw-r--r-- | Documentation/networking/device_drivers/ethernet/intel/ice.rst | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/core-api/irq/irq-domain.rst b/Documentation/core-api/irq/irq-domain.rst index 6979b4af2c1f..9c0e8758037a 100644 --- a/Documentation/core-api/irq/irq-domain.rst +++ b/Documentation/core-api/irq/irq-domain.rst @@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that case the Linux IRQ numbers cannot be dynamically assigned and the legacy mapping should be used. -As the name implies, the *_legacy() functions are deprecated and only +As the name implies, the \*_legacy() functions are deprecated and only exist to ease the support of ancient platforms. No new users should be -added. +added. Same goes for the \*_simple() functions when their use results +in the legacy behaviour. The legacy map assumes a contiguous range of IRQ numbers has already been allocated for the controller and that the IRQ number can be diff --git a/Documentation/networking/device_drivers/ethernet/intel/ice.rst b/Documentation/networking/device_drivers/ethernet/intel/ice.rst index e7d9cbff771b..67b7a701ce9e 100644 --- a/Documentation/networking/device_drivers/ethernet/intel/ice.rst +++ b/Documentation/networking/device_drivers/ethernet/intel/ice.rst @@ -851,7 +851,7 @@ NOTES: - 0x88A8 traffic will not be received unless VLAN stripping is disabled with the following command:: - # ethool -K <ethX> rxvlan off + # ethtool -K <ethX> rxvlan off - 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS configured on the same port. 0x88a8/0x8100 traffic will not be received if |