Subject: Re: linux-next: manual merge of the creds tree

From: James Morris <[email-masked]>
Date: Fri, 8 Aug 2008 19:23:11 +1000 (EST)

On Fri, 8 Aug 2008, Stephen Rothwell wrote:

> Hi David,
> 
> Today's linux-next merge of the creds tree got a conflict in
> fs/xfs/xfs_acl.c between commit 6811235504abbeed42673cf70014759f39e12a9b
> ("[XFS] XFS: Kill xfs_vtoi()") from the xfs tree and commit
> 785af0f385cd424d4b40908bf0e467df3dc05434 ("CRED: Change current->fs[ug]id
> to current_fs[ug]id()") from the creds tree.
> 
> I did the obvious fixup.

I'm not 100% clear on the new process.

What happens with your fixup patch?  Is this something you maintain in 
your tree from now until these trees are merged with Linus?  (At which 
point we'll run into the same conflicts again ?)

- James
-- 
James Morris
<[email-masked]>