mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* Re: test13-pre4-ac2 - part of diff fails
@ 2000-12-23 14:52 Steven Cole
  0 siblings, 0 replies; 6+ messages in thread
From: Steven Cole @ 2000-12-23 14:52 UTC (permalink / raw)
  To: linux-kernel; +Cc: daniel

Daniel Stone wrote:
>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.

I was able to patch and build 2.4.0test13pre4-ac2.  I did not see the problem
with smp.c which existed with the earlier test13pre3-ac3.

[root@localhost src]# date;uname -a
Sat Dec 23 07:33:48 MST 2000
Linux localhost.localdomain 2.4.0-test13pre4-ac2 #3 Fri Dec 22 22:06:06 MST 
2000 i686 unknown

1 Script started on Fri Dec 22 18:28:38 2000
2 [root@localhost linux]# patch -p1 <patch-2.4.0test13pre4-ac2
3 patching file CREDITS
[snipped]
28 patching file arch/i386/kernel/setup.c
29 patching file arch/i386/kernel/smp.c
30 patching file arch/i386/kernel/smpboot.c

I did things in this order:

tar zxvf linux-2.4.0-test12.tar.gz 
patch -p0 <test13-pre4
cd linux
patch -p1 <patch-2.4.0test13pre4-ac2

Found problem with build, fixed it, submitted patch.

cd /usr/src
patch -p0 <linux-2.4.0-test12-reiserfs-3.6.23-patch
patch -p0 <reiserfs-Makefile-patch

I then built a kernel with reiserfs-3.6.23 which I'm running now.

Steven
-
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/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: test13-pre4-ac2 - part of diff fails
@ 2000-12-23 12:23 Mark Orr
  2000-12-23 12:53 ` Daniel Stone
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Orr @ 2000-12-23 12:23 UTC (permalink / raw)
  To: linux-kernel; +Cc: Daniel Stone, Alan Cox


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)

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.

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.

--
Mark Orr
markorr@intersurf.com

-
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/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* test13-pre4-ac2 - part of diff fails
@ 2000-12-23  2:37 Daniel Stone
  2000-12-23 10:25 ` Alan Cox
  0 siblings, 1 reply; 6+ messages in thread
From: Daniel Stone @ 2000-12-23  2:37 UTC (permalink / raw)
  To: linux-kernel

I get this when patch'ing in test13-pre4-ac2 (with ReiserFS and Netfilter
patches, none of which touch SMP).

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. ?
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/

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2000-12-23 15:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-12-23 14:52 test13-pre4-ac2 - part of diff fails Steven Cole
  -- strict thread matches above, loose matches on Subject: below --
2000-12-23 12:23 Mark Orr
2000-12-23 12:53 ` Daniel Stone
2000-12-23  2:37 Daniel Stone
2000-12-23 10:25 ` Alan Cox
2000-12-23 11:21   ` Daniel Stone

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®