archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Dave Airlie <>,
	DRI <>,
	Bjorn Helgaas <>
Cc: Daniel Vetter <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>,
	Mika Westerberg <>,
	Qinglang Miao <>
Subject: linux-next: manual merge of the drm tree with the pci tree
Date: Tue, 8 Dec 2020 13:27:54 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:


between commit:

  99efde6c9bb7 ("PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()")

from the pci tree and commit:

  9572e6693cd7 ("vga_switcheroo: simplify the return expression of vga_switcheroo_runtime_resume")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

diff --cc drivers/gpu/vga/vga_switcheroo.c
index 8843b078ad4e,1401fd52f37a..000000000000
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@@ -1039,12 -1038,8 +1038,8 @@@ static int vga_switcheroo_runtime_resum
  	vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_ON);
 -	pci_wakeup_bus(pdev->bus);
 +	pci_resume_bus(pdev->bus);
- 	ret = dev->bus->pm->runtime_resume(dev);
- 	if (ret)
- 		return ret;
- 	return 0;
+ 	return dev->bus->pm->runtime_resume(dev);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-12-08  2:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-08  2:27 Stephen Rothwell [this message]
2020-12-08 11:47 ` linux-next: manual merge of the drm tree with the pci tree Mika Westerberg
2020-12-14 20:39 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-07-22  1:04 Stephen Rothwell

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).