| Summary: | Fix PCI chipset handling on IA64 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | xorg | Reporter: | Egbert Eich <eich> | ||||
| Component: | Server/DDX/Xorg | Assignee: | Egbert Eich <eich> | ||||
| Status: | RESOLVED FIXED | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | high | CC: | roland.mainz | ||||
| Version: | 6.8.1 | ||||||
| Hardware: | PA-RISC (HP) | ||||||
| OS: | Linux (All) | ||||||
| Whiteboard: | |||||||
| i915 platform: | i915 features: | ||||||
| Attachments: |
|
||||||
|
Description
Egbert Eich
2004-11-26 07:21:06 UTC
Created attachment 1402 [details] [review] [FIXED_X11R68x] Fix See above. Comment on attachment 1402 [details] [review] [FIXED_X11R68x] Fix Approval for X11R6.8.x stable branch granted in the 2004-12-08 release-wranglers phone call. Please don't commit, I'll do that myself... Egbert: I am having problems getting this patch applied to the X11R6.8.x branch: -- snip -- patch -p0 --dry-run <../attachment.cgi\?id\=1402 patching file programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] y Hunk #1 FAILED at 1. Hunk #2 FAILED at 122. Hunk #3 FAILED at 201. Hunk #4 FAILED at 253. Hunk #5 FAILED at 267. Hunk #6 FAILED at 287. Hunk #7 FAILED at 304. Hunk #8 succeeded at 325 (offset 1 line). Hunk #9 FAILED at 339. Hunk #10 succeeded at 352 (offset 1 line). Hunk #11 FAILED at 369. 9 out of 11 hunks FAILED -- saving rejects to file programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.c.rej patching file programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.h patching file programs/Xserver/hw/xfree86/os-support/bus/Imakefile patching file programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] y Hunk #1 FAILED at 1. Hunk #2 FAILED at 34. 2 out of 2 hunks FAILED -- saving rejects to file programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.c.rej patching file programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.h patching file programs/Xserver/hw/xfree86/os-support/bus/ia64Pci.c patching file programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] y Hunk #1 FAILED at 1. Hunk #2 FAILED at 97. Hunk #3 FAILED at 118. Hunk #4 FAILED at 138. Hunk #5 FAILED at 181. Hunk #6 FAILED at 322. Hunk #7 FAILED at 346. Hunk #8 FAILED at 360. Hunk #9 FAILED at 423. Hunk #10 FAILED at 465. Hunk #11 FAILED at 485. Hunk #12 succeeded at 542 (offset 38 lines). Hunk #13 FAILED at 583. Hunk #14 FAILED at 603. Hunk #15 succeeded at 664 with fuzz 2 (offset 49 lines). Hunk #16 succeeded at 967 (offset 49 lines). Hunk #17 succeeded at 984 with fuzz 2 (offset 52 lines). Hunk #18 FAILED at 998. Hunk #19 succeeded at 1014 with fuzz 2 (offset 56 lines). Hunk #20 FAILED at 1040. Hunk #21 FAILED at 1055. Hunk #22 FAILED at 1072. Hunk #23 FAILED at 1089. Hunk #24 FAILED at 1113. Hunk #25 FAILED at 1124. Hunk #26 succeeded at 1148 with fuzz 2 (offset 65 lines). 20 out of 26 hunks FAILED -- saving rejects to file programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c.rej patching file programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.h patching file programs/Xserver/hw/xfree86/os-support/linux/Imakefile patching file programs/Xserver/hw/xfree86/os-support/linux/lnx_ia64.c patching file programs/Xserver/hw/xfree86/os-support/shared/ia64Pci.c patching file programs/Xserver/hw/xfree86/os-support/shared/ia64Pci.h -- snip -- Can you take a look at the problem, make a new patch, attach it to this bug and commit it then yourself, please ? Patch checked-in into Xorg trunk and X11R6.8.x stable branch... ... marking bug as FIXED. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.