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

Message-ID: <20150128111055.41091d7e@canb.auug.org.au>
Date:	Wed, 28 Jan 2015 11:10:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Bjorn Helgaas <bhelgaas@...gle.com>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the pci tree with the mips tree

Hi Bjorn,

Today's linux-next merge of the pci tree got conflicts in
arch/mips/pci/pci-bcm1480.c, arch/mips/pci/pci-octeon.c and
arch/mips/pci/pcie-octeon.c between commit 7b09777c187d ("MIPS: Add
struct pci_ops member names to initialization") from the mips tree and
commit ab1d7f9646fe ("MIPS: PCI: Add struct pci_ops member names to
initialization") from the pci tree.

I fixed it up (same patch, different white space - I used the ones from
the mips tree) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped