Re: [next-20101028] Call trace in ext4

[Ted Ts'o]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/