From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 036E5C433FE for ; Tue, 8 Dec 2020 11:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A990E23A7F for ; Tue, 8 Dec 2020 11:49:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729052AbgLHLtl (ORCPT ); Tue, 8 Dec 2020 06:49:41 -0500 Received: from mga06.intel.com ([134.134.136.31]:5209 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725803AbgLHLtl (ORCPT ); Tue, 8 Dec 2020 06:49:41 -0500 IronPort-SDR: uS9jtQB7A+2vxALhk799l2dRyzyCyhgZwM1XCdjszVPqO3KUdZP2QuIzSHez+y4osDa1IEsl4/ lz5TUqlZngfQ== X-IronPort-AV: E=McAfee;i="6000,8403,9828"; a="235474374" X-IronPort-AV: E=Sophos;i="5.78,402,1599548400"; d="scan'208";a="235474374" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2020 03:48:05 -0800 IronPort-SDR: +mYAsGNwLPzSACc9S8+36/64d/OoImY/y1/fHBX6dA6McsnXEeAXnCQkDcHxOw34xTe6V8DnCD 34BlhhgZ3X4Q== X-IronPort-AV: E=Sophos;i="5.78,402,1599548400"; d="scan'208";a="363605727" Received: from lahna.fi.intel.com (HELO lahna) ([10.237.72.163]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2020 03:48:02 -0800 Received: by lahna (sSMTP sendmail emulation); Tue, 08 Dec 2020 13:47:59 +0200 Date: Tue, 8 Dec 2020 13:47:59 +0200 From: Mika Westerberg To: Stephen Rothwell Cc: Dave Airlie , DRI , Bjorn Helgaas , Daniel Vetter , Linux Kernel Mailing List , Linux Next Mailing List , Qinglang Miao Subject: Re: linux-next: manual merge of the drm tree with the pci tree Message-ID: <20201208114759.GA5246@lahna.fi.intel.com> References: <20201208132632.7c3a6a41@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201208132632.7c3a6a41@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi, On Tue, Dec 08, 2020 at 01:27:54PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/vga/vga_switcheroo.c > > between commit: > > 99efde6c9bb7 ("PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()") > > from the pci tree and commit: > > 9572e6693cd7 ("vga_switcheroo: simplify the return expression of vga_switcheroo_runtime_resume") > > from the drm 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. Thanks for the fix Stephen! Looks correct to me. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53323C4167B for ; Wed, 9 Dec 2020 08:32:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD13123B87 for ; Wed, 9 Dec 2020 08:32:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD13123B87 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 94A9C6E811; Wed, 9 Dec 2020 08:32:18 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2F766E92B for ; Tue, 8 Dec 2020 11:48:05 +0000 (UTC) IronPort-SDR: zXP4zALrdYVUd5z24impV0Ds8yNO648rTdrd1ccrFv0VyczxS9kxH6ae/+3gOpM5dIceXHnZJs BAwKNuiNIVxA== X-IronPort-AV: E=McAfee;i="6000,8403,9828"; a="174021258" X-IronPort-AV: E=Sophos;i="5.78,402,1599548400"; d="scan'208";a="174021258" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2020 03:48:05 -0800 IronPort-SDR: +mYAsGNwLPzSACc9S8+36/64d/OoImY/y1/fHBX6dA6McsnXEeAXnCQkDcHxOw34xTe6V8DnCD 34BlhhgZ3X4Q== X-IronPort-AV: E=Sophos;i="5.78,402,1599548400"; d="scan'208";a="363605727" Received: from lahna.fi.intel.com (HELO lahna) ([10.237.72.163]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2020 03:48:02 -0800 Received: by lahna (sSMTP sendmail emulation); Tue, 08 Dec 2020 13:47:59 +0200 Date: Tue, 8 Dec 2020 13:47:59 +0200 From: Mika Westerberg To: Stephen Rothwell Subject: Re: linux-next: manual merge of the drm tree with the pci tree Message-ID: <20201208114759.GA5246@lahna.fi.intel.com> References: <20201208132632.7c3a6a41@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201208132632.7c3a6a41@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-Mailman-Approved-At: Wed, 09 Dec 2020 08:32:01 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Airlie , Daniel Vetter , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Qinglang Miao , Bjorn Helgaas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, On Tue, Dec 08, 2020 at 01:27:54PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/vga/vga_switcheroo.c > > between commit: > > 99efde6c9bb7 ("PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()") > > from the pci tree and commit: > > 9572e6693cd7 ("vga_switcheroo: simplify the return expression of vga_switcheroo_runtime_resume") > > from the drm 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. Thanks for the fix Stephen! Looks correct to me. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel