xfs-masters
[Top] [All Lists]

Re: [xfs-masters] linux-next: manual merge of the xfs tree with Linus' t

To: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: Re: [xfs-masters] linux-next: manual merge of the xfs tree with Linus' tree
From: Christoph Hellwig <hch@xxxxxx>
Date: Mon, 28 Mar 2011 15:44:40 +0200
Cc: Christoph Hellwig <hch@xxxxxx>, David Chinner <david@xxxxxxxxxxxxx>, xfs-masters@xxxxxxxxxxx, Jens Axboe <jaxboe@xxxxxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
In-reply-to: <20110329003725.7815c2a3.sfr@xxxxxxxxxxxxxxxx>
References: <20110328122148.1b48a742.sfr@xxxxxxxxxxxxxxxx> <20110328104753.GA27327@xxxxxx> <20110329003725.7815c2a3.sfr@xxxxxxxxxxxxxxxx>
User-agent: Mutt/1.5.17 (2007-11-01)
On Tue, Mar 29, 2011 at 12:37:25AM +1100, Stephen Rothwell wrote:
> So does that mean that the whole xfs tree commit can be removed/ignored?
> That is a bit of a pain to do in a merge (especially considering that
> there is another commit in the xfs tree that changes that file.  If the
> whole commit is no longer needed, maybe it could be dropped from the xfs
> tree or reverted.

No, that change is just a small part of the commit.

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