All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Slaby <jirislaby@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	Masami Hiramatsu <mhiramat@redhat.com>
Subject: Re: linux-next: manual merge of the limits tree with the  tree
Date: Tue, 22 Dec 2009 16:07:10 +0100	[thread overview]
Message-ID: <4B30E09E.7080200@gmail.com> (raw)
In-Reply-To: <20091219094616.744fc1c1.sfr@canb.auug.org.au>

On 12/18/2009 11:46 PM, Stephen Rothwell wrote:
> Today's linux-next merge of the limits tree got a conflict in fs/exec.c
> between commit f6151dfea21496d43dbaba32cfcd9c9f404769bc ("mm: introduce
> coredump parameter structure") from the  tree and commit
> 1157605c47673fc63b052df4688697695a9873d5 ("FS: use helpers for rlimits")
> from the limits tree.
> 
> I fixed it up (see below - thanks Andrew) and can carry the fix for a
> while.

Thanks, I fixed that in my tree and pushed now.

-- 
js

      reply	other threads:[~2009-12-22 15:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-18 22:46 linux-next: manual merge of the limits tree with the tree Stephen Rothwell
2009-12-22 15:07 ` 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=4B30E09E.7080200@gmail.com \
    --to=jirislaby@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mhiramat@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.