From: Ralf Baechle <ralf@linux-mips.org>
To: Paul Bolle <pebolle@tiscali.nl>
Cc: linux-mips@linux-mips.org
Subject: Re: next-20140529: CONFIG_MIPS_MT_SMTC
Date: Thu, 29 May 2014 17:02:27 +0200 [thread overview]
Message-ID: <20140529150227.GH5157@linux-mips.org> (raw)
In-Reply-To: <1401361928.6186.48.camel@x220>
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
prev parent reply other threads:[~2014-05-29 15:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-29 11:12 next-20140529: CONFIG_MIPS_MT_SMTC Paul Bolle
2014-05-29 15:02 ` Ralf Baechle [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140529150227.GH5157@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=linux-mips@linux-mips.org \
--cc=pebolle@tiscali.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.