Messages in this thread | | | Date | Tue, 29 Nov 2011 14:26:31 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vhost tree with the m68knommu tree |
| |
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in arch/m68k/Kconfig between commit b366a24529e1 ("m68k: simpler m68k and ColdFire CPU's can use generic csum code") from the m68knommu tree and commit 4673ca8eb369 ("lib: move GENERIC_IOMAP to lib/Kconfig") from the vhost tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/m68k/Kconfig index 32fd364,973e686..0000000 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@@ -37,12 -38,6 +37,9 @@@ config GENERIC_CALIBRATE_DELA bool default y - config GENERIC_IOMAP - def_bool MMU +config GENERIC_CSUM + bool + config TIME_LOW_RES bool default y [unhandled content-type:application/pgp-signature] | |