From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Jurgens <danielj@mellanox.com>,
Doug Ledford <dledford@redhat.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Matan Barak <matanb@mellanox.com>
Subject: Re: linux-next: build failure after merge of the selinux tree
Date: Mon, 22 May 2017 17:12:38 -0400 [thread overview]
Message-ID: <CAHC9VhQW8iLyOyr3SWTgyDXEi5yF2yAtbjFKfPQdZ10yZUDf3A@mail.gmail.com> (raw)
In-Reply-To: <20170522124855.68ad087f@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-05-22 21:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 2:48 linux-next: build failure after merge of the selinux tree Stephen Rothwell
2017-05-22 21:12 ` Paul Moore [this message]
2017-05-22 21:16 ` Daniel Jurgens
-- strict thread matches above, loose matches on Subject: below --
2024-03-27 2:10 Stephen Rothwell
2024-03-27 13:13 ` Paul Moore
2021-10-05 3:10 Stephen Rothwell
2021-10-05 13:57 ` Paul Moore
2019-12-10 1:40 Stephen Rothwell
2019-12-10 2:25 ` Paul Moore
2019-04-03 1:22 Stephen Rothwell
2019-04-03 1:25 ` Paul Moore
2019-03-19 1:40 Stephen Rothwell
2019-03-19 17:11 ` Paul Moore
2017-01-10 1:27 Stephen Rothwell
2017-01-11 3:11 ` Paul Moore
2017-02-10 2:50 ` Stephen Rothwell
2017-02-10 12:34 ` Paul Moore
2012-01-05 4:24 Stephen Rothwell
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=CAHC9VhQW8iLyOyr3SWTgyDXEi5yF2yAtbjFKfPQdZ10yZUDf3A@mail.gmail.com \
--to=paul@paul-moore.com \
--cc=danielj@mellanox.com \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matanb@mellanox.com \
--cc=sfr@canb.auug.org.au \
/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).