Linux-Next discussions
 help / color / mirror / Atom feed
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: kosaki.motohiro@jp.fujitsu.com,
	Pekka Enberg <penberg@cs.helsinki.fi>,
	Christoph Lameter <cl@linux-foundation.org>,
	linux-next@vger.kernel.org, Rik van Riel <riel@redhat.com>,
	Lee Schermerhorn <Lee.Schermerhorn@hp.com>,
	Hugh Dickins <hugh@veritas.com>,
	Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the slab tree
Date: Mon, 3 Nov 2008 13:52:38 +0900 (JST)	[thread overview]
Message-ID: <20081103135126.A2E3.KOSAKI.MOTOHIRO@jp.fujitsu.com> (raw)
In-Reply-To: <20081103151911.b18d641a.sfr@canb.auug.org.au>

Hi

> Today's linux-next merge of the slab tree got a conflict in mm/vmscan.c
> between commit 4f98a2fee8acdb4ac84545df98cccecfd130f8db ("vmscan: split
> LRU lists into anon & file sets") from Linus' tree and commit
> 9fb8a023ad432b0ca884790a8a05991180ab42b6 ("slub: Trigger defragmentation
> from memory reclaim") from the slab tree.
> 
> Overlapping changes.  I fixed it up (see below) and will carry the fix
> for a few days (during which time I hope it will be fixed in the slab
> tree).

looks good to me.

thanks, stephen.

  reply	other threads:[~2008-11-03  4:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-03  4:19 linux-next: manual merge of the slab tree Stephen Rothwell
2008-11-03  4:52 ` KOSAKI Motohiro [this message]
2008-11-03  9:39 ` Pekka Enberg
  -- strict thread matches above, loose matches on Subject: below --
2008-11-03  4:26 Stephen Rothwell
2008-11-03  9:39 ` Pekka Enberg
2008-11-03  4:07 Stephen Rothwell
2008-11-03  9:38 ` Pekka Enberg
2008-10-21  4:55 Stephen Rothwell
2008-08-13  4:57 Stephen Rothwell
2008-08-13  6:19 ` Pekka Enberg
2008-08-13  7:11   ` Stephen Rothwell
2008-08-13  7:10     ` Pekka Enberg
2008-08-13  7:36       ` Stephen Rothwell
2008-08-13  7:21 ` Pekka Enberg
2008-08-13  7:40   ` 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=20081103135126.A2E3.KOSAKI.MOTOHIRO@jp.fujitsu.com \
    --to=kosaki.motohiro@jp.fujitsu.com \
    --cc=Lee.Schermerhorn@hp.com \
    --cc=akpm@linux-foundation.org \
    --cc=cl@linux-foundation.org \
    --cc=hugh@veritas.com \
    --cc=linux-next@vger.kernel.org \
    --cc=nishimura@mxp.nes.nec.co.jp \
    --cc=penberg@cs.helsinki.fi \
    --cc=riel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox