From patchwork Fri Aug 23 02:35:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1151909 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="XfZZy0yZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46F599568Mz9sNC for ; Fri, 23 Aug 2019 12:35:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390197AbfHWCfO (ORCPT ); Thu, 22 Aug 2019 22:35:14 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:48211 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725856AbfHWCfN (ORCPT ); Thu, 22 Aug 2019 22:35:13 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 46F58r1Kg0z9s7T; Fri, 23 Aug 2019 12:35:08 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1566527710; bh=2w1O39fqBqmJqk2tKtjRcxFlQifasUHv32rpJh2IRwA=; h=Date:From:To:Cc:Subject:From; b=XfZZy0yZXUgWfHiKlwnCmKvR2luZQAumTBvqYfNTThPqJ3pV1r/DjeUFfknOrE8SG orHdQ/oOKYB0i8B7w6yOqtHKGp+Org4V/Wgi/HMts0TNPYnCMt8kBae0hBH+RBEQoZ plO0+Z/xIR4DBlSOJpU8THCCaabT1XCOXQsezEOLZLUYwW76fiGTyW9Pv7bYocLRBr LQixqqy7NSaBqcSAIMS0RswWq1s54XXkps9/dlC89LqPk/ca49BWBueXfOh6uK1hIo yXZr6vRJ8ezuWAfIoUiFGoicUa5i0NQao22H3fnwgEgyUJWBC+Do1fz17xPhig+8GM XXjB0sXTPLILQ== Date: Fri, 23 Aug 2019 12:35:07 +1000 From: Stephen Rothwell To: David Miller , Networking , Bjorn Helgaas Cc: Linux Next Mailing List , Linux Kernel Mailing List , Randy Dunlap , Haiyang Zhang , Saeed Mahameed , Lorenzo Pieralisi Subject: linux-next: manual merge of the net-next tree with the pci tree Message-ID: <20190823123507.197cac03@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/pci/Kconfig drivers/pci/controller/pci-hyperv.c between commit: f58ba5e3f686 ("PCI: pci-hyperv: Fix build errors on non-SYSFS config") 44b1ece783ff ("PCI: hv: Detect and fix Hyper-V PCI domain number collision") from the pci tree and commit: 348dd93e40c1 ("PCI: hv: Add a Hyper-V PCI interface driver for software backchannel interface") from the net-next 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. diff --cc drivers/pci/Kconfig index 232042722261,c313de96a357..000000000000 --- a/drivers/pci/Kconfig diff --cc drivers/pci/controller/pci-hyperv.c index 3a56de6b2ec2,9c93ac2215b7..000000000000 --- a/drivers/pci/controller/pci-hyperv.c