Messages in this thread | | | Date | Tue, 27 Sep 2011 14:22:17 +0200 | From | Frederic Weisbecker <> | Subject | Re: linux-next: manual merge of the akpm tree with the tree |
| |
On Tue, Sep 27, 2011 at 04:59:20PM +1000, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the scsi-post-merge tree got conflicts in > arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c, > arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between > commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from > the rcu tree and commit 6a541324a31f ("The current interrupt traces from > irq_handler_entry and irq_handler_exit") from the akpm tree. > > Just context changes. I fixed them up (see below) and can carry the fixes > as necessary.
Looks good as well.
Thanks!
| |