Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1646492 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-05-22 04:50 +0200 |
| Last post | 2017-05-22 23:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the selinux tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-22 04:50 +0200
Re: linux-next: build failure after merge of the selinux tree Paul Moore <paul@paul-moore.com> - 2017-05-22 23:20 +0200
Re: linux-next: build failure after merge of the selinux tree Daniel Jurgens <danielj@mellanox.com> - 2017-05-22 23:20 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-05-22 04:50 +0200 |
| Subject | linux-next: build failure after merge of the selinux tree |
| Message-ID | <tJLzX-80i-1@gated-at.bofh.it> |
Hi Paul,
After merging the selinux tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/infiniband/core/uverbs_cmd.c: In function 'create_qp':
drivers/infiniband/core/uverbs_cmd.c:1513:4: error: label 'err_destroy' used but not defined
goto err_destroy;
^
Caused by commit
89b54b4d09bd ("IB/core: Enforce PKey security on QPs")
interacting with commit
fd3c7904db6e ("IB/core: Change idr objects to use the new schema")
from Linus' tree.
I have applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 May 2017 12:45:57 +1000
Subject: [PATCH] IB/core: fix up for create_qp label changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/infiniband/core/uverbs_cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 558fd5204b32..0ad3b05405d8 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1510,7 +1510,7 @@ static int create_qp(struct ib_uverbs_file *file,
if (cmd->qp_type != IB_QPT_XRC_TGT) {
ret = ib_create_qp_security(qp, device);
if (ret)
- goto err_destroy;
+ goto err_cb;
qp->real_qp = qp;
qp->device = device;
--
2.11.0
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Paul Moore <paul@paul-moore.com> |
|---|---|
| Date | 2017-05-22 23:20 +0200 |
| Message-ID | <tK2Ua-2m2-29@gated-at.bofh.it> |
| In reply to | #1646492 |
On Sun, May 21, 2017 at 10:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the selinux tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/infiniband/core/uverbs_cmd.c: In function 'create_qp':
> drivers/infiniband/core/uverbs_cmd.c:1513:4: error: label 'err_destroy' used but not defined
> goto err_destroy;
> ^
>
> Caused by commit
>
> 89b54b4d09bd ("IB/core: Enforce PKey security on QPs")
>
> interacting with commit
>
> fd3c7904db6e ("IB/core: Change idr objects to use the new schema")
>
> from Linus' tree.
>
> I have applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 22 May 2017 12:45:57 +1000
> Subject: [PATCH] IB/core: fix up for create_qp label changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/infiniband/core/uverbs_cmd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks Stephen, this looks right to me.
Daniel and Doug, does this look right to you?
> diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
> index 558fd5204b32..0ad3b05405d8 100644
> --- a/drivers/infiniband/core/uverbs_cmd.c
> +++ b/drivers/infiniband/core/uverbs_cmd.c
> @@ -1510,7 +1510,7 @@ static int create_qp(struct ib_uverbs_file *file,
> if (cmd->qp_type != IB_QPT_XRC_TGT) {
> ret = ib_create_qp_security(qp, device);
> if (ret)
> - goto err_destroy;
> + goto err_cb;
>
> qp->real_qp = qp;
> qp->device = device;
> --
> 2.11.0
>
> --
> Cheers,
> Stephen Rothwell
--
paul moore
www.paul-moore.com
[toc] | [prev] | [next] | [standalone]
| From | Daniel Jurgens <danielj@mellanox.com> |
|---|---|
| Date | 2017-05-22 23:20 +0200 |
| Message-ID | <tK2Ua-2m2-35@gated-at.bofh.it> |
| In reply to | #1647405 |
On 5/22/2017 4:12 PM, Paul Moore wrote:
> On Sun, May 21, 2017 at 10:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Paul,
>>
>> After merging the selinux tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/infiniband/core/uverbs_cmd.c: In function 'create_qp':
>> drivers/infiniband/core/uverbs_cmd.c:1513:4: error: label 'err_destroy' used but not defined
>> goto err_destroy;
>> ^
>>
>> Caused by commit
>>
>> 89b54b4d09bd ("IB/core: Enforce PKey security on QPs")
>>
>> interacting with commit
>>
>> fd3c7904db6e ("IB/core: Change idr objects to use the new schema")
>>
>> from Linus' tree.
>>
>> I have applied the following merge fix patch for today:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 22 May 2017 12:45:57 +1000
>> Subject: [PATCH] IB/core: fix up for create_qp label changes
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/infiniband/core/uverbs_cmd.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
> Thanks Stephen, this looks right to me.
>
> Daniel and Doug, does this look right to you?
Yes, that's right.
>
>> diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
>> index 558fd5204b32..0ad3b05405d8 100644
>> --- a/drivers/infiniband/core/uverbs_cmd.c
>> +++ b/drivers/infiniband/core/uverbs_cmd.c
>> @@ -1510,7 +1510,7 @@ static int create_qp(struct ib_uverbs_file *file,
>> if (cmd->qp_type != IB_QPT_XRC_TGT) {
>> ret = ib_create_qp_security(qp, device);
>> if (ret)
>> - goto err_destroy;
>> + goto err_cb;
>>
>> qp->real_qp = qp;
>> qp->device = device;
>> --
>> 2.11.0
>>
>> --
>> Cheers,
>> Stephen Rothwell
>
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web