public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
	Andrew Morton <akpm@linux-foundation•org>,
	Ingo Molnar <mingo@elte•hu>,
	Jesse Barnes <jbarnes@virtuousgeek•org>
Subject: New linux-next tree suspend-2.6
Date: Sun, 15 Mar 2009 17:54:36 +0100	[thread overview]
Message-ID: <200903151754.37147.rjw@sisk.pl> (raw)

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)

next             reply	other threads:[~2009-03-15 16:54 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-15 16:54 Rafael J. Wysocki [this message]
2009-03-16  2:16 ` New linux-next tree suspend-2.6 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

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=200903151754.37147.rjw@sisk.pl \
    --to=rjw@sisk$(echo .)pl \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=jbarnes@virtuousgeek$(echo .)org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox