* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Ingo,
>
> Today's linux-next merge of the oprofile tree got a conflict in
> arch/x86/kernel/apic_32.c between commit
> 274cfe5912eebe9d4e1a4c451fe617289a181fcf ("x86: apic - rearrange
> functions and comments") from the x86 tree and commits
> 286f571837ba9d67625afd015366d79345abb414 ("x86: apic_*.c: add description
> to AMD's extended LVT functions"),
> 09691616850b3614dfb44790e1e1419b6a7f5d13 ("x86: apic: export symbols for
> extended interrupt LVT functions") and
> 6aa360e6c16c145edf1837690e0f7aaea6b86ef3 ("x86: apic: changing export
> symbols to *_GPL") from the oprofile tree.
>
> The former moved some code that was updated by the latter. I fixed it
> up (see below) and can carry it.
thanks Stephen - conflict resolution looks good to me.
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
