From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753385AbeEGX0K (ORCPT ); Mon, 7 May 2018 19:26:10 -0400 Received: from ozlabs.org ([203.11.71.1]:51547 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752782AbeEGX0J (ORCPT ); Mon, 7 May 2018 19:26:09 -0400 Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Date: Tue, 8 May 2018 09:25:55 +1000 From: Stephen Rothwell To: Bjorn Helgaas , Christoph Hellwig Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the pci tree with the dma-mapping tree Message-ID: <20180508092555.01818b20@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/XbChCFfWkNl1ul3TiRyXrGl"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/XbChCFfWkNl1ul3TiRyXrGl Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the pci tree got a conflict in: arch/microblaze/include/asm/pci.h between commit: 325ef1857fff ("PCI: remove PCI_DMA_BUS_IS_PHYS") from the dma-mapping tree and commits: 2fe31eb73520 ("microblaze/PCI: Remove pcibios_finish_adding_to_bus() dead= code") d52194a1e550 ("microblaze/PCI: Remove pcibios_claim_one_bus() dead code") from the pci tree. I fixed it up (see below) 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. --=20 Cheers, Stephen Rothwell diff --cc arch/microblaze/include/asm/pci.h index 66cf3a5a2f83,54ee91964852..000000000000 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@@ -61,10 -62,12 +61,6 @@@ extern int pci_mmap_legacy_page_range(s =20 #define HAVE_PCI_LEGACY 1 =20 - extern void pcibios_claim_one_bus(struct pci_bus *b); -=20 - extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); -/* The PCI address space does equal the physical memory - * address space (no IOMMU). The IDE and SCSI device layers use - * this boolean for bounce buffer decisions. - */ -#define PCI_DMA_BUS_IS_PHYS (1) -- extern void pcibios_resource_survey(void); =20 struct file; --Sig_/XbChCFfWkNl1ul3TiRyXrGl Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlrw4IMACgkQAVBC80lX 0GzxdQf+P9Ts5xEKw1jL2QSlWH95POlk4uKhjyPPG3OudmadzkRHmgcRtSiL/umQ zjj36gPZVV+OCxYJdFRb6KpdOs75QdLvUmynqCsZzjNTs7u9JHxgZwipVBecZT8R 3B3SKdjLXE+7Q3VZgf0wXmaRPnCkCFptAr5RrvoLzFFuNBqb12ytE/eaCwZrRPVz EtdmrDnzXrN40HzdtFgunA8wS13ry1t5jC5TkIQf+dfn4W6reok7lfYQ2TR0+Row r+pX5MpljVMiuBc5ifiiG646VExrOqiSLXWbWrZ8O2qkiY2u6pLXkesdaKd/U7ik BSmFivg2mxAs10p2DdqbL5Fgyagfag== =XjGQ -----END PGP SIGNATURE----- --Sig_/XbChCFfWkNl1ul3TiRyXrGl--