From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752607AbcADBzR (ORCPT ); Sun, 3 Jan 2016 20:55:17 -0500 Received: from ozlabs.org ([103.22.144.67]:34668 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894AbcADBzO (ORCPT ); Sun, 3 Jan 2016 20:55:14 -0500 Date: Mon, 4 Jan 2016 12:55:12 +1100 From: Stephen Rothwell To: Mimi Zohar Cc: James Morris , Al Viro , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Petko Manolov Subject: Re: linux-next: manual merge of the security tree with the vfs tree Message-ID: <20160104125512.53a64cd2@canb.auug.org.au> In-Reply-To: <1451871440.2772.16.camel@linux.vnet.ibm.com> References: <20151231152453.08cfae79@canb.auug.org.au> <1451871440.2772.16.camel@linux.vnet.ibm.com> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mimi, On Sun, 03 Jan 2016 20:37:20 -0500 Mimi Zohar wrote: > > FYI, I pushed out Petko's patch to linux-integrity/next earlier today. > His patch moves taking the ima_write_mutex to after the the call to > copy_from_user(), as discussed. This obviously won't fix the conflict > with Al's patch. How do you want to handle it? Do I need to do > anything? No, I will just do a different conflict resolution. I will send the usual email when I get to it. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au