From: Boaz Harrosh <bharrosh@panasas.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Bolle <pebolle@tiscali.nl>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: Re: linux-next: manual merge of the trivial tree with the vfs tree
Date: Tue, 10 Aug 2010 18:19:01 -0400 [thread overview]
Message-ID: <4C61D055.4090909@panasas.com> (raw)
In-Reply-To: <20100810121900.cbceb878.sfr@canb.auug.org.au>
On 08/09/2010 10:19 PM, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> fs/exofs/inode.c between commit 21883a7d05d4c1e97943fa1a587aa2c2a3b09e8c
> ("exofs: New truncate sequence") from the vfs tree and commit
> 426d31071ac476ea62c62656b242930c17b58c00 ("fix printk typo 'faild'") from
> the trivial tree.
>
> Just context changes. I fixed it up (see below) and can carry it for a
> while.
The "exofs: New truncate sequence" is now in the Kernel. So perhaps
fix printk typo 'faild'" could be rebased.
Or you can send the patch to me and I'll push it. Which ever you
prefer
Thanks
Boaz
next prev parent reply other threads:[~2010-08-10 22:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 2:19 linux-next: manual merge of the trivial tree with the vfs tree Stephen Rothwell
2010-08-10 22:19 ` Boaz Harrosh [this message]
2010-08-11 7:38 ` Jiri Kosina
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=4C61D055.4090909@panasas.com \
--to=bharrosh@panasas.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--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).