From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: linux-next: build failure after merge of the char-misc tree
Date: Thu, 27 Feb 2014 16:48:08 +1100 [thread overview]
Message-ID: <20140227164808.354149fc2237d5f3df04242d@canb.auug.org.au> (raw)
In-Reply-To: <20140227033716.GC31199@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
Hi Greg,
On Wed, 26 Feb 2014 19:37:16 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote:
> >
> > On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the char-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > In file included from drivers/misc/mei/hw-txe.c:25:0:
> > > drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t'
> > > irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
> > > ^
> > >
> > > Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but
> > > probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF
> > > Migration support") from the pci tree which removed the include of
> > > irqreturn.h from pci.h ...
> > >
> > > See Rule 1 from Documentation/SubmitChecklist ...
> > >
> > > I added the following merge fix patch (this should be applied to the
> > > char-misc tree):
> >
> > Ping?
>
> I've merged everything together, and it all builds properly for me in
> the char-misc branches, so I don't see what is missing. What did I do
> wrong?
Nothing, your tree is fine, except when merged with the pci tree. There
is a commit in the pci tree that removed the include of irqreturn.h from
pci.h, thus exposing that drivers/misc/mei/hw-txe.c did not include
irqreturn.h directly despite using stuff from there (similarly for
hw-txe.h). My patch is just a "quality of implementation" thing in your
tree at the moment, but applying it to your tree will save doing the
semantic merge conflict fixup in linux-next and later in Linus' tree when
your tree and the pci tree meet there.
i.e. it does not hurt your tree to apply it and will save is forgetting
later.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-02-27 5:48 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 5:47 linux-next: build failure after merge of the char-misc tree Stephen Rothwell
2014-02-26 6:47 ` Stephen Rothwell
2014-02-27 3:37 ` Greg KH
2014-02-27 5:48 ` Stephen Rothwell [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-07-27 8:08 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
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
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=20140227164808.354149fc2237d5f3df04242d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).