From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Morris Subject: Re: linux-next: build failure after merge of the kspp tree Date: Wed, 28 Jun 2017 15:48:23 +1000 (AEST) Message-ID: References: <20170620145655.4b7f3efb@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: Received: from namei.org ([65.99.196.166]:41069 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751010AbdF1Fse (ORCPT ); Wed, 28 Jun 2017 01:48:34 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Kees Cook Cc: John Johansen , Stephen Rothwell , Linux-Next Mailing List , Linux Kernel Mailing List On Tue, 27 Jun 2017, Kees Cook wrote: > On Mon, Jun 26, 2017 at 8:33 PM, James Morris wrote: > > On Mon, 26 Jun 2017, Kees Cook wrote: > > > >> >> Fixes: 8014370f1257 ("apparmor: move path_link mediation to using labels") > >> >> Signed-off-by: Stephen Rothwell > >> > Acked-by: John Johansen > >> > >> 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