From: "Anthony Brock" <Anthony_Brock@ous.edu>
To: user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] Problems applying patches to 2.6.12-rc5-mm1
Date: Tue, 31 May 2005 11:03:23 -0700 [thread overview]
Message-ID: <s29c447f.050@ORANGE.OUS.EDU> (raw)
I'm running into a problem applying the latest tarball from Jeff's tree. I've downloaded the linux-2.6.12-rc5 source and applied the -mm1 patches with:
# bzip2 -dc ../2.6.12-rc5-mm1.bz2 |patch -p1
This applied without issue. I then tried to apply the tarball from Jeff's patches:
# quilt push -a
Applying patch set-tsk-need-resched
patching file arch/um/kernel/process_kern.c
< output trimmed >
Applying patch os-main
patching file arch/um/kernel/Makefile
patching file arch/um/kernel/main.c
Hunk #1 FAILED at 1.
File arch/um/kernel/main.c is not empty after patch, as expected
1 out of 1 hunk FAILED -- rejects in file arch/um/kernel/main.c
patching file arch/um/kernel/um_arch.c
patching file arch/um/os-Linux/Makefile
patching file arch/um/os-Linux/main.c
Patch os-main does not apply (enforce with -f)
#
Any ideas?
Tony
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next reply other threads:[~2005-05-31 18:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-31 18:03 Anthony Brock [this message]
2005-05-31 22:00 ` [uml-devel] Problems applying patches to 2.6.12-rc5-mm1 Jeff Dike
-- strict thread matches above, loose matches on Subject: below --
2005-05-31 23:01 Anthony Brock
2005-05-31 23:32 ` Blaisorblade
2005-06-01 17:06 Anthony Brock
2005-06-03 2:18 ` Anthony Brock
2005-06-03 2:52 ` Anthony Brock
2005-06-03 22:08 ` Blaisorblade
[not found] <s29c8a5a.087@ORANGE.OUS.EDU>
2005-06-01 17:10 ` Jeff Dike
2005-06-01 18:01 Anthony Brock
[not found] <s29d95a6.056@ORANGE.OUS.EDU>
2005-06-01 20:31 ` Jeff Dike
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=s29c447f.050@ORANGE.OUS.EDU \
--to=anthony_brock@ous.edu \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.