Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753944AbdF0WQu (ORCPT ); Tue, 27 Jun 2017 18:16:50 -0400 Received: from mail-it0-f50.google.com ([209.85.214.50]:38192 "EHLO mail-it0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826AbdF0WQm (ORCPT ); Tue, 27 Jun 2017 18:16:42 -0400 MIME-Version: 1.0 In-Reply-To: References: <20170620145655.4b7f3efb@canb.auug.org.au> From: Kees Cook Date: Tue, 27 Jun 2017 15:16:40 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the kspp tree To: James Morris Cc: John Johansen , Stephen Rothwell , Linux-Next Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 773 Lines: 23 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. -Kees -- Kees Cook Pixel Security