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
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
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 ("x86/PCI: Make a kernel-doc comment a normal one")
from the tip tree.
I fixed it up (I
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
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
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,
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")
from the pci tree and commit:
2905c50b7d3e ("x86/xen: Make xen_msi_init() static and rename it to
Hi all,
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 commit:
7ca435cf857d ("x86/irq: Cleanup the arch_*_msi_irqs() leftovers")
Hi all,
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:
585dfe8abc44 ("PCI: vmd: Dont abuse vector irqomain as parent")
from the tip
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
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
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/irq/affinity.c
between commit:
6f9a22bc5775 ("PCI/MSI: Ignore affinity if pre/post vector count is more than
min_vecs")
from the pci tree and commit:
9a0ef98e186d ("genirq/affinity: Assign vectors to all
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/irq/affinity.c
between commit:
6f9a22bc5775 ("PCI/MSI: Ignore affinity if pre/post vector count is more than
min_vecs")
from the pci tree and commit:
9a0ef98e186d ("genirq/affinity: Assign vectors to all
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
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
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 commit:
61e1c5905290 ("PCI/MSI: Propagate IRQ affinity description through the MSI
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 commit:
61e1c5905290 ("PCI/MSI: Propagate IRQ affinity description through the MSI
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")
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) from the
Hi all,
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") from the tip tree.
I fixed it up (see
Hi all,
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) from the tip tree.
I fixed it up (see below)
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/topology.h between commit 25453e9e521382 ("x86/PCI: Remove
mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()") from the pci
tree and commit 36fc5500bb1907bea7e ("sched: Remove unused mc_capable()
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/topology.h between commit 25453e9e521382 (x86/PCI: Remove
mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()) from the pci
tree and commit 36fc5500bb1907bea7e (sched: Remove unused mc_capable()
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,
>
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,
platforms:
Hi all,
Today's linux-next merge of the tip tree got conflicts in
arch/x86/pci/numaq_32.c and arch/x86/pci/visws.c between commit
8d7d818676d3 ("x86/PCI: Use pcibios_scan_root() instead of
pci_scan_bus_with_sysdata()") from the pci tree and commits c5f9ee3d665a
("x86, platforms: Remove SGI Visual
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,
platforms: Remove SGI Visual Workstation") from the tip tree.
I fixed it up (see
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,
platforms: Remove SGI Visual Workstation) from the tip tree.
I fixed it up (see below)
Hi all,
Today's linux-next merge of the tip tree got conflicts in
arch/x86/pci/numaq_32.c and arch/x86/pci/visws.c between commit
8d7d818676d3 (x86/PCI: Use pcibios_scan_root() instead of
pci_scan_bus_with_sysdata()) from the pci tree and commits c5f9ee3d665a
(x86, platforms: Remove SGI Visual
Hi all,
Today's linux-next merge of the tip tree got a conflict in
include/linux/acpi.h between commit c8678473609b ("ACPI: Tidy acpi_run_osc
() declarations") from the pci tree and commit 4b3db708b114 ("ACPI, x86:
Extended error log driver for x86 platform") from the tip tree.
I fixed it up
Hi all,
Today's linux-next merge of the tip tree got a conflict in
include/linux/acpi.h between commit c8678473609b (ACPI: Tidy acpi_run_osc
() declarations) from the pci tree and commit 4b3db708b114 (ACPI, x86:
Extended error log driver for x86 platform) from the tip tree.
I fixed it up (see
31 matches
Mail list logo
