diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2017-01-13 02:27:22 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2017-01-13 02:31:19 +0000 |
| commit | 7eba3f5dd6f7fc97817b6826242138c7a1e0f293 (patch) | |
| tree | 9f3699d79d9bd3f8c0e9ce2d7bd791fe518714e0 /Makefile | |
| parent | 9de837c9a044478dc60af6c1cb5ec33970e3ce91 (diff) | |
| download | linux-cip-7eba3f5dd6f7fc97817b6826242138c7a1e0f293.tar.gz | |
CIP: Add a number to the version suffix and move it out of Makefilev4.4.42-cip1
We can potentially have more than one CIP release per kernel.org
stable release, so make the version suffix -cip1.
Defining the version suffix in the Makefile resulted in a conflict
when I merged the linux-4.4.y branch, and that's going to happen in
every future merge too. Instead of defining it there, put it in
localversion-cip.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 867863d9c037d2..341b05fb4f94e9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 42 -EXTRAVERSION = -cip +EXTRAVERSION = NAME = Blurry Fish Butt # *DOCUMENTATION* |