From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Williamson <alex.williamson@redhat•com>,
Bjorn Helgaas <bhelgaas@google•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Gavin Shan <gwshan@linux•vnet.ibm.com>,
Yijing Wang <wangyijing@huawei•com>
Subject: linux-next: manual merge of the vfio tree with the pci tree
Date: Wed, 1 Oct 2014 13:14:21 +1000 [thread overview]
Message-ID: <20141001131421.64cab8d7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2045 bytes --]
Hi Alex,
Today's linux-next merge of the vfio tree got a conflict in
drivers/pci/msi.c between commits a160fe94cb53 ("PCI/MSI: Remove unused
get_cached_msi_msg()") and 18ef822c59f6 ("PCI/MSI: Rename
__get_cached_msi_msg() to get_cached_msi_msg()") from the pci tree and
commit 3b307ffe3faa ("PCI: Export MSI message relevant functions") from
the vfio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required). And then I added this merge fix patch (I should probably
also have added an include of linux/irq.h):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 1 Oct 2014 13:09:58 +1000
Subject: [PATCH] vfio: update for get_cached_msi_msg API change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/vfio/pci/vfio_pci_intrs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 553212f037c3..a068bb0d69e5 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -559,7 +559,7 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
if (msix) {
struct msi_msg msg;
- get_cached_msi_msg(irq, &msg);
+ get_cached_msi_msg(irq_get_msi_desc(irq), &msg);
write_msi_msg(irq, &msg);
}
--
2.1.1
Someone needs to remember to send this fix to Linus when these 2 trees
are merged into his tree ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/pci/msi.c
index d077749df25b,e468d65eb238..000000000000
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@@ -288,6 -305,14 +288,7 @@@ void get_cached_msi_msg(struct msi_des
*msg = entry->msg;
}
-
-void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg)
-{
- struct msi_desc *entry = irq_get_msi_desc(irq);
-
- __get_cached_msi_msg(entry, msg);
-}
+ EXPORT_SYMBOL_GPL(get_cached_msi_msg);
void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
{
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-10-01 3:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 3:14 Stephen Rothwell [this message]
2014-10-01 17:06 ` linux-next: manual merge of the vfio tree with the pci tree Alex Williamson
2014-10-01 22:52 ` Stephen Rothwell
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=20141001131421.64cab8d7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex.williamson@redhat$(echo .)com \
--cc=bhelgaas@google$(echo .)com \
--cc=gwshan@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wangyijing@huawei$(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