Subject: linux-next: manual merge of the kbuild tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 Jul 2016 11:50:05 +1000

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in:

  Makefile

between commits:

  6e8d666e9253 ("Disable "maybe-uninitialized" warning globally")

from Linus' tree and commits:

  543c37cb1650 ("Add sancov plugin")

from the kbuild tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Makefile
index d384848478b9,edd7af68411f..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -370,8 -370,8 +370,8 @@@ LDFLAGS_MODULE  
  CFLAGS_KERNEL	=
  AFLAGS_KERNEL	=
  LDFLAGS_vmlinux =
 -CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized
 +CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im
- CFLAGS_KCOV	= -fsanitize-coverage=trace-pc
+ CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)

  # Use USERINCLUDE when you must reference the UAPI directories only.