public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: wwp <subscript-GANU6spQydw@public.gmane.org>
To: acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
	Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org>
Subject: Re: 2.4.24 patch apply failed on vanilla kernel
Date: Wed, 7 Jan 2004 15:53:25 +0100	[thread overview]
Message-ID: <20040107155325.5bfceba0@tethys> (raw)
In-Reply-To: <20040107134658.5afa9142.acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org>

Hi Marcel Meckel,


On Wed, 7 Jan 2004 13:46:58 +0100 Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org> wrote:

> trying to patch 2.4.24 patch into a vanilla kernel results in 1
> reject:
> 
> patching file arch/i386/kernel/acpi.c
> patching file arch/i386/kernel/mpparse.c
> patching file arch/i386/kernel/smpboot.c
> Hunk #1 FAILED at 1106.
> 1 out of 1 hunk FAILED -- saving rejects to file
> arch/i386/kernel/smpboot.c.rej patching file arch/x86_64/kernel/acpi.c
> patching file drivers/acpi/Config.in
> patching file drivers/acpi/bus.c

It is like if the acpi patch is based on a 2.4.24+uv1 patch (that replaces the use
of NR_CPUS w/ BITS_PER_LONG). Quite easy to fix by hand, simply override
the for (..) line w/ the one provided by the acpi patch.


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click

  parent reply	other threads:[~2004-01-07 14:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-01-07 12:46 2.4.24 patch apply failed on vanilla kernel Marcel Meckel
     [not found] ` <20040107134658.5afa9142.acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org>
2004-01-07 14:25   ` wwp
     [not found]     ` <20040107152540.574f5882-qdKmdXVU2OY@public.gmane.org>
2004-01-07 16:07       ` Micha Feigin
     [not found]         ` <20040107160711.GB12275-4cxDFgrrBECgSpxsJD1C4w@public.gmane.org>
2004-01-07 16:38           ` wwp
2004-01-07 14:53   ` wwp [this message]
     [not found]     ` <20040107155325.5bfceba0-qdKmdXVU2OY@public.gmane.org>
2004-01-07 15:39       ` Marcel Meckel
     [not found]         ` <20040107163907.391c146e.acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org>
2004-01-07 15:50           ` wwp
     [not found]             ` <20040107165054.1fbfc829-qdKmdXVU2OY@public.gmane.org>
2004-01-07 20:01               ` Sérgio Monteiro Basto
     [not found]                 ` <1073505678.7422.24.camel-4/PLUo9XfK/yXfm4dIG/yWZHpeb/A1Y/@public.gmane.org>
2004-01-07 21:54                   ` wwp
2004-01-07 21:56                   ` wwp
     [not found]                     ` <20040107225650.388f96d4-qdKmdXVU2OY@public.gmane.org>
2004-01-09 10:19                       ` Len Brown
     [not found]                         ` <1073643569.2447.66.camel-D2Zvc0uNKG8@public.gmane.org>
2004-01-09 10:33                           ` wwp
  -- strict thread matches above, loose matches on Subject: below --
2004-01-08  6:16 Yu, Luming
2004-01-08  9:46 Yu, Luming
     [not found] ` <3ACA40606221794F80A5670F0AF15F8401720CA3-SRlDPOYGfgogGBtAFL8yw7fspsVTdybXVpNB7YpNyf8@public.gmane.org>
2004-01-08 10:52   ` Luca Capello
2004-01-08 22:13   ` Brian Perkins

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=20040107155325.5bfceba0@tethys \
    --to=subscript-ganu6spqydw@public.gmane.org \
    --cc=acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org \
    --cc=acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.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