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 C26DAC433E4 for ; Mon, 27 Jul 2020 09:24:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DDD020658 for ; Mon, 27 Jul 2020 09:24:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="MhdFzXzK"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="dwlGuksq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbgG0JYz (ORCPT ); Mon, 27 Jul 2020 05:24:55 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39673 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726433AbgG0JYy (ORCPT ); Mon, 27 Jul 2020 05:24:54 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 90AB85C0121; Mon, 27 Jul 2020 05:24:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 27 Jul 2020 05:24:53 -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=wONXKD2dA0rgroO9nB09aEG0uwm Yq/40yIZTx+PxQHo=; b=MhdFzXzK8KFfSHqO/iYYWYSVGhtY/GQJxU9LCUd3dcL j55LUk2pDvSGPdJr6cmmwEU0OtOweabsQX8bkm5rZugAn0iH6AJV5sSYdauHdwIl uriafanzX3CPuCX4e2KFAR9dsWdAqez/dooO3+uQ09OWPKSHlq85rKf+LnuQ5+Gs qrti1jeOGNR5kSckCXAZx1ma5y2Pv/Z8B/nKHbFaopFuqhJtfuxwSvunwCf1LHuO Of4nY6JkllrgJvXifN2ZBSorrdu81GXVl5Y67ALv/r7ukmYPymn7joUpiARE6BuA 7mGbYUaN38zS71FhPDMURbzNY60PljkICeFx4j2PMIQ== 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=wONXKD 2dA0rgroO9nB09aEG0uwmYq/40yIZTx+PxQHo=; b=dwlGuksqt0yC55nV8EffBU TU6v2gSa7r/VzhaGEqbLdnNR6XkGephlmh3HSCQmsLHD0r5QiAG+LRU7vOufF9qW PU1qQoGY+WLIhPsWivfQ8xzk3FtKeDSs6dbb5P8LOpA6CtyXixJoRTydN0V94/vz GrIqrlcWoJEbtJ1OVwp3V5lii521nfAoe2VB00OdRaMYXSSvd/209DuEWYK4xVCA LJYjmVR18qZqWPP5XyMWRpdO+PUJGWoYxbGHx8+pWvRcuYHWPZKprJSJc7S5Yq4N 4yxF5eZRGXAJXzyb1uJtOJHrd3Vz37Ux3XTKWQOLVw7wpuR7pyKCnkYGwwuPVBVw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedriedtgdduhecutefuodetggdotefrodftvf 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 8B0473280069; Mon, 27 Jul 2020 05:24:52 -0400 (EDT) Date: Mon, 27 Jul 2020 11:24:48 +0200 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Linux Next Mailing List , Linux Kernel Mailing List , Oded Gabbay , Omer Shpigelman Subject: Re: linux-next: build failure after merge of the char-misc tree Message-ID: <20200727092448.GB1764157@kroah.com> References: <20200727180831.6c356fc1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200727180831.6c356fc1@canb.auug.org.au> 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 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