From: Al Viro <viro@ZenIV.linux.org.uk>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the vfs tree
Date: Fri, 18 Jul 2008 13:51:32 +0100 [thread overview]
Message-ID: <20080718125131.GP28946@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20080718083341.GD21656@linux-mips.org>
On Fri, Jul 18, 2008 at 09:33:41AM +0100, Ralf Baechle wrote:
> On Fri, Jul 18, 2008 at 03:36:29PM +1000, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the vfs tree got conflicts in
> > arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
> > 2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
> > thanks for all the fish") from the mips tree and commit
> > 2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
> > the vfs tree.
> >
> > I removed both files.
>
> Removing arch/mips/kernel/irixelf.c is fine but removing <asm/namei.h>
> will break the build of fs/namei.c.
>
> Btw, shouldn't <linux/namei.h> include <asm/namei.h>? Or alternatively
> maybe rename <asm/namei.h> to something else?
No. altroot is *gone* and so is asm/namei.h. Patch in my tree removed that
one, along with the crap in fs/namei.c that used to use it. Since irixelf.c
used to use the value of IRIX_EMUL, the same patch moved that #define in there.
So the conflict resolution is correct...
next prev parent reply other threads:[~2008-07-18 12:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-18 5:36 linux-next: manual merge of the vfs tree Stephen Rothwell
2008-07-18 8:33 ` Ralf Baechle
2008-07-18 9:06 ` Stephen Rothwell
2008-07-18 12:51 ` Al Viro [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the vfs tree Thierry Reding
2008-10-15 6:50 Stephen Rothwell
2008-08-19 5:25 Stephen Rothwell
2008-08-19 5:23 Stephen Rothwell
2008-08-12 5:20 Stephen Rothwell
2008-08-12 19:27 ` J. Bruce Fields
2008-08-12 5:14 Stephen Rothwell
2008-08-12 5:01 Stephen Rothwell
2008-07-25 4:30 Stephen Rothwell
2008-07-18 5:33 Stephen Rothwell
2008-07-18 5:27 Stephen Rothwell
2008-07-18 9:44 ` Stephen Rothwell
2008-06-25 5:47 Stephen Rothwell
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=20080718125131.GP28946@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).