Hi all,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/pci.c
between commit:
40fb68c7725a ("Revert "PCI/ASPM: Save/restore L1SS Capability for
suspend/resume"")
from Linus' tree and commit:
d2bb2f9e1af6 ("PCI/ASPM: Move LTR, ASPM L1SS save/restore into PCIe
sa
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/quirks.c
between commit:
0a8f41023e8a ("PCI: Move Apex Edge TPU class quirk to fix BAR assignment")
from Linus' tree and commit:
68f5fc4ea9dd ("PCI: Avoid Pericom USB controller OHCI/EHCI PME# defect")
from
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/controller/pci-hyperv.c
between commits:
348dd93e40c1 ("PCI: hv: Add a Hyper-V PCI interface driver for software
backchannel interface")
467a3bb97432 ("PCI: hv: Allocate a named fwnode instead of an address-b
Hello,
On Fri, 20 Jul 2018 10:15:53 +0100, Lorenzo Pieralisi wrote:
> > switch (resource_type(res)) {
> > case IORESOURCE_IO:
> > - advk_pcie_set_ob_win(pcie, 1,
> > -upper_32_bits(res->start),
> > -
On Fri, Jul 20, 2018 at 11:03:10AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> drivers/pci/controller/pci-aardvark.c
>
> between commit:
>
> 1df3e5b3feeb ("PCI: aardvark: Fix I/O space page leak")
>
> from Linus' tree and com
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/controller/pci-aardvark.c
between commit:
1df3e5b3feeb ("PCI: aardvark: Fix I/O space page leak")
from Linus' tree and commit:
6df6ba974a55 ("PCI: aardvark: Remove PCIe outbound window configuration")
from
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/quirks.c
between commit:
7dcf688d4c78 ("PCI/cxgb4: Extend T3 PCI quirk to T4+ devices")
from Linus' tree and commit:
996058573b22 ("PCI/VPD: Move VPD quirks to vpd.c")
from the pci tree.
I fixed it up (I
On Sun, Mar 25, 2018 at 8:23 PM, Stephen Rothwell wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> include/linux/of_pci.h
>
> between commit:
>
> a6f1086e29e9 ("PCI: Move of_irq_parse_and_map_pci() declaration under
> OF_IRQ")
My series was based on top
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
include/linux/of_pci.h
between commit:
a6f1086e29e9 ("PCI: Move of_irq_parse_and_map_pci() declaration under OF_IRQ")
from Linus' tree and commit:
effab67ffe90 ("PCI: Move private DT related functions into private hea
Hi all,
With the merge window opening, just a reminder that this conflict still
exists.
On Mon, 26 Jun 2017 10:51:54 +1000 Stephen Rothwell
wrote:
>
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> drivers/gpu/drm/radeon/radeon_device.c
>
> between commit:
>
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/gpu/drm/radeon/radeon_device.c
between commit:
4eb59793cca0 ("drm/radeon: add a PX quirk for another K53TK variant")
from Linus' tree and commit:
22c21de73087 ("drm/radeon: make MacBook Pro d3_delay quirk more
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/msi.c
between commit:
62c61514191b ("doc: Add missing parameter for msi_setup")
from Linus' tree and commit:
67f1e4473857 ("PCI/MSI: Document new parameter for msi_capability_init()")
from the pci tree.
On Thu, Jun 23, 2016 at 11:44:29AM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> drivers/nvme/host/pci.c
>
> between commit:
>
> edb50a5403d2 ("NVMe: Only release requested regions")
>
> from Linus' tree and commit:
>
> a1
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/nvme/host/pci.c
between commit:
edb50a5403d2 ("NVMe: Only release requested regions")
from Linus' tree and commit:
a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions")
from the pci tree.
I fixed it u
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
include/linux/pci_ids.h
between commit:
2d1e0254ef83 ("pci_ids: add Netronome Systems vendor")
from Linus' tree and commit:
a755e169031d ("PCI: Add Netronome vendor and device IDs")
from the pci tree.
I fixed it up
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in
include/linux/aer.h between commit 37448adfc7ce ("aerdrv: Move
cper_print_aer() call out of interrupt context") from Linus' tree and
commit fde41b9fa2d0 ("PCI/AER: Remove "extern" from function
declarations") from the pci tree.
On Mon, Jun 3, 2013 at 7:49 PM, Stephen Rothwell wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/acpi/pci_root.c between commit 3f327e39b4b8 ("PCI: acpiphp:
> Re-enumerate devices when host bridge receives Bus Check") from Linus'
> tree and commit 6dc7d2
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in
drivers/acpi/pci_root.c between commit 3f327e39b4b8 ("PCI: acpiphp:
Re-enumerate devices when host bridge receives Bus Check") from Linus'
tree and commit 6dc7d22c6738 ("PCI/ACPI: Use dev_printk(),
acpi_handle_print(), pr_xxx() w
> Today's linux-next merge of the pci tree got a conflict in
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
> 8eee694c3e66 ("bnx2x: fix unload previous driver flow when flr-capable")
> from Linus' tree and commit 2a80eebcbf3e ("bnx2x: Use PCI Express
> Capability accessors") from
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in
drivers/rapidio/devices/tsi721.c between commit 9a9a9a7adafe
("rapidio/tsi721: fix unused variable compiler warning") from Linus' tree
and commit 5cdaaf8a11ba ("rapdio/tsi721: Use PCI Express Capability
accessors") from the pci t
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
8eee694c3e66 ("bnx2x: fix unload previous driver flow when flr-capable")
from Linus' tree and commit 2a80eebcbf3e ("bnx2x: Use PCI Express
Capability accessors") fro
21 matches
Mail list logo
