From: Ingo Molnar <mingo@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: James Bottomley <James.Bottomley@HansenPartnership•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Manish Rangankar <manish.rangankar@cavium•com>,
"Martin K. Petersen" <martin.petersen@oracle•com>,
Nilesh Javali <nilesh.javali@cavium•com>,
Adheer Chandravanshi <adheer.chandravanshi@qlogic•com>,
Chad Dupuis <chad.dupuis@cavium•com>,
Saurav Kashyap <saurav.kashyap@cavium•com>,
Arun Easi <arun.easi@cavium•com>,
Sebastian Andrzej Siewior <bigeasy@linutronix•de>
Subject: Re: linux-next: build failure after merge of the scsi tree
Date: Sat, 24 Dec 2016 11:15:08 +0100 [thread overview]
Message-ID: <20161224101508.GA12123@gmail.com> (raw)
In-Reply-To: <20161224123853.08284e8a@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi All,
>
> On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley <James.Bottomley@HansenPartnership•com> wrote:
> >
> > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > >
> > > After merging the scsi tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > > register_hotcpu_notifier(&qedi_cpu_notifier);
> > > ^
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> > > function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > > unregister_hotcpu_notifier(&qedi_cpu_notifier);
> > > ^
> > >
> > > Caused by commit
> > >
> > > ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> > > framework.")
> > >
> > > Interacting with commit
> > >
> > > 8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > register/unregister functions")
> > >
> > > from the tip tree.
> >
> > Well, that's a bit of a problem given that the SCSI tree has a pending
> > pull request including this driver.
> >
> > Thomas, can you do another fixup in your tip tree like you did for the
> > two BNX2* drivers?
>
> OK, so this is now a problem for the tip tree merge since James tree
> has been pulled by Linus.
Yeah, we'll handle it - that's why the final chunk of changes were left to after
-rc1, to not cause such merge conflicts upstream.
For now I've excluded the relevant -tip side commits from the linux-next branch.
Thanks,
Ingo
next prev parent reply other threads:[~2016-12-24 10:15 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-23 0:45 linux-next: build failure after merge of the scsi tree Stephen Rothwell
2016-12-23 0:56 ` James Bottomley
[not found] ` <20161224123853.08284e8a@canb.auug.org.au>
2016-12-24 10:15 ` Ingo Molnar [this message]
2016-12-24 10:44 ` Stephen Rothwell
2016-12-24 11:46 ` Thomas Gleixner
2016-12-24 16:48 ` James Bottomley
-- strict thread matches above, loose matches on Subject: below --
2019-03-20 0:48 Stephen Rothwell
2017-08-28 8:02 Stephen Rothwell
2017-02-06 5:04 Stephen Rothwell
2017-02-13 0:32 ` Stephen Rothwell
2017-02-13 16:18 ` Jens Axboe
2015-11-13 1:35 Stephen Rothwell
2015-11-13 8:32 ` Sreekanth Reddy
2015-06-02 8:06 Stephen Rothwell
2015-06-02 15:02 ` James Bottomley
2015-02-04 6:29 Stephen Rothwell
2015-02-04 6:47 ` Joe Perches
2015-02-04 15:26 ` James Bottomley
2014-11-10 6:15 Stephen Rothwell
2014-11-10 6:27 ` Anish Bhatt
2014-11-10 13:46 ` Christoph Hellwig
2014-11-10 15:21 ` James Bottomley
2014-11-10 15:48 ` Christoph Hellwig
2014-11-10 15:50 ` James Bottomley
2014-11-10 16:01 ` Christoph Hellwig
2014-11-04 4:43 Stephen Rothwell
2014-11-04 7:07 ` Hannes Reinecke
2014-11-05 4:48 ` Stephen Rothwell
2014-11-03 2:52 Stephen Rothwell
2014-11-03 7:51 ` Hannes Reinecke
2014-11-03 18:31 ` Christoph Hellwig
2014-09-26 8:34 Stephen Rothwell
2014-09-26 8:36 ` Christoph Hellwig
2014-09-26 9:57 ` James Bottomley
2014-09-26 12:43 ` Brian King
2013-01-12 2:23 wenxiong
2013-01-11 1:03 Stephen Rothwell
2013-01-11 7:34 ` James Bottomley
2013-01-11 15:27 ` Brian King
2013-01-11 15:37 ` James Bottomley
2013-01-11 16:05 ` Greg KH
2013-01-11 17:35 ` Brian King
2013-01-11 18:04 ` James Bottomley
2012-07-20 0:41 Stephen Rothwell
2012-07-20 8:50 ` James Bottomley
2012-03-26 1:17 Stephen Rothwell
2012-03-26 7:57 ` James Bottomley
2012-03-26 14:07 ` Greg KH
2012-03-27 7:29 ` James Bottomley
2012-03-27 22:17 ` Alexey Dobriyan
2012-03-27 22:22 ` Greg KH
2012-03-27 22:35 ` Alexey Dobriyan
2012-03-27 22:39 ` Alexey Dobriyan
2012-03-28 23:54 ` Greg KH
2012-03-29 19:38 ` Greg KH
2012-03-28 23:52 ` Greg KH
2012-03-29 7:32 ` Gerard Snitselaar
2012-03-29 8:25 ` Stephen Rothwell
2012-03-29 8:35 ` James Bottomley
2012-03-29 9:03 ` Gerard Snitselaar
2012-03-29 16:15 ` Greg KH
2012-03-23 2:00 Stephen Rothwell
2012-03-23 4:50 ` Benjamin Herrenschmidt
2012-03-23 8:14 ` James Bottomley
2012-03-23 8:53 ` Benjamin Herrenschmidt
2012-03-23 9:01 ` James Bottomley
2012-03-23 15:22 ` Jeff Garzik
2012-03-23 10:26 ` Alexey Dobriyan
2012-03-23 15:30 ` Jeff Garzik
2012-03-23 8:20 ` James Bottomley
2012-03-23 9:24 ` Stephen Rothwell
2011-12-15 1:58 Stephen Rothwell
2011-12-15 6:53 ` James Bottomley
2011-08-29 2:09 Stephen Rothwell
2011-08-29 7:17 ` James Bottomley
2011-08-29 8:07 ` Giridhar Malavali
2011-05-27 3:25 Stephen Rothwell
2011-05-27 13:47 ` James Bottomley
2010-10-26 0:19 Stephen Rothwell
2010-10-26 15:50 ` James Bottomley
2010-02-10 1:33 Stephen Rothwell
2010-02-10 22:16 ` James Bottomley
2010-02-10 23:11 ` Stephen Rothwell
2010-02-16 0:38 ` Stephen Rothwell
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=20161224101508.GA12123@gmail.com \
--to=mingo@kernel$(echo .)org \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=adheer.chandravanshi@qlogic$(echo .)com \
--cc=arun.easi@cavium$(echo .)com \
--cc=bigeasy@linutronix$(echo .)de \
--cc=chad.dupuis@cavium$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=manish.rangankar@cavium$(echo .)com \
--cc=martin.petersen@oracle$(echo .)com \
--cc=nilesh.javali@cavium$(echo .)com \
--cc=saurav.kashyap@cavium$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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