From: Dave Chinner <david@fromorbit.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dave Chinner <dchinner@redhat.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the vfs tree with the xfs tree
Date: Tue, 19 Jul 2011 11:29:23 +1000 [thread overview]
Message-ID: <20110719012923.GI30254@dastard> (raw)
In-Reply-To: <20110718133636.579d9002dbb56cd6408a2a7b@canb.auug.org.au>
On Mon, Jul 18, 2011 at 01:36:36PM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/xfs/linux-2.6/xfs_super.c between commit 2bcf6e970f5a ("xfs: start
> periodic workers later") from the xfs tree and commit d86b98f73104 ("xfs:
> make use of new shrinker callout for the inode cache") from the vfs tree.
>
> I fixed it up (I think, see below) and can carry the fix as necessary.
Looks OK to me.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
next prev parent reply other threads:[~2011-07-19 1:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 3:36 linux-next: manual merge of the vfs tree with the xfs tree Stephen Rothwell
2011-07-19 1:29 ` Dave Chinner [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-19 0:49 Stephen Rothwell
2021-04-20 16:40 ` Darrick J. Wong
2021-04-12 2:22 Stephen Rothwell
2021-04-13 15:20 ` Darrick J. Wong
2018-10-31 0:52 Stephen Rothwell
2018-10-31 1:12 ` Dave Chinner
2016-12-11 23:19 Stephen Rothwell
2015-11-10 23:21 Stephen Rothwell
2015-04-14 1:34 Stephen Rothwell
2015-04-13 1:57 Stephen Rothwell
2015-04-13 2:12 ` Dave Chinner
2010-07-26 1:51 Stephen Rothwell
2010-07-26 3:59 ` Dave Chinner
2010-07-26 4:05 ` Stephen Rothwell
2010-07-05 0:02 Stephen Rothwell
2010-07-07 1:48 ` Christoph Hellwig
2010-07-07 3:50 ` Stephen Rothwell
2010-08-04 1:54 ` 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=20110719012923.GI30254@dastard \
--to=david@fromorbit.com \
--cc=dchinner@redhat.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).