From: Ted Ts'o <tytso@mit.edu>
To: sedat.dilek@gmail.com
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-ext4@vger.kernel.org, sfr@canb.auug.org.au,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: [next-20101028] Call trace in ext4
Date: Thu, 28 Oct 2010 11:27:47 -0400 [thread overview]
Message-ID: <20101028152747.GA16666@thunk.org> (raw)
In-Reply-To: <AANLkTinOoxB4FnVXm1sSbW7zbdrEpA_dYzphh0CEWr-8@mail.gmail.com>
On Thu, Oct 28, 2010 at 05:08:32PM +0200, Sedat Dilek wrote:
> I tried to GIT-pull ext4/upstream-merge and linux-2.6/master into
> linux-next (20101028), for both cases there occured CONFLICTS.
> So let's see if this is fixed in tommorow's linux-next patch .
>
> For now, I switch to Linux 2.6.36-git11 and will report later.
Yeah, sorry. What got dropped into Linux next was something that was
in the middle of getting prepared for the push to Linus. Thanks to
the shortened merge window and things being crazy for me (between
$WORK stuff, Kernel Summit and Linux Plumber's Conference stuff, etc.)
some stuff didn't get fully finished in the ext4 tree until the very
last minute.
There were indeed a largish number of conflicts this time around,
mainly because of parallel development between the bio layer and ext4.
I suspect Stephen had not resolved those conflicts in the same way as
I had, and thus you had problems trying to pull in ext4/upstream-merge
into linux-next.
Linux 2.6.36-git11 has the full set of ext4 commits which I intended
to push to Linus before 37-rc1, and so linux-next should be free of
conflicts for tomorrow night. Let me know if you have any problems
with -git11.
Regards,
- Ted
next prev parent reply other threads:[~2010-10-28 15:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 10:05 [next-20101038] Call trace in ext4 Sedat Dilek
2010-10-28 10:34 ` [next-20101028] " Sedat Dilek
2010-10-28 15:08 ` Sedat Dilek
2010-10-28 15:27 ` Ted Ts'o [this message]
2010-10-28 17:52 ` [next-20101038] " Markus Trippelsdorf
2010-10-28 18:01 ` Ted Ts'o
2010-10-28 18:16 ` Eric Sandeen
2010-10-28 19:32 ` Ted Ts'o
2010-10-28 19:36 ` Eric Sandeen
2010-10-28 19:54 ` Ted Ts'o
2010-10-28 19:54 ` Sedat Dilek
2010-10-28 20:05 ` Ted Ts'o
2010-10-28 20:15 ` Sedat Dilek
2010-10-28 20:37 ` Ted Ts'o
2010-10-28 21:02 ` Sedat Dilek
2010-10-28 21:06 ` Ted Ts'o
2010-10-28 21:17 ` Sedat Dilek
2010-10-28 18:20 ` Sedat Dilek
2010-10-28 18:34 ` Sedat Dilek
2010-10-28 18:55 ` Ted 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=20101028152747.GA16666@thunk.org \
--to=tytso@mit.edu \
--cc=arnd@arndb.de \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sedat.dilek@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).