Messages in this thread | | | Date | Fri, 21 Mar 2014 17:45:55 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in arch/x86/include/asm/Kbuild between commit 073d8224d299 ("arch: Remove stub cputime.h headers") from the tip tree and commit "x86: use generic early_ioremap" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/include/asm/Kbuild index 4acddc43ee0c,c98cd05d1cdf..000000000000 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@@ -5,5 -5,5 +5,6 @@@ genhdr-y += unistd_64. genhdr-y += unistd_x32.h generic-y += clkdev.h +generic-y += cputime.h + generic-y += early_ioremap.h generic-y += mcs_spinlock.h [unhandled content-type:application/pgp-signature] | |