On Thu, May 29, 2014 at 01:12:08PM +0200, Paul Bolle wrote:
> Kconfig symbol MIPS_MT_SMTC was removed in next-20140526, in commit
> 633648c5ad3 ("MIPS: MT: Remove SMTC support").
>
> A few references to its macro popped up again in next-20140529. These
> references can be traced back to commits ae4ce45419f9 ("MIPS: traps: Add
> CPU PM callback for trap configuration") and 74e91335190c ("MIPS: PM:
> Implement PM helper macros"). And those commits were merged in commit
> 7b2e5b89e488 ("Merge branch 'wip-mips-pm' of
> https://github.com/paulburton/linux into mips-for-linux-next"). Now I'm
> guessing that those references to CONFIG_MIPS_MT_SMTC didn't generate
> merge conflicts and therefor went unnoticed.
>
> The trivial solution here is to remove all code hidden behind those
> references. Would that solution be correct?
Yes. I did the fix up in the merge commit.
Thanks,
Ralf
