From: Jeff Layton <jlayton@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Howells <dhowells@redhat•com>,
James Morris <jmorris@namei•org>,
linux-next@vger•kernel.org, Steve French <smfrench@gmail•com>,
linux-cifs-client@lists•samba.org
Subject: Re: linux-next: manual merge of the creds tree
Date: Fri, 8 Aug 2008 07:41:11 -0400 [thread overview]
Message-ID: <20080808074111.6ccfc4fd@tleilax.poochiereds.net> (raw)
In-Reply-To: <20080808160303.224eb000.sfr@canb.auug.org.au>
On Fri, 8 Aug 2008 16:03:03 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi David,
>
> On Fri, 8 Aug 2008 16:01:43 +1000 Stephen Rothwell <sfr@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
>
>From a quick look, your fixes look correct to me...
Thanks,
--
Jeff Layton <jlayton@redhat•com>
next prev parent reply other threads:[~2008-08-08 11:46 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-08 6:01 linux-next: manual merge of the creds tree Stephen Rothwell
2008-08-08 6:03 ` Stephen Rothwell
2008-08-08 11:41 ` Jeff Layton [this message]
2008-08-08 15:25 ` Steve French
-- strict thread matches above, loose matches on Subject: below --
2008-08-08 6:08 Stephen Rothwell
2008-08-08 7:29 ` David Howells
2008-08-08 9:23 ` James Morris
2008-08-10 12:53 ` Stephen Rothwell
2008-08-10 13:23 ` Stephen Rothwell
2008-08-12 7:09 Stephen Rothwell
2008-08-12 7:13 Stephen Rothwell
2008-08-14 5:59 Stephen Rothwell
2008-08-15 7:38 Stephen Rothwell
2008-08-18 6:33 Stephen Rothwell
2008-08-18 6:37 ` Stephen Rothwell
2008-08-27 6:59 Stephen Rothwell
2008-08-28 6:42 Stephen Rothwell
2008-08-29 8:14 Stephen Rothwell
2008-08-29 8:56 ` James Morris
2008-08-29 10:18 ` David Howells
2008-10-15 9:48 Stephen Rothwell
2008-10-15 12:00 ` David Howells
2008-10-15 9:55 Stephen Rothwell
2008-10-15 12:02 ` David Howells
2008-10-16 7:33 ` Stephen Rothwell
2008-10-15 10:00 Stephen Rothwell
2008-10-15 12:02 ` David Howells
2008-10-15 10:05 Stephen Rothwell
2008-10-15 11:52 ` David Howells
2008-10-15 10:12 Stephen Rothwell
2008-10-15 12:00 ` David Howells
2008-10-17 6:08 Stephen Rothwell
2008-10-17 10:34 ` David Howells
2008-10-17 6:13 Stephen Rothwell
2008-10-17 10:34 ` David Howells
2008-10-17 10:38 ` Kirill A. Shutemov
2008-10-20 8:18 Stephen Rothwell
2008-10-20 11:55 ` David Howells
2008-10-21 6:07 Stephen Rothwell
2008-10-21 14:30 ` David Howells
2008-10-30 4:47 Stephen Rothwell
2008-10-30 8:03 ` Christoph Hellwig
2008-10-30 10:14 ` David Howells
2008-10-30 10:16 ` Christoph Hellwig
2008-10-30 12:31 ` David Howells
2008-10-31 0:55 ` Lachlan McIlroy
2008-10-31 2:49 ` Stephen Rothwell
2008-10-31 9:02 ` David Howells
2008-10-30 10:14 ` David Howells
2008-12-29 4:06 ` Stephen Rothwell
2008-10-31 5:47 Stephen Rothwell
2008-10-31 9:03 ` David Howells
2008-10-31 16:54 ` Eric Sandeen
2008-10-31 5:56 Stephen Rothwell
2008-10-31 10:37 ` David Howells
2008-10-31 6:06 Stephen Rothwell
2008-10-31 9:16 ` David Howells
2008-10-31 21:32 ` Eric Paris
2008-11-05 4:56 Stephen Rothwell
2008-11-05 12:08 ` David Howells
2008-11-05 23:19 ` James Morris
2008-11-06 11:13 ` David Howells
2008-11-07 7:49 Stephen Rothwell
2008-11-07 15:04 ` David Howells
2008-11-12 5:22 Stephen Rothwell
2008-11-12 5:30 Stephen Rothwell
2008-11-12 18:23 ` David Howells
2008-11-12 22:32 ` Stephen Rothwell
2008-11-13 5:09 Stephen Rothwell
2008-11-13 5:19 Stephen Rothwell
2008-11-13 5:24 Stephen Rothwell
2008-11-13 12:33 ` David Howells
2008-11-13 12:45 ` Stephen Rothwell
2008-11-13 14:46 ` Serge E. Hallyn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080808074111.6ccfc4fd@tleilax.poochiereds.net \
--to=jlayton@redhat$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-cifs-client@lists$(echo .)samba.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=smfrench@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox