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,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 68116C433E8 for ; Mon, 27 Jul 2020 09:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FA572065C for ; Mon, 27 Jul 2020 09:28:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VNWPsY7E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728059AbgG0J2q (ORCPT ); Mon, 27 Jul 2020 05:28:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbgG0J2o (ORCPT ); Mon, 27 Jul 2020 05:28:44 -0400 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49351C061794; Mon, 27 Jul 2020 02:28:44 -0700 (PDT) Received: by mail-oi1-x243.google.com with SMTP id l84so1231505oig.10; Mon, 27 Jul 2020 02:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZJg7rUQPxCJO68OHx9bQfRbdAKaeax6Y3AUlWjJj0tk=; b=VNWPsY7EVxQ+M/2DB50xFQfaejUcZWxZpMi4qkl7zseIcKLWAZOo47Iwx7APalEdHL iuinUjzMwB7TBFiMGjoaYsc8Kewh8YgvwhaH94pn/bZPYCXqf+ALkq5gDNAtfnoUqH3r gIiMe9W6uzaAVimf+vx7tRQ0EKOWY46miy/zOJDh83u3VpWarVSMWNGuXTeBkR5KcrX7 LEH27Qmkft43NQmaS0ffcN05JBT6li8mVVGC4LA+gOliixvfC5mKRh9LZoWdNIGy6lXt 4/oUlGXPpgeFK4WU3zTfPFiUHVctUOZMfMYuojuS8K814bgfhQKsIU/a+doqNZMVde4B dy4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZJg7rUQPxCJO68OHx9bQfRbdAKaeax6Y3AUlWjJj0tk=; b=QzvXGiWvN8UT0ii9NxuvjdPJv4ls0mgSeItGFsGYca0ieZPPbQtAVNGN126IJkm4Rw 8QCJF+AfBCqCSZNXje1ZTNRbR+S2fh+4uqlPPbLiFIcse2GDwpnmmv9P7jTY6r6sxqYn YK0qphnp0igyTxVOKQ4bf/IwkwZ9qPRroFq3FlydYNRbg4bGRjSfABa+31AJM7CYfyQk yQvPg+t1JaFDGrkxPYdHHFOXfw5Y8r8SST6QC8iIUilxs4wgqhGp7Wp066rfaeY0ejIj Z3siBAds2wo2Okxsin8zKKD+JwGOyHfoXGIdC3mhY2IQjImxJx1ex1sJeRgBRweUMYaq kbDw== X-Gm-Message-State: AOAM533acVjg1aQ6hBUVEzU5s08r2aELeVb0SyMaUwXzoZKdpJJRQqbP Aeg+25k+T3d4ACr9e9qdLAkMFORqt1bKUmKziuI= X-Google-Smtp-Source: ABdhPJxjye1QxLOvJO/FqAaSdrTq7LPaIbsNyIODBPl7Skk5VhikxfcFNp3lCFfJ6uQT/K/ypVcVEEIKI9owGzwJrN8= X-Received: by 2002:aca:cf15:: with SMTP id f21mr6552849oig.102.1595842123580; Mon, 27 Jul 2020 02:28:43 -0700 (PDT) MIME-Version: 1.0 References: <20200727180831.6c356fc1@canb.auug.org.au> <20200727092448.GB1764157@kroah.com> In-Reply-To: <20200727092448.GB1764157@kroah.com> From: Oded Gabbay Date: Mon, 27 Jul 2020 12:28:14 +0300 Message-ID: Subject: Re: linux-next: build failure after merge of the char-misc tree To: Greg KH Cc: Stephen Rothwell , Arnd Bergmann , Linux Next Mailing List , Linux Kernel Mailing List , Omer Shpigelman Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Oded