From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexander Aring <alex.aring@gmail.com>,
Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
marcel@holtmann.org
Subject: Re: linux-next: build failure after merge of the bluetooth tree
Date: Mon, 14 Sep 2015 10:22:34 +1000 [thread overview]
Message-ID: <20150914102234.38df8b11@canb.auug.org.au> (raw)
In-Reply-To: <20150914101428.13d5ec2d@canb.auug.org.au>
Hi Gustavo,
On Mon, 14 Sep 2015 10:14:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I applied the patches that Andrew has had in his post merge series
> (but I think you were sent a rolled up version):
Actually it was sent by Alexander to Marcel:
From: Alexander Aring <alex.aring@gmail.com>
To: marcel@holtmann.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Alexander Aring <alex.aring@gmail.com>,
Stefan Schmidt <stefan@osg.samsung.com>
Subject: [PATCH bluetooth-next] drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
Date: Fri, 11 Sep 2015 11:23:30 +0200
Message-Id: <1441963410-24844-1-git-send-email-alex.aring@gmail.com>
X-Mailer: git-send-email 2.5.1
From: Andrew Morton <akpm@linux-foundation.org>
I will shortly be sending
http://ozlabs.org/~akpm/mmots/broken-out/fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch
to Linus. This will cause the linux-next version of
drivers/net/ieee802154/at86rf230.c to break at compilation time.
Below is the fix. I suggest you apply this immediately.
Otherwise I'll try to remember to send this in after Alexander's
890acf8330cac is merged. But there will be a window during which the
build fails, and we'll get emails...
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
drivers/net/ieee802154/at86rf230.c | 35 ++++++++++-------------------------
1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index b8b0628..9756e64 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1645,32 +1645,17 @@ static struct dentry *at86rf230_debugfs_root;
static int at86rf230_stats_show(struct seq_file *file, void *offset)
{
struct at86rf230_local *lp = file->private;
- int ret;
-
- ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
- if (ret < 0)
- return ret;
-
- ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
- lp->trac.success_data_pending);
- if (ret < 0)
- return ret;
-
- ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
- lp->trac.success_wait_for_ack);
- if (ret < 0)
- return ret;
-
- ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
- lp->trac.channel_access_failure);
- if (ret < 0)
- return ret;
- ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
- if (ret < 0)
- return ret;
-
- return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+ seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
+ seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
+ lp->trac.success_data_pending);
+ seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
+ lp->trac.success_wait_for_ack);
+ seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
+ lp->trac.channel_access_failure);
+ seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
+ seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+ return 0;
}
static int at86rf230_stats_open(struct inode *inode, struct file *file)
--
2.5.1
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2015-09-14 0:22 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-14 0:14 linux-next: build failure after merge of the bluetooth tree Stephen Rothwell
2015-09-14 0:22 ` Stephen Rothwell [this message]
2015-09-22 1:20 ` Stephen Rothwell
2015-09-22 3:42 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2023-07-20 22:21 Iwashima, Kuniyuki
[not found] <PH0PR11MB51269B6805230AB8ED209B14D332A@PH0PR11MB5126.namprd11.prod.outlook.com>
2023-07-20 0:50 ` Stephen Rothwell
2023-07-20 1:24 ` Jakub Kicinski
2023-07-20 3:00 ` Stephen Rothwell
[not found] ` <PH0PR11MB5126763E5913574B8ED6BDE4D33EA@PH0PR11MB5126.namprd11.prod.outlook.com>
2023-07-20 3:24 ` Jakub Kicinski
2023-07-20 6:00 ` Alexander Mikhalitsyn
2023-07-20 15:14 ` Jakub Kicinski
2023-07-20 15:21 ` Alexander Mikhalitsyn
2023-07-20 22:19 ` Stephen Rothwell
2023-07-20 22:12 ` Stephen Rothwell
2023-07-20 23:27 ` Jakub Kicinski
2023-07-20 23:30 ` Stephen Rothwell
[not found] <PH0PR11MB51262F07CD4739BDCB920483D322A@PH0PR11MB5126.namprd11.prod.outlook.com>
2023-06-23 8:34 ` Alexander Mikhalitsyn
2023-06-23 9:23 ` Alexander Mikhalitsyn
2023-06-23 12:24 ` Christian Brauner
2023-06-23 12:28 ` Alexander Mikhalitsyn
2023-06-23 15:09 ` Jakub Kicinski
2023-06-26 22:09 ` Alexander Mikhalitsyn
[not found] <PH0PR11MB5126F2B2E020774AF8D91299D35BA@PH0PR11MB5126.namprd11.prod.outlook.com>
2023-06-15 23:27 ` Stephen Rothwell
2023-06-13 3:02 Stephen Rothwell
2023-06-15 22:32 ` Stephen Rothwell
2023-07-06 23:41 ` Stephen Rothwell
2021-12-07 0:26 Stephen Rothwell
2021-12-06 0:37 Stephen Rothwell
2021-09-27 0:16 Stephen Rothwell
[not found] <PH0PR11MB5126EFEDB65650EFC3368981D3749@PH0PR11MB5126.namprd11.prod.outlook.com>
2021-04-08 4:57 ` Stephen Rothwell
2021-04-08 3:59 Stephen Rothwell
2020-07-27 3:44 Stephen Rothwell
2020-07-27 5:22 ` Christoph Hellwig
2020-07-27 13:28 ` Alain Michaud
2019-10-18 0:13 Stephen Rothwell
2015-08-12 8:01 Stephen Rothwell
2014-10-27 2:19 Stephen Rothwell
2014-10-28 14:49 ` Johan Hedberg
2012-09-19 1:45 Stephen Rothwell
2012-02-22 1:21 Stephen Rothwell
2012-02-22 1:29 ` David Miller
2011-12-21 2:19 Stephen Rothwell
2011-04-28 1:41 Stephen Rothwell
2011-04-28 4:12 ` Gustavo F. Padovan
2011-02-15 2:16 Stephen Rothwell
2011-02-15 12:48 ` Gustavo F. Padovan
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=20150914102234.38df8b11@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=alex.aring@gmail.com \
--cc=gustavo@padovan.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcel@holtmann.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).