public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chris Wright <chrisw@osdl.org>
To: Olof Johansson <olof@austin.ibm.com>
Cc: Andrew Morton <akpm@osdl.org>,
	paulus@samba.org, jgarzik@pobox.com, rene@exactcode.de,
	torvalds@osdl.org, linux-kernel@vger.kernel.org, greg@kroah.com,
	chrisw@osdl.org
Subject: Re: [PATCH] trivial fix for 2.6.11 raid6 compilation on ppc w/ Altivec
Date: Thu, 3 Mar 2005 21:54:51 -0800	[thread overview]
Message-ID: <20050304055451.GN5389@shell0.pdx.osdl.net> (raw)
In-Reply-To: <20050304022424.GA26769@austin.ibm.com>

* Olof Johansson (olof@austin.ibm.com) wrote:
> Hi,
> 
> On Thu, Mar 03, 2005 at 05:59:51PM -0800, Andrew Morton wrote:
> > This patch doesn't seem right - current 2.6.11 has:
> > 
> >         return cur_cpu_spec->cpu_features & CPU_FTR_ALTIVEC;
> 
> The patch was against what Greg had already pushed into the
> linux-release.bkbits.net 2.6.11 tree, i.e. not what's in mainline.
> You're right, your revised patch would apply against mainline.
> 
> However: This patch shouldn't go to mainline, since
> ppc-ppc64-abstract-cpu_feature-checks.patch in your tree takes care of
> the problem. I'd like the abstraction/cleanup patch to be merged upstream
> instead of the #ifdef hack once the tree opens up.

Olof's patch is in the linux-release tree, so this brings up a point
regarding merging.  If the quick fix is to be replaced by a better fix
later (as in this case) there's some room for merge conflict.  Does this
pose a problem for either -mm or Linus' tree?

thanks,
-chris
-- 
Linux Security Modules     http://lsm.immunix.org     http://lsm.bkbits.net

  reply	other threads:[~2005-03-04  5:55 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-03 18:05 [PATCH] trivial fix for 2.6.11 raid6 compilation on ppc w/ Altivec Rene Rebe
2005-03-03 18:26 ` Jeff Garzik
2005-03-03 18:48   ` Greg KH
2005-03-03 18:59     ` Rene Rebe
2005-03-03 19:18   ` Greg KH
2005-03-03 19:48     ` Jeff Garzik
2005-03-03 20:07       ` Chris Wright
2005-03-03 20:32         ` Greg KH
2005-03-03 20:57           ` Jeff Garzik
2005-03-04 12:10             ` Francois Romieu
2005-03-03 22:30   ` Paul Mackerras
2005-03-03 22:45     ` Greg KH
2005-03-03 23:05       ` Dave Jones
2005-03-03 22:55     ` Olof Johansson
2005-03-03 23:14       ` Greg KH
2005-03-04  1:59       ` Andrew Morton
2005-03-04  2:24         ` Olof Johansson
2005-03-04  5:54           ` Chris Wright [this message]
2005-03-04  6:06             ` Jeff Garzik
2005-03-04  6:17               ` Andrew Morton
2005-03-04  6:33                 ` Jeff Garzik
2005-03-04  6:06             ` Andrew Morton
2005-03-04  6:12               ` Jeff Garzik
2005-03-04  6:20                 ` Andrew Morton
2005-03-04  6:20                 ` Chris Wright
2005-03-04  6:23                   ` Andrew Morton
2005-03-04  6:47                     ` Chris Wright
2005-03-04  6:54                       ` Andrew Morton
2005-03-04  7:04                         ` Chris Wright
2005-03-04  7:05                       ` Jeff Garzik
2005-03-04  7:12                         ` Andrew Morton
2005-03-04  7:14                           ` Jeff Garzik
2005-03-04 16:27                     ` Greg KH
2005-03-04 18:38                       ` Linus Torvalds
2005-03-04 18:41                         ` Greg KH
2005-03-06 23:06                       ` Alan Cox
2005-03-07 18:03                         ` Alan Cox

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=20050304055451.GN5389@shell0.pdx.osdl.net \
    --to=chrisw@osdl.org \
    --cc=akpm@osdl.org \
    --cc=greg@kroah.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olof@austin.ibm.com \
    --cc=paulus@samba.org \
    --cc=rene@exactcode.de \
    --cc=torvalds@osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox