[linux-cifs-client] Re: linux-next: manual merge of the creds tree

[Stephen Rothwell]

Hi David,

On Fri, 8 Aug 2008 16:01:43 +1000 Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> Today's linux-next merge of the creds tree got conflicts in fs/cifs/dir.c
> between commits 4e1e7fb9e879d48011a887715d7966484d9644ea ("bundle up Unix
> SET_PATH_INFO args into a struct and change name") and
> 95089910933e10768cfef1ab0bab0c55b962aacb ("[CIFS] cifs_mkdir and
> cifs_create should respect the setgid bit on parent dir") from the cifs
> tree and commit 785af0f385cd424d4b40908bf0e467df3dc05434 ("CRED: Change
> current->fs[ug]id to current_fs[ug]id()") from the creds tree.
> 
> I fixed it up as best I could.  Might be worth a check once I publish the
> tree.

The same applies to fs/cifs/inode.c

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : http://lists.samba.org/archive/linux-cifs-client/attachments/20080808/85896f9d/attachment.bin