From: Chris Metcalf <cmetcalf@tilera.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Slaby <jirislaby@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the limits tree with the tile tree
Date: Tue, 20 Jul 2010 00:18:33 -0400 [thread overview]
Message-ID: <4C452399.3050708@tilera.com> (raw)
In-Reply-To: <20100720134833.4082eed4.sfr@canb.auug.org.au>
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
WARNING: multiple messages have this Message-ID (diff)
From: Chris Metcalf <cmetcalf@tilera.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Slaby <jirislaby@gmail.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the limits tree with the tile tree
Date: Tue, 20 Jul 2010 00:18:33 -0400 [thread overview]
Message-ID: <4C452399.3050708@tilera.com> (raw)
In-Reply-To: <20100720134833.4082eed4.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-07-20 4:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-20 3:48 linux-next: manual merge of the limits tree with the tile tree Stephen Rothwell
2010-07-20 4:18 ` Chris Metcalf [this message]
2010-07-20 4:18 ` Chris Metcalf
2010-07-20 8:01 ` Jiri Slaby
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=4C452399.3050708@tilera.com \
--to=cmetcalf@tilera.com \
--cc=arnd@arndb.de \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.