Re: Resolved merge conflicts in next-creds

[Stephen Rothwell]

Hi David,

On Tue, 12 Aug 2008 10:27:08 +0100 David Howells <dhowells@xxxxxxxxxx> wrote:
>
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> > The important thing (and what is different in what I have proposed) is
> > that what you are asking Linus to take here has zero impact (i.e. you just
> > add a header file that noone uses and whose contents are clearly noops)
> > and then it is very obvious that when people start to use it, the changes
> > really cannot introduce a regression.
> 
> Actually, you do have to modify XFS too.  It declares current_fsuid(),
> current_fsgid() and struct cred within itself.  The first two just require
> some simple renames, and the third just requires using my struct cred instead
> when it appears.

One step at a time ... the rename is clearly necessary, but adding
"struct cred" can wait.  We may not be able to get all the conflicts
solved by adding stuff to Linus' tree early.  My aim is just to reduce my
pain level.  :-)

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature