linux-kernel - Re: linux-next: manual merge of the pci tree with the asm-generic 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]

Message-ID: <CAErSpo5UpMrBn2VFyMD4VHvKnC04vGy5Wpzi76ZhD=ne6kdLtw@mail.gmail.com>
Date:   Wed, 04 Apr 2018 18:38:51 +0000
From:   Bjorn Helgaas <bhelgaas@...gle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>,
        linux-next list <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        jesper@....nu, David Howells <dhowells@...hat.com>
Subject: Re: linux-next: manual merge of the pci tree with the asm-generic tree

On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell <sfr@...b.auug.org.au>
wrote:

> Hi all,

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

>     arch/cris/arch-v32/drivers/pci/bios.c

> between commits:

>     c690eddc2f3b ("CRIS: Drop support for the CRIS port")
>     fd8773f9f544 ("arch: remove frv port")
>     739d875dd698 ("mn10300: Remove the architecture")

> from the asm-generic tree and commit:

>     31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")

> from the pci tree.

FWIW, I dropped the cris, frv, and mn10300 parts from my patch
(31cbca85df15).