From: Nick Piggin <npiggin@kernel.dk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nick Piggin <npiggin@kernel.dk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>,
Eric Van Hensbergen <ericvh@gmail.com>
Subject: Re: linux-next: manual merge of the vfs-scale tree with the v9fs tree
Date: Tue, 4 Jan 2011 16:52:30 +1100 [thread overview]
Message-ID: <20110104055230.GA3402@amd> (raw)
In-Reply-To: <20110104124054.c767a4ee.sfr@canb.auug.org.au>
On Tue, Jan 04, 2011 at 12:40:54PM +1100, Stephen Rothwell wrote:
> Hi Nick,
>
> Today's linux-next merge of the vfs-scale tree got a conflict in
> fs/9p/vfs_inode.c between commit 3d21652a1d23591e7f0bbbbedae29ce78c2c1113
> ("fs/9p: Move dotl inode operations into a seperate file") from the v9fs
> tree and various commits from the vfs-scale tree.
>
> I fixed it up by using the v9fs changes to that file and then applying
> the following merge fixup patch (which I can carry as necessary).
Thanks Stephen.
> Someone will need to fix this up before one of these trees is merged by
> Linus, or to send this merge fix to Linus.
If Linus does pull vfs-scale, and if it is before the v9fs tree, I can
help with the conversion. Otherwise I will be happy to fix up fallout
in my tree.
Thanks,
Nick
next prev parent reply other threads:[~2011-01-04 5:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 1:40 linux-next: manual merge of the vfs-scale tree with the v9fs tree Stephen Rothwell
2011-01-04 5:52 ` Nick Piggin [this message]
2011-01-04 18:16 ` Venkateswararao Jujjuri (JV)
2011-01-05 6:44 ` Nick Piggin
2011-01-05 23:05 ` Venkateswararao Jujjuri (JV)
2011-01-10 21:49 ` Eric Van Hensbergen
2011-01-11 8:14 ` Aneesh Kumar K. V
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=20110104055230.GA3402@amd \
--to=npiggin@kernel.dk \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=ericvh@gmail.com \
--cc=jvrao@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).