Messages in this thread | | | Date | Tue, 19 Oct 2010 15:48:49 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the powerpc tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/powerpc/kernel/time.c between commit cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using timebase rather than PURR") from the powerpc tree and commit e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq context callbacks") from the tip tree.
Just context changes. I fixed it up and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |