From: Jiri Slaby <jirislaby@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: writable limits into -next
Date: Tue, 20 Jul 2010 10:08:34 +0200 [thread overview]
Message-ID: <4C455982.1000800@gmail.com> (raw)
In-Reply-To: <20100720110814.ffe72bc0.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2010-07-20 8:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-19 16:54 writable limits into -next Jiri Slaby
2010-07-20 1:08 ` Stephen Rothwell
2010-07-20 8:08 ` 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=4C455982.1000800@gmail.com \
--to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).