Re: linux-next: manual merge of the drm tree with the pci tree

Hi all, On Tue, 8 Dec 2020 13:27:54 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/vga/vga_switcheroo.c > > between commit: > > 99efde6c9bb7 ("PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()") > > from the pci tree and c

Re: linux-next: manual merge of the drm tree with the pci tree

Hi, On Tue, Dec 08, 2020 at 01:27:54PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/vga/vga_switcheroo.c > > between commit: > > 99efde6c9bb7 ("PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()") > > from the pc

linux-next: manual merge of the drm tree with the pci tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/vga/vga_switcheroo.c 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_s