From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D522BC433E0 for ; Mon, 27 Jul 2020 10:05:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8E0E2070B for ; Mon, 27 Jul 2020 10:05:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="Z5bnTPaU"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="W3BUIpJn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727789AbgG0KFf (ORCPT ); Mon, 27 Jul 2020 06:05:35 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:53343 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727775AbgG0KFf (ORCPT ); Mon, 27 Jul 2020 06:05:35 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B75F05C00D3; Mon, 27 Jul 2020 06:05:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 27 Jul 2020 06:05:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=nkiXJc4keFr7cYw6tolgITjL9Sd lT92NZc95gSR+fm0=; b=Z5bnTPaU3sbRrlCzG9wPczFBbPGV9iwU/s0b9UxkXQf vRzgP6FKCjAkLP5O88VRX0oDTGB62E4aXa/yNvhvdbCUh18VsMN8/9GO7M0bgk0p gGq3lLT4aa4dMkZlP+fQAYnfqgK5rniGhg2M4ZfbzN5vwDr+QbjBH9z2quiSrwCD ZkIERREM2mRFWgVdDBqZVqyOmDwLUwyrL79R2Kg8h9EL0rR+XyUBIFtmWZOdN9Cu RcFPcqCsNeQJcErLNKGPXAMfkmCxPLRq1W4gT3yPTO4POYwpacbNEvzY7AqfxPnq eQjBVeKmw25KQ8Dps77vFIm+riD0VKRtkXjhG2BZC4Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=nkiXJc 4keFr7cYw6tolgITjL9SdlT92NZc95gSR+fm0=; b=W3BUIpJnVYBR0xm/ujel9V uNyxSzGnlSy9HEZpnp1udvneuEBH40hOoKJMO8tCarWOdBfHvsgizJsjDnAsGrkG ZamN4+vwjVa0HmtSlggok5UTX8cgg5ggM64u7hvaoIg4Hw2G1kFCFE/Jk4Lfhlnx 56PPMHvdVTrkqnt6/obiZvzFflSDYVWxNLsxrboKgcz8IbVL3LU2hCrNg+BbggaH zYOlmsiPuyQcANIpvtKRlGKOrEAqVUd2uthiA/SM60HH24N34dxrH+3iDU0CfeeZ 0DnVacDR1zc49uTY9lUsX2O3hh0ljW9mxQLK65CY62ADVsf5GIHh7LY3IobXRJPw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedriedtgddvgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuheejgf ffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecukfhppeekfedr keeirdekledruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 88B0F3060067; Mon, 27 Jul 2020 06:05:32 -0400 (EDT) Date: Mon, 27 Jul 2020 12:05:29 +0200 From: Greg KH To: Oded Gabbay Cc: Stephen Rothwell , Arnd Bergmann , Linux Next Mailing List , Linux Kernel Mailing List , Omer Shpigelman Subject: Re: linux-next: build failure after merge of the char-misc tree Message-ID: <20200727100529.GA1922918@kroah.com> References: <20200727180831.6c356fc1@canb.auug.org.au> <20200727092448.GB1764157@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Jul 27, 2020 at 12:28:14PM +0300, Oded Gabbay wrote: > On Mon, Jul 27, 2020 at 12:24 PM Greg KH wrote: > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory > > > 12 | #include "habanalabs.h" > > > | ^~~~~~~~~~~~~~ > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory > > > 12 | #include "habanalabs.h" > > > | ^~~~~~~~~~~~~~ > > > > > > Presumably caused by commit > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > Ugh, this is a mess of a merge with this driver. > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > version, and try to resolve this error, but if you could verify I got it > > correct, that would be great. > > > > thanks, > > > > greg k-h > > Sure, np. Just point me where to look. I didn't see the above build issue, but maybe I didn't have the right configuration options enabled for my build. Oded, I've done the merge and pushed it out to my char-misc-next branch, let me know if I've messed anything up there. thanks, greg k-h