Messages in this thread | | | From | Kees Cook <> | Date | Tue, 27 Jun 2017 15:16:40 -0700 | Subject | Re: linux-next: build failure after merge of the kspp tree |
| |
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.
-Kees
-- Kees Cook Pixel Security
| |