On Fri, 8 Aug 2008 16:03:03 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi David, > > On Fri, 8 Aug 2008 16:01:43 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 > >From a quick look, your fixes look correct to me... Thanks, -- Jeff Layton <jlayton@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html