| To: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | [xfs-masters] Re: linux-next: manual merge of the creds tree |
| From: | James Morris <jmorris@xxxxxxxxx> |
| Date: | Fri, 8 Aug 2008 19:23:11 +1000 (EST) |
| Cc: | David Howells <dhowells@xxxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx, David Chinner <dgc@xxxxxxx>, xfs-masters@xxxxxxxxxxx |
| In-reply-to: | <20080808160844.796dfcc1.sfr@canb.auug.org.au> |
| References: | <20080808160844.796dfcc1.sfr@canb.auug.org.au> |
| Reply-to: | xfs-masters@xxxxxxxxxxx |
| Sender: | xfs-masters-bounce@xxxxxxxxxxx |
| User-agent: | Alpine 1.10 (LRH 962 2008-03-14) |
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
<jmorris@xxxxxxxxx>
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [xfs-masters] Re: linux-next: manual merge of the creds tree, David Howells |
|---|---|
| Next by Date: | [xfs-masters] [Bug 788] New: running stress test on xfs causes kernel oops, bugzilla-daemon |
| Previous by Thread: | [xfs-masters] Re: linux-next: manual merge of the creds tree, David Howells |
| Next by Thread: | [xfs-masters] Re: linux-next: manual merge of the creds tree, Stephen Rothwell |
| Indexes: | [Date] [Thread] [Top] [All Lists] |