From: Oded Gabbay <oded.gabbay@gmail.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Omer Shpigelman <oshpigelman@habana.ai>
Subject: Re: linux-next: build failure after merge of the char-misc tree
Date: Wed, 29 Jul 2020 12:55:00 +0300 [thread overview]
Message-ID: <CAFCwf11_h8eC5B8Fod=LiJJ2vjaOrdNs3W+pHnK-YhM=jD-yeQ@mail.gmail.com> (raw)
In-Reply-To: <20200728171913.GE43359@kroah.com>
Great, thanks!
Oded
On Tue, Jul 28, 2020 at 8:19 PM Greg KH <greg@kroah.com> wrote:
>
> On Tue, Jul 28, 2020 at 07:17:05PM +0200, Greg KH wrote:
> > On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > >
> > > On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH <greg@kroah.com> wrote:
> > > >
> > > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote:
> > > > > Hi Greg,
> > > > >
> > > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH <greg@kroah.com> 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.
> > > > >
> > > > > The conflicts are gone, but I still get these errors.
> > > >
> > > > Very odd, I can not duplicate this at all here. I just did a clean
> > > > checkout of the char-misc-next branch and a full 'make allmodconfig' for
> > > > x86_64, and it worked just fine.
> > > >
> > > > Are you sure it's not coming from some other tree?
> > >
> > > Do you build with a separate object tree? I always use make O=...
> > > which makes the difference. I tested with just your tree.
> >
> > Ah, no, I do not. Odd, let me see what kind of crazy they are doing
> > with include build directives...
> >
> > thanks for the hint.
>
> Ok, fix sent out, that should resolve this.
>
> thanks,
>
> greg k-h
next prev parent reply other threads:[~2020-07-29 9:55 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 8:08 linux-next: build failure after merge of the char-misc tree Stephen Rothwell
2020-07-27 9:24 ` Greg KH
2020-07-27 9:28 ` Oded Gabbay
2020-07-27 10:05 ` Greg KH
2020-07-27 10:59 ` Oded Gabbay
2020-07-28 7:33 ` Stephen Rothwell
2020-07-28 7:53 ` Greg KH
2020-07-28 8:23 ` Stephen Rothwell
2020-07-28 17:17 ` Greg KH
2020-07-28 17:19 ` Greg KH
2020-07-29 9:55 ` Oded Gabbay [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 4:25 Stephen Rothwell
2023-06-26 9:06 ` Greg KH
2022-05-20 9:46 Stephen Rothwell
2022-05-20 19:08 ` Greg KH
2022-06-12 17:23 ` Samuel Thibault
2022-02-25 20:40 broonie
2022-02-26 15:08 ` Greg KH
2022-03-01 5:14 ` Stephen Rothwell
2022-03-01 21:27 ` Greg KH
2021-10-27 4:48 Stephen Rothwell
2021-10-27 6:51 ` Greg KH
2020-05-04 1:46 Stephen Rothwell
2020-05-04 1:47 ` Stephen Rothwell
2020-05-04 7:14 ` Greg KH
[not found] ` <BYAPR02MB394115C2C80B1169D282A646B7A60@BYAPR02MB3941.namprd02.prod.outlook.com>
2020-05-04 7:31 ` Greg KH
2019-07-08 9:23 Stephen Rothwell
2019-07-12 0:44 ` Stephen Rothwell
2019-07-12 7:59 ` Greg KH
2017-04-12 5:18 Stephen Rothwell
2017-04-12 10:33 ` Greg KH
2017-03-20 2:44 Stephen Rothwell
2017-03-20 12:23 ` Arnd Bergmann
2017-03-21 0:18 ` Benjamin Herrenschmidt
2017-03-21 0:36 ` Cyril Bur
2017-03-21 2:58 ` Joel Stanley
2015-08-07 6:32 Stephen Rothwell
2015-05-27 5:52 Stephen Rothwell
2015-05-27 7:08 ` Winkler, Tomas
2015-05-27 12:36 ` Greg KH
2014-02-21 5:47 Stephen Rothwell
2014-02-26 6:47 ` Stephen Rothwell
2014-02-27 3:37 ` Greg KH
2014-02-27 5:48 ` Stephen Rothwell
2013-09-27 7:10 Stephen Rothwell
2013-09-28 1:04 ` Greg KH
2013-04-02 6:29 Stephen Rothwell
2013-04-02 6:49 ` Richard Weinberger
2013-03-26 4:18 Stephen Rothwell
2013-03-18 2:56 Stephen Rothwell
2013-03-18 8:58 ` Kurt Van Dijck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFCwf11_h8eC5B8Fod=LiJJ2vjaOrdNs3W+pHnK-YhM=jD-yeQ@mail.gmail.com' \
--to=oded.gabbay@gmail.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=oshpigelman@habana.ai \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).