linux-kernel - linux-next: manual merge of the mips tree with the pci-current 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: <20170922100114.569b940e@canb.auug.org.au>
Date:   Fri, 22 Sep 2017 10:01:14 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <james.hogan@...tec.com>,
        Bjorn Helgaas <bhelgaas@...gle.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Manuel Lauss <manuel.lauss@...il.com>
Subject: linux-next: manual merge of the mips tree with the pci-current tree

Hi all,

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

  arch/mips/pci/pci-octeon.c

between commit:

  19a8d6b7604d ("MIPS: PCI: Move map_irq() hooks out of initdata")

from the pci-current tree and commit:

  8eba3651f1da ("MIPS: PCI: fix pcibios_map_irq section mismatch")

from the mips tree.

I fixed it up (basically the same patch - I used the pci-current tree
version) 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