From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership•com>,
Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Hannes Reinecke <hare@suse•de>, Joe Perches <joe@perches•com>
Subject: linux-next: build failure after merge of the scsi tree
Date: Wed, 4 Feb 2015 17:29:25 +1100 [thread overview]
Message-ID: <20150204172925.728016bf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2806 bytes --]
Hi James,
After merging the scsi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought to be
ret = dev_printk(level, &sdev->sdev_gendev, "%s", logbuf);
^
drivers/scsi/scsi_logging.c: In function 'scmd_printk':
drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought to be
ret = dev_printk(level, &scmd->device->sdev_gendev, "%s", logbuf);
^
Caused by commit ded85c193a39 ("scsi: Implement per-cpu logging
buffer") interacting with commit d1f1052c5204 ("device: Change
dev_<level> logging functions to return void") from the driver-core
tree.
I added the following merge resolution patch. Someone will have to
remember to tell Linus. Also, the void return may be able to be
propagated further up the chain since these two new affected functions
now always return 0.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 4 Feb 2015 17:18:08 +1100
Subject: [PATCH] scsi: merge resolution for dev_printk API change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/scsi/scsi_logging.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c
index ecc5918e372a..0810e92874d2 100644
--- a/drivers/scsi/scsi_logging.c
+++ b/drivers/scsi/scsi_logging.c
@@ -99,7 +99,6 @@ int sdev_prefix_printk(const char *level, const struct scsi_device *sdev,
va_list args;
char *logbuf;
size_t off = 0, logbuf_len;
- int ret;
if (!sdev)
return 0;
@@ -116,9 +115,9 @@ int sdev_prefix_printk(const char *level, const struct scsi_device *sdev,
off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
va_end(args);
}
- ret = dev_printk(level, &sdev->sdev_gendev, "%s", logbuf);
+ dev_printk(level, &sdev->sdev_gendev, "%s", logbuf);
scsi_log_release_buffer(logbuf);
- return ret;
+ return 0;
}
EXPORT_SYMBOL(sdev_prefix_printk);
@@ -128,7 +127,6 @@ int scmd_printk(const char *level, const struct scsi_cmnd *scmd,
va_list args;
char *logbuf;
size_t off = 0, logbuf_len;
- int ret;
if (!scmd || !scmd->cmnd)
return 0;
@@ -143,9 +141,9 @@ int scmd_printk(const char *level, const struct scsi_cmnd *scmd,
off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
va_end(args);
}
- ret = dev_printk(level, &scmd->device->sdev_gendev, "%s", logbuf);
+ dev_printk(level, &scmd->device->sdev_gendev, "%s", logbuf);
scsi_log_release_buffer(logbuf);
- return ret;
+ return 0;
}
EXPORT_SYMBOL(scmd_printk);
--
2.1.4
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-04 6:29 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-04 6:29 Stephen Rothwell [this message]
2015-02-04 6:47 ` linux-next: build failure after merge of the scsi tree Joe Perches
2015-02-04 15:26 ` 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
2016-12-23 0:45 Stephen Rothwell
2016-12-23 0:56 ` James Bottomley
[not found] ` <20161224123853.08284e8a@canb.auug.org.au>
2016-12-24 10:15 ` Ingo Molnar
2016-12-24 10:44 ` Stephen Rothwell
2016-12-24 11:46 ` Thomas Gleixner
2016-12-24 16:48 ` James Bottomley
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
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=20150204172925.728016bf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=hare@suse$(echo .)de \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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