On Tue, 27 Jun 2017, Kees Cook wrote: > On Mon, Jun 26, 2017 at 8:33 PM, James Morris <jmorris@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx> > >> > Acked-by: John Johansen <john.johansen@xxxxxxxxxxxxx> > >> > >> 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@xxxxxxxxx> -- 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