linux-kernel - Re: linux-next: manual merge of the trivial tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1206291448070.11491@pobox.suse.cz>
Date:	Fri, 29 Jun 2012 14:48:33 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wanpeng Li <liwp@...ux.vnet.ibm.com>,
	Hugh Dickins <hughd@...gle.com>,
	Konstantin Khlebnikov <khlebnikov@...nvz.org>,
	Andrew Morton <akpm@...ux-foundation.org>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/