From patchwork Thu Nov 3 23:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 15260 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp51456wru; Thu, 3 Nov 2022 16:19:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5RNr9L3cmpK9K3q8GT8prFhHb0WSNTZdL9wo7XIAZ9hwbILCYHAHE0vE3DOBUBlzibWvrS X-Received: by 2002:a17:907:72cf:b0:7ad:7e95:69d7 with SMTP id du15-20020a17090772cf00b007ad7e9569d7mr29941161ejc.97.1667517567009; Thu, 03 Nov 2022 16:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667517567; cv=none; d=google.com; s=arc-20160816; b=s6mwlkpJuFE9GX9uR05608i59CZi9emXU+ZiDm8BlYicPHqKk/dGcm0NZMsk9E0FMz zV6cWn0IOYXlTLQjLDs1ym1pYBQpni3MY+d09P+3xkdILgf4ooSkia+QEwI9zqbiyDDd EZN2yaaaUsoYMFgox61zgfGFBvIIT6E88YAE7AOdsNXZIfnTjAY3/Qilj6BnoJYHkfGS hW4FLCR4lrEmoGmC5lltnb3IuGaOV2c/C+rrUN+t7ZTaZ7qthjtYu4D5GA+MzfRMGkBO VpXo7vtHoIK9qRPsiPNtSS6IP9UIogBF8wZFPs8KuyepYQCGC+67rkXb6qrwEGzmsh3r 3DDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=tM1MvXcfRBx2uPm9hhpVrMwKQf2k9tr/drdD63iQNfU=; b=ipC0abjy2wJ2LQtO2gr0YAbNBRkIyKZo0La1MePdF4+jePWZpCTh+I8IxwYlTmFVPp hoCGyjhgjpGsLQn38YRQXvUtHO9GTZckIoRN/npmdTVCQnPb3sOp1TNMe0bXRlfpmMU0 Vg8pIxtCa9/fS9LOsduIOFzywiESWKC1N7gD6QMVHkjNCqojekMmLZMl5GfbYP74P+yK P0gJKkwGrXn1/lJ+hge6dqGXoRq1AOQBORetayQ+2riDa0Dvjr7W4cxJAjWkjiyGNXZc IB9OqQ69IQkMpdSD/36/t3ItzClsxh4AeH/LqgN4OrJF+R0T1/wN9WkVZ8QrZxgBfL1I qf2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=K4uh6ywN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x1-20020a05640226c100b0045c93142111si3568696edd.70.2022.11.03.16.19.03; Thu, 03 Nov 2022 16:19:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=K4uh6ywN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230435AbiKCXP2 (ORCPT + 99 others); Thu, 3 Nov 2022 19:15:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbiKCXP0 (ORCPT ); Thu, 3 Nov 2022 19:15:26 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2824B1CFCA; Thu, 3 Nov 2022 16:15:22 -0700 (PDT) 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 4N3KNm1zvPz4xGQ; Fri, 4 Nov 2022 10:15:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1667517320; bh=tM1MvXcfRBx2uPm9hhpVrMwKQf2k9tr/drdD63iQNfU=; h=Date:From:To:Cc:Subject:From; b=K4uh6ywNakRILCxgMKWHWpuhkXJELXpJf8gQCbflffySvh5IRmhSkBryXHRfp4TyI tyU97ExysDFENluBp5qiSSpVDotqtmr8Kq3ohSkKJskxSbmkTll/dOPIf01R8p9og2 LMXNUPSPCn/UJfyk69AVvofEzJWoW3Ha5rWI7uG8XBIElCq8upUjetEbCMTVjCOkvD 6grOmFvDO9LmLzKFLypA3K3cF87oa1Nylw61ujG5cfvoZQPxAyQjFoVJlbPv8djpPy /q0r58w7G9tnCFXHQtb3ymFSINiEwihGsw6BVQEMoTLZ2qN2Sb8x0Phseh1bM6OMSR W4LyR9Y/ycH2A== Date: Fri, 4 Nov 2022 10:15:03 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Christian =?utf-8?b?S8O2bmln?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20221104101503.777fa92f@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748518900737863155?= X-GMAIL-MSGID: =?utf-8?q?1748518900737863155?= Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/gpu_scheduler.h between commit: 7b476affcccf ("drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag") from Linus' tree and commit: 4d5230b50dd4 ("drm/scheduler: add drm_sched_job_add_resv_dependencies") from the drm-misc 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 include/drm/gpu_scheduler.h index ca11716d084a,e40baefadc3a..000000000000 --- a/include/drm/gpu_scheduler.h