Messages in this thread | | | Date | Tue, 20 Jul 2010 10:08:34 +0200 | From | Jiri Slaby <> | 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
| |