Re: linux-next: manual merge of the namespace tree with the m68k tree

[Geert Uytterhoeven]

On Wed, May 11, 2011 at 06:17, Eric W. Biederman <ebiederm@xxxxxxxxxxxx> wrote:
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
>> Today's linux-next merge of the namespace tree got a conflict in
>> arch/m68k/kernel/entry_mm.S between commit 55e1af1ab184 ("m68k: Merge mmu
>> and non-mmu versions of sys_call_table") from the m68k tree and commit
>> e975ee91dcc1 ("ns: Wire up the setns system call") from the namespace
>> tree.
>>
>> I just used the m68k version of that file and that should be all that is
>> necessary.
>
> Sounds good. ÂGert asked me to check in that conflict (probably so
> bisects will continue to work), and if the commit id is right it looks
> like the m68k tree is seeing active development on that change right now.

I can add the syscall as soon as sys_setns() hits mainline.
That's what we usually do with new syscalls.

Gr{oetje,eeting}s,

            Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
             Â Â -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/