public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, "Theodore Ts'o" <tytso@mit.edu>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tejun Heo <tj@kernel.org>,
	linux-fsdevel@vger.kernel.org
Subject: Re: linux-next: manual merge of the block tree with the ext4 tree
Date: Wed, 26 Nov 2014 23:38:26 -0800	[thread overview]
Message-ID: <20141127073826.GA4578@infradead.org> (raw)
In-Reply-To: <20141127145347.0083c0bc@canb.auug.org.au>

On Thu, Nov 27, 2014 at 02:53:47PM +1100, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> fs/fs-writeback.c between commit ef7fdf5e8c87 ("vfs: add support for a
> lazytime mount option")

Mergign that into a branch for linux-next must surely have been a
mistake, as the code isn't anywhere near ready.

I also think it very much should go into through the vfs tree.

  reply	other threads:[~2014-11-27  7:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27  3:53 linux-next: manual merge of the block tree with the ext4 tree Stephen Rothwell
2014-11-27  7:38 ` Christoph Hellwig [this message]
2014-11-29 10:08 ` Sabrina Dubroca
2014-11-29 17:38   ` Theodore Ts'o
2014-11-29 22:08   ` Jeremiah Mahler
  -- strict thread matches above, loose matches on Subject: below --
2023-06-26  3:09 Stephen Rothwell
2023-06-26  8:00 ` Christoph Hellwig
2023-06-27  0:46 ` Stephen Rothwell
2023-06-13  2:54 Stephen Rothwell
2023-06-13  5:00 ` Christoph Hellwig
2016-07-15  4:33 Stephen Rothwell
2014-11-26  2:41 Stephen Rothwell
2010-09-21  4:04 Stephen Rothwell
2010-10-23  2:47 ` Stephen Rothwell
2010-04-29  3:51 Stephen Rothwell

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=20141127073826.GA4578@infradead.org \
    --to=hch@infradead.org \
    --cc=axboe@kernel.dk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tj@kernel.org \
    --cc=tytso@mit.edu \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox