mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@osdl.org>
To: "Paolo 'Blaisorblade' Giarrusso" <blaisorblade@yahoo.it>
Cc: jdike@addtoit.com, linux-kernel@vger.kernel.org,
	user-mode-linux-devel@lists.sourceforge.net
Subject: Re: [PATCH 1/6] Uml - reuse i386 cpu-specific tuning
Date: Wed, 26 Oct 2005 00:22:00 -0700	[thread overview]
Message-ID: <20051026002200.1ebb06f2.akpm@osdl.org> (raw)
In-Reply-To: <20051025221105.21106.95194.stgit@zion.home.lan>

"Paolo 'Blaisorblade' Giarrusso" <blaisorblade@yahoo.it> wrote:
>
>  arch/i386/Kconfig      |  304 ------------------------------------------------
>   arch/i386/Kconfig.cpu  |  305 ++++++++++++++++++++++++++++++++++++++++++++++++

Have mercy.  I currently have twelve patches which alter arch/i386/Kconfig
and this patch conflicts with most of them.  This shouldn't come as a
surprise - Kconfig files are oft-patched, and this is x86.

What I did was to simply copy the large block between

	if !X86_ELAN

and

	config X86_OOSTORE

over into Kconfig.cpu, taking the modifications with it.

As long as that's also what you did things should work OK.  If you actually
made any changes as you did the copy-and-paste, we're screwed.


  parent reply	other threads:[~2005-10-26  7:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-10-25 22:11 Paolo 'Blaisorblade' Giarrusso
2005-10-25 22:12 ` [PATCH 2/6] uml: fix "reuse i386 cpu optimizations" Paolo 'Blaisorblade' Giarrusso
2005-10-25 22:12 ` [PATCH 3/6] uml: remove old UM_FASTCALL, and make the thing work again Paolo 'Blaisorblade' Giarrusso
2005-10-25 22:12 ` [PATCH 4/6] x86_64: fix L1_CACHE_SHIFT_MAX for Intel EM64T [for 2.6.14?] Paolo 'Blaisorblade' Giarrusso
2005-10-25 22:24   ` Andi Kleen
2005-10-25 22:44     ` Blaisorblade
2005-10-25 23:33       ` Andi Kleen
2005-10-26  0:00         ` [uml-devel] " Blaisorblade
2005-10-25 22:13 ` [PATCH 5/6] i386: use -mcpu, not -mtune, for GCCs older than 3.4 Paolo 'Blaisorblade' Giarrusso
2005-10-25 22:13 ` [PATCH 6/6] x86_64: enable xchg optimization for x86_64 Paolo 'Blaisorblade' Giarrusso
2005-10-25 22:22   ` Andi Kleen
2005-10-25 22:44     ` Blaisorblade
2005-10-26  7:22 ` Andrew Morton [this message]
2005-10-26  9:19   ` [PATCH 1/6] Uml - reuse i386 cpu-specific tuning Blaisorblade

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=20051026002200.1ebb06f2.akpm@osdl.org \
    --to=akpm@osdl.org \
    --cc=blaisorblade@yahoo.it \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    /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
Powered by JetHome