diff options
| author | Jakub Kicinski <[email protected]> | 2024-08-22 17:05:09 -0700 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-08-22 17:06:18 -0700 |
| commit | 761d527d5d0036b98a2cecf4de1293d84d452aa1 (patch) | |
| tree | 077007afc1704c75f7e733c69bfd1603b8c8e0df /scripts/Makefile.modfinal | |
| parent | bfc52deef5ed58d92cfbe68dbceee3102617a8df (diff) | |
| parent | aa0743a229366e8c1963f1b72a1c974a9d15f08f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/broadcom/bnxt/bnxt.h
c948c0973df5 ("bnxt_en: Don't clear ntuple filters and rss contexts during ethtool ops")
f2878cdeb754 ("bnxt_en: Add support to call FW to update a VNIC")
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'scripts/Makefile.modfinal')
| -rw-r--r-- | scripts/Makefile.modfinal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 1fa98b5e952b..306a6bb86e4d 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -62,7 +62,7 @@ endif targets += $(modules:%.o=%.ko) $(modules:%.o=%.mod.o) -# Add FORCE to the prequisites of a target to force it to be always rebuilt. +# Add FORCE to the prerequisites of a target to force it to be always rebuilt. # --------------------------------------------------------------------------- PHONY += FORCE |