mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Daniel Stone <daniel@kabuki.eyep.net>
To: Mark Orr <markorr@intersurf.com>
Cc: linux-kernel@vger.kernel.org, Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: test13-pre4-ac2 - part of diff fails
Date: Sat, 23 Dec 2000 23:53:50 +1100	[thread overview]
Message-ID: <20001223132215Z129894-440+3714@vger.kernel.org> (raw)
In-Reply-To: Your message of "Sat, 23 Dec 2000 06:23:19 CDT." <XFMail.20001223062319.markorr@intersurf.com>
In-Reply-To: <XFMail.20001223062319.markorr@intersurf.com>

> 
> On 23-Dec-2000 Daniel Stone wrote:
> >> > patching file arch/i386/kernel/smp.c
> >> > Reversed (or previously applied) patch detected!  Assume -R? [n] 
> >> > Apply anyway? [n] y
> >> > Hunk #1 FAILED at 278.
> >> > Hunk #2 succeeded at 511 (offset 9 lines).
> >> > 1 out of 2 hunks FAILED -- saving rejects to file
> >> > arch/i386/kernel/smp.c.rej
> >> > 
> >> > Works fine if I reverse it and then put it back in. ?
> >> 
> >> Its a bug in my patch - get 13pre4ac2 ..
> > 
> > Um.
> > Subject: Re: test13-pre4-ac2 - part of diff fails
> > It's _IN_ 13-4ac2.
> 
> I applied test13-pre4-ac2 here, and it applied cleanly.
> Are you applying it to a clean tree?  Are your using
> patch v2.5.4 ?   (that's the version I have)

linux-2.4.0-test12 + reiserfs + test13-pre4 + reiserfs makefile fix (only
changes fs/reiserfs/Makefile) + netfilter patch-o-matic stuff (only touches
net/ipv4/netfilter) + test13-pre4-ac2.

also seen on just linux-2.4.0-test12 + test13-pre4 + test13-pre4-ac2.
 
> FWIW, I was getting smp.c patch failures (well, it said the
> patch was previously applied) along with a bunch of
> IPTables stuff -- that was a couple of -ac's ago.

same here, just forgot to report it.

> AC1 and AC2 applied cleanly, tho AC1 wouldnt compile
> uniprocessor/no-quotas unless you added a 
> #include <linux/smp_lock.h> to fs/ext2/balloc.c
> (i.e. it left some hanging refs to lock_kernel and
> unlock_kernel in fs.o,  and I think there was also
> one in the UDF module.    It's fixed in -ac2.

ac1 came out while I was asleep, and I woke up to ac2 being released.

d
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

  parent reply	other threads:[~2000-12-23 13:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2000-12-23 12:23 Mark Orr
2000-12-23 12:32 ` whats happening Sourav Sen
2000-12-23 17:15   ` keyser-lk
2000-12-23 12:53 ` Daniel Stone [this message]
  -- strict thread matches above, loose matches on Subject: below --
2000-12-23 14:52 test13-pre4-ac2 - part of diff fails Steven Cole
2000-12-23  2:37 Daniel Stone
2000-12-23 10:25 ` Alan Cox
2000-12-23 11:21   ` Daniel Stone

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=20001223132215Z129894-440+3714@vger.kernel.org \
    --to=daniel@kabuki.eyep.net \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=markorr@intersurf.com \
    /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®