* New linux-next tree suspend-2.6
@ 2009-03-15 16:54 Rafael J. Wysocki
2009-03-16 2:16 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2009-03-15 16:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton, Ingo Molnar, Jesse Barnes
Hi Stephen,
Here's a new tree for linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git linux-next
It is based on the Linus' current tree, but I can rebase it on top of anything
else if that helps.
Unfortunately, it has two merge conflict that I'm not sure how to resolve.
The first one is with the linux-next branch of pci-2.6 and it may be resolved
by applying the appended patch on top of pci-2.6/linux-next before
merging suspend-2.6/linux-next.
The second one is with the x86 tree (I think) in drivers/xen/manage.c, but this
one is trivial.
Thanks,
Rafael
---
Revert 'PCI PM: Consistently use variable name "error" for pm call return values'
This is needed to resolve a merge conflict between the linux-next
branch of the pci-2.6 tree and the linux-next branch of the
suspend-2.6 tree.
---
drivers/pci/pci-driver.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Index: linux-next/drivers/pci/pci-driver.c
===================================================================
--- linux-next.orig/drivers/pci/pci-driver.c
+++ linux-next/drivers/pci/pci-driver.c
@@ -351,17 +351,17 @@ static int pci_legacy_suspend(struct dev
{
struct pci_dev * pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver;
- int error = 0;
+ int i = 0;
if (drv && drv->suspend) {
pci_power_t prev = pci_dev->current_state;
pci_dev->state_saved = false;
- error = drv->suspend(pci_dev, state);
- suspend_report_result(drv->suspend, error);
- if (error)
- return error;
+ i = drv->suspend(pci_dev, state);
+ suspend_report_result(drv->suspend, i);
+ if (i)
+ return i;
if (pci_dev->state_saved)
goto Fixup;
@@ -384,20 +384,20 @@ static int pci_legacy_suspend(struct dev
Fixup:
pci_fixup_device(pci_fixup_suspend, pci_dev);
- return error;
+ return i;
}
static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
{
struct pci_dev * pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver;
- int error = 0;
+ int i = 0;
if (drv && drv->suspend_late) {
- error = drv->suspend_late(pci_dev, state);
- suspend_report_result(drv->suspend_late, error);
+ i = drv->suspend_late(pci_dev, state);
+ suspend_report_result(drv->suspend_late, i);
}
- return error;
+ return i;
}
static int pci_legacy_resume_early(struct device *dev)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New linux-next tree suspend-2.6
2009-03-15 16:54 New linux-next tree suspend-2.6 Rafael J. Wysocki
@ 2009-03-16 2:16 ` Stephen Rothwell
2009-03-16 9:05 ` Stephen Rothwell
2009-03-16 22:13 ` Rafael J. Wysocki
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-16 2:16 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, Andrew Morton, Ingo Molnar, Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]
Hi Rafael,
On Sun, 15 Mar 2009 17:54:36 +0100 "Rafael J. Wysocki" <rjw@sisk•pl> wrote:
>
> Here's a new tree for linux-next:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git linux-next
>
> It is based on the Linus' current tree, but I can rebase it on top of anything
> else if that helps.
Linus' tree is good as a base.
> Unfortunately, it has two merge conflict that I'm not sure how to resolve.
Thanks for the suggested resolutions.
> The first one is with the linux-next branch of pci-2.6 and it may be resolved
> by applying the appended patch on top of pci-2.6/linux-next before
> merging suspend-2.6/linux-next.
I notice that your resolution is to revert a patch from the pci tree. As
an alternative, you could apply the pci tree patch to your tree (which is
what I will effectively do today when I resolve the conflict).
OK, its a bit late in the cycle to be adding stuff for 2.6.30, but I will
add your tree from today and we will see how it goes.
What I tell everyone: all patches/commits in the tree/series must
have been:
posted to a relevant mailing list
reviewed
unit tested
destined for the next merge window (or the current release)
*before* they are included. The linux-next tree is for integration
testing and to lower the impact of conflicts between subsystems in the
next merge window.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New linux-next tree suspend-2.6
2009-03-16 2:16 ` Stephen Rothwell
@ 2009-03-16 9:05 ` Stephen Rothwell
2009-03-16 22:16 ` Rafael J. Wysocki
2009-03-16 22:13 ` Rafael J. Wysocki
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-16 9:05 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, Andrew Morton, Ingo Molnar, Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
Hi Rafael,
On Mon, 16 Mar 2009 13:16:47 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I notice that your resolution is to revert a patch from the pci tree. As
> an alternative, you could apply the pci tree patch to your tree.
Which I now see is exactly what you did. This makes the resolution for
me very easy as I just need to use your version of the changes.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New linux-next tree suspend-2.6
2009-03-16 2:16 ` Stephen Rothwell
2009-03-16 9:05 ` Stephen Rothwell
@ 2009-03-16 22:13 ` Rafael J. Wysocki
1 sibling, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2009-03-16 22:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton, Ingo Molnar, Jesse Barnes
On Monday 16 March 2009, Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> On Sun, 15 Mar 2009 17:54:36 +0100 "Rafael J. Wysocki" <rjw@sisk•pl> wrote:
> >
> > Here's a new tree for linux-next:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git linux-next
> >
> > It is based on the Linus' current tree, but I can rebase it on top of anything
> > else if that helps.
>
> Linus' tree is good as a base.
>
> > Unfortunately, it has two merge conflict that I'm not sure how to resolve.
>
> Thanks for the suggested resolutions.
>
> > The first one is with the linux-next branch of pci-2.6 and it may be resolved
> > by applying the appended patch on top of pci-2.6/linux-next before
> > merging suspend-2.6/linux-next.
>
> I notice that your resolution is to revert a patch from the pci tree. As
> an alternative, you could apply the pci tree patch to your tree (which is
> what I will effectively do today when I resolve the conflict).
>
> OK, its a bit late in the cycle to be adding stuff for 2.6.30, but I will
> add your tree from today and we will see how it goes.
Thanks!
It's late, because it's been discussed a lot recently, but the patches are
really important (and supported by Linus ;-)).
> What I tell everyone: all patches/commits in the tree/series must
> have been:
>
> posted to a relevant mailing list
> reviewed
> unit tested
> destined for the next merge window (or the current release)
>
> *before* they are included.
This applies to all of the patches currently in the suspend tree. :-)
> The linux-next tree is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
Sure.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New linux-next tree suspend-2.6
2009-03-16 9:05 ` Stephen Rothwell
@ 2009-03-16 22:16 ` Rafael J. Wysocki
2009-03-16 23:10 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2009-03-16 22:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton, Ingo Molnar, Jesse Barnes
On Monday 16 March 2009, Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> On Mon, 16 Mar 2009 13:16:47 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > I notice that your resolution is to revert a patch from the pci tree. As
> > an alternative, you could apply the pci tree patch to your tree.
>
> Which I now see is exactly what you did. This makes the resolution for
> me very easy as I just need to use your version of the changes.
Jesse is going to drop the conflicting patch from his tree, so this issue
will go away shortly.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New linux-next tree suspend-2.6
2009-03-16 22:16 ` Rafael J. Wysocki
@ 2009-03-16 23:10 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-16 23:10 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, Andrew Morton, Ingo Molnar, Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
Hi Rafael,
On Mon, 16 Mar 2009 23:16:10 +0100 "Rafael J. Wysocki" <rjw@sisk•pl> wrote:
>
> Jesse is going to drop the conflicting patch from his tree, so this issue
> will go away shortly.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-03-16 23:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-15 16:54 New linux-next tree suspend-2.6 Rafael J. Wysocki
2009-03-16 2:16 ` Stephen Rothwell
2009-03-16 9:05 ` Stephen Rothwell
2009-03-16 22:16 ` Rafael J. Wysocki
2009-03-16 23:10 ` Stephen Rothwell
2009-03-16 22:13 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox