linux-kernel - Re: linux-next: manual merge of the vfio tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 2 Oct 2014 08:52:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alex Williamson <alex.williamson@...hat.com>
Cc:	Bjorn Helgaas <bhelgaas@...gle.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Gavin Shan <gwshan@...ux.vnet.ibm.com>,
	Yijing Wang <wangyijing@...wei.com>
Subject: Re: linux-next: manual merge of the vfio tree with the pci tree

Hi Alex,

On Wed, 01 Oct 2014 11:06:14 -0600 Alex Williamson <alex.williamson@...hat.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@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)