From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Zyngier <marc.zyngier@arm•com>, Bjorn Helgaas <bhelgaas@google•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Haiyang Zhang <haiyangz@microsoft•com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm•com>
Subject: linux-next: manual merge of the irqchip tree with the pci tree
Date: Wed, 21 Aug 2019 14:42:00 +1000 [thread overview]
Message-ID: <20190821144200.7192b3a4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
Hi all,
Today's linux-next merge of the irqchip tree got a conflict in:
drivers/pci/controller/pci-hyperv.c
between commit:
44b1ece783ff ("PCI: hv: Detect and fix Hyper-V PCI domain number collision")
from the pci tree and commit:
467a3bb97432 ("PCI: hv: Allocate a named fwnode instead of an address-based one")
from the irqchip 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/pci/controller/pci-hyperv.c
index 3a56de6b2ec2,97056f3dd317..000000000000
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@@ -2563,7 -2521,7 +2563,8 @@@ static int hv_pci_probe(struct hv_devic
const struct hv_vmbus_device_id *dev_id)
{
struct hv_pcibus_device *hbus;
+ u16 dom_req, dom;
+ char *name;
int ret;
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-08-21 4:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190821144200.7192b3a4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhelgaas@google$(echo .)com \
--cc=haiyangz@microsoft$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lorenzo.pieralisi@arm$(echo .)com \
--cc=marc.zyngier@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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