Re: linux-next: build failure after merge of the bluetooth tree
Hi Luiz, On Thu, 8 Apr 2021 04:47:04 + "Von Dentz, Luiz" wrote: > > I'd leave this for Marcel to comments, but there are quite many > instances of // comment like that, so I wonder what is going on, or > perhaps that is not allowed in include/uapi? We only do these standalone compile checks on the uapi header files. -- Cheers, Stephen Rothwell pgpACVhh2tkWa.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the bluetooth tree
Hi all,
After merging the bluetooth tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from :32:
./usr/include/linux/virtio_bt.h:1:1: error: C++ style comments are not allowed
in ISO C90
1 | // SPDX-License-Identifier: BSD-3-Clause
| ^
./usr/include/linux/virtio_bt.h:1:1: note: (this will be reported only once per
input file)
Caused by commit
148a48f61393 ("Bluetooth: Add support for virtio transport driver")
I have used the bluetooth tree from next-20210407 for today.
--
Cheers,
Stephen Rothwell
pgpt9Z2bR_E0e.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the bluetooth tree
Same here, thanks for the fix! On Mon, Jul 27, 2020 at 1:22 AM Christoph Hellwig wrote: > > The fixup looks good to me, thanks.
Re: linux-next: build failure after merge of the bluetooth tree
The fixup looks good to me, thanks.
linux-next: build failure after merge of the bluetooth tree
Hi all,
After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
net/bluetooth/sco.c: In function 'sco_sock_setsockopt':
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
862 | if (get_user(opt, (u32 __user *)optval)) {
| ^~
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
Caused by commit
00398e1d5183 ("Bluetooth: Add support for BT_PKT_STATUS CMSG data for SCO
connections")
interacting with commit
a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")
from the net-next tree.
I have applied the following merge fix patch:
From: Stephen Rothwell
Date: Mon, 27 Jul 2020 13:41:30 +1000
Subject: [PATCH] Bluetooth: fix for introduction of sockptr_t
Signed-off-by: Stephen Rothwell
---
net/bluetooth/sco.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 6e6b03844a2a..dcf7f96ff417 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -859,7 +859,7 @@ static int sco_sock_setsockopt(struct socket *sock, int
level, int optname,
break;
case BT_PKT_STATUS:
- if (get_user(opt, (u32 __user *)optval)) {
+ if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
err = -EFAULT;
break;
}
--
2.27.0
--
Cheers,
Stephen Rothwell
pgprLcgJiu6cF.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the bluetooth tree
Hi all,
After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from drivers/bluetooth/hci_ldisc.c:34:
drivers/bluetooth/btintel.h: In function 'btintel_reset_to_bootloader':
drivers/bluetooth/btintel.h:188:9: warning: 'return' with a value, in function
returning void [-Wreturn-type]
188 | return -EOPNOTSUPP;
| ^
drivers/bluetooth/btintel.h:186:20: note: declared here
186 | static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)
|^~~
Caused by commit
b9a2562f4918 ("Bluetooth: btusb: Trigger Intel FW download error recovery")
--
Cheers,
Stephen Rothwell
pgptB1jP2vLF_.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the bluetooth tree
From: Stephen Rothwell Date: Tue, 22 Sep 2015 11:20:15 +1000 > 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 Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the bluetooth tree
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: mar...@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.ar...@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)
--
2.5.1
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the bluetooth tree
Hi Gustavo,
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: mar...@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.ar...@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
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)
--
2.5.1
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the bluetooth tree
Hi Gustavo,
After merging the bluetooth tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/ieee802154/at86rf230.c: In function 'at86rf230_s
tats_show':
drivers/net/ieee802154/at86rf230.c:1650:6: error: void value not ignored as it
ought to be
ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
^
drivers/net/ieee802154/at86rf230.c:1654:6: error: void value not ignored as it
ought to be
ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
^
drivers/net/ieee802154/at86rf230.c:1659:6: error: void value not ignored as it
ought to be
ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
^
drivers/net/ieee802154/at86rf230.c:1664:6: error: void value not ignored as it
ought to be
ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
^
drivers/net/ieee802154/at86rf230.c:1669:6: error: void value not ignored as it
ought to be
ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
^
drivers/net/ieee802154/at86rf230.c:1673:2: error: void value not ignored as it
ought to be
return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
^
drivers/net/ieee802154/at86rf230.c:1674:1: warning: control reaches end of
non-void function [-Wreturn-type]
}
^
Caused by commit
890acf8330ca ("at86rf230: add debugfs support")
interacting with commit
6798a8caaf64 ("fs/seq_file: convert int seq_vprint/seq_printf/etc... returns
to void")
from Linus' tree (as you were warned it would).
I applied the patches that Andrew has had in his post merge series
(but I think you were sent a rolled up version):
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
---
drivers/net/ieee802154/at86rf230.c | 28 ++-
1 file changed, 7 insertions(+), 21 deletions(-)
diff -puN
drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null
drivers/net/ieee802154/at86rf230.c
---
a/drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null
+++ a/drivers/net/ieee802154/at86rf230.c
@@ -1647,30 +1647,16 @@ static int at86rf230_stats_show(struct s
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",
+ 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);
- if (ret < 0)
- return ret;
-
- ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
+ 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",
+ 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, "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)
From: Alexander Aring
Subject: drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix
Date: Fri, 11 Sep 2015 11:28:20 -0700
fix whitespace, unused var `ret'
Signed-off-by: Alexander Aring
Cc: Stephen Rothwell
Cc: Stefan Schmidt
Cc: Marcel Holtmann
Signed-off-by: Andrew Morton
---
drivers/net/ieee802154/at86rf230.c |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff -puN
drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix
drivers/net/ieee802154/at86rf230.c
---
a/drivers/net/ieee802154/at86rf230.c~drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix
+++ a/drivers/net/ieee802154/at86rf230.c
@@ -1645,15 +1645,14 @@ static struct dentry *at86rf230_debugfs_
static int at86rf230_stats_show(struct seq_file *file, void *offset)
{
struct at86rf230_local *lp = file->private;
- int ret;
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);
+ lp->trac.success_data_pending);
seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
-lp->trac.success_wait_for_ack);
+
linux-next: build failure after merge of the bluetooth tree
Hi Gustavo,
After merging the bluetooth tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/bluetooth/hci_bcm.c: In function 'bcm_acpi_probe':
drivers/bluetooth/hci_bcm.c:458:2: error: implicit declaration of function
'acpi_dev_get_resources' [-Werror=implicit-function-declaration]
acpi_dev_get_resources(adev, &resources, bcm_resource, dev);
^
Caused by commit
ae056908862b ("Bluetooth: hci_bcm: Retrieve UART speed from ACPI")
This build does not have ACPI enabled.
I have added the following patch for today:
From: Stephen Rothwell
Date: Wed, 12 Aug 2015 17:58:00 +1000
Subject: [PATCH] Bluetooth: hci_bcm: need to depend on CONFIG_ACPI
Signed-off-by: Stephen Rothwell
---
drivers/bluetooth/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 0bd88c942a52..affaecab4fa6 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -147,6 +147,7 @@ config BT_HCIUART_INTEL
config BT_HCIUART_BCM
bool "Broadcom protocol support"
depends on BT_HCIUART
+ depends on ACPI
select BT_HCIUART_H4
select BT_BCM
help
--
2.5.0
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the bluetooth tree
Hi Stephen,
On Mon, Oct 27, 2014, Stephen Rothwell wrote:
> After merging the bluetooth tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> net/bluetooth/smp.o: In function `test_smp':
> smp.c:(.init.text+0x0): multiple definition of `init_module'
> net/bluetooth/af_bluetooth.o:af_bluetooth.c:(.init.text+0x0): first defined
> here
>
> Probably caused by commit 4cd3362da899 ("Bluetooth: Add skeleton for
> SMP self-tests").
>
> I have used the bluetooth tree from next-20141023 for today.
We've applied a revert patch for the SMP self-tests to the
bluetooth-next tree until we figure out how to fix this properly.
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the bluetooth tree
Hi Gustavo,
After merging the bluetooth tree, today's linux-next build (x86_64
allmodconfig) failed like this:
net/bluetooth/smp.o: In function `test_smp':
smp.c:(.init.text+0x0): multiple definition of `init_module'
net/bluetooth/af_bluetooth.o:af_bluetooth.c:(.init.text+0x0): first defined here
Probably caused by commit 4cd3362da899 ("Bluetooth: Add skeleton for
SMP self-tests").
I have used the bluetooth tree from next-20141023 for today.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpgFQi8jZ_c9.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the bluetooth tree
Hi Gustavo,
After merging the bluetooth tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/bluetooth/btusb.c:100:2: error: expected '}' before '{' token
Caused by commit 493969cf4728 ("Bluetooth: Add support for BCM20702A0
[04ca, 2003]"). That wasn't really well tested, now was it? :-(
I have used the bluetooth tree from next-20120918 for today.
BTW, why is that commit not signed off by its author?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpaT2iANhb5K.pgp
Description: PGP signature
