Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933118Ab2EWUv3 (ORCPT ); Wed, 23 May 2012 16:51:29 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:61134 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753183Ab2EWUv2 convert rfc822-to-8bit (ORCPT ); Wed, 23 May 2012 16:51:28 -0400 MIME-Version: 1.0 In-Reply-To: <20120523181917.GN11775@ZenIV.linux.org.uk> References: <20120523170740.ae058d8d5468d471eb948c39@canb.auug.org.au> <4FBD090E.5020901@xenotime.net> <20120523181917.GN11775@ZenIV.linux.org.uk> Date: Wed, 23 May 2012 22:51:26 +0200 X-Google-Sender-Auth: JUBH8uYZWvbjvQcPuo4vA1xntZw Message-ID: Subject: Re: linux-next: Tree for May 23 (uml) From: Geert Uytterhoeven To: Al Viro Cc: Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, LKML , Richard Weinberger Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1456 Lines: 32 On Wed, May 23, 2012 at 8:19 PM, Al Viro wrote: >> uml defconfig on x86_64: >> >> arch/um/kernel/process.c: In function 'interrupt_end': >> arch/um/kernel/process.c:122:14: error: 'struct task_struct' has no member named 'replacement_session_keyring' >> arch/um/kernel/process.c:123:4: error: implicit declaration of function 'key_replace_session_keyring' > > Grr...  That's a conflict between uml gaining TIF_NOTIFY_RESUME (needed > prereq to task_work_add() series) and patch in said series doing away > with explicit calls of key_replace_session_keyring().  Fixup is to remove > those two lines in arch/um/process.c, same as done on other architectures > by "keys: kill the dummy key_replace_session_keyring()" (commit c1cb001). JFYI, also on m68k: http://kisskb.ellerman.id.au/kisskb/buildresult/6353103/ Gr{oetje,eeting}s,                         Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.                                 -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/