xfs
[Top] [All Lists]

Re: [PATCH 19/20] xfs: implement pNFS export operations

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: [PATCH 19/20] xfs: implement pNFS export operations
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 13 Feb 2015 13:38:11 +1100
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>, Jeff Layton <jeff.layton@xxxxxxxxxxxxxxx>, Christoph Hellwig <hch@xxxxxx>, Jeff Layton <jlayton@xxxxxxxxxxxxxxx>, linux-nfs@xxxxxxxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20150213015422.GE12722@dastard>
References: <20150205004758.GO4251@dastard> <20150205070858.GA593@xxxxxx> <20150205135756.GA6386@xxxxxx> <20150206222047.GM12722@dastard> <20150206224258.GJ29783@xxxxxxxxxxxx> <20150208133435.GA27081@xxxxxx> <20150208090942.51e99687@xxxxxxxxxxxxxxxxxxxxxxx> <20150209201154.GA27746@xxxxxxxxxxxx> <20150210000423.GY12722@dastard> <20150213011130.GA6808@xxxxxxxxxxxx> <20150213015422.GE12722@dastard>
Hi Dave,

On Fri, 13 Feb 2015 12:54:22 +1100 Dave Chinner <david@xxxxxxxxxxxxx> wrote:
>
> Thanks Bruce. I might have to build a merged tree because one of the
> changes from the review modified a header file introduced in the NFS
> tree.
> 
> I'll see how it goes, and see if I can avoid doing something that
> will make Linus yell at me :P

If its a syntactic conflict with an obvious resolution, just leave it
(or maybe mention it in the pull request).  It gives him something to
do so he feels useful. :-)

/me notes that I did not see a conflict while merging the xfs tree in
linux-next today ...

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpJCPfLysNM0.pgp
Description: OpenPGP digital signature

<Prev in Thread] Current Thread [Next in Thread>