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

2020-11-30 Thread Bjorn Helgaas
On Mon, Nov 30, 2020 at 11:21:20AM +0100, Borislav Petkov wrote: > On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > arch/x86/pci/i386.c > > > > between commit: > > > > ace091d17272 ("x86

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

2020-11-30 Thread Borislav Petkov
On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/pci/i386.c > > between commit: > > ace091d17272 ("x86/PCI: Fix kernel-doc markup") > > from the pci tree and commit: > > 638920a66a17

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

2020-10-12 Thread Stephen Rothwell
Hi all, On Fri, 25 Sep 2020 15:35:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/kernel/apic/msi.c > > between commit: > > 2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configuring IRTE") > > from the pci tree and

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

2020-10-12 Thread Stephen Rothwell
Hi all, On Fri, 25 Sep 2020 15:21:18 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/pci/controller/vmd.c > > between commit: > > 42443f036042 ("PCI: vmd: Create IRQ Domain configuration helper") > > from the pci tree and commit:

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

2020-10-01 Thread Bjorn Helgaas
On Thu, Oct 01, 2020 at 04:38:27PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/pci/xen.c > > between commit: > > b0623566c2e9 ("x86/xen: Fix xen_msi_init() missing prototype warning") I dropped this from my tree, tha

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

2017-06-28 Thread Christoph Hellwig
On Wed, Jun 28, 2017 at 01:15:34PM +1000, Stephen Rothwell wrote: > 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

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

2016-12-12 Thread Bjorn Helgaas
On Fri, Dec 09, 2016 at 01:38:13PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/pci/msi.c > > between commit: > > 67f1e4473857 ("PCI/MSI: Document new parameter for msi_capability_init()") > > from the pci tree and com

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

2014-11-24 Thread Thomas Gleixner
On Mon, 24 Nov 2014, Stephen Rothwell wrote: > Today's linux-next merge of the tip tree got a conflict in > drivers/pci/host/pcie-rcar.c between commit 3c70637f7569 ("PCI: rcar: > Make rcar_pci static") from the pci tree and commit 7c35c8cc32f3 ("PCI: > rcar: Save MSI controller in pci_sys_data") f

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

2014-03-03 Thread Liviu Dudau
On Mon, Mar 03, 2014 at 06:03:35AM +, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > drivers/pci/Makefile between commit 39656f29f665 ("PCI: Cleanup per-arch > list of object files") from the pci tree and commit c5f9ee3d665a ("x86, > platform