public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Jackson <pj@sgi.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: 2.6.16-rc2-mm1
Date: Wed, 8 Feb 2006 13:17:08 -0800	[thread overview]
Message-ID: <20060208131708.f81b025e.pj@sgi.com> (raw)
In-Reply-To: <20060207220627.345107c3.akpm@osdl.org>

The broken out patch set for 2.6.16-rc2-mm1 is not applying for me.

The very first patch, linus.patch, has 74 FAIL'd files. Just pulling
out the failing lines, I see some 180 lines of output, beginning with:

    Applying patch linus.patch
    patching file arch/arm/mach-s3c2410/Makefile
    Hunk #1 FAILED at 10.
    Hunk #2 FAILED at 29.
    2 out of 2 hunks FAILED -- rejects in file arch/arm/mach-s3c2410/Makefile
    patching file arch/arm/mm/proc-xscale.S
    Hunk #1 FAILED at 241.
    Hunk #2 FAILED at 260.
    2 out of 2 hunks FAILED -- rejects in file arch/arm/mm/proc-xscale.S
    patching file arch/cris/Makefile
    Hunk #1 FAILED at 119.
    1 out of 1 hunk FAILED -- rejects in file arch/cris/Makefile
    patching file arch/ia64/Kconfig
    Hunk #1 FAILED at 194.
    Hunk #2 succeeded at 375 with fuzz 2 (offset 2 lines).
    1 out of 2 hunks FAILED -- rejects in file arch/ia64/Kconfig
    patching file arch/ia64/kernel/sal.c
    Hunk #1 FAILED at 14.
    Hunk #2 succeeded at 288 with fuzz 2 (offset 73 lines).
    Hunk #3 FAILED at 408.
    2 out of 3 hunks FAILED -- rejects in file arch/ia64/kernel/sal.c


Looking hastily at the arch/arm/mach-s3c2410/Makefile, it looked like
linus.patch was trying to add gpio support to a Makefile that already
had it.

However ... I've been having a bad hair day with source control.  So,
if the above looks like operator error, it probably is.

-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@sgi.com> 1.925.600.0401

  reply	other threads:[~2006-02-08 21:17 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-08  6:06 2.6.16-rc2-mm1 Andrew Morton
2006-02-08 21:17 ` Paul Jackson [this message]
2006-02-10 10:34   ` 2.6.16-rc2-mm1 Sachin Sant
2006-02-10  0:37 ` [-mm patch] drivers/scsi/gdth.c: make __gdth_execute() static Adrian Bunk
2006-02-10 13:11   ` Christoph Hellwig
2006-02-10  0:41 ` [-mm patch] drivers/message/fusion/mptctl.c: make struct async_queue static Adrian Bunk
2006-02-10  0:43 ` [-mm patch] drivers/video/geode/video_gx.c: make struct gx_pll_table_48MHz static Adrian Bunk
2006-02-10 12:31 ` [-mm patch] fs/xfs/linux-2.6/xfs_linux.h: #if CONFIG_SMP -> #ifdef CONFIG_SMP Adrian Bunk
2006-02-10 14:52 ` Radeonfb ignores video= parameter [was: Re: 2.6.16-rc2-mm1] Mattia Dongili
2006-02-10 15:14   ` [PATCH] fbdev: Fix typo in fbmem.c Antonino A. Daplas
2006-02-10 16:34     ` Mattia Dongili
2006-02-10 18:17 ` 2.6.16-rc2-mm1 Coywolf Qi Hunt
2006-02-10 19:25   ` 2.6.16-rc2-mm1 Andrew Morton
2006-02-10 20:05     ` 2.6.16-rc2-mm1 Coywolf Qi Hunt
2006-02-10 20:22     ` 2.6.16-rc2-mm1 Matthias Urlichs
2006-02-10 21:30 ` 2.6.16-rc2-mm1 Jim Crilly
2006-02-10 22:25   ` 2.6.16-rc2-mm1 Andrew Morton
2006-02-10 22:34     ` 2.6.16-rc2-mm1 Dave Jones
2006-02-10 22:28   ` 2.6.16-rc2-mm1 Jeff Garzik
2006-02-10 22:30     ` 2.6.16-rc2-mm1 Jim Crilly
2006-02-10 21:55 ` 2.6.16-rc2-mm1 Pavel Machek
2006-02-11 20:31 ` 2.6.16-rc2-mm1 Martin Hermanowski
2006-02-11 21:41   ` 2.6.16-rc2-mm1 Andrew Morton
2006-02-11 22:27     ` 2.6.16-rc2-mm1 Martin Hermanowski
2006-02-11 23:34       ` 2.6.16-rc2-mm1 Andrew Morton
2006-02-12 12:10         ` 2.6.16-rc2-mm1 Martin Hermanowski
2006-02-13 23:30 ` 2.6.16-rc2-mm1: crash on suspend Laurent Riffard
2006-02-14  0:57 ` 2.6.16-rc2-mm1 Alexandre Buisse
2006-02-14  0:51   ` 2.6.16-rc2-mm1 Andrew Morton

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=20060208131708.f81b025e.pj@sgi.com \
    --to=pj@sgi.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox