diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 09:59:29 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 10:01:01 -0700 |
| commit | e7073830cc8b52ef3df7dd150e4dac7706e0e104 (patch) | |
| tree | e257cb163ac414e82acf319ab8cdd98ad4434036 /Makefile | |
| parent | 628bc3e5a1beae395b5b515998396c60559ed3a9 (diff) | |
| parent | 8c3b7565f81e030ef448378acd1b35dabb493e3b (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/hisilicon/hns3/hns3pf/hclge_main.c
35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ VERSION = 6 PATCHLEVEL = 9 SUBLEVEL = 0 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc7 NAME = Hurr durr I'ma ninja sloth # *DOCUMENTATION* |