From: Jiri Slaby <jirislaby@gmail.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,
Eric Paris <eparis@redhat.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Neil Horman <nhorman@tuxdriver.com>
Subject: Re: linux-next: manual merge of the limits tree with the net and fsnotify trees
Date: Sat, 05 Dec 2009 15:21:24 +0100 [thread overview]
Message-ID: <4B1A6C64.4050408@gmail.com> (raw)
In-Reply-To: <20091205150053.48384393.sfr@canb.auug.org.au>
On 12/05/2009 05:00 AM, Stephen Rothwell wrote:
> On Fri, 04 Dec 2009 08:59:22 +0100 Jiri Slaby <jirislaby@gmail.com> wrote:
>>
>> On 12/04/2009 08:30 AM, Stephen Rothwell wrote:
>>> diff --cc arch/x86/ia32/ia32entry.S
>>> index da89ae1,c61ced2..0000000
>>> --- a/arch/x86/ia32/ia32entry.S
>>> +++ b/arch/x86/ia32/ia32entry.S
>>> @@@ -841,7 -841,6 +841,9 @@@ ia32_sys_call_table
>>> .quad compat_sys_pwritev
>>> .quad compat_sys_rt_tgsigqueueinfo /* 335 */
>>> .quad sys_perf_event_open
>>> + .quad compat_sys_recvmmsg
>>> + .quad sys_fanotify_init
>>> + .quad sys32_fanotify_mark
>>> + .quad compat_sys_getprlimit
>>
>> Thanks, but please go on with the by-five numbering in comments.
>
> I am sure that will be done by whoever does the final conflict
> resolution.
Ah, sorry, I apparently don't know how this works. Thanks for explanation.
--
js
prev parent reply other threads:[~2009-12-05 14:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-04 7:30 linux-next: manual merge of the limits tree with the net and fsnotify trees Stephen Rothwell
2009-12-04 7:30 ` Stephen Rothwell
2009-12-04 7:59 ` Jiri Slaby
2009-12-05 4:00 ` Stephen Rothwell
2009-12-05 14:21 ` Jiri Slaby [this message]
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=4B1A6C64.4050408@gmail.com \
--to=jirislaby@gmail.com \
--cc=acme@redhat.com \
--cc=davem@davemloft.net \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--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.