From: Ingo Molnar <mingo@kernel.org>
To: Richard Weinberger <richard@nod.at>
Cc: x86@kernel.org, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, paulmck@linux.vnet.ibm.com, fweisbec@gmail.com,
josh@joshtriplett.org, tj@kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] x86: Merge x86_32 and x86_64 cpu_idle()
Date: Fri, 23 Mar 2012 13:33:13 +0100 [thread overview]
Message-ID: <20120323123313.GG13920@gmail.com> (raw)
In-Reply-To: <4F6C6D3F.3010403@nod.at>
* Richard Weinberger <richard@nod.at> wrote:
> Am 23.03.2012 13:25, schrieb Ingo Molnar:
> >
> >* Richard Weinberger<richard@nod.at> wrote:
> >
> >>Both functions are mostly identical, so we can merge them.
> >>
> >>Signed-off-by: Richard Weinberger<richard@nod.at>
> >>---
> >> arch/x86/include/asm/idle.h | 1 +
> >> arch/x86/kernel/process.c | 114 ++++++++++++++++++++++++++++++++++++++++++
> >> arch/x86/kernel/process_32.c | 60 ----------------------
> >> arch/x86/kernel/process_64.c | 109 ----------------------------------------
> >> 4 files changed, 115 insertions(+), 169 deletions(-)
> >
> >Doesn't apply on latest -tip:
> >
> >patching file arch/x86/include/asm/idle.h
> >patching file arch/x86/kernel/process.c
> >Hunk #2 succeeded at 26 with fuzz 2 (offset 1 line).
> >Hunk #3 succeeded at 392 (offset 1 line).
> >patching file arch/x86/kernel/process_32.c
> >Hunk #3 succeeded at 55 (offset 1 line).
> >Hunk #4 FAILED at 65.
> >1 out of 4 hunks FAILED -- rejects in file arch/x86/kernel/process_32.c
> >patching file arch/x86/kernel/process_64.c
> >Hunk #3 FAILED at 48.
> >1 out of 3 hunks FAILED -- rejects in file arch/x86/kernel/process_64.c
> >
>
> It was based on Linus' tree.
The conflicts were against Linus's tree - the merge window added
new code there.
> I'll rebase it on -tip.
Thanks!
Ingo
next prev parent reply other threads:[~2012-03-23 12:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-16 20:18 [PATCH] x86: Merge x86_32 and x86_64 cpu_idle() Richard Weinberger
2012-03-16 21:22 ` H. Peter Anvin
2012-03-16 21:40 ` [PATCH v2] " Richard Weinberger
2012-03-19 13:05 ` Frederic Weisbecker
2012-03-23 12:25 ` Ingo Molnar
2012-03-23 12:31 ` Richard Weinberger
2012-03-23 12:33 ` Ingo Molnar [this message]
2012-03-23 18:20 ` [PATCH] " Richard Weinberger
2012-03-24 7:25 ` Ingo Molnar
2012-03-25 21:00 ` Richard Weinberger
2012-03-26 15:31 ` [tip:x86/urgent] x86: Merge the x86_32 and x86_64 cpu_idle() functions tip-bot for Richard Weinberger
2012-03-16 23:04 ` [PATCH] checkpatch.pl: Check for functions without a real prototype Richard Weinberger
2012-03-16 23:31 ` Joe Perches
2012-03-16 23:35 ` Richard Weinberger
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=20120323123313.GG13920@gmail.com \
--to=mingo@kernel.org \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=richard@nod.at \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=x86@kernel.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.