From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>, Sudeep Dutt <sudeep.dutt@intel.com>,
Dasaratharaman Chandramouli
<dasaratharaman.chandramouli@intel.com>,
Ashutosh Dixit <ashutosh.dixit@intel.com>,
Caz Yokoyama <Caz.Yokoyama@intel.com>,
Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>,
Nikhil Rao <nikhil.rao@intel.com>
Subject: Re: linux-next: build failure after merge of the char-misc tree
Date: Fri, 27 Sep 2013 18:04:02 -0700 [thread overview]
Message-ID: <20130928010402.GA22939@kroah.com> (raw)
In-Reply-To: <20130927171029.609cf783d3f9645ebe7117c0@canb.auug.org.au>
On Fri, Sep 27, 2013 at 05:10:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/misc/mic/host/mic_main.c: In function 'mic_probe':
> drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function 'sysfs_get_dirent'
> NULL, "state");
> ^
> In file included from include/linux/kobject.h:21:0,
> from include/linux/module.h:16,
> from drivers/misc/mic/host/mic_main.c:26:
> include/linux/sysfs.h:465:1: note: declared here
> sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name)
> ^
>
> Caused by commit 3a6a9201897c ("Intel MIC Host Driver, card OS state
> management") interacting with commit 388975cccaaf ("sysfs: clean up
> sysfs_get_dirent()") from the driver-core tree.
>
> I added this merge fix patch:
That looks correct, thanks, I'll carry this along to handle the merge
issue when it all goes to Linus.
greg k-h
next prev parent reply other threads:[~2013-09-28 1:04 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 7:10 linux-next: build failure after merge of the char-misc tree Stephen Rothwell
2013-09-28 1:04 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-03 11:20 回复: 回复: 回复: " Greg KH
2025-07-04 1:32 ` Lizhi Xu
2025-07-03 7:10 Stephen Rothwell
2025-07-03 8:30 ` Greg KH
2025-05-05 6:08 Stephen Rothwell
2025-05-05 6:12 ` Stephen Rothwell
2025-05-05 7:14 ` Stephen Rothwell
2025-05-05 7:39 ` Thomas Weißschuh
2025-05-05 8:28 ` Stephen Rothwell
2025-05-01 6:45 Stephen Rothwell
2025-05-01 7:26 ` Greg KH
2025-05-01 10:15 ` Thadeu Lima de Souza Cascardo
2025-05-01 14:20 ` Greg KH
2025-04-29 5:54 Stephen Rothwell
2025-04-29 10:58 ` Thadeu Lima de Souza Cascardo
2025-04-30 12:16 ` Thadeu Lima de Souza Cascardo
2025-04-30 14:09 ` Greg Kroah-Hartman
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
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-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=20130928010402.GA22939@kroah.com \
--to=greg@kroah.com \
--cc=Caz.Yokoyama@intel.com \
--cc=arnd@arndb.de \
--cc=ashutosh.dixit@intel.com \
--cc=dasaratharaman.chandramouli@intel.com \
--cc=harshavardhan.r.kharche@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nikhil.rao@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=sudeep.dutt@intel.com \
--cc=tj@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).