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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <m1liydeuqs.fsf@fess.ebiederm.org>
Date:	Tue, 10 May 2011 21:17:31 -0700
From:	ebiederm@...ssion.com (Eric W. Biederman)
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: Re: linux-next: manual merge of the namespace tree with the m68k tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi Eric,
>
> 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.

Eric

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/