From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Theodore Tso <tytso@MIT.EDU>
Cc: linux-next@vger.kernel.org
Subject: linux-next: manual merge of the ext4 tree with Linus' tree
Date: Mon, 2 Feb 2009 13:56:19 +1100 [thread overview]
Message-ID: <20090202135619.cff6fe73.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
Hi Ted,
Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/ext4.h between commit 06a279d636734da32bb62dd2f7b0ade666f65d7c
("ext4: only use i_size_high for regular files") from Linus' tree and
commit eef9a6114469769465d43b1f8198ee1ae888e143 ("ext4: ignore
i_size_high for directories") from the ext4 tree.
These two commits appear to do almost the same thing. I used the version
from Linus' tree. Please either merge Linus' tree into the ext4 tree or
drop/modify the commit there.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-02-02 2:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 2:56 Stephen Rothwell [this message]
2009-09-17 1:56 linux-next: manual merge of the ext4 tree with Linus tree Stephen Rothwell
2009-09-17 13:22 ` Theodore Tso
2009-09-17 13:30 ` Stephen Rothwell
2010-05-22 5:50 linux-next: manual merge of the ext4 tree with Linus' tree Stephen Rothwell
2010-10-28 0:45 Stephen Rothwell
2011-02-14 2:19 Stephen Rothwell
2011-03-25 1:56 Stephen Rothwell
2011-03-25 14:45 ` Tejun Heo
2011-03-25 16:30 ` Sedat Dilek
2011-03-25 19:58 ` Ted Ts'o
2013-08-13 1:33 Stephen Rothwell
2016-03-21 0:29 Stephen Rothwell
2019-09-19 11:44 Mark Brown
2020-10-20 23:03 Stephen Rothwell
2020-12-17 23:12 Stephen Rothwell
2021-06-07 0:27 Stephen Rothwell
2023-06-27 0:39 Stephen Rothwell
2023-06-27 6:37 ` Christoph Hellwig
2023-06-27 7:26 ` 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=20090202135619.cff6fe73.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-next@vger.kernel.org \
--cc=tytso@MIT.EDU \
/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).