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: From: Stephen Rothwell Date: Fri, 27 Sep 2013 17:07:12 +1000 Subject: [PATCH] Intel MIC Host Driver: fix for sysfs_get_dirent API change Signed-off-by: Stephen Rothwell --- drivers/misc/mic/host/mic_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c index a8965d4..28c8490 100644 --- a/drivers/misc/mic/host/mic_main.c +++ b/drivers/misc/mic/host/mic_main.c @@ -316,8 +316,7 @@ static int mic_probe(struct pci_dev *pdev, "device_create_with_groups failed rc %d\n", rc); goto smpt_uninit; } - mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, - NULL, "state"); + mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, "state"); if (!mdev->state_sysfs) { rc = -ENODEV; dev_err(&pdev->dev, "sysfs_get_dirent failed rc %d\n", rc); -- 1.8.4.rc3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au