From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdIVABS (ORCPT ); Thu, 21 Sep 2017 20:01:18 -0400 Received: from ozlabs.org ([103.22.144.67]:51147 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751728AbdIVABQ (ORCPT ); Thu, 21 Sep 2017 20:01:16 -0400 Date: Fri, 22 Sep 2017 10:01:14 +1000 From: Stephen Rothwell To: Ralf Baechle , James Hogan , Bjorn Helgaas Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Lorenzo Pieralisi , Manuel Lauss Subject: linux-next: manual merge of the mips tree with the pci-current tree Message-ID: <20170922100114.569b940e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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