From patchwork Tue Jun 27 01:54:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 113183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7904799vqr; Mon, 26 Jun 2023 19:57:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7qA0mEvjuIl/yDgWZ7Y4ITDBc7kPsQ7q8MTCukPmqm6hmKfYjqyaqsuEAQNgoM5aq5HdvG X-Received: by 2002:a17:907:7293:b0:988:d841:7f8d with SMTP id dt19-20020a170907729300b00988d8417f8dmr20001404ejc.71.1687834626994; Mon, 26 Jun 2023 19:57:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687834626; cv=none; d=google.com; s=arc-20160816; b=KhXyTrli/qL/P20BRyfsSS/kC7kesr6XluLkMBpmlb+sQTLJBC5eicYS75toLKLJ6q WESNCp1Sj0aRteQxpbrybZto+//rYcQCqafjlL1l5RU8QPgcJPlHi6mD6PWDw0YjXmck D+TJhi3oq6clkO5cBphDvGJnYaJZjHzPSbHZfFvHFHLaoAJWpH1AUX1TKCclrgFo3pKZ YNIAz687zwZJpQNthH8dt8uGGexKH4xAyNnZvzTbil61bNyC0/MYRBQSOY9MMhgYo7uN ayz3v8w5IoKJ40PB58486BB2xrXfymqSfmt+bYjymz7tFCoZX8Xyj4ZwUXN90UWlopkX fbwg== 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=RRajNkNOmZ7k6F/p7wmvGLYlz9dAU7dhw4zq91Sf2i8=; fh=sJGB+76Fp0Q8DF3SJEhRMzi2hJqad1M2SHleLOT2kss=; b=Yb//g3akOj6JaTb+5WbO0T9sDDhr/LE7T75WRWspAKfPpOFc6sVI3w4cv5nShv+DLn PXMi2L1UVjwHkaPn7U+AlAhBmWdArWS+vbV0O6xd0TvUiplduZY9Kdg0/Uy2aXMBk5Sg V23vUfqJZd/sHd5Qrecl4o5ggEAN67xH9M1JNHpCIGfsy5/53Ifi+shuLYQesizmVk1n 3Jn+ZoHgR/eAkDpESBGFmJNOLLSHYWXkCTA1+BvVXy6QLVEg/+AaJz8TnSpZCto7Sdgy 4zS6Sk3ymsUPZkHEbfL5+b9q5TCVxeDQO5nkRX+wWc79X09LmaeEFRcNsEEJrsrUFgMI HCeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=kGYYiwiL; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w21-20020a17090633d500b0098cdd1e26eesi3718848eja.955.2023.06.26.19.56.43; Mon, 26 Jun 2023 19:57:06 -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=kGYYiwiL; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230052AbjF0Bym (ORCPT + 99 others); Mon, 26 Jun 2023 21:54:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbjF0Byj (ORCPT ); Mon, 26 Jun 2023 21:54:39 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 372AE1720; Mon, 26 Jun 2023 18:54:37 -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 4Qqnp209DBz4wb6; Tue, 27 Jun 2023 11:54:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687830875; bh=RRajNkNOmZ7k6F/p7wmvGLYlz9dAU7dhw4zq91Sf2i8=; h=Date:From:To:Cc:Subject:From; b=kGYYiwiL1YXQkNnZ5HOR9k/2YfORMdjyglVwTjbwG5iIGUg0pLhIC2Z5+Tqh11lpo PAGrMvXAZj6xrsJnoot7tTkHJLArlZZBMGNII/4WP9V/k9nObblgVC5d4ZJJDB+wVf rJemaPmOES9zyZeCBjbGb2FzoqF5IojIshloWsozYTwouPM7Rjg/llRIAiFzQleh1Q /xUQ2OYiFD1S10LjbIJ+kpqc4+6oUKSXmz2I/e9+gNIDosh7xjN29Wj4wYrVkioi9B 8g4DKeFNKqR5zs0q8uE/msFCMrBO7YJo8KZzz1Fw199r6Jpp1PCpcJ2idwh/ZD5UkG wOaD/OmuJNOng== Date: Tue, 27 Jun 2023 11:54:32 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Cc: Intel Graphics , DRI , Boris Brezillon , Christian =?utf-8?b?S8O2?= =?utf-8?b?bmln?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20230627115432.6179f0ea@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,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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?1769822881626358922?= X-GMAIL-MSGID: =?utf-8?q?1769822881626358922?= Hi all, Today's linux-next merge of the drm tree got a conflict in: include/drm/gpu_scheduler.h between commit: db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from drm_sched_fence_scheduled()") from the drm-misc-fixes tree and commit: 539f9ee4b52a ("drm/scheduler: properly forward fence errors") 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 include/drm/gpu_scheduler.h index b29e347b10a9,e95b4837e5a3..000000000000 --- a/include/drm/gpu_scheduler.h