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,
	Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the limits tree with Linus' tree
Date: Mon, 14 Dec 2009 11:10:45 +0100	[thread overview]
Message-ID: <4B260F25.6070908@gmail.com> (raw)
In-Reply-To: <20091214143909.a7b6dcf1.sfr@canb.auug.org.au>

On 12/14/2009 04:39 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the limits tree got a conflict in
> arch/ia64/kernel/sys_ia64.c between commit
> bb52d6694002b9d632bb355f64daa045c6293a4e ("Get rid of open-coding in
> ia64_brk()") from Linus' tree and commit
> d9ef7d0ce61f214180f505b78cdf8f9b3d862dfa ("IA64: use helpers for
> rlimits") from the limits tree.
> 
> The former removed the code that the latter was updating.  A merge with
> Linus' tree will fix this up, but it is pretty trivial anyway.

Hi.

Thanks, I fixed all 3 conflicts.

-- 
js

  reply	other threads:[~2009-12-14 10:10 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-14  3:39 linux-next: manual merge of the limits tree with Linus' tree Stephen Rothwell
2009-12-14 10:10 ` Jiri Slaby [this message]
2009-12-14 10:29   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2009-12-14  3:39 Stephen Rothwell
2009-12-14 10:04 ` Arnd Bergmann
2009-12-14  3:39 Stephen Rothwell

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=4B260F25.6070908@gmail.com \
    --to=jirislaby@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@zeniv.linux.org.uk \
    /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.