From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thadeu Lima de Souza Cascardo <cascardo@holoscopio•com>,
Theodore Ts'o <tytso@mit•edu>
Subject: linux-next: manual merge of the trivial tree with the ext4 tree
Date: Wed, 25 Nov 2009 18:34:14 +1100 [thread overview]
Message-ID: <20091125183414.eb45acca.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Jiri,
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-11-25 7:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 7:34 Stephen Rothwell [this message]
2009-11-25 11:16 ` linux-next: manual merge of the trivial tree with the ext4 tree Jiri Kosina
2009-11-25 11:45 ` tytso
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=20091125183414.eb45acca.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cascardo@holoscopio$(echo .)com \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/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