From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Williamson <alex.williamson@redhat•com>
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: Thu, 2 Oct 2014 08:52:33 +1000 [thread overview]
Message-ID: <20141002085233.286f6f22@canb.auug.org.au> (raw)
In-Reply-To: <1412183174.7360.218.camel@ul30vt.home>
[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]
Hi Alex,
On Wed, 01 Oct 2014 11:06:14 -0600 Alex Williamson <alex.williamson@redhat•com> wrote:
>
> On Wed, 2014-10-01 at 13:14 +1000, Stephen Rothwell wrote:
> >
> > 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):
>
> 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!
Seems Bjorn has removed the conflicting commits from the pci tree.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2014-10-01 22:52 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
2014-10-01 22:52 ` Stephen Rothwell [this message]
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=20141002085233.286f6f22@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