Skip to contentSkip to conversation

2.6.18-rc6-mm1

DISCUSSION Chuck Ebbert 2 participants 2 messages Sep 11, 2006

lore
Share & tools
lore
#0 lore raw

In-Reply-To: <[email protected]>

Quoted 3 lines · Andrew Morton
Quoted 1 line

Patch gregkh-driver-pm-pci-and-ide-handle-pm_event_prethaw.patch does not apply (enforce with -f)

It works for me - I expect your tree is out of sync.

Well something is out of sync but I don't think it's me.

Starting over with GPG-verified downloads from kernel.org I get:

$ tar xjf /mnt/t/lib/linux/2.6.17/linux-2.6.17.tar.bz2
$ cd linux-2.6.17
$ bzcat /mnt/t/lib/linux/2.6.18/rc6/patch-2.6.18-rc6.bz2 | patch -p1 -s
$ tar xjf /mnt/t/lib/linux/2.6.18/rc6/mm1/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)

And like I said, you can even see that git-block.patch, earlier in the series, creates this problem:

$ quilt applied | fgrep block
git-block.patch
git-block-hack.patch

This is the failing hunk. The highlighted context line is wrong because git-block.patch changed it:

drivers/ide/ide.c +4 -2
@@ -1207,7 +1207,7 @@ int system_bus_clock (void)
 
 EXPORT_SYMBOL(system_bus_clock);
 
-static int generic_ide_suspend(struct device *dev, pm_message_t state)
+static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 {
        ide_drive_t *drive = dev->driver_data;
        struct request rq;
@@ -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);
 }

And here is the piece of git-block.patch that changed it:

drivers/ide/ide.c +2 -2
@@ -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;
 
Signature · 1 line
Chuck
#1 lore raw
Quoted 9 lines · On Mon, 11 Sep 2006 08:41:02 -0400 Chuck Ebbert <[email protected]>…

In-Reply-To: <[email protected]>

Quoted 3 lines · Andrew Morton
Quoted 1 line

Patch gregkh-driver-pm-pci-and-ide-handle-pm_event_prethaw.patch does not apply (enforce with -f)

It works for me - I expect your tree is out of sync.

Well something is out of sync but I don't think it's me.

Beats me, sorry.

wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.18-rc6.tar.bz2
wget ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc6/2.6.18-rc6-mm1/2.6.18-rc6-mm1-broken-out.tar.gz box:/home/akpm> mkdir aa
box:/home/akpm> cd aa
box:/home/akpm/aa> tar xfj ../linux-2.6.18-rc6.tar.bz2
box:/home/akpm/aa> cd linux-2.6.18-rc6
box:/home/akpm/aa/linux-2.6.18-rc6> tar xfz ../../2.6.18-rc6-mm1-broken-out.tar.gz box:/home/akpm/aa/linux-2.6.18-rc6> mv broken-out patches
box:/home/akpm/aa/linux-2.6.18-rc6> quilt push -a > /dev/null
box:/home/akpm/aa/linux-2.6.18-rc6> quilt applied | wc -l
1835

box:/home/akpm/aa/linux-2.6.18-rc6> quilt --version 0.45