linux-kernel - linux-next: manual merge of the tmem tree with the xen-two 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-next>] [day] [month] [year] [list]

Message-Id: <20110622144611.a900a000.sfr@canb.auug.org.au>
Date:	Wed, 22 Jun 2011 14:46:11 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Magenheimer <dan.magenheimer@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: linux-next: manual merge of the tmem tree with the xen-two tree

Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in
drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
prepare tmem shim to handle frontswap") from the xen-two tree and commit
ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.

I just used the xen-two versions of these files (as they look newer).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped