Messages in this thread | | | Date | Wed, 22 Jun 2011 14:46:11 +1000 | From | Stephen Rothwell <> | 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |