diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-07-13 22:52:51 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-07-13 22:52:51 +0300 |
| commit | 611ac726f9ebbb12f2113e5345ef109660954eeb (patch) | |
| tree | 522735cbdec83a33ec29723b4ddc347118fdae21 /include/linux/netdev_features.h | |
| parent | 5d4ed4f8b5efd347d761ee98c3a6e4e42e23f67e (diff) | |
| parent | e73f0f0ee7541171d89f2e2491130c7771ba58d3 (diff) | |
| download | linux-611ac726f9ebbb12f2113e5345ef109660954eeb.tar.xz | |
Merge drm/drm-next into drm-intel-gt-next
Catching up with 5.14-rc1 and also preparing for a
needed common topic branch for the "Minor revid/stepping
and workaround cleanup"
Reference: https://patchwork.freedesktop.org/series/92299/
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/netdev_features.h')
| -rw-r--r-- | include/linux/netdev_features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index 3de38d6a0aea..2c6b9e416225 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -93,7 +93,7 @@ enum { /* * Add your fresh new feature above and remember to update - * netdev_features_strings[] in net/core/ethtool.c and maybe + * netdev_features_strings[] in net/ethtool/common.c and maybe * some feature mask #defines below. Please also describe it * in Documentation/networking/netdev-features.rst. */ |