From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752658AbcGSIcO (ORCPT ); Tue, 19 Jul 2016 04:32:14 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:60779 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752263AbcGSIcH (ORCPT ); Tue, 19 Jul 2016 04:32:07 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Michal Marek , netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, akpm Subject: Re: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes Date: Tue, 19 Jul 2016 10:31:26 +0200 Message-ID: <21521763.EfAflxWUP8@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-28-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <20160718201439.GA9053@sepie.suse.cz> References: <20160615154553.3177021-1-arnd@arndb.de> <20160615154553.3177021-6-arnd@arndb.de> <20160718201439.GA9053@sepie.suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:ITRqjmOAtDv5EyXrTu7NRAVXPgGB6F0Wg3zAFg7cpZrz1LM26GE o2uLUXTiT89TdoSNesNPeRgnvuBgSC/QSQC2vOGMGsjfesqLsXat2Pbgj3F50oDeYay08aC Y+UYQ/7jwB904d8/AEYrcQlZY4MXtRziGlzContI7UlMEMpQE2YXJ8t2tNN4Mo8wRoRZo4o dggkp0XJfGDPKEEsCyr0A== X-UI-Out-Filterresults: notjunk:1;V01:K0:uLVZXMv5wXI=:sq6hfaUswPMKEe9lY8S/CL TBVW4+WLchF1q6P6dR0+7TkLfWtKYXjU3bRB1d5u6i1eDp2nB3r6O+Z+oxAGeSUrUL1Ccg7a2 pHCltjZDclpOrqnT0Zy0CMFe9fFuqyL7Fyc67AG1D4Zk8rfIdM8+uta3DiilNI63EFfHXqR+p PubMokgeB+RT0xQWJA7XjTTQmTTvP7GRbhytvNYie3B0utKWrC25uBnaAAOiCWd02LUX5vf1Q 7fIplIQ1aya0tjgv3TziWh8GFZ70Wrngyd5i2gkoL3ovQV0Ixh1aMaJtwCu60aQAL32NwDRK+ lAnMxCcN2SzvOJdZDPgY8MyOIAojRDdSda64RUtVUkXjUGXIBelwtCdoxAc4uZR+LFsN4JQbr PSp5mkMF3mF16zfLBeRh24FZI2iSaTCEHuOW4tCZvIyYVjDLII67YWvdB5poIxle86F0DyhxA NjSRgrMJ8eMPfXPHAyK7eQ7qPuJfKRRoZwk3yW0USa+E3qAw7iXwNVouz3M0YeAmv0nAbZq+O pMXoSJ/s2N6et7SKYXPhGqvvYa0J10Mjd43Z4eJDVsub8N+2sjDormPvXdW8LG3mmpwiBpMYy Izk0OXttk2n4FoyW2vMd/SMarCK2qYGq7Oyw6FCN0XmM0J82dnGgh+IaBcq2Dtw81c3dgonb7 uUcic+jMBmWoxhywuyd4clvqFsy/sB4XLb6TwbhCXrEcKPT78FO8YzM7DFsbC2/LrXfBxKmCS ZV0Ac/23UUOmT/CK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday, July 18, 2016 10:14:39 PM CEST Michal Marek wrote: > On Wed, Jun 15, 2016 at 05:45:47PM +0200, Arnd Bergmann wrote: > > When building with separate object directories and driver specific > > Makefiles that add additional header include paths, Kbuild adjusts > > the gcc flags so that we include both the directory in the source > > tree and in the object tree. > > > > However, due to another bug I fixed earlier, this did not actually > > include the correct directory in the object tree, so we know that > > we only really need the source tree here. Also, including the > > object tree sometimes causes warnings about nonexisting directories > > when the include path only exists in the source. > > > > This changes the logic to only emit the -I argument for the srctree, > > not for objects. We still need both $(srctree)/$(src) and $(obj) > > though, so I'm adding them manually. > > > > Signed-off-by: Arnd Bergmann > > Hi Arnd, > > I applied the series up to this patch to kbuild.git#kbuild. The rest > seem to be related but not dependent patches, so I'll leave it up to the > respective maintainers to pick them up. Is that OK with you? I think that's fine, a couple were already picked up, and what I have left now is a281bfa5713a [SUBMITTED 20160615] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default 83934921e68e [SUBMITTED 20160615] rtlwifi: don't add include path for rtl8188ee 5664e7bb88a8 [SUBMITTED 20160615] drm: amd: remove broken include path e6d3cf76f9f8 [SUBMITTED 20160615] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M b21947dbd792 [SUBMITTED 20160615] ARM: don't include removed directories I can probably put the last two into arm-soc directly. After that, we'd be left with a very small diff for the series: diff --git a/Makefile b/Makefile index caa33e007a8c..53074dbe8619 100644 --- a/Makefile +++ b/Makefile @@ -754,6 +754,9 @@ endif NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) CHECKFLAGS += $(NOSTDINC_FLAGS) +# warn about incorrect -I include paths +KBUILD_CFLAGS += -Wmissing-include-dirs + # warn about C99 declaration after statement KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) diff --git a/drivers/gpu/drm/amd/acp/Makefile b/drivers/gpu/drm/amd/acp/Makefile index 8363cb57915b..8a08e81ee90d 100644 --- a/drivers/gpu/drm/amd/acp/Makefile +++ b/drivers/gpu/drm/amd/acp/Makefile @@ -3,6 +3,4 @@ # of AMDSOC/AMDGPU drm driver. # It provides the HW control for ACP related functionalities. -subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include - AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile index a85419a37651..676e7de27f27 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile @@ -12,4 +12,4 @@ rtl8188ee-objs := \ obj-$(CONFIG_RTL8188EE) += rtl8188ee.o -ccflags-y += -Idrivers/net/wireless/rtlwifi -D__CHECK_ENDIAN__ +ccflags-y += -D__CHECK_ENDIAN__ I have only tested this on arm, arm64 and x86, so I don't know if that introduces new warnings, but we could ask Andrew if he wants to add that to linux-mm after the merge window. Arnd