From: Markos Chandras <Markos.Chandras@imgtec.com>
To: <linux-mips@linux-mips.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Subject: Re: [PATCH 1/2] MIPS: Remove SMTC Support
Date: Tue, 8 Apr 2014 12:03:53 +0100 [thread overview]
Message-ID: <5343D799.2040203@imgtec.com> (raw)
In-Reply-To: <1396954750-24762-2-git-send-email-markos.chandras@imgtec.com>
On 04/08/2014 11:59 AM, Markos Chandras wrote:
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 037a44d..e12843a 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -124,7 +124,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> seq_printf(m, "kscratch registers\t: %d\n",
> hweight8(cpu_data[n].kscratch_mask));
> seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
> -
Hi Ralf,
This change was not intentional. It's due to a bad merge conflict
resolution. Could you please fix this before you merge this patch?
Thanks!
--
markos
WARNING: multiple messages have this Message-ID (diff)
From: Markos Chandras <Markos.Chandras@imgtec.com>
To: linux-mips@linux-mips.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Subject: Re: [PATCH 1/2] MIPS: Remove SMTC Support
Date: Tue, 8 Apr 2014 12:03:53 +0100 [thread overview]
Message-ID: <5343D799.2040203@imgtec.com> (raw)
Message-ID: <20140408110353.lyJxbJTXqt-oNcOE1AdPVEE6k1y8xysD0M8jHQRrhfk@z> (raw)
In-Reply-To: <1396954750-24762-2-git-send-email-markos.chandras@imgtec.com>
On 04/08/2014 11:59 AM, Markos Chandras wrote:
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 037a44d..e12843a 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -124,7 +124,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> seq_printf(m, "kscratch registers\t: %d\n",
> hweight8(cpu_data[n].kscratch_mask));
> seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
> -
Hi Ralf,
This change was not intentional. It's due to a bad merge conflict
resolution. Could you please fix this before you merge this patch?
Thanks!
--
markos
next prev parent reply other threads:[~2014-04-08 11:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-08 10:59 [PATCH 0/2] Remove SMTC Support Markos Chandras
2014-04-08 10:59 ` Markos Chandras
2014-04-08 10:59 ` [PATCH 1/2] MIPS: " Markos Chandras
2014-04-08 10:59 ` Markos Chandras
2014-04-08 11:03 ` Markos Chandras [this message]
2014-04-08 11:03 ` Markos Chandras
2014-04-08 10:59 ` [PATCH 2/2] MIPS: Kconfig: Make MIPS_MT_SMP a regular Kconfig symbol Markos Chandras
2014-04-08 10:59 ` Markos Chandras
2014-04-08 14:44 ` [PATCH 0/2] Remove SMTC Support Ralf Baechle
2014-04-08 22:49 ` Kevin D. Kissell
2014-05-05 3:29 ` Maciej W. Rozycki
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=5343D799.2040203@imgtec.com \
--to=markos.chandras@imgtec.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/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.