linux-kernel - linux-next: manual merge of the tip 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-next>] [day] [month] [year] [list]

Message-ID: <20201001163827.20ea7bf9@canb.auug.org.au>
Date:   Thu, 1 Oct 2020 16:38:27 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Bjorn Helgaas <bhelgaas@...gle.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Li Heng <liheng40@...wei.com>
Subject: linux-next: manual merge of the tip tree with the pci tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/x86/pci/xen.c

between commit:

  b0623566c2e9 ("x86/xen: Fix xen_msi_init() missing prototype warning")

from the pci tree and commit:

  2905c50b7d3e ("x86/xen: Make xen_msi_init() static and rename it to xen_hvm_msi_init()")

from the tip tree.

I fixed it up (I just used the latter since it incorporated the change
from the former) 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

Content of type "application/pgp-signature" skipped