From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
David Chinner <david@fromorbit.com>,
xfs-masters@oss.sgi.com, Jens Axboe <jaxboe@fusionio.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [xfs-masters] linux-next: manual merge of the xfs tree with Linus' tree
Date: Mon, 28 Mar 2011 15:44:40 +0200 [thread overview]
Message-ID: <20110328134440.GA31780@lst.de> (raw)
In-Reply-To: <20110329003725.7815c2a3.sfr@canb.auug.org.au>
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 parent reply other threads:[~2011-03-28 13:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 1:21 linux-next: manual merge of the xfs tree with Linus' tree Stephen Rothwell
2011-03-28 10:47 ` [xfs-masters] " Christoph Hellwig
2011-03-28 10:53 ` Christoph Hellwig
2011-03-28 10:58 ` Jens Axboe
2011-03-28 10:58 ` Jens Axboe
2011-03-28 11:00 ` Christoph Hellwig
2011-03-29 2:57 ` Alex Elder
2011-03-29 2:57 ` Alex Elder
2011-03-29 20:08 ` Christoph Hellwig
2011-03-30 11:43 ` Jens Axboe
2011-03-30 11:57 ` blk_flush_plug in the MD code, was " Christoph Hellwig
2011-03-28 13:37 ` Stephen Rothwell
2011-03-28 13:44 ` Christoph Hellwig [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110328134440.GA31780@lst.de \
--to=hch@lst.de \
--cc=david@fromorbit.com \
--cc=jaxboe@fusionio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=xfs-masters@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.