X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=Makefile;h=8c7de9a72ea26f88316c70279164056897631541;hb=da609eda81a8b842417ccf74bdf6bf9b5d403549;hp=18ecb49f1af67949ebc481fe6412bd7b487448c8;hpb=b4a5ea09b29371c2e6a10783faa3593428404343;p=linux-2.6-microblaze.git

diff --git a/Makefile b/Makefile
index 18ecb49f1af6..8c7de9a72ea2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
-PATCHLEVEL = 17
+PATCHLEVEL = 18
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc1
 NAME = Superb Owl
 
 # *DOCUMENTATION*
@@ -793,10 +793,6 @@ ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
 # The kernel builds with '-std=gnu11' so use of GNU extensions is acceptable.
 KBUILD_CFLAGS += -Wno-gnu
-# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
-# source of a reference will be _MergedGlobals and not on of the whitelisted names.
-# See modpost pattern 2
-KBUILD_CFLAGS += -mno-global-merge
 else
 
 # gcc inanely warns about local variables called 'main'