From: Alex Williamson <alex.williamson@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Gavin Shan <gwshan@linux•vnet.ibm.com>,
Yijing Wang <wangyijing@huawei•com>
Subject: Re: linux-next: manual merge of the vfio tree with the pci tree
Date: Wed, 01 Oct 2014 11:06:14 -0600 [thread overview]
Message-ID: <1412183174.7360.218.camel@ul30vt.home> (raw)
In-Reply-To: <20141001131421.64cab8d7@canb.auug.org.au>
On Wed, 2014-10-01 at 13:14 +1000, Stephen Rothwell wrote:
> 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):
Hi Stephen,
Thanks for the heads-up and manual merge. I've reviewed the changes to
the MSI API that got us into this conflict and I disagree with them.
I've posted a series to revert a selection of changes currently coming
in through pci/next that should make for a clean merge should Bjorn come
to the same conclusion. If you need to re-apply the fix in the
meantime, please do include <linux/irq.h> since it generated a build
failure on arm without it. Thanks!
Alex
> 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 ...
next prev parent reply other threads:[~2014-10-01 17:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 3:14 linux-next: manual merge of the vfio tree with the pci tree Stephen Rothwell
2014-10-01 17:06 ` Alex Williamson [this message]
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=1412183174.7360.218.camel@ul30vt.home \
--to=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=sfr@canb$(echo .)auug.org.au \
--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