linux-kernel - Re: linux-next: manual merge of the limits tree with the net and fsnotify trees

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: <20091205150053.48384393.sfr@canb.auug.org.au>
Date:	Sat, 5 Dec 2009 15:00:53 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Slaby <jirislaby@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Eric Paris <eparis@...hat.com>,
	Arnaldo Carvalho de Melo <acme@...hat.com>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	Neil Horman <nhorman@...driver.com>
Subject: Re: linux-next: manual merge of the limits tree with the net and
 fsnotify trees

Hi Jiri,

On Fri, 04 Dec 2009 08:59:22 +0100 Jiri Slaby <jirislaby@...il.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.  Thanks for noticing.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped