diff options
| author | Vignesh Raghavendra <vigneshr@ti.com> | 2021-08-26 23:40:38 +0530 |
|---|---|---|
| committer | Vignesh Raghavendra <vigneshr@ti.com> | 2021-08-26 23:41:19 +0530 |
| commit | d503fa533d63aa5a9ee8c88d147965e2102c0427 (patch) | |
| tree | 157fe3aa0eb5ff7ca5540ab048fd9bee79b134c7 /include/linux/netdev_features.h | |
| parent | 2c327604ae2fbc80e0641efb8569610f4d72c0c1 (diff) | |
| parent | 5805e5eec901e830c7741d4916270d0b9cfd6743 (diff) | |
Merge tag 'v5.10.59' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-5.10.y
This is the 5.10.59 stable release
* tag 'v5.10.59' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (2436 commits)
Linux 5.10.59
net: xilinx_emaclite: Do not print real IOMEM pointer
ovl: prevent private clone if bind mount is not allowed
ppp: Fix generating ppp unit id when ifname is not specified
ALSA: hda: Add quirk for ASUS Flow x13
ALSA: hda/realtek: fix mute/micmute LEDs for HP ProBook 650 G8 Notebook PC
ALSA: pcm: Fix mmap breakage without explicit buffer setup
USB:ehci:fix Kunpeng920 ehci hardware problem
vboxsf: Make vboxsf_dir_create() return the handle for the created file
vboxsf: Honor excl flag to the dir-inode create op
arm64: dts: renesas: beacon: Fix USB ref clock references
arm64: dts: renesas: beacon: Fix USB extal reference
arm64: dts: renesas: rzg2: Add usb2_clksel to RZ/G2 M/N/H
mm: make zone_to_nid() and zone_set_nid() available for DISCONTIGMEM
Revert "selftests/resctrl: Use resctrl/info for feature detection"
bpf: Add lockdown check for probe_write_user helper
firmware: tee_bnxt: Release TEE shm, session, and context during kexec
tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag
KVM: SVM: Fix off-by-one indexing when nullifying last used SEV VMCB
Linux 5.10.58
...
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Conflicts:
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
drivers/media/platform/exynos4-is/fimc-isp-video.c
drivers/media/platform/video-mux.c
drivers/net/phy/dp83867.c
drivers/tty/serial/8250/8250_omap.c
net/hsr/hsr_forward.c
net/hsr/hsr_forward.h
net/hsr/hsr_slave.c
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 5254738e1b41..d34134186b1e 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -92,7 +92,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. */ |