MIME-Version: 1.0
References: <20211217113507.76f852f2@canb.auug.org.au> <CALF+zO=zDrRzPkpgjRQNYbxQ8j3qNVJjo9Ub=tCqFtT32sr-KQ@mail.gmail.com>
 <1957083.1639746671@warthog.procyon.org.uk>
In-Reply-To: <1957083.1639746671@warthog.procyon.org.uk>
From:   David Wysochanski <dwysocha@redhat.com>
Date:   Fri, 17 Dec 2021 08:33:59 -0500
Message-ID: <CALF+zOnZ4v7DaZ6ymh28MPeeDYDLg06mWKxhB0xOVE2P8LGZ+w@mail.gmail.com>
Subject: Re: linux-next: manual merge of the nfs-anna tree with the fscache tree
To:     David Howells <dhowells@redhat.com>
Cc:     Anna Schumaker <Anna.Schumaker@netapp.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Trond Myklebust <trondmy@gmail.com>,
        NFS Mailing List <linux-nfs@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, Dec 17, 2021 at 8:11 AM David Howells <dhowells@redhat.com> wrote:
>
> David Wysochanski <dwysocha@redhat.com> wrote:
>
> > Anna, feel free to drop these from your tree to avoid the conflicts
> > with the rest of your tree and dhowells fscache-rewrite patchset.
>
> Would it help to take some bits through my tree?  (Or, at least, alter my NFS
> patches)
>

I think so.  If Anna is ok with it, she can drop them from her tree.
And I'm looking at these 7 patches to see which ones make sense on top
of your tree (the v3 patches you just sent).

Mainly my patches were cleanups, plus converting from dfprintk to tracepoints.
Some patches may no longer be needed.
As one example, this may be better done with tracepoints inside
__fscache_use_cookie and __fscache_unuse_cookie

3b779545aa01 ("NFS: Convert NFS fscache enable/disable dfprintks to
tracepoints")