From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: tytso@mit.edu, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] ext4 update
Date: Thu, 25 Oct 2007 16:31:13 -0700 [thread overview]
Message-ID: <20071025163113.491a4461.akpm@linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.0.999.0710170857490.26902@woody.linux-foundation.org>
On Wed, 17 Oct 2007 08:59:53 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Wed, 17 Oct 2007, Theodore Ts'o wrote:
> >
> > Please pull from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
>
> This conflicts in nontrivial ways with
>
> commit 7c9e69faa28027913ee059c285a5ea8382e24b5d
> Author: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> Date: Tue Oct 16 23:27:02 2007 -0700
>
> ext2/ext3/ext4: add block bitmap validation
>
> which I just merged from -mm.
<catching up>
There shouldn't have been conflicts here - if there were I wouldn't have
sent those patches. Unless there were things in the ext4 pull which
weren't present in the ext4 quilt tree which I included in 2.6.23-mm1?
next prev parent reply other threads:[~2007-10-25 23:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-17 4:26 [GIT PULL] ext4 update Theodore Ts'o
2007-10-17 4:51 ` david
2007-10-18 6:29 ` Andreas Dilger
2007-10-17 15:59 ` Linus Torvalds
2007-10-17 22:55 ` Theodore Tso
2007-10-25 23:31 ` Andrew Morton [this message]
2007-10-25 23:44 ` Linus Torvalds
2007-10-25 23:53 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2008-04-30 2:45 Theodore Ts'o
2008-02-25 22:47 Theodore Ts'o
2008-02-10 6:33 Theodore Ts'o
2008-01-29 5:50 Theodore Ts'o
2008-01-29 12:53 ` Theodore Tso
2008-01-29 21:54 ` Jan Engelhardt
2008-01-30 7:11 ` Theodore Tso
2008-01-30 8:38 ` Paul Collins
2008-01-30 8:52 ` Linus Torvalds
2007-07-18 13:42 Theodore Ts'o
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=20071025163113.491a4461.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.