On Fri, Mar 05, 2010 at 03:48:23PM +0000, Al Viro wrote:> I'm going to push the next VFS pile in about half an hour and get to the> write_inode situation. I'm not sure what's the best course here. Note> that since you've pulled it, you also have conflicts with what's in the> mainline. I can do *another* backmerge (already had one due to gfs2 trivial> conflicts) and push the result. Which will suck, since XFS conflicts> are not entirely trivial and we'll get a really ugly merge node, with> conflict resolution both hidden and not quite obvious.

OK, a backmerge it is. Linus, could you please pullgit.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git/ write_inodeor suggest a saner way to do that?

I've done backmerges of two points in mainline (trees that got mergedinto mainline, actually) that created conflicts. So at that point it's(a) descendent of what's been pulled into NFS tree and (b) merges cleanwith mainline. All for two patches (at commit 716c28c..) ;-/

It's independent from the previous VFS pull; there's more stuff, hopefullyfor later today, but the worst of the mess should be gone with that one.