From: Borislav Petkov <bp@alien8.de>
To: Kevin Winchester <kjwinchester@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Nick Bowler <nbowler@elliptictech.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org, Randy Dunlap <rdunlap@xenotime.net>
Subject: Re: [PATCH v5 0/5] x86: Cleanup and simplify cpu-specific data
Date: Sun, 29 Apr 2012 14:47:24 +0200 [thread overview]
Message-ID: <20120429124724.GA27784@liondog.tnic> (raw)
In-Reply-To: <CAELBVzAN33S4_VATnO7FaNjNaObqHsp+OXPsQYeve1N_qUztcA@mail.gmail.com>
On Fri, Apr 27, 2012 at 08:37:36PM -0300, Kevin Winchester wrote:
> Alright, my git/make skills must be lacking. I just checked out
> 3.4-rc4 to a new branch, and then git cherry-picked my 5 patches onto
> that branch.
FWIW,
you probably would need to rediff them again because they don't apply
cleanly on current linus (v3.4-rc4-308-gf7b006931751):
x86: Move per cpu cpu_llc_id to a field in struct cpuinfo_x86
This simplifies the various code paths using this field as it
groups the per-cpu data together.
Acked-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: x86: Move per cpu cpu_llc_id to a field in struct cpuinfo_x86
error: patch failed: arch/x86/kernel/apic/apic_numachip.c:208
error: arch/x86/kernel/apic/apic_numachip.c: patch does not apply
error: patch failed: arch/x86/kernel/cpu/amd.c:350
error: arch/x86/kernel/cpu/amd.c: patch does not apply
Patch failed at 0002 x86: Move per cpu cpu_llc_id to a field in struct cpuinfo_x86
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Or it could be due to fuzz which git cannot stomach but patch can.
Anyway, applying the mbox of your 5 patches on -rc4 got me further but
choked on the last patch:
Applying: x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c
error: patch failed: arch/x86/kernel/process.c:17
error: arch/x86/kernel/process.c: patch does not apply
Patch failed at 0005 x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Applying it with patch worked though, probably due to fuzziness.
> Then I ran:
>
> $ make ARCH=i386 allnoconfig
> $ make ARCH=i386
>
> And the build completed without warnings or errors. Should that be
> equivalent to what you did to build i386 allnoconfig? If so, then I
> wonder why I would not see those problems.
>
> Can anyone offer any advice?
Other than that, i386 all{no,yes,mod}config seem to build fine here.
--
Regards/Gruss,
Boris.
next prev parent reply other threads:[~2012-04-29 12:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 23:57 [PATCH v4 " Kevin Winchester
2012-02-23 23:57 ` [PATCH v4 1/5] x86: Move per cpu cpu_llc_shared_map to a field in struct cpuinfo_x86 Kevin Winchester
2012-02-23 23:57 ` [PATCH v4 2/5] x86: Move per cpu cpu_llc_id " Kevin Winchester
2012-02-23 23:57 ` [PATCH v4 3/5] x86: Move per cpu cpu_sibling_map " Kevin Winchester
2012-02-23 23:57 ` [PATCH v4 4/5] x86: Move per cpu cpu_core_map " Kevin Winchester
2012-02-23 23:57 ` [PATCH v4 5/5] x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c Kevin Winchester
2012-02-24 11:47 ` [PATCH v4 0/5] x86: Cleanup and simplify cpu-specific data Borislav Petkov
2012-02-24 12:22 ` Kevin Winchester
2012-02-24 12:30 ` Borislav Petkov
2012-02-27 11:59 ` Ingo Molnar
2012-02-28 0:52 ` Kevin Winchester
2012-02-28 3:43 ` H. Peter Anvin
2012-02-28 8:24 ` Ingo Molnar
2012-02-28 8:31 ` H. Peter Anvin
2012-03-01 13:06 ` Kevin Winchester
2012-03-01 13:45 ` Ingo Molnar
2012-03-28 22:43 ` [PATCH v5 " Kevin Winchester
2012-03-28 22:43 ` [PATCH v5 1/5] x86: Move per cpu cpu_llc_shared_map to a field in struct cpuinfo_x86 Kevin Winchester
2012-03-28 22:43 ` [PATCH v5 2/5] x86: Move per cpu cpu_llc_id " Kevin Winchester
2012-03-28 22:43 ` [PATCH v5 3/5] x86: Move per cpu cpu_sibling_map " Kevin Winchester
2012-03-28 22:43 ` [PATCH v5 4/5] x86: Move per cpu cpu_core_map " Kevin Winchester
2012-03-28 22:43 ` [PATCH v5 5/5] x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c Kevin Winchester
2012-04-26 18:09 ` [PATCH v5 0/5] x86: Cleanup and simplify cpu-specific data Kevin Winchester
2012-04-26 19:48 ` H. Peter Anvin
[not found] ` <CAELBVzAi_yndZbDc0TkXhbqzn2wULpnsFMA_dop=Uvaii8tkqg@mail.gmail.com>
2012-04-26 21:21 ` H. Peter Anvin
2012-04-27 23:37 ` Kevin Winchester
2012-04-29 12:47 ` Borislav Petkov [this message]
2012-04-29 22:55 ` Kevin Winchester
2012-04-29 23:33 ` [PATCH v6 " Kevin Winchester
2012-04-29 23:33 ` [PATCH v6 1/5] x86: Move per cpu cpu_llc_shared_map to a field in struct cpuinfo_x86 Kevin Winchester
2012-04-29 23:37 ` H. Peter Anvin
2012-04-30 15:05 ` Kevin Winchester
2012-05-07 8:32 ` Ingo Molnar
2012-04-29 23:33 ` [PATCH v6 2/5] x86: Move per cpu cpu_llc_id " Kevin Winchester
2012-04-29 23:33 ` [PATCH v6 3/5] x86: Move per cpu cpu_sibling_map " Kevin Winchester
2012-04-29 23:33 ` [PATCH v6 4/5] x86: Move per cpu cpu_core_map " Kevin Winchester
2012-04-29 23:33 ` [PATCH v6 5/5] x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c Kevin Winchester
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=20120429124724.GA27784@liondog.tnic \
--to=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=kjwinchester@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nbowler@elliptictech.com \
--cc=rdunlap@xenotime.net \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®