Messages in this thread | | | Date | Fri, 29 Jun 2012 14:48:33 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: 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
| |