From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Frederic Weisbecker <fweisbec@gmail•com>
Cc: Al Viro <viro@ZenIV•linux.org.uk>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: manual merge of the vfs tree with the tree
Date: Mon, 25 May 2009 16:50:13 +1000 [thread overview]
Message-ID: <20090525165013.7d641a6d.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090524220336.GF6471@nowhere>
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
Hi Frederic,
On Mon, 25 May 2009 00:03:38 +0200 Frederic Weisbecker <fweisbec@gmail•com> wrote:
>
> So for now, IMO you have the right fix. The end result should be:
Thanks for the confirmation.
> > + if (s->s_dirt)
> > + reiserfs_write_super(s);
>
> But this part seems to solve another conflict, right?
> I'm not sure about it.
See Christoph's reply.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-05-25 6:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 1:23 linux-next: manual merge of the vfs tree with the tree Stephen Rothwell
2009-05-24 22:03 ` Frederic Weisbecker
2009-05-24 22:07 ` Christoph Hellwig
2009-05-25 17:10 ` Frederic Weisbecker
2009-05-25 6:50 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-05 5:46 mpe@ellerman•id.au
2014-05-29 3:25 Stephen Rothwell
2012-09-24 1:45 Stephen Rothwell
2009-06-09 1:08 Stephen Rothwell
2009-06-09 6:58 ` Miklos Szeredi
2009-06-09 7:27 ` Stephen Rothwell
2009-05-13 2:20 Stephen Rothwell
2009-05-08 4:44 Stephen Rothwell
2009-05-08 13:40 ` Miklos Szeredi
2009-05-08 17:50 ` Al Viro
2009-05-09 16:58 ` Miklos Szeredi
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=20090525165013.7d641a6d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=fweisbec@gmail$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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