diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-26 05:52:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-26 05:52:29 +0200 |
| commit | 8b4483658364f05b2e32845c8f445cdfd9452286 (patch) | |
| tree | 4734ef83378b1e90475ec4776ac72dfe16a7249b /Makefile | |
| parent | net: sched: flower: refactor reoffload for concurrent access (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-8b4483658364f05b2e32845c8f445cdfd9452286.tar.xz linux-8b4483658364f05b2e32845c8f445cdfd9452286.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easy cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Shy Crocodile # *DOCUMENTATION* |