Messages in this thread Patch in this message | | | Date | Sun, 10 Sep 2006 22:34:33 -0400 | From | Chuck Ebbert <> | Subject | Re: 2.6.18-rc6-mm1 |
| |
In-Reply-To: <20060908011317.6cb0495a.akpm@osdl.org>
On Fri, 8 Sep 2006 01:13:17 -0700, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc6/2.6.18-rc6-mm1/
$ cd 2.6.18-rc6-mm1 $ tar xjf 2.6.18-rc6-mm1-broken-out.tar.bz2 $ mv broken-out patches $ quilt push -a ... Applying patch gregkh-driver-pm-pci-and-ide-handle-pm_event_prethaw.patch patching file drivers/ide/ide.c Hunk #2 FAILED at 1221. 1 out of 2 hunks FAILED -- rejects in file drivers/ide/ide.c patching file drivers/pci/pci.c Patch gregkh-driver-pm-pci-and-ide-handle-pm_event_prethaw.patch does not apply (enforce with -f)
git-block.patch (applied earlier) has this:
--- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -1217,9 +1217,9 @@ static int generic_ide_suspend(struct de memset(&rq, 0, sizeof(rq)); memset(&rqpm, 0, sizeof(rqpm)); memset(&args, 0, sizeof(args)); - rq.flags = REQ_PM_SUSPEND; + rq.cmd_type = REQ_TYPE_PM_SUSPEND; rq.special = &args; - rq.end_io_data = &rqpm; <================= + rq.data = &rqpm; <================= rqpm.pm_step = ide_pm_state_start_suspend; rqpm.pm_state = state.event;
which conflicts with this chunk in the failing patch:
@@ -1221,7 +1221,9 @@ static int generic_ide_suspend(struct de rq.special = &args; rq.end_io_data = &rqpm; <================= rqpm.pm_step = ide_pm_state_start_suspend; - rqpm.pm_state = state.event; + if (mesg.event == PM_EVENT_PRETHAW) + mesg.event = PM_EVENT_FREEZE; + rqpm.pm_state = mesg.event; return ide_do_drive_cmd(drive, &rq, ide_wait); }
I fixed that, but then...
Applying patch git-gfs2.patch patching file CREDITS patching file Documentation/filesystems/gfs2.txt patching file MAINTAINERS patching file fs/Kconfig Hunk #1 succeeded at 325 (offset 2 lines). Hunk #2 FAILED at 1933. 1 out of 2 hunks FAILED -- rejects in file fs/Kconfig
-- Chuck
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |