From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758956AbcG1BuK (ORCPT ); Wed, 27 Jul 2016 21:50:10 -0400 Received: from ozlabs.org ([103.22.144.67]:42042 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752762AbcG1BuH (ORCPT ); Wed, 27 Jul 2016 21:50:07 -0400 Date: Thu, 28 Jul 2016 11:50:05 +1000 From: Stephen Rothwell To: Michal Marek , Linus Torvalds Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Emese Revfy Subject: linux-next: manual merge of the kbuild tree with Linus' tree Message-ID: <20160728115005.31536fcf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.