Messages in this thread | | | Date | Fri, 9 Mar 2012 15:40:50 +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/platforms/iseries/setup.c between commit 8ee3e0d69623 ("powerpc: Remove the main legacy iSerie platform code") from the powerpc tree and commit bd2f55361f18 ("sched/rt: Use schedule_preempt_disabled()") from the tip tree.
The former removed the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |