* next-20140529: CONFIG_MIPS_MT_SMTC
@ 2014-05-29 11:12 Paul Bolle
2014-05-29 15:02 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Paul Bolle @ 2014-05-29 11:12 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips
Hi Ralf,
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?
Paul Bolle
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: next-20140529: CONFIG_MIPS_MT_SMTC
2014-05-29 11:12 next-20140529: CONFIG_MIPS_MT_SMTC Paul Bolle
@ 2014-05-29 15:02 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2014-05-29 15:02 UTC (permalink / raw)
To: Paul Bolle; +Cc: linux-mips
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-29 15:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-29 11:12 next-20140529: CONFIG_MIPS_MT_SMTC Paul Bolle
2014-05-29 15:02 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox