Re: 2.6.22-rc3-mm1 - page_mkwrite() breakage

Andrew Morton
2007-06-01T22:47:49Z

On Fri, 1 Jun 2007 15:33:02 -0700
Mark Fasheh <mark.fasheh@oracle.com> wrote:

> On Fri, Jun 01, 2007 at 03:25:37PM -0700, Andrew Morton wrote:
> > > Andrew, if this is ok with you I'd really like to see that fix in -mm. Ocfs2
> > > shared write mmap will instantly deadlock without it.
> >
> > ug, OK. I get a ginormous reject when merging ocfs2 on Nick's stuff which
> > I've been largely ignoring thus far.
>
> Huh, I'm a bit confused... I created this patch on top of 2.6.22-rc3-mm1
> which most certainly contains a merge of git-ocfs2.patch and the series
> which at least contains
> mm-fix-fault-vs-invalidate-race-for-linear-mappings.patch.

Right. I did a lot of tricksy work for rc3-mm1 to merge git-ocfs2 on top
of Nick's stuff. Then I repulled your tree and lost it all. This is
because I was dumb and I fixed rc3-mm1's git-ocfs.patch rather than doing a
separate fix-rejects-in-git-ocfs2.patch.

This is all unique-to-akpm stuff which you don't need to worry about ;)

> So, which of Nick's patches are we talking about here?
>
> Btw, I know you tend to handle rejects yourself, but if it's a major PITA
> I'd be happy to help out. Boy, I'm hoping I didn't just ask for a load of
> trouble there :)

Is OK - I'll move Nick's patches back to behind the git trees and it'll all come
good.