[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGXu5jLW9Hnng=bS11g98sXUiEk7fE6mizemD_au974hb-qJVQ@mail.gmail.com>
Date: Tue, 27 Jun 2017 15:16:40 -0700
From: Kees Cook <keescook@...gle.com>
To: James Morris <jmorris@...ei.org>
Cc: John Johansen <john.johansen@...onical.com>,
Stephen Rothwell <sfr@...b.auug.org.au>,
Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the kspp tree
On Mon, Jun 26, 2017 at 8:33 PM, James Morris <jmorris@...ei.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@...b.auug.org.au>
>> > Acked-by: John Johansen <john.johansen@...onical.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.
-Kees
--
Kees Cook
Pixel Security
Powered by blists - more mailing lists