[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4C455982.1000800@gmail.com>
Date: Tue, 20 Jul 2010 10:08:34 +0200
From: Jiri Slaby <jirislaby@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: writable limits into -next
On 07/20/2010 03:08 AM, Stephen Rothwell wrote:
>> There will be merge conflicts in unistd files with "unistd: add
>> __NR_prlimit64 syscall numbers". You can take a look at
>> http://decibel.fi.muni.cz/cgi-bin/gitweb.cgi?p=mm.git;a=shortlog;h=refs/heads/devel
>> to see how it looks like in -next.
>
> Not sure how this is useful as it is your mm tree?
Hi, feel free to ignore it. It was intended just as a hint how the
conflicts may be resolved.
thanks,
--
js
--
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/
Powered by blists - more mailing lists