* ext4 changes in linux-next
@ 2009-01-07 22:04 Andrew Morton
2009-01-07 23:32 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2009-01-07 22:04 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-ext4
Ted,
a pile of new ext4 stuff just turned up in linux-next. This means that
I had to rework
filesystem-freeze-add-error-handling-of-write_super_lockfs-unlockfs.patch
a little bit, and that patch now has a dependency upon the newly-added
ext4 patches.
I assume those one-day-old changes are targetted at 2.6.20, so I'll
need to undo that fix when I send
filesystem-freeze-add-error-handling-of-write_super_lockfs-unlockfs.patch
(perhaps today) and this will then cause conflicts in ext4 and/pr
linux-next.
It's not a big problem in this case, but this is why we ask that new
work not be added into linux-next until 2.6.x-rc1 has been cut.
Ta.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ext4 changes in linux-next
2009-01-07 22:04 ext4 changes in linux-next Andrew Morton
@ 2009-01-07 23:32 ` Andrew Morton
2009-01-08 0:20 ` Theodore Tso
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2009-01-07 23:32 UTC (permalink / raw)
To: tytso, linux-ext4
On Wed, 7 Jan 2009 14:04:36 -0800
Andrew Morton <akpm@linux-foundation.org> wrote:
> a pile of new ext4 stuff just turned up in linux-next
filesystem-freeze-add-error-handling-of-write_super_lockfs-unlockfs.patch
is dependent on things which are in linux-next's fs/ext4/super.c.
I could fix the (large) reject and proceed, but then you'd have
reject-fixing to do as well.
Do you plan on merging all those changes into mainline for 2.6.29? If
so, please do so asap?
If not, I'll just go ahead and trash your stuff :)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ext4 changes in linux-next
2009-01-07 23:32 ` Andrew Morton
@ 2009-01-08 0:20 ` Theodore Tso
0 siblings, 0 replies; 3+ messages in thread
From: Theodore Tso @ 2009-01-08 0:20 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-ext4
On Wed, Jan 07, 2009 at 03:32:09PM -0800, Andrew Morton wrote:
> On Wed, 7 Jan 2009 14:04:36 -0800
> Andrew Morton <akpm@linux-foundation.org> wrote:
>
> > a pile of new ext4 stuff just turned up in linux-next
Sorry, most of the stuff had been sitting in the unstable part of the
queue, but I didn't have time to get them fully vetted and pushed into
the stable tree until the week just before and after the new year's.
They've actually been tested for a while, but I like to review all the
patches before they go in.
> Do you plan on merging all those changes into mainline for 2.6.29? If
> so, please do so asap?
Yes, and I sent the pull request to Linus earlier today. Last I
checked it hasn't hit his public tree yet, but hopefully it will by
tomorrow.
- Ted
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-08 0:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-07 22:04 ext4 changes in linux-next Andrew Morton
2009-01-07 23:32 ` Andrew Morton
2009-01-08 0:20 ` Theodore Tso
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).