From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756241AbbAWQP5 (ORCPT ); Fri, 23 Jan 2015 11:15:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56414 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755358AbbAWQPu (ORCPT ); Fri, 23 Jan 2015 11:15:50 -0500 From: Paul Moore To: Al Viro Cc: Guenter Roeck , linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, rgb@redhat.com, sd@queasysnail.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 0/5] Overhaul the audit filename handling Date: Fri, 23 Jan 2015 11:15:20 -0500 Message-ID: <1912499.zovdJNolxD@sifl> Organization: Red Hat User-Agent: KMail/4.14.3 (Linux/3.16.7-gentoo; KDE/4.14.3; x86_64; ; ) In-Reply-To: <20150123053056.GC29656@ZenIV.linux.org.uk> References: <20150122045303.1347.98054.stgit@localhost> <20150122214000.GX29656@ZenIV.linux.org.uk> <20150123053056.GC29656@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, January 23, 2015 05:30:56 AM Al Viro wrote: > On Thu, Jan 22, 2015 at 09:40:01PM +0000, Al Viro wrote: > > On Thu, Jan 22, 2015 at 09:29:03PM +0000, Al Viro wrote: > > > On Thu, Jan 22, 2015 at 04:25:13PM -0500, Paul Moore wrote: > > > > Your experimental branch looks good to me, thanks. > > > > > > Pushed into for-next; I'm probably going to move that stuff into a > > > never-rebased branch, merged into for-next and safe to pull into your > > > tree if you want to do something on top of that set. > > > > OK, vfs.git#getname is it; it's in never-to-be-rebased mode and it's > > merged > > into vfs.git#for-next (as of right now; HEAD is 9ee4c4). If you need to > > do > > something on top of that stuff, pulling vfs.git#getname is safe. > > Unfortunately, that thing was -rc2-based, leading to conflict with mainline > in kernel/auditsc.c. My fault, I hadn't realized that "audit: create > private file name copies when auditing inodes" in audit tree was, in fact, > present in mainline. vfs.git#getname2 is -rc3-based, same resulting > kernel/auditsc.c as in #getname. Please, use that. vfs.git#for-next > merges from that one now, so tomorrow -next should have no problems from > vfs.git... No worries, thanks for the update. -- paul moore security @ redhat