Messages in this thread | | | Date | Tue, 27 Mar 2012 15:57:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi all,
Today's linux-next merge of the akpm tree got a conflict in arch/x86/kernel/process_64.c between commit 90e240142bd3 ("x86: Merge the x86_32 and x86_64 cpu_idle() functions") from the tip tree and commit 54d16004d978 ("x86: use this_cpu_xxx to replace percpu_xxx funcs") from the akpm tree.
The former moved the code to another file, so I did this change from the latter (in enter_idle) to arch/x86/kernel/process.c.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |