lkml.org 
[lkml]   [2012]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the trivial tree with Linus' tree
On Fri, 29 Jun 2012, Stephen Rothwell wrote:

> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> include/linux/mmzone.h between commit 89abfab133ef ("mm/memcg: move
> reclaim_stat into lruvec") from Linus' tree and commit 46028e6d10cb ("mm:
> cleanup on the comments of zone_reclaim_stat") from the trivial tree.
>
> The former moved the code that was updated by the latter. I applied the
> latter to the new position (see below).

I have merged Linus' tree into for-next and resolved the conflict, so it's
gone from your POV now.

Thanks,

--
Jiri Kosina
SUSE Labs


\
 
 \ /
  Last update: 2012-06-29 15:21    [W:1.453 / U:0.900 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site