From patchwork Tue Dec 8 02:27:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11957445 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=-8.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 E5477C4361B for ; Tue, 8 Dec 2020 02:28:03 +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 398ED23998 for ; Tue, 8 Dec 2020 02:28:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 398ED23998 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au 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 1CB466E93E; Tue, 8 Dec 2020 02:28:02 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C1046E93E for ; Tue, 8 Dec 2020 02:27:59 +0000 (UTC) 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 4CqkcC1YMnz9sVl; Tue, 8 Dec 2020 13:27:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607394476; bh=Gdnq684lFz9atgY1eOCUXr2MAA6CAdhLY3wRaXZ8zAQ=; h=Date:From:To:Cc:Subject:From; b=hZbvXxLnnkungkLgzMGYvh+9zf8f2Ys0Y3qZNCbE2l9kvCv+MINgu+w+HYapZuhdM QyghCZmmZoWFBOPERilNlXqCY3qAc042jjFvHcCVcj4gKQk42puS+k5O5QmXOo4Hst aDedSVwd4REUhOg7y3g/SV2LErlO8UI7mxIhtQUIKGGdJwyUvebVQ3DMfyTqafhEdy 17i1xUJuspPAvJ1HzTLkK84XKnLtAxBIUwO7qzDR7gkIbsnDBzKxIIb0eFsfYIoUC3 N1Sy3KgKBvYkOkVEjEdmPggAPhCVSm5GHvbsQlOjG2Rt453KYFg0Rl7ouM5bSVVMj/ uOvO8CsJbkpGQ== Date: Tue, 8 Dec 2020 13:27:54 +1100 From: Stephen Rothwell To: Dave Airlie , DRI , Bjorn Helgaas Subject: linux-next: manual merge of the drm tree with the pci tree Message-ID: <20201208132632.7c3a6a41@canb.auug.org.au> MIME-Version: 1.0 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: Daniel Vetter , Linux Next Mailing List , Mika Westerberg , Linux Kernel Mailing List , Qinglang Miao Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. diff --cc drivers/gpu/vga/vga_switcheroo.c index 8843b078ad4e,1401fd52f37a..000000000000 --- a/drivers/gpu/vga/vga_switcheroo.c