On 5/22/2017 4:12 PM, Paul Moore wrote:
> On Sun, May 21, 2017 at 10:48 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
>> 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@xxxxxxxxxxxxxxxx>
>> ---
>> 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
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
