From: tytso@mit.edu
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Subject: Re: linux-next: manual merge of the trivial tree with the ext4 tree
Date: Wed, 25 Nov 2009 06:45:22 -0500 [thread overview]
Message-ID: <20091125114522.GD14289@thunk.org> (raw)
In-Reply-To: <alpine.LSU.2.00.0911251216270.6953@wotan.suse.de>
On Wed, Nov 25, 2009 at 12:16:43PM +0100, Jiri Kosina wrote:
> On Wed, 25 Nov 2009, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the trivial tree got a conflict in
> > fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
> > ("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
> > tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
> > some typos and punctuation in comments") from the trivial tree.
> >
> > The former moved the comment fixed by the latter and fixed the typo along
> > the way.
>
> Dropped the mballoc hunk from my queue, thanks.
You mean balloc hunk, I hope. (In the commit in question, I moved the
comment from fs/ext4/balloc.c to fs/ext4/mballoc.c.)
- Ted
next prev parent reply other threads:[~2009-11-25 11:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 7:34 linux-next: manual merge of the trivial tree with the ext4 tree Stephen Rothwell
2009-11-25 11:16 ` Jiri Kosina
2009-11-25 11:45 ` tytso [this message]
2009-11-25 11:56 ` Jiri Kosina
2009-11-25 12:25 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-12-31 1:57 Stephen Rothwell
2010-12-31 16:15 ` Uwe Kleine-König
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=20091125114522.GD14289@thunk.org \
--to=tytso@mit.edu \
--cc=cascardo@holoscopio.com \
--cc=jkosina@suse.cz \
--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