linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20110511140225.2c7e300f.sfr@canb.auug.org.au>
Date:	Wed, 11 May 2011 14:02:25 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Eric W. Biederman" <ebiederm@...ssion.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: linux-next: manual merge of the namespace tree with the m68k tree

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped