Re: writable limits into -next

Re: writable limits into -next

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2227 bytes --]

Hi Jiri,

On Mon, 19 Jul 2010 18:54:28 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:
>
> could I ask you to include wrlimits tree into the -next. I refactored it
> according to comments and will try to merge it on my own (as nobody is
> willing to merge it apparently).
> 
> It's at:
> git://decibel.fi.muni.cz/~xslaby/linux#writable_limits

Added back from today.

> 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?

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
	Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr@canb.auug.org.au

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: writable limits into -next

[Jiri Slaby]

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