Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753764AbcLLIOb (ORCPT ); Mon, 12 Dec 2016 03:14:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36550 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbcLLIO3 (ORCPT ); Mon, 12 Dec 2016 03:14:29 -0500 Message-ID: <1481530466.3372.1.camel@redhat.com> Subject: Re: linux-next: manual merge of the akpm tree with the vfs tree From: Ian Kent To: Stephen Rothwell , Al Viro , Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 12 Dec 2016 16:14:26 +0800 In-Reply-To: <20161212165207.48c149de@canb.auug.org.au> References: <20161212165207.48c149de@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 12 Dec 2016 08:14:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1454 Lines: 36 On Mon, 2016-12-12 at 16:52 +1100, Stephen Rothwell wrote: > Hi all, > > Al let me know that he had put a newer version of the autofs patches > into his vfs tree, so I have dropped the following patches from the akpm > tree today: > >   vfs: change d_manage() to take a struct path >   vfs: add path_is_mountpoint() helper >   vfs: fix boolreturn.cocci warnings >   vfs: add path_has_submounts() >   autofs: change autofs4_expire_wait() to take struct path >   autofs: change autofs4_wait() to take struct path >   autofs: use path_is_mountpoint() to fix unreliable d_mountpoint() checks >   autofs: use path_has_submounts() to fix unreliable have_submount() checks >   vfs: remove unused have_submounts() function >   vfs: merge path_is_mountpoint() and path_is_mountpoint_rcu() >   autofs: make struct path const in autofs4_dir_open() >   autofs: change struct path to const in autofs4_expire_wait() and > autofs4_wait() >   vfs: change struct path to const in d_manage() >   vfs: constify path parameter of path_has_submounts() >   autofs: don't hold spinlock over direct mount expire >   vfs: make may_umount_tree() mount propagation aware >   vfs-make-may_umount_tree-mount-propogation-aware-checkpatch-fixes > > I hope that was the correct ones. Hi Stephen, Yes, Al merged a number of the patches, fixed a couple of problems, and rejected one which I'm still working on. The list looks right to me. That's great, thanks, Ian