Re: linux-next: build failure after merge of the kspp tree

From	James Morris <jmorris@namei.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: build failure after merge of the kspp tree
Date	2017-06-28 07:50 +0200
Message-ID	<tXe1r-2Mb-9@gated-at.bofh.it> (permalink)
References	<tUjqF-3YW-1@gated-at.bofh.it> <tUkd5-4w2-29@gated-at.bofh.it> <tWGMa-5KY-11@gated-at.bofh.it> <tWPw5-37c-1@gated-at.bofh.it> <tX6ZY-6Ou-17@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Tue, 27 Jun 2017, Kees Cook wrote:

> On Mon, Jun 26, 2017 at 8:33 PM, James Morris <jmorris@namei.org> wrote:
> > On Mon, 26 Jun 2017, Kees Cook wrote:
> >
> >> >> Fixes: 8014370f1257 ("apparmor: move path_link mediation to using labels")
> >> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > Acked-by: John Johansen <john.johansen@canonical.com>
> >>
> >> Hi James,
> >>
> >> Just a ping; this needs to get into -next to avoid build errors.
> >
> > Surely Linus will resolve this when he pulls the trees in?
> 
> It's not a merge glitch, it's a refactoring glitch. John's commit in
> security-next ("apparmor: move path_link mediation to using labels")
> undid an earlier commit 8486adf0d755 ("apparmor: use designated
> initializers") from v4.11. This patch is needed for security-next.
> 

Thanks.

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next


-- 
James Morris
<jmorris@namei.org>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the kspp tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-20 07:00 +0200
  Re: linux-next: build failure after merge of the kspp tree Kees Cook <keescook@google.com> - 2017-06-20 07:40 +0200
    Re: linux-next: build failure after merge of the kspp tree John Johansen <john.johansen@canonical.com> - 2017-06-20 07:50 +0200
  Re: linux-next: build failure after merge of the kspp tree John Johansen <john.johansen@canonical.com> - 2017-06-20 07:50 +0200
    Re: linux-next: build failure after merge of the kspp tree Kees Cook <keescook@google.com> - 2017-06-26 20:20 +0200
      Re: linux-next: build failure after merge of the kspp tree James Morris <jmorris@namei.org> - 2017-06-27 05:40 +0200
        Re: linux-next: build failure after merge of the kspp tree Kees Cook <keescook@google.com> - 2017-06-28 00:20 +0200
          Re: linux-next: build failure after merge of the kspp tree James Morris <jmorris@namei.org> - 2017-06-28 07:50 +0200

csiph-web