From patchwork Tue Sep 22 01:20:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 520801 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 86C33140788 for ; Tue, 22 Sep 2015 11:20:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932412AbbIVBUT (ORCPT ); Mon, 21 Sep 2015 21:20:19 -0400 Received: from ozlabs.org ([103.22.144.67]:32964 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757437AbbIVBUR (ORCPT ); Mon, 21 Sep 2015 21:20:17 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id ACC2814018C; Tue, 22 Sep 2015 11:20:15 +1000 (AEST) Date: Tue, 22 Sep 2015 11:20:15 +1000 From: Stephen Rothwell To: Gustavo Padovan , David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Aring , Joe Perches , Andrew Morton , marcel@holtmann.org Subject: Re: linux-next: build failure after merge of the bluetooth tree Message-ID: <20150922112015.140547fb@canb.auug.org.au> In-Reply-To: <20150914102234.38df8b11@canb.auug.org.au> References: <20150914101428.13d5ec2d@canb.auug.org.au> <20150914102234.38df8b11@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Gustavo, On Mon, 14 Sep 2015 10:22:34 +1000 Stephen Rothwell wrote: > > On Mon, 14 Sep 2015 10:14:28 +1000 Stephen Rothwell 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 > To: marcel@holtmann.org > Cc: Andrew Morton , > Stephen Rothwell , > Alexander Aring , > Stefan Schmidt > 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 > > 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 > Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL OK, this is now a problem for the net-next tree since the bluetooth tree was merged there :-( Can someone please apply this patch? Hi Dave, An x64_64 allmodconfig build after merging the next-next tree breaks in linux-next due to the patch below not being applied to the bluetooth tree. I have been applying the equivalent to the bluetooth tree merge in linux-next for a while now. [Patch repeated for Dave - this is from and email from Andrew via Alexander to Marcel which I forwarded to Gustavo] From: Stephen Rothwell Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL Signed-off-by: Stephen Rothwell Cc: Alexander Aring Cc: Stefan Schmidt Cc: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Alexander Aring --- 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)