From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932954AbcLHXoP (ORCPT ); Thu, 8 Dec 2016 18:44:15 -0500 Received: from ozlabs.org ([103.22.144.67]:47317 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932825AbcLHXoN (ORCPT ); Thu, 8 Dec 2016 18:44:13 -0500 Date: Fri, 9 Dec 2016 10:44:09 +1100 From: Stephen Rothwell To: Bjorn Helgaas Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Hemminger , Thomas Gleixner Subject: linux-next: manual merge of the pci tree with Linus' tree Message-ID: <20161209104409.1f64df16@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 Bjorn, Today's linux-next merge of the pci tree got a conflict in: drivers/pci/msi.c between commit: 62c61514191b ("doc: Add missing parameter for msi_setup") from Linus' tree and commit: 67f1e4473857 ("PCI/MSI: Document new parameter for msi_capability_init()") from the pci tree. I fixed it up (I just used the pci 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