linux-kernel - Re: linux-next: manual merge of the limits tree with the tile 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: <4C452399.3050708@tilera.com>
Date:	Tue, 20 Jul 2010 00:18:33 -0400
From:	Chris Metcalf <cmetcalf@...era.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jiri Slaby <jirislaby@...il.com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Arnd Bergmann <arnd@...db.de>
Subject: Re: linux-next: manual merge of the limits tree with the tile tree

On 7/19/2010 11:48 PM, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the limits tree got a conflict in
> include/asm-generic/unistd.h between commits
> 5360bd776f73d0a7da571d72a09a03f237e99900 ("Fix up the "generic" unistd.h
> ABI to be more useful") and b51cae21ee66f77a368428e6bdf75a0c012c9fd7
> ("Add wait4() back to the set of <asm-generic/unistd.h> syscalls") from
> the tile tree and commit f33ebbe9da2c3c24664a0ad4f8fd83f293547e63
> ("unistd: add __NR_prlimit64 syscall numbers") from the limits tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
>   

Jiri, would it be possible to put __NR_prlimit64 as number 261 in
<asm-generic/syscall.h>?  This would avoid the requirement for Tilera
users to have a "flag day" to renumber some of our syscalls.  I assume
there are no users at all of this flavor of the __NR_prlimit64 syscall
number yet otherwise, except the "score" architecture folks who
presumably wouldn't have started trying to use the syscall yet.

Thanks, and Stephen, thanks for the fixup.

-- 
Chris Metcalf, Tilera Corp.
http://www.tilera.com

--
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/